From eed4847469e77e59f08da3d1cfdbfeda56bb7e2f Mon Sep 17 00:00:00 2001 From: Andrei Arlou Date: Fri, 29 Nov 2019 23:39:05 +0300 Subject: [PATCH] KEYCLOAK-12311 Fix minor warnings with collections in packages: forms, keys, partialimport, protocol from module "services" --- .../forms/account/freemarker/model/SessionsBean.java | 4 ++-- .../forms/login/freemarker/model/RegisterBean.java | 4 ++-- .../forms/login/freemarker/model/X509ConfirmBean.java | 2 +- .../main/java/org/keycloak/keys/DefaultKeyManager.java | 4 +--- .../keycloak/partialimport/ClientRolesPartialImport.java | 4 ++-- .../protocol/docker/DockerAuthV2ProtocolFactory.java | 2 +- .../org/keycloak/protocol/oidc/OIDCWellKnownProvider.java | 8 +++----- .../java/org/keycloak/protocol/oidc/TokenManager.java | 3 +-- .../protocol/oidc/endpoints/UserInfoEndpoint.java | 2 +- .../org/keycloak/protocol/oidc/mappers/AddressMapper.java | 2 +- .../protocol/oidc/mappers/AudienceProtocolMapper.java | 4 ++-- .../keycloak/protocol/oidc/mappers/FullNameMapper.java | 4 ++-- .../keycloak/protocol/oidc/mappers/HardcodedClaim.java | 2 +- .../org/keycloak/protocol/oidc/mappers/HardcodedRole.java | 4 ++-- .../keycloak/protocol/oidc/mappers/RoleNameMapper.java | 4 ++-- .../protocol/oidc/mappers/UserSessionNoteMapper.java | 4 ++-- .../protocol/saml/mappers/AttributeStatementHelper.java | 4 ++-- 17 files changed, 28 insertions(+), 33 deletions(-) diff --git a/services/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java b/services/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java index dcb7ced7c9d..218d23c67f3 100755 --- a/services/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java +++ b/services/src/main/java/org/keycloak/forms/account/freemarker/model/SessionsBean.java @@ -37,7 +37,7 @@ public class SessionsBean { private RealmModel realm; public SessionsBean(RealmModel realm, List sessions) { - this.events = new LinkedList(); + this.events = new LinkedList<>(); for (UserSessionModel session : sessions) { this.events.add(new UserSessionBean(realm, session)); } @@ -78,7 +78,7 @@ public class SessionsBean { } public Set getClients() { - Set clients = new HashSet(); + Set clients = new HashSet<>(); for (String clientUUID : session.getAuthenticatedClientSessions().keySet()) { ClientModel client = realm.getClientById(clientUUID); clients.add(client.getClientId()); diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java index 450220fb2c0..f15a808ad31 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RegisterBean.java @@ -25,10 +25,10 @@ import java.util.Map; */ public class RegisterBean { - private Map formData = new HashMap(); + private Map formData; public RegisterBean(MultivaluedMap formData) { - this.formData = new HashMap(); + this.formData = new HashMap<>(); if (formData != null) { for (String k : formData.keySet()) { diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java index 20d87f45548..5afd7884a4e 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java @@ -25,7 +25,7 @@ import java.util.Map; */ public class X509ConfirmBean { - private Map formData = new HashMap<>(); + private Map formData; public X509ConfirmBean(MultivaluedMap formData) { this.formData = new HashMap<>(); diff --git a/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java b/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java index a4a362c199a..0e041653018 100644 --- a/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java +++ b/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java @@ -137,9 +137,7 @@ public class DefaultKeyManager implements KeyManager { public List getKeys(RealmModel realm) { List keys = new LinkedList<>(); for (KeyProvider p : getProviders(realm)) { - for (KeyWrapper key : p .getKeys()) { - keys.add(key); - } + keys.addAll(p.getKeys()); } return keys; } diff --git a/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java b/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java index 95fa4a66455..b27c7d6e91a 100644 --- a/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java @@ -120,8 +120,8 @@ public class ClientRolesPartialImport { throw noClientFound(clientId); } - toOverwrite.put(clientId, new HashSet()); - toSkip.put(clientId, new HashSet()); + 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()) { diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java index 92888817ef9..e0ff0f32165 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java @@ -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); } diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java index df8dbfc8581..7cb626d0b99 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java @@ -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 list(String... values) { - List s = new LinkedList<>(); - for (String v : values) { - s.add(v); - } - return s; + return Arrays.asList(values); } private List getClientAuthMethodsSupported() { diff --git a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java index e9fba3d51ee..945e875977f 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java @@ -470,10 +470,9 @@ public class TokenManager { } return roleMappings; } else { - Set scopeMappings = new HashSet<>(); // 1 - Client roles of this client itself - scopeMappings.addAll(client.getRoles()); + Set 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) { diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java index b0c91831456..4b4bcd3345d 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java @@ -192,7 +192,7 @@ public class UserInfoEndpoint { AccessToken userInfo = new AccessToken(); tokenManager.transformUserInfoAccessToken(session, userInfo, userSession, clientSessionCtx); - Map claims = new HashMap(); + Map claims = new HashMap<>(); claims.put("sub", userModel.getId()); claims.putAll(userInfo.getOtherClaims()); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java index df56bb529fa..9d61b81ff34 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java @@ -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(); + 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)); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AudienceProtocolMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AudienceProtocolMapper.java index dcd0f981d24..80914bcecfe 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AudienceProtocolMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AudienceProtocolMapper.java @@ -35,7 +35,7 @@ import org.keycloak.representations.IDToken; */ public class AudienceProtocolMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper, OIDCIDTokenMapper { - private static final List configProperties = new ArrayList(); + private static final List 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 config = new HashMap(); + Map config = new HashMap<>(); if (includedClientAudience != null) { config.put(INCLUDED_CLIENT_AUDIENCE, includedClientAudience); } diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java index a196641b4ff..13dccc5114f 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java @@ -39,7 +39,7 @@ import java.util.Optional; */ public class FullNameMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper, OIDCIDTokenMapper, UserInfoTokenMapper { - private static final List configProperties = new ArrayList(); + private static final List 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 config = new HashMap(); + Map 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"); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java index 99f7a1f7613..58f031af5ab 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java @@ -96,7 +96,7 @@ public class HardcodedClaim extends AbstractOIDCProtocolMapper implements OIDCAc mapper.setName(name); mapper.setProtocolMapper(PROVIDER_ID); mapper.setProtocol(OIDCLoginProtocol.LOGIN_PROTOCOL); - Map config = new HashMap(); + Map config = new HashMap<>(); config.put(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME, hardcodedName); config.put(CLAIM_VALUE, hardcodedValue); config.put(OIDCAttributeMapperHelper.JSON_TYPE, claimType); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java index 4ab9eba4259..34e2ed4a5d2 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java @@ -41,7 +41,7 @@ import java.util.Map; */ public class HardcodedRole extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper { - private static final List configProperties = new ArrayList(); + private static final List 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 config = new HashMap(); + Map config = new HashMap<>(); config.put(ROLE_CONFIG, role); mapper.setConfig(config); return mapper; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java index 9a41a29b0a3..04757dc497e 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java @@ -41,7 +41,7 @@ import java.util.Map; */ public class RoleNameMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper { - private static final List configProperties = new ArrayList(); + private static final List 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 config = new HashMap(); + Map config = new HashMap<>(); config.put(ROLE_CONFIG, role); config.put(NEW_ROLE_NAME, newName); mapper.setConfig(config); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java index 5d1763c40d4..e173004e6bf 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java @@ -37,7 +37,7 @@ import java.util.Map; */ public class UserSessionNoteMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper, OIDCIDTokenMapper { - private static final List configProperties = new ArrayList(); + private static final List 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 config = new HashMap(); + Map config = new HashMap<>(); config.put(ProtocolMapperUtils.USER_SESSION_NOTE, userSessionNote); config.put(OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME, tokenClaimName); config.put(OIDCAttributeMapperHelper.JSON_TYPE, jsonType); diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java index 69c27c11c8f..e78c8b8f625 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java @@ -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 types = new ArrayList(3); + List 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 config = new HashMap(); + Map config = new HashMap<>(); if (userAttribute != null) config.put(ProtocolMapperUtils.USER_ATTRIBUTE, userAttribute); config.put(SAML_ATTRIBUTE_NAME, samlAttributeName); if (friendlyName != null) {