diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java index bf14e909a..77f595ce1 100644 --- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java +++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java @@ -83,7 +83,7 @@ public class IntrospectingTokenService implements ResourceServerTokenServices { } } - private Map authCache = new HashMap(); + private Map authCache = new HashMap<>(); /** * Logger for this class */ @@ -135,11 +135,11 @@ public class IntrospectingTokenService implements ResourceServerTokenServices { private OAuth2Request createStoredRequest(final JsonObject token) { String clientId = token.get("client_id").getAsString(); - Set scopes = new HashSet(); + Set scopes = new HashSet<>(); if (token.has("scope")) { scopes.addAll(OAuth2Utils.parseParameterList(token.get("scope").getAsString())); } - Map parameters = new HashMap(); + Map parameters = new HashMap<>(); parameters.put("client_id", clientId); parameters.put("scope", OAuth2Utils.formatParameterList(scopes)); OAuth2Request storedRequest = new OAuth2Request(parameters, clientId, null, true, scopes, null, null, null, null); @@ -175,7 +175,7 @@ public class IntrospectingTokenService implements ResourceServerTokenServices { String validatedToken = null; RestTemplate restTemplate; - MultiValueMap form = new LinkedMultiValueMap(); + MultiValueMap form = new LinkedMultiValueMap<>(); final String clientId = client.getClientId(); final String clientSecret = client.getClientSecret(); diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java index 8141794ca..3e78e4b9c 100644 --- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java +++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java @@ -34,7 +34,7 @@ public class OAuth2AccessTokenImpl implements OAuth2AccessToken { private JsonObject introspectionResponse; private String tokenString; - private Set scopes = new HashSet(); + private Set scopes = new HashSet<>(); private Date expireDate; diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java index 26257aa10..3b8a2564f 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java @@ -49,12 +49,12 @@ public class NamedAdminAuthoritiesMapper implements OIDCAuthoritiesMapper { private static final SimpleGrantedAuthority ROLE_ADMIN = new SimpleGrantedAuthority("ROLE_ADMIN"); private static final SimpleGrantedAuthority ROLE_USER = new SimpleGrantedAuthority("ROLE_USER"); - private Set admins = new HashSet(); + private Set admins = new HashSet<>(); @Override public Collection mapAuthorities(JWT idToken, UserInfo userInfo) { - Set out = new HashSet(); + Set out = new HashSet<>(); try { ReadOnlyJWTClaimsSet claims = idToken.getJWTClaimsSet(); diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java index 12a52d71d..ebf058cdd 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java @@ -299,7 +299,7 @@ public class OIDCAuthenticationFilter extends AbstractAuthenticationProcessingFi ServerConfiguration serverConfig = servers.getServerConfiguration(issuer); final RegisteredClient clientConfig = clients.getClientConfiguration(serverConfig); - MultiValueMap form = new LinkedMultiValueMap(); + MultiValueMap form = new LinkedMultiValueMap<>(); form.add("grant_type", "authorization_code"); form.add("code", authorizationCode); form.setAll(authOptions.getTokenOptions(serverConfig, clientConfig, request)); diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java index 351d83766..36ed96391 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java @@ -91,7 +91,7 @@ public class UserInfoFetcher { userInfoString = restTemplate.getForObject(serverConfiguration.getUserInfoUri(), String.class); } else if (serverConfiguration.getUserInfoTokenMethod().equals(UserInfoTokenMethod.FORM)) { - MultiValueMap form = new LinkedMultiValueMap(); + MultiValueMap form = new LinkedMultiValueMap<>(); form.add("access_token", token.getAccessTokenValue()); RestTemplate restTemplate = new RestTemplate(factory); diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java index 46489165f..18d5b9be2 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java @@ -66,8 +66,8 @@ public class DynamicRegistrationClientConfigurationService implements ClientConf private RegisteredClient template; - private Set whitelist = new HashSet(); - private Set blacklist = new HashSet(); + private Set whitelist = new HashSet<>(); + private Set blacklist = new HashSet<>(); public DynamicRegistrationClientConfigurationService() { clients = CacheBuilder.newBuilder().build(new DynamicClientRegistrationLoader()); @@ -192,7 +192,7 @@ public class DynamicRegistrationClientConfigurationService implements ClientConf headers.setContentType(MediaType.APPLICATION_JSON); headers.setAccept(Lists.newArrayList(MediaType.APPLICATION_JSON)); - HttpEntity entity = new HttpEntity(serializedClient, headers); + HttpEntity entity = new HttpEntity<>(serializedClient, headers); String registered = restTemplate.postForObject(serverConfig.getRegistrationEndpointUri(), entity, String.class); // TODO: handle HTTP errors @@ -212,7 +212,7 @@ public class DynamicRegistrationClientConfigurationService implements ClientConf headers.set("Authorization", String.format("%s %s", OAuth2AccessToken.BEARER_TYPE, knownClient.getRegistrationAccessToken())); headers.setAccept(Lists.newArrayList(MediaType.APPLICATION_JSON)); - HttpEntity entity = new HttpEntity(headers); + HttpEntity entity = new HttpEntity<>(headers); String registered = restTemplate.exchange(knownClient.getRegistrationClientUri(), HttpMethod.GET, entity, String.class).getBody(); // TODO: handle HTTP errors diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java index d8fc7576a..07dc95095 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java @@ -65,8 +65,8 @@ public class DynamicServerConfigurationService implements ServerConfigurationSer // map of issuer -> server configuration, loaded dynamically from service discovery private LoadingCache servers; - private Set whitelist = new HashSet(); - private Set blacklist = new HashSet(); + private Set whitelist = new HashSet<>(); + private Set blacklist = new HashSet<>(); public DynamicServerConfigurationService() { // initialize the cache diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/InMemoryRegisteredClientService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/InMemoryRegisteredClientService.java index 69a365578..8963016ef 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/InMemoryRegisteredClientService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/InMemoryRegisteredClientService.java @@ -31,7 +31,7 @@ import org.mitre.openid.connect.client.service.RegisteredClientService; */ public class InMemoryRegisteredClientService implements RegisteredClientService { - private Map clients = new HashMap(); + private Map clients = new HashMap<>(); /* (non-Javadoc) * @see org.mitre.openid.connect.client.service.RegisteredClientService#getByIssuer(java.lang.String) diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/JsonFileRegisteredClientService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/JsonFileRegisteredClientService.java index 55dd56c6d..984bf6221 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/JsonFileRegisteredClientService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/JsonFileRegisteredClientService.java @@ -73,7 +73,7 @@ public class JsonFileRegisteredClientService implements RegisteredClientService private File file; - private Map clients = new HashMap(); + private Map clients = new HashMap<>(); public JsonFileRegisteredClientService(String filename) { this.file = new File(filename); diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java index 937a2dc2a..f1c89793f 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java @@ -44,8 +44,8 @@ public class ThirdPartyIssuerService implements IssuerService { private String accountChooserUrl; - private Set whitelist = new HashSet(); - private Set blacklist = new HashSet(); + private Set whitelist = new HashSet<>(); + private Set blacklist = new HashSet<>(); /* (non-Javadoc) * @see org.mitre.openid.connect.client.service.IssuerService#getIssuer(javax.servlet.http.HttpServletRequest) diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java index ebbf6b69d..8e1ef9135 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java @@ -63,8 +63,8 @@ public class WebfingerIssuerService implements IssuerService { // map of user input -> issuer, loaded dynamically from webfinger discover private LoadingCache issuers; - private Set whitelist = new HashSet(); - private Set blacklist = new HashSet(); + private Set whitelist = new HashSet<>(); + private Set blacklist = new HashSet<>(); /** * Name of the incoming parameter to check for discovery purposes. diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticClientConfigurationService.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticClientConfigurationService.java index 46787034c..c6c4c323d 100644 --- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticClientConfigurationService.java +++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticClientConfigurationService.java @@ -57,7 +57,7 @@ public class TestStaticClientConfigurationService { service = new StaticClientConfigurationService(); - Map clients = new HashMap(); + Map clients = new HashMap<>(); clients.put(issuer, mockClient); service.setClients(clients); diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticServerConfigurationService.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticServerConfigurationService.java index 7edc16320..e49911995 100644 --- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticServerConfigurationService.java +++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticServerConfigurationService.java @@ -53,7 +53,7 @@ public class TestStaticServerConfigurationService { service = new StaticServerConfigurationService(); - Map servers = new HashMap(); + Map servers = new HashMap<>(); servers.put(issuer, mockServerConfig); service.setServers(servers); diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/encryption/service/impl/DefaultJWTEncryptionAndDecryptionService.java b/openid-connect-common/src/main/java/org/mitre/jwt/encryption/service/impl/DefaultJWTEncryptionAndDecryptionService.java index f95340d03..d498d99c2 100644 --- a/openid-connect-common/src/main/java/org/mitre/jwt/encryption/service/impl/DefaultJWTEncryptionAndDecryptionService.java +++ b/openid-connect-common/src/main/java/org/mitre/jwt/encryption/service/impl/DefaultJWTEncryptionAndDecryptionService.java @@ -58,10 +58,10 @@ public class DefaultJWTEncryptionAndDecryptionService implements JWTEncryptionAn private static final Logger logger = LoggerFactory.getLogger(DefaultJWTEncryptionAndDecryptionService.class); // map of identifier to encrypter - private Map encrypters = new HashMap(); + private Map encrypters = new HashMap<>(); // map of identifier to decrypter - private Map decrypters = new HashMap(); + private Map decrypters = new HashMap<>(); private String defaultEncryptionKeyId; @@ -70,7 +70,7 @@ public class DefaultJWTEncryptionAndDecryptionService implements JWTEncryptionAn private JWEAlgorithm defaultAlgorithm; // map of identifier to key - private Map keys = new HashMap(); + private Map keys = new HashMap<>(); /** * Build this service based on the keys given. All public keys will be used to make encrypters, @@ -253,7 +253,7 @@ public class DefaultJWTEncryptionAndDecryptionService implements JWTEncryptionAn @Override public Map getAllPublicKeys() { - Map pubKeys = new HashMap(); + Map pubKeys = new HashMap<>(); // pull out all public keys for (String keyId : keys.keySet()) { @@ -269,7 +269,7 @@ public class DefaultJWTEncryptionAndDecryptionService implements JWTEncryptionAn @Override public Collection getAllEncryptionAlgsSupported() { - Set algs = new HashSet(); + Set algs = new HashSet<>(); for (JWEEncrypter encrypter : encrypters.values()) { algs.addAll(encrypter.supportedAlgorithms()); @@ -287,7 +287,7 @@ public class DefaultJWTEncryptionAndDecryptionService implements JWTEncryptionAn */ @Override public Collection getAllEncryptionEncsSupported() { - Set encs = new HashSet(); + Set encs = new HashSet<>(); for (JWEEncrypter encrypter : encrypters.values()) { encs.addAll(encrypter.supportedEncryptionMethods()); diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJWTSigningAndValidationService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJWTSigningAndValidationService.java index 43a1d4701..ea34efd34 100644 --- a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJWTSigningAndValidationService.java +++ b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJWTSigningAndValidationService.java @@ -50,10 +50,10 @@ import com.nimbusds.jwt.SignedJWT; public class DefaultJWTSigningAndValidationService implements JWTSigningAndValidationService { // map of identifier to signer - private Map signers = new HashMap(); + private Map signers = new HashMap<>(); // map of identifier to verifier - private Map verifiers = new HashMap(); + private Map verifiers = new HashMap<>(); /** * Logger for this class @@ -65,7 +65,7 @@ public class DefaultJWTSigningAndValidationService implements JWTSigningAndValid private JWSAlgorithm defaultAlgorithm; // map of identifier to key - private Map keys = new HashMap(); + private Map keys = new HashMap<>(); /** * Build this service based on the keys given. All public keys will be used @@ -269,7 +269,7 @@ public class DefaultJWTSigningAndValidationService implements JWTSigningAndValid @Override public Map getAllPublicKeys() { - Map pubKeys = new HashMap(); + Map pubKeys = new HashMap<>(); // pull all keys out of the verifiers if we know how for (String keyId : keys.keySet()) { @@ -289,7 +289,7 @@ public class DefaultJWTSigningAndValidationService implements JWTSigningAndValid @Override public Collection getAllSigningAlgsSupported() { - Set algs = new HashSet(); + Set algs = new HashSet<>(); for (JWSSigner signer : signers.values()) { algs.addAll(signer.supportedAlgorithms()); diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java index ceecf0619..144d3c24c 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java @@ -86,16 +86,16 @@ public class ClientDetailsEntity implements ClientDetails { /** Fields from the OAuth2 Dynamic Registration Specification */ private String clientId = null; // client_id private String clientSecret = null; // client_secret - private Set redirectUris = new HashSet(); // redirect_uris + private Set redirectUris = new HashSet<>(); // redirect_uris private String clientName; // client_name private String clientUri; // client_uri private String logoUri; // logo_uri private Set contacts; // contacts private String tosUri; // tos_uri private AuthMethod tokenEndpointAuthMethod = AuthMethod.SECRET_BASIC; // token_endpoint_auth_method - private Set scope = new HashSet(); // scope - private Set grantTypes = new HashSet(); // grant_types - private Set responseTypes = new HashSet(); // response_types + private Set scope = new HashSet<>(); // scope + private Set grantTypes = new HashSet<>(); // grant_types + private Set responseTypes = new HashSet<>(); // response_types private String policyUri; private String jwksUri; // URI pointer to keys private JWKSet jwks; // public key stored by value @@ -127,11 +127,11 @@ public class ClientDetailsEntity implements ClientDetails { private Set requestUris; // request_uris /** Fields to support the ClientDetails interface **/ - private Set authorities = new HashSet(); + private Set authorities = new HashSet<>(); private Integer accessTokenValiditySeconds = 0; // in seconds private Integer refreshTokenValiditySeconds = 0; // in seconds - private Set resourceIds = new HashSet(); - private Map additionalInformation = new HashMap(); + private Set resourceIds = new HashSet<>(); + private Map additionalInformation = new HashMap<>(); /** Our own fields **/ private String clientDescription = ""; // human-readable description @@ -151,7 +151,7 @@ public class ClientDetailsEntity implements ClientDetails { private final String value; // map to aid reverse lookup - private static final Map lookup = new HashMap(); + private static final Map lookup = new HashMap<>(); static { for (AuthMethod a : AuthMethod.values()) { lookup.put(a.getValue(), a); @@ -177,7 +177,7 @@ public class ClientDetailsEntity implements ClientDetails { private final String value; // map to aid reverse lookup - private static final Map lookup = new HashMap(); + private static final Map lookup = new HashMap<>(); static { for (AppType a : AppType.values()) { lookup.put(a.getValue(), a); @@ -203,7 +203,7 @@ public class ClientDetailsEntity implements ClientDetails { private final String value; // map to aid reverse lookup - private static final Map lookup = new HashMap(); + private static final Map lookup = new HashMap<>(); static { for (SubjectType u : SubjectType.values()) { lookup.put(u.getValue(), u); diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java index c0e510954..d04a12132 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java @@ -142,7 +142,7 @@ public class OAuth2AccessTokenEntity implements OAuth2AccessToken { @Override @Transient public Map getAdditionalInformation() { - Map map = new HashMap(); //super.getAdditionalInformation(); + Map map = new HashMap<>(); //super.getAdditionalInformation(); if (getIdToken() != null) { map.put(ID_TOKEN_FIELD_NAME, getIdTokenString()); } diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/DefaultClientUserDetailsService.java b/openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/DefaultClientUserDetailsService.java index 808a6d3bb..b662b8caa 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/DefaultClientUserDetailsService.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/DefaultClientUserDetailsService.java @@ -72,7 +72,7 @@ public class DefaultClientUserDetailsService implements UserDetailsService { boolean accountNonExpired = true; boolean credentialsNonExpired = true; boolean accountNonLocked = true; - Collection authorities = new HashSet(client.getAuthorities()); + Collection authorities = new HashSet<>(client.getAuthorities()); authorities.add(ROLE_CLIENT); return new User(clientId, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities); diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JWKSetView.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JWKSetView.java index d35a3a6f6..db599ff60 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JWKSetView.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JWKSetView.java @@ -58,7 +58,7 @@ public class JWKSetView extends AbstractView { //BiMap keyMap = (BiMap) model.get("keys"); Map keys = (Map) model.get("keys"); - JWKSet jwkSet = new JWKSet(new ArrayList(keys.values())); + JWKSet jwkSet = new JWKSet(new ArrayList<>(keys.values())); try { diff --git a/openid-connect-common/src/main/java/org/mitre/util/JsonUtils.java b/openid-connect-common/src/main/java/org/mitre/util/JsonUtils.java index 3cb008928..35136a9f3 100644 --- a/openid-connect-common/src/main/java/org/mitre/util/JsonUtils.java +++ b/openid-connect-common/src/main/java/org/mitre/util/JsonUtils.java @@ -205,7 +205,7 @@ public class JsonUtils { public static List getAsJwsAlgorithmList(JsonObject o, String member) { List strings = getAsStringList(o, member); if (strings != null) { - List algs = new ArrayList(); + List algs = new ArrayList<>(); for (String alg : strings) { algs.add(JWSAlgorithm.parse(alg)); } @@ -221,7 +221,7 @@ public class JsonUtils { public static List getAsJweAlgorithmList(JsonObject o, String member) { List strings = getAsStringList(o, member); if (strings != null) { - List algs = new ArrayList(); + List algs = new ArrayList<>(); for (String alg : strings) { algs.add(JWEAlgorithm.parse(alg)); } @@ -237,7 +237,7 @@ public class JsonUtils { public static List getAsEncryptionMethodList(JsonObject o, String member) { List strings = getAsStringList(o, member); if (strings != null) { - List algs = new ArrayList(); + List algs = new ArrayList<>(); for (String alg : strings) { algs.add(EncryptionMethod.parse(alg)); } @@ -248,7 +248,7 @@ public class JsonUtils { } public static Map readMap(JsonReader reader) throws IOException { - Map map = new HashMap(); + Map map = new HashMap<>(); reader.beginObject(); while(reader.hasNext()) { String name = reader.nextName(); @@ -279,13 +279,13 @@ public class JsonUtils { reader.beginArray(); switch (reader.peek()) { case STRING: - arraySet = new HashSet(); + arraySet = new HashSet<>(); while (reader.hasNext()) { arraySet.add(reader.nextString()); } break; case NUMBER: - arraySet = new HashSet(); + arraySet = new HashSet<>(); while (reader.hasNext()) { arraySet.add(reader.nextLong()); } diff --git a/openid-connect-common/src/test/java/org/mitre/jose/TestJWKSetKeyStore.java b/openid-connect-common/src/test/java/org/mitre/jose/TestJWKSetKeyStore.java index a3abd9efb..611d57ad7 100644 --- a/openid-connect-common/src/test/java/org/mitre/jose/TestJWKSetKeyStore.java +++ b/openid-connect-common/src/test/java/org/mitre/jose/TestJWKSetKeyStore.java @@ -82,7 +82,7 @@ public class TestJWKSetKeyStore { KeyUse.ENCRYPTION, null, JWEAlgorithm.RSA1_5, RSAkid_rsa2, null, null, null); - List keys_list = new LinkedList(); + List keys_list = new LinkedList<>(); private JWKSet jwkSet; private String ks_file = "ks.txt"; private String ks_file_badJWK = "ks_badJWK.txt"; diff --git a/openid-connect-common/src/test/java/org/mitre/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java b/openid-connect-common/src/test/java/org/mitre/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java index 72b3ef002..c85e17f72 100644 --- a/openid-connect-common/src/test/java/org/mitre/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java +++ b/openid-connect-common/src/test/java/org/mitre/jwt/encryption/service/impl/TestDefaultJWTEncryptionAndDecryptionService.java @@ -135,7 +135,7 @@ public class TestDefaultJWTEncryptionAndDecryptionService { .build(); - private List keys_list = new LinkedList(); + private List keys_list = new LinkedList<>(); private DefaultJWTEncryptionAndDecryptionService service; private DefaultJWTEncryptionAndDecryptionService service_2; diff --git a/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java b/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java index 3170cd9ba..cce124eb4 100644 --- a/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java +++ b/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java @@ -299,7 +299,7 @@ public class DiscoveryEndpoint { Algorithm.NONE); ArrayList grantTypes = Lists.newArrayList("authorization_code", "implicit", "urn:ietf:params:oauth:grant-type:jwt-bearer", "client_credentials", "urn:ietf:params:oauth:grant_type:redelegate"); - Map m = new HashMap(); + Map m = new HashMap<>(); m.put("issuer", config.getIssuer()); m.put("authorization_endpoint", baseUrl + "authorize"); m.put("token_endpoint", baseUrl + "token"); diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java index 333f5046b..3127e39d4 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java @@ -48,13 +48,13 @@ public class JpaOAuth2TokenRepository implements OAuth2TokenRepository { @Override public Set getAllAccessTokens() { TypedQuery query = manager.createNamedQuery(OAuth2AccessTokenEntity.QUERY_ALL, OAuth2AccessTokenEntity.class); - return new LinkedHashSet(query.getResultList()); + return new LinkedHashSet<>(query.getResultList()); } @Override public Set getAllRefreshTokens() { TypedQuery query = manager.createNamedQuery(OAuth2RefreshTokenEntity.QUERY_ALL, OAuth2RefreshTokenEntity.class); - return new LinkedHashSet(query.getResultList()); + return new LinkedHashSet<>(query.getResultList()); } @@ -187,7 +187,7 @@ public class JpaOAuth2TokenRepository implements OAuth2TokenRepository { TypedQuery query = manager.createNamedQuery(OAuth2AccessTokenEntity.QUERY_EXPIRED_BY_DATE, OAuth2AccessTokenEntity.class); query.setParameter(OAuth2AccessTokenEntity.PARAM_DATE, new Date()); query.setMaxResults(MAXEXPIREDRESULTS); - return new LinkedHashSet(query.getResultList()); + return new LinkedHashSet<>(query.getResultList()); } @Override @@ -195,7 +195,7 @@ public class JpaOAuth2TokenRepository implements OAuth2TokenRepository { TypedQuery query = manager.createNamedQuery(OAuth2RefreshTokenEntity.QUERY_EXPIRED_BY_DATE, OAuth2RefreshTokenEntity.class); query.setParameter(OAuth2RefreshTokenEntity.PARAM_DATE, new Date()); query.setMaxResults(MAXEXPIREDRESULTS); - return new LinkedHashSet(query.getResultList()); + return new LinkedHashSet<>(query.getResultList()); } } diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java index 7c9a8fb6d..53027e8c1 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java @@ -52,7 +52,7 @@ public class JpaSystemScopeRepository implements SystemScopeRepository { public Set getAll() { TypedQuery query = em.createNamedQuery(SystemScope.QUERY_ALL, SystemScope.class); - return new LinkedHashSet(query.getResultList()); + return new LinkedHashSet<>(query.getResultList()); } /* (non-Javadoc) diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java index 284b4a7d4..4e32c9504 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java @@ -330,7 +330,7 @@ public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEnt JsonElement json = parser.parse(jsonString); if (json.isJsonArray()) { - List redirectUris = new ArrayList(); + List redirectUris = new ArrayList<>(); for (JsonElement el : json.getAsJsonArray()) { redirectUris.add(el.getAsString()); } diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java index a9baf9118..c77e24a70 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java @@ -272,12 +272,12 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi OAuth2AccessTokenEntity token = new OAuth2AccessTokenEntity(); // get the stored scopes from the authentication holder's authorization request; these are the scopes associated with the refresh token - Set refreshScopesRequested = new HashSet(refreshToken.getAuthenticationHolder().getAuthentication().getOAuth2Request().getScope()); + Set refreshScopesRequested = new HashSet<>(refreshToken.getAuthenticationHolder().getAuthentication().getOAuth2Request().getScope()); Set refreshScopes = scopeService.fromStrings(refreshScopesRequested); // remove any of the special system scopes refreshScopes = scopeService.removeReservedScopes(refreshScopes); - Set scopeRequested = authRequest.getScope() == null ? new HashSet() : new HashSet(authRequest.getScope()); + Set scopeRequested = authRequest.getScope() == null ? new HashSet() : new HashSet<>(authRequest.getScope()); Set scope = scopeService.fromStrings(scopeRequested); // remove any of the special system scopes diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java index ac30910c9..687a7fe33 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java @@ -165,7 +165,7 @@ public class DefaultSystemScopeService implements SystemScopeService { if (scope == null) { return null; } else { - return new LinkedHashSet(Collections2.filter(Collections2.transform(scope, stringToSystemScope), Predicates.notNull())); + return new LinkedHashSet<>(Collections2.filter(Collections2.transform(scope, stringToSystemScope), Predicates.notNull())); } } @@ -177,7 +177,7 @@ public class DefaultSystemScopeService implements SystemScopeService { if (scope == null) { return null; } else { - return new LinkedHashSet(Collections2.filter(Collections2.transform(scope, systemScopeToString), Predicates.notNull())); + return new LinkedHashSet<>(Collections2.filter(Collections2.transform(scope, systemScopeToString), Predicates.notNull())); } } diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java b/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java index 6d41e0644..004c77a02 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java @@ -75,12 +75,12 @@ public class ChainedTokenGranter extends AbstractTokenGranter { Set requestedScopes = tokenRequest.getScope(); if (requestedScopes == null) { - requestedScopes = new HashSet(); + requestedScopes = new HashSet<>(); } // do a check on the requested scopes -- if they exactly match the client scopes, they were probably shadowed by the token granter if (client.getScope().equals(requestedScopes)) { - requestedScopes = new HashSet(); + requestedScopes = new HashSet<>(); } // if our scopes are a valid subset of what's allowed, we can continue diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java index 61336fe10..719e4ee9e 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java @@ -163,7 +163,7 @@ public class OAuthConfirmationController { // pre-process the scopes Set scopes = scopeService.fromStrings(authRequest.getScope()); - Set sortedScopes = new LinkedHashSet(scopes.size()); + Set sortedScopes = new LinkedHashSet<>(scopes.size()); Set systemScopes = scopeService.getAll(); // sort scopes for display based on the inherent order of system scopes @@ -180,12 +180,12 @@ public class OAuthConfirmationController { // get the userinfo claims for each scope UserInfo user = userInfoService.getByUsername(p.getName()); - Map> claimsForScopes = new HashMap>(); + Map> claimsForScopes = new HashMap<>(); if (user != null) { JsonObject userJson = user.toJson(); for (SystemScope systemScope : sortedScopes) { - Map claimValues = new HashMap(); + Map claimValues = new HashMap<>(); Set claims = scopeClaimTranslationService.getClaimsForScope(systemScope.getValue()); for (String claim : claims) { diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/filter/AuthorizationRequestFilter.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/filter/AuthorizationRequestFilter.java index e5b55918f..f70b25e3e 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/filter/AuthorizationRequestFilter.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/filter/AuthorizationRequestFilter.java @@ -235,7 +235,7 @@ public class AuthorizationRequestFilter extends GenericFilterBean { * @return */ private Map createRequestMap(Map parameterMap) { - Map requestMap = new HashMap(); + Map requestMap = new HashMap<>(); for (String key : parameterMap.keySet()) { String[] val = parameterMap.get(key); if (val != null && val.length > 0) { diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultScopeClaimTranslationService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultScopeClaimTranslationService.java index 2d936e197..ff57ad5e0 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultScopeClaimTranslationService.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultScopeClaimTranslationService.java @@ -104,7 +104,7 @@ public class DefaultScopeClaimTranslationService implements ScopeClaimTranslatio if (scopesToClaims.containsKey(scope)) { return scopesToClaims.get(scope); } else { - return new HashSet(); + return new HashSet<>(); } } @@ -113,7 +113,7 @@ public class DefaultScopeClaimTranslationService implements ScopeClaimTranslatio */ @Override public Set getClaimsForScopeSet(Set scopes) { - Set result = new HashSet(); + Set result = new HashSet<>(); for (String scope : scopes) { result.addAll(getClaimsForScope(scope)); } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java index d399ade14..389e143d1 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java @@ -88,14 +88,14 @@ public class DefaultStatsService implements StatsService { Collection allSites = approvedSiteService.getAll(); // process to find number of unique users and sites - Set userIds = new HashSet(); - Set clientIds = new HashSet(); + Set userIds = new HashSet<>(); + Set clientIds = new HashSet<>(); for (ApprovedSite approvedSite : allSites) { userIds.add(approvedSite.getUserId()); clientIds.add(approvedSite.getClientId()); } - Map e = new HashMap(); + Map e = new HashMap<>(); e.put("approvalCount", allSites.size()); e.put("userCount", userIds.size()); @@ -145,7 +145,7 @@ public class DefaultStatsService implements StatsService { * @return */ private Map getEmptyClientCountMap() { - Map counts = new HashMap(); + Map counts = new HashMap<>(); Collection clients = clientService.getAllClients(); for (ClientDetailsEntity client : clients) { counts.put(client.getId(), 0); diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java index 2e0fe9b4d..43d2ff6b9 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java @@ -155,9 +155,9 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements } fixObjectReferences(); } - private Map refreshTokenToClientRefs = new HashMap(); - private Map refreshTokenToAuthHolderRefs = new HashMap(); - private Map refreshTokenOldToNewIdMap = new HashMap(); + private Map refreshTokenToClientRefs = new HashMap<>(); + private Map refreshTokenToAuthHolderRefs = new HashMap<>(); + private Map refreshTokenOldToNewIdMap = new HashMap<>(); /** * @param reader @@ -220,11 +220,11 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements reader.endArray(); logger.info("Done reading refresh tokens"); } - private Map accessTokenToClientRefs = new HashMap(); - private Map accessTokenToAuthHolderRefs = new HashMap(); - private Map accessTokenToRefreshTokenRefs = new HashMap(); - private Map accessTokenToIdTokenRefs = new HashMap(); - private Map accessTokenOldToNewIdMap = new HashMap(); + private Map accessTokenToClientRefs = new HashMap<>(); + private Map accessTokenToAuthHolderRefs = new HashMap<>(); + private Map accessTokenToRefreshTokenRefs = new HashMap<>(); + private Map accessTokenToIdTokenRefs = new HashMap<>(); + private Map accessTokenOldToNewIdMap = new HashMap<>(); /** * @param reader @@ -305,7 +305,7 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements reader.endArray(); logger.info("Done reading access tokens"); } - private Map authHolderOldToNewIdMap = new HashMap(); + private Map authHolderOldToNewIdMap = new HashMap<>(); /** * @param reader @@ -387,12 +387,12 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements //used by readAuthenticationHolders private OAuth2Request readAuthorizationRequest(JsonReader reader) throws IOException { - Set scope = new LinkedHashSet(); - Set resourceIds = new HashSet(); + Set scope = new LinkedHashSet<>(); + Set resourceIds = new HashSet<>(); boolean approved = false; - Collection authorities = new HashSet(); - Map authorizationParameters = new HashMap(); - Set responseTypes = new HashSet(); + Collection authorities = new HashSet<>(); + Map authorizationParameters = new HashMap<>(); + Set responseTypes = new HashSet<>(); String redirectUri = null; String clientId = null; reader.beginObject(); @@ -416,7 +416,7 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements resourceIds = readSet(reader); } else if (name.equals("authorities")) { Set authorityStrs = readSet(reader); - authorities = new HashSet(); + authorities = new HashSet<>(); for (String s : authorityStrs) { GrantedAuthority ga = new SimpleGrantedAuthority(s); authorities.add(ga); @@ -492,11 +492,9 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements return savedUserAuth; } - - - Map grantOldToNewIdMap = new HashMap(); - Map grantToWhitelistedSiteRefs = new HashMap(); - Map> grantToAccessTokensRefs = new HashMap>(); + Map grantOldToNewIdMap = new HashMap<>(); + Map grantToWhitelistedSiteRefs = new HashMap<>(); + Map> grantToAccessTokensRefs = new HashMap<>(); /** * @param reader @@ -565,7 +563,7 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements reader.endArray(); logger.info("Done reading grants"); } - Map whitelistedSiteOldToNewIdMap = new HashMap(); + Map whitelistedSiteOldToNewIdMap = new HashMap<>(); /** * @param reader @@ -677,7 +675,7 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements client.setScope(scope); } else if (name.equals("authorities")) { Set authorityStrs = readSet(reader); - Set authorities = new HashSet(); + Set authorities = new HashSet<>(); for (String s : authorityStrs) { GrantedAuthority ga = new SimpleGrantedAuthority(s); authorities.add(ga); @@ -909,7 +907,7 @@ public class MITREidDataService_1_0 extends MITREidDataServiceSupport implements whitelistedSiteOldToNewIdMap.clear(); for (Long oldGrantId : grantToAccessTokensRefs.keySet()) { Set oldAccessTokenIds = grantToAccessTokensRefs.get(oldGrantId); - Set tokens = new HashSet(); + Set tokens = new HashSet<>(); for(Long oldTokenId : oldAccessTokenIds) { Long newTokenId = accessTokenOldToNewIdMap.get(oldTokenId); tokens.add(tokenRepository.getAccessTokenById(newTokenId)); diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java index 26f5d2cad..0ab9ce166 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_1.java @@ -158,9 +158,9 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements } fixObjectReferences(); } - private Map refreshTokenToClientRefs = new HashMap(); - private Map refreshTokenToAuthHolderRefs = new HashMap(); - private Map refreshTokenOldToNewIdMap = new HashMap(); + private Map refreshTokenToClientRefs = new HashMap<>(); + private Map refreshTokenToAuthHolderRefs = new HashMap<>(); + private Map refreshTokenOldToNewIdMap = new HashMap<>(); /** * @param reader @@ -223,11 +223,11 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements reader.endArray(); logger.info("Done reading refresh tokens"); } - private Map accessTokenToClientRefs = new HashMap(); - private Map accessTokenToAuthHolderRefs = new HashMap(); - private Map accessTokenToRefreshTokenRefs = new HashMap(); - private Map accessTokenToIdTokenRefs = new HashMap(); - private Map accessTokenOldToNewIdMap = new HashMap(); + private Map accessTokenToClientRefs = new HashMap<>(); + private Map accessTokenToAuthHolderRefs = new HashMap<>(); + private Map accessTokenToRefreshTokenRefs = new HashMap<>(); + private Map accessTokenToIdTokenRefs = new HashMap<>(); + private Map accessTokenOldToNewIdMap = new HashMap<>(); /** * @param reader @@ -308,7 +308,7 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements reader.endArray(); logger.info("Done reading access tokens"); } - private Map authHolderOldToNewIdMap = new HashMap(); + private Map authHolderOldToNewIdMap = new HashMap<>(); /** * @param reader @@ -390,13 +390,13 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements //used by readAuthenticationHolders private OAuth2Request readAuthorizationRequest(JsonReader reader) throws IOException { - Set scope = new LinkedHashSet(); - Set resourceIds = new HashSet(); + Set scope = new LinkedHashSet<>(); + Set resourceIds = new HashSet<>(); boolean approved = false; - Collection authorities = new HashSet(); - Map requestParameters = new HashMap(); - Set responseTypes = new HashSet(); - Map extensions = new HashMap(); + Collection authorities = new HashSet<>(); + Map requestParameters = new HashMap<>(); + Set responseTypes = new HashSet<>(); + Map extensions = new HashMap<>(); String redirectUri = null; String clientId = null; reader.beginObject(); @@ -418,7 +418,7 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements resourceIds = readSet(reader); } else if (name.equals("authorities")) { Set authorityStrs = readSet(reader); - authorities = new HashSet(); + authorities = new HashSet<>(); for (String s : authorityStrs) { GrantedAuthority ga = new SimpleGrantedAuthority(s); authorities.add(ga); @@ -502,12 +502,10 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements return savedUserAuth; } - - - - Map grantOldToNewIdMap = new HashMap(); - Map grantToWhitelistedSiteRefs = new HashMap(); - Map> grantToAccessTokensRefs = new HashMap>(); + Map grantOldToNewIdMap = new HashMap<>(); + Map grantToWhitelistedSiteRefs = new HashMap<>(); + Map> grantToAccessTokensRefs = new HashMap<>(); + /** * @param reader * @throws IOException @@ -575,7 +573,7 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements reader.endArray(); logger.info("Done reading grants"); } - Map whitelistedSiteOldToNewIdMap = new HashMap(); + Map whitelistedSiteOldToNewIdMap = new HashMap<>(); /** * @param reader @@ -687,7 +685,7 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements client.setScope(scope); } else if (name.equals("authorities")) { Set authorityStrs = readSet(reader); - Set authorities = new HashSet(); + Set authorities = new HashSet<>(); for (String s : authorityStrs) { GrantedAuthority ga = new SimpleGrantedAuthority(s); authorities.add(ga); @@ -922,7 +920,7 @@ public class MITREidDataService_1_1 extends MITREidDataServiceSupport implements grantToWhitelistedSiteRefs.clear(); for (Long oldGrantId : grantToAccessTokensRefs.keySet()) { Set oldAccessTokenIds = grantToAccessTokensRefs.get(oldGrantId); - Set tokens = new HashSet(); + Set tokens = new HashSet<>(); for(Long oldTokenId : oldAccessTokenIds) { Long newTokenId = accessTokenOldToNewIdMap.get(oldTokenId); tokens.add(tokenRepository.getAccessTokenById(newTokenId)); diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java index b77ba17f3..6815ea476 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_2.java @@ -778,9 +778,10 @@ public class MITREidDataService_1_2 extends MITREidDataServiceSupport implements return savedUserAuth; } - Map grantOldToNewIdMap = new HashMap(); - Map grantToWhitelistedSiteRefs = new HashMap(); - Map> grantToAccessTokensRefs = new HashMap>(); + Map grantOldToNewIdMap = new HashMap<>(); + Map grantToWhitelistedSiteRefs = new HashMap<>(); + Map> grantToAccessTokensRefs = new HashMap<>(); + /** * @param reader * @throws IOException diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java index 3efd4d81a..02bd9f1a6 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java @@ -290,7 +290,7 @@ public class TofuUserApprovalHandler implements UserApprovalHandler { @Override public Map getUserApprovalRequest(AuthorizationRequest authorizationRequest, Authentication userAuthentication) { - Map model = new HashMap(); + Map model = new HashMap<>(); // In case of a redirect we might want the request parameters to be included model.putAll(authorizationRequest.getRequestParameters()); return model; diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java index f9d689c44..a3fcb81d7 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java @@ -144,8 +144,8 @@ public class UserInfoView extends AbstractView { JsonObject obj = ui.toJson(); Set allowedByScope = translator.getClaimsForScopeSet(scope); - Set authorizedByClaims = new HashSet(); - Set requestedByClaims = new HashSet(); + Set authorizedByClaims = new HashSet<>(); + Set requestedByClaims = new HashSet<>(); if (authorizedClaims != null) { JsonObject userinfoAuthorized = authorizedClaims.getAsJsonObject().get("userinfo").getAsJsonObject(); diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java index 39b880e0f..2258d3dee 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/DynamicClientRegistrationEndpoint.java @@ -409,7 +409,7 @@ public class DynamicClientRegistrationEndpoint { // filter out unknown grant types // TODO: make this a pluggable service - Set requestedGrantTypes = new HashSet(newClient.getGrantTypes()); + Set requestedGrantTypes = new HashSet<>(newClient.getGrantTypes()); requestedGrantTypes.retainAll( ImmutableSet.of("authorization_code", "implicit", "password", "client_credentials", "refresh_token", diff --git a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java index cd85a1477..0fc6e8624 100644 --- a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java +++ b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionResultAssembler.java @@ -104,7 +104,7 @@ public class TestDefaultIntrospectionResultAssembler { .put("sub", "sub") .put("exp", 123L) .put("expires_at", dateFormat.valueToString(new Date(123 * 1000L))) - .put("permissions", new ImmutableSet.Builder() + .put("permissions", new ImmutableSet.Builder<>() .add(new ImmutableMap.Builder() .put("resource_set_id", "1") // note that the resource ID comes out as a string .put("scopes", new ImmutableSet.Builder<>() diff --git a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java index bc7e6da15..4d7204c30 100644 --- a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java +++ b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java @@ -183,7 +183,7 @@ public class TestDefaultOAuth2ClientDetailsEntityService { ClientDetailsEntity client = new ClientDetailsEntity(); - Set grantTypes = new HashSet(); + Set grantTypes = new HashSet<>(); grantTypes.add("refresh_token"); client.setGrantTypes(grantTypes); @@ -320,7 +320,7 @@ public class TestDefaultOAuth2ClientDetailsEntityService { ClientDetailsEntity oldClient = new ClientDetailsEntity(); ClientDetailsEntity client = new ClientDetailsEntity(); - Set grantTypes = new HashSet(); + Set grantTypes = new HashSet<>(); grantTypes.add("refresh_token"); client.setGrantTypes(grantTypes); diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java index a81084b1a..80df0c0a0 100644 --- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java +++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_0.java @@ -193,7 +193,7 @@ public class TestMITREidDataService_1_0 { System.err.println(configJson); JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(tokenRepository.saveRefreshToken(isA(OAuth2RefreshTokenEntity.class))).thenAnswer(new Answer() { Long id = 343L; @Override @@ -324,7 +324,7 @@ public class TestMITREidDataService_1_0 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(tokenRepository.saveAccessToken(isA(OAuth2AccessTokenEntity.class))).thenAnswer(new Answer() { Long id = 343L; @Override @@ -540,7 +540,7 @@ public class TestMITREidDataService_1_0 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(wlSiteRepository.save(isA(WhitelistedSite.class))).thenAnswer(new Answer() { Long id = 345L; @Override @@ -631,7 +631,7 @@ public class TestMITREidDataService_1_0 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(approvedSiteRepository.save(isA(ApprovedSite.class))).thenAnswer(new Answer() { Long id = 343L; @Override @@ -738,7 +738,7 @@ public class TestMITREidDataService_1_0 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(authHolderRepository.save(isA(AuthenticationHolderEntity.class))).thenAnswer(new Answer() { Long id = 356L; @Override @@ -909,8 +909,8 @@ public class TestMITREidDataService_1_0 { System.err.println(configJson); JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeRefreshTokenTable = new HashMap(); - final Map fakeAuthHolderTable = new HashMap(); + final Map fakeRefreshTokenTable = new HashMap<>(); + final Map fakeAuthHolderTable = new HashMap<>(); when(tokenRepository.saveRefreshToken(isA(OAuth2RefreshTokenEntity.class))).thenAnswer(new Answer() { Long id = 343L; @Override diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java index 3dba95a5f..6d8188e9f 100644 --- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java +++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_1.java @@ -197,7 +197,7 @@ public class TestMITREidDataService_1_1 { System.err.println(configJson); JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(tokenRepository.saveRefreshToken(isA(OAuth2RefreshTokenEntity.class))).thenAnswer(new Answer() { Long id = 332L; @Override @@ -329,7 +329,7 @@ public class TestMITREidDataService_1_1 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(tokenRepository.saveAccessToken(isA(OAuth2AccessTokenEntity.class))).thenAnswer(new Answer() { Long id = 324L; @Override @@ -544,7 +544,7 @@ public class TestMITREidDataService_1_1 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(wlSiteRepository.save(isA(WhitelistedSite.class))).thenAnswer(new Answer() { Long id = 333L; @Override @@ -635,7 +635,7 @@ public class TestMITREidDataService_1_1 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(approvedSiteRepository.save(isA(ApprovedSite.class))).thenAnswer(new Answer() { Long id = 364L; @Override @@ -742,7 +742,7 @@ public class TestMITREidDataService_1_1 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(authHolderRepository.save(isA(AuthenticationHolderEntity.class))).thenAnswer(new Answer() { Long id = 243L; @Override @@ -921,8 +921,8 @@ public class TestMITREidDataService_1_1 { System.err.println(configJson); JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeRefreshTokenTable = new HashMap(); - final Map fakeAuthHolderTable = new HashMap(); + final Map fakeRefreshTokenTable = new HashMap<>(); + final Map fakeAuthHolderTable = new HashMap<>(); when(tokenRepository.saveRefreshToken(isA(OAuth2RefreshTokenEntity.class))).thenAnswer(new Answer() { Long id = 343L; @Override diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java index 797e7bfff..b0f5dd651 100644 --- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java +++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestMITREidDataService_1_2.java @@ -237,7 +237,7 @@ public class TestMITREidDataService_1_2 { assertThat(refreshTokens.size(), is(2)); // check for both of our refresh tokens in turn - Set checked = new HashSet(); + Set checked = new HashSet<>(); for (JsonElement e : refreshTokens) { assertThat(e.isJsonObject(), is(true)); JsonObject token = e.getAsJsonObject(); @@ -327,7 +327,7 @@ public class TestMITREidDataService_1_2 { logger.debug(configJson); JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(tokenRepository.saveRefreshToken(isA(OAuth2RefreshTokenEntity.class))).thenAnswer(new Answer() { Long id = 332L; @Override @@ -481,7 +481,7 @@ public class TestMITREidDataService_1_2 { assertThat(accessTokens.size(), is(2)); // check for both of our access tokens in turn - Set checked = new HashSet(); + Set checked = new HashSet<>(); for (JsonElement e : accessTokens) { assertTrue(e.isJsonObject()); JsonObject token = e.getAsJsonObject(); @@ -596,7 +596,7 @@ public class TestMITREidDataService_1_2 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(tokenRepository.saveAccessToken(isA(OAuth2AccessTokenEntity.class))).thenAnswer(new Answer() { Long id = 324L; @Override @@ -729,7 +729,7 @@ public class TestMITREidDataService_1_2 { assertThat(clients.size(), is(2)); // check for both of our clients in turn - Set checked = new HashSet(); + Set checked = new HashSet<>(); for (JsonElement e : clients) { assertThat(e.isJsonObject(), is(true)); JsonObject client = e.getAsJsonObject(); @@ -899,7 +899,7 @@ public class TestMITREidDataService_1_2 { assertThat(sites.size(), is(3)); // check for both of our sites in turn - Set checked = new HashSet(); + Set checked = new HashSet<>(); for (JsonElement e : sites) { assertThat(e.isJsonObject(), is(true)); JsonObject site = e.getAsJsonObject(); @@ -1040,7 +1040,7 @@ public class TestMITREidDataService_1_2 { assertThat(sites.size(), is(3)); // check for both of our sites in turn - Set checked = new HashSet(); + Set checked = new HashSet<>(); for (JsonElement e : sites) { assertThat(e.isJsonObject(), is(true)); JsonObject site = e.getAsJsonObject(); @@ -1102,7 +1102,7 @@ public class TestMITREidDataService_1_2 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(wlSiteRepository.save(isA(WhitelistedSite.class))).thenAnswer(new Answer() { Long id = 333L; @Override @@ -1222,7 +1222,7 @@ public class TestMITREidDataService_1_2 { assertThat(sites.size(), is(2)); // check for both of our sites in turn - Set checked = new HashSet(); + Set checked = new HashSet<>(); for (JsonElement e : sites) { assertThat(e.isJsonObject(), is(true)); JsonObject site = e.getAsJsonObject(); @@ -1256,7 +1256,7 @@ public class TestMITREidDataService_1_2 { assertTrue(compare.getApprovedAccessTokens() == null || compare.getApprovedAccessTokens().isEmpty()); } else { assertNotNull(compare.getApprovedAccessTokens()); - Set tokenIds = new HashSet(); + Set tokenIds = new HashSet<>(); for(OAuth2AccessTokenEntity entity : compare.getApprovedAccessTokens()) { tokenIds.add(entity.getId().toString()); } @@ -1327,7 +1327,7 @@ public class TestMITREidDataService_1_2 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(approvedSiteRepository.save(isA(ApprovedSite.class))).thenAnswer(new Answer() { Long id = 364L; @Override @@ -1466,7 +1466,7 @@ public class TestMITREidDataService_1_2 { assertThat(holders.size(), is(2)); // check for both of our clients in turn - Set checked = new HashSet(); + Set checked = new HashSet<>(); for (JsonElement e : holders) { assertThat(e.isJsonObject(), is(true)); JsonObject holder = e.getAsJsonObject(); @@ -1541,7 +1541,7 @@ public class TestMITREidDataService_1_2 { JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeDb = new HashMap(); + final Map fakeDb = new HashMap<>(); when(authHolderRepository.save(isA(AuthenticationHolderEntity.class))).thenAnswer(new Answer() { Long id = 243L; @Override @@ -1645,7 +1645,7 @@ public class TestMITREidDataService_1_2 { assertThat(scopes.size(), is(3)); // check for both of our clients in turn - Set checked = new HashSet(); + Set checked = new HashSet<>(); for (JsonElement e : scopes) { assertThat(e.isJsonObject(), is(true)); JsonObject scope = e.getAsJsonObject(); @@ -1830,8 +1830,8 @@ public class TestMITREidDataService_1_2 { logger.debug(configJson); JsonReader reader = new JsonReader(new StringReader(configJson)); - final Map fakeRefreshTokenTable = new HashMap(); - final Map fakeAuthHolderTable = new HashMap(); + final Map fakeRefreshTokenTable = new HashMap<>(); + final Map fakeAuthHolderTable = new HashMap<>(); when(tokenRepository.saveRefreshToken(isA(OAuth2RefreshTokenEntity.class))).thenAnswer(new Answer() { Long id = 343L; @Override @@ -1889,7 +1889,7 @@ public class TestMITREidDataService_1_2 { } private Set jsonArrayToStringSet(JsonArray a) { - Set s = new HashSet(); + Set s = new HashSet<>(); for (JsonElement jsonElement : a) { s.add(jsonElement.getAsString()); } diff --git a/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java b/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java index dc87299b6..f11422c66 100644 --- a/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java +++ b/uma-server/src/main/java/org/mitre/uma/web/UmaDiscoveryEndpoint.java @@ -46,7 +46,7 @@ public class UmaDiscoveryEndpoint { @RequestMapping(".well-known/uma-configuration") public String umaConfiguration(Model model) { - Map m = new HashMap(); + Map m = new HashMap<>(); String issuer = config.getIssuer(); ImmutableSet tokenProfiles = ImmutableSet.of("bearer");