libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

KEYCLOAK-12311 Fix minor warnings with collections in packages: forms, keys, partialimport, protocol from module "services"

Browse source
This commit is contained in:
Andrei Arlou 2019-11-29 23:39:05 +03:00 committed by Stian Thorgersen
parent 7409f6991f
commit eed4847469
17 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java
View file

@ -37,7 +37,7 @@ public class SessionsBean {
private RealmModel realm;
public SessionsBean(RealmModel realm, List<UserSessionModel> sessions) {
this.events = new LinkedList<UserSessionBean>();
this.events = new LinkedList<>();
for (UserSessionModel session : sessions) {
this.events.add(new UserSessionBean(realm, session));
}
@ -78,7 +78,7 @@ public class SessionsBean {
}
public Set<String> getClients() {
Set<String> clients = new HashSet<String>();
Set<String> clients = new HashSet<>();
for (String clientUUID : session.getAuthenticatedClientSessions().keySet()) {
ClientModel client = realm.getClientById(clientUUID);
clients.add(client.getClientId());

4
services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java
View file

@ -25,10 +25,10 @@ import java.util.Map;
*/
public class RegisterBean {
private Map<String, String> formData = new HashMap<String, String>();
private Map<String, String> formData;
public RegisterBean(MultivaluedMap<String, String> formData) {
this.formData = new HashMap<String, String>();
this.formData = new HashMap<>();
if (formData != null) {
for (String k : formData.keySet()) {

2
services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java
View file

@ -25,7 +25,7 @@ import java.util.Map;
*/
public class X509ConfirmBean {
private Map<String, String> formData = new HashMap<>();
private Map<String, String> formData;
public X509ConfirmBean(MultivaluedMap<String, String> formData) {
this.formData = new HashMap<>();

4
services/src/main/java/org/keycloak/keys/DefaultKeyManager.java
View file

@ -137,9 +137,7 @@ public class DefaultKeyManager implements KeyManager {
public List<KeyWrapper> getKeys(RealmModel realm) {
List<KeyWrapper> keys = new LinkedList<>();
for (KeyProvider p : getProviders(realm)) {
for (KeyWrapper key : p .getKeys()) {
keys.add(key);
}
keys.addAll(p.getKeys());
}
return keys;
}

4
services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java
View file

@ -120,8 +120,8 @@ public class ClientRolesPartialImport {
throw noClientFound(clientId);
}
toOverwrite.put(clientId, new HashSet<RoleRepresentation>());
toSkip.put(clientId, new HashSet<RoleRepresentation>());
toOverwrite.put(clientId, new HashSet<>());
toSkip.put(clientId, new HashSet<>());
for (RoleRepresentation roleRep : repList.get(clientId)) {
if (exists(realm, session, clientId, roleRep)) {
switch (partialImportRep.getPolicy()) {

2
services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java
View file

@ -28,7 +28,7 @@ public class DockerAuthV2ProtocolFactory extends AbstractLoginProtocolFactory im
addAllRequestedScopeMapper.setName(AllowAllDockerProtocolMapper.PROVIDER_ID);
addAllRequestedScopeMapper.setProtocolMapper(AllowAllDockerProtocolMapper.PROVIDER_ID);
addAllRequestedScopeMapper.setProtocol(DockerAuthV2Protocol.LOGIN_PROTOCOL);
addAllRequestedScopeMapper.setConfig(Collections.EMPTY_MAP);
addAllRequestedScopeMapper.setConfig(Collections.emptyMap());
builtins.put(AllowAllDockerProtocolMapper.PROVIDER_ID, addAllRequestedScopeMapper);
defaultBuiltins.add(addAllRequestedScopeMapper);
}

8
services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java
View file

@ -42,6 +42,8 @@ import org.keycloak.wellknown.WellKnownProvider;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
@ -140,11 +142,7 @@ public class OIDCWellKnownProvider implements WellKnownProvider {
}
private static List<String> list(String... values) {
List<String> s = new LinkedList<>();
for (String v : values) {
s.add(v);
}
return s;
return Arrays.asList(values);
}
private List<String> getClientAuthMethodsSupported() {

3
services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java
View file

@ -470,10 +470,9 @@ public class TokenManager {
}
return roleMappings;
} else {
Set<RoleModel> scopeMappings = new HashSet<>();
// 1 - Client roles of this client itself
scopeMappings.addAll(client.getRoles());
Set<RoleModel> scopeMappings = new HashSet<>(client.getRoles());
// 2 - Role mappings of client itself + default client scopes + optional client scopes requested by scope parameter (if applyScopeParam is true)
for (ClientScopeModel clientScope : clientScopes) {

2
services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java
View file

@ -192,7 +192,7 @@ public class UserInfoEndpoint {
AccessToken userInfo = new AccessToken();
tokenManager.transformUserInfoAccessToken(session, userInfo, userSession, clientSessionCtx);
Map<String, Object> claims = new HashMap<String, Object>();
Map<String, Object> claims = new HashMap<>();
claims.put("sub", userModel.getId());
claims.putAll(userInfo.getOtherClaims());

2
services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java
View file

@ -78,7 +78,7 @@ public class AddressMapper extends AbstractOIDCProtocolMapper implements OIDCAcc
address.setName("address");
address.setProtocolMapper(PROVIDER_ID);
address.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL);
config = new HashMap<String, String>();
config = new HashMap<>();
config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ACCESS_TOKEN, Boolean.toString(accessToken));
config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ID_TOKEN, Boolean.toString(idToken));
config.put(OIDCAttributeMapperHelper.INCLUDE_IN_USERINFO, Boolean.toString(userInfo));

4
services/src/main/java/org/keycloak/protocol/oidc/mappers/AudienceProtocolMapper.java
View file

@ -35,7 +35,7 @@ import org.keycloak.representations.IDToken;
*/
public class AudienceProtocolMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper, OIDCIDTokenMapper {
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
private static final List<ProviderConfigProperty> configProperties = new ArrayList<>();
public static final String INCLUDED_CLIENT_AUDIENCE = "included.client.audience";
private static final String INCLUDED_CLIENT_AUDIENCE_LABEL = "included.client.audience.label";
@ -121,7 +121,7 @@ public class AudienceProtocolMapper extends AbstractOIDCProtocolMapper implement
mapper.setProtocolMapper(PROVIDER_ID);
mapper.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL);
Map<String, String> config = new HashMap<String, String>();
Map<String, String> config = new HashMap<>();
if (includedClientAudience != null) {
config.put(INCLUDED_CLIENT_AUDIENCE, includedClientAudience);
}

4
services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java
View file

@ -39,7 +39,7 @@ import java.util.Optional;
*/
public class FullNameMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper, OIDCIDTokenMapper, UserInfoTokenMapper {
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
private static final List<ProviderConfigProperty> configProperties = new ArrayList<>();
static {
OIDCAttributeMapperHelper.addIncludeInTokensConfig(configProperties, FullNameMapper.class);
@ -88,7 +88,7 @@ public class FullNameMapper extends AbstractOIDCProtocolMapper implements OIDCAc
mapper.setName(name);
mapper.setProtocolMapper(PROVIDER_ID);
mapper.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL);
Map<String, String> config = new HashMap<String, String>();
Map<String, String> config = new HashMap<>();
if (accessToken) config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ACCESS_TOKEN, "true");
if (idToken) config.put(OIDCAttributeMapperHelper.INCLUDE_IN_ID_TOKEN, "true");
if (userInfo) config.put(OIDCAttributeMapperHelper.INCLUDE_IN_USERINFO, "true");

2
services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java
View file

@ -96,7 +96,7 @@ public class HardcodedClaim extends AbstractOIDCProtocolMapper implements OIDCAc
mapper.setName(name);
mapper.setProtocolMapper(PROVIDER_ID);
mapper.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL);
Map<String, String> config = new HashMap<String, String>();
Map<String, String> config = new HashMap<>();
config.put(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME, hardcodedName);
config.put(CLAIM_VALUE, hardcodedValue);
config.put(OIDCAttributeMapperHelper.JSON_TYPE, claimType);

4
services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java
View file

@ -41,7 +41,7 @@ import java.util.Map;
*/
public class HardcodedRole extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper {
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
private static final List<ProviderConfigProperty> configProperties = new ArrayList<>();
public static final String ROLE_CONFIG = "role";
@ -113,7 +113,7 @@ public class HardcodedRole extends AbstractOIDCProtocolMapper implements OIDCAcc
mapper.setName(name);
mapper.setProtocolMapper(mapperId);
mapper.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL);
Map<String, String> config = new HashMap<String, String>();
Map<String, String> config = new HashMap<>();
config.put(ROLE_CONFIG, role);
mapper.setConfig(config);
return mapper;

4
services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java
View file

@ -41,7 +41,7 @@ import java.util.Map;
*/
public class RoleNameMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper {
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
private static final List<ProviderConfigProperty> configProperties = new ArrayList<>();
public static final String ROLE_CONFIG = "role";
public static String NEW_ROLE_NAME = "new.role.name";
@ -136,7 +136,7 @@ public class RoleNameMapper extends AbstractOIDCProtocolMapper implements OIDCAc
mapper.setName(name);
mapper.setProtocolMapper(mapperId);
mapper.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL);
Map<String, String> config = new HashMap<String, String>();
Map<String, String> config = new HashMap<>();
config.put(ROLE_CONFIG, role);
config.put(NEW_ROLE_NAME, newName);
mapper.setConfig(config);

4
services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java
View file

@ -37,7 +37,7 @@ import java.util.Map;
*/
public class UserSessionNoteMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper, OIDCIDTokenMapper {
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
private static final List<ProviderConfigProperty> configProperties = new ArrayList<>();
static {
ProviderConfigProperty property;
@ -93,7 +93,7 @@ public class UserSessionNoteMapper extends AbstractOIDCProtocolMapper implements
mapper.setName(name);
mapper.setProtocolMapper(PROVIDER_ID);
mapper.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL);
Map<String, String> config = new HashMap<String, String>();
Map<String, String> config = new HashMap<>();
config.put(ProtocolMapperUtils.USER_SESSION_NOTE, userSessionNote);
config.put(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME, tokenClaimName);
config.put(OIDCAttributeMapperHelper.JSON_TYPE, jsonType);

4
services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java
View file

@ -90,7 +90,7 @@ public class AttributeStatementHelper {
property.setName(AttributeStatementHelper.SAML_ATTRIBUTE_NAMEFORMAT);
property.setLabel("SAML Attribute NameFormat");
property.setHelpText("SAML Attribute NameFormat. Can be basic, URI reference, or unspecified.");
List<String> types = new ArrayList(3);
List<String> types = new ArrayList<>(3);
types.add(AttributeStatementHelper.BASIC);
types.add(AttributeStatementHelper.URI_REFERENCE);
types.add(AttributeStatementHelper.UNSPECIFIED);
@ -104,7 +104,7 @@ public class AttributeStatementHelper {
mapper.setName(name);
mapper.setProtocolMapper(mapperId);
mapper.setProtocol(SamlProtocol.LOGIN_PROTOCOL);
Map<String, String> config = new HashMap<String, String>();
Map<String, String> config = new HashMap<>();
if (userAttribute != null) config.put(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute);
config.put(SAML_ATTRIBUTE_NAME, samlAttributeName);
if (friendlyName != null) {