http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java index 008f221..fbe4108 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java @@ -152,7 +152,7 @@ public class ClaimUtils { if (processedClaim != null) { resultClaim = processedClaim.clone(); List<Object> values = resultClaim.getValues(); - List<Object> mappedValues = new ArrayList<Object>(); + List<Object> mappedValues = new ArrayList<>(); if (values == null || mapping == null || mapping.size() == 0) { resultClaim.setValues(mappedValues);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java index 8db75c3..7a9e5ca 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenCancelOperation.java @@ -55,7 +55,7 @@ public class TokenCancelOperation extends AbstractOperation implements CancelOpe private static final Logger LOG = LogUtils.getL7dLogger(TokenCancelOperation.class); - private List<TokenCanceller> tokencancellers = new ArrayList<TokenCanceller>(); + private List<TokenCanceller> tokencancellers = new ArrayList<>(); public void setTokenCancellers(List<TokenCanceller> tokenCancellerList) { this.tokencancellers = tokenCancellerList; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java index b73c108..a939f96 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenRenewOperation.java @@ -61,7 +61,7 @@ public class TokenRenewOperation extends AbstractOperation implements RenewOpera private static final Logger LOG = LogUtils.getL7dLogger(TokenRenewOperation.class); - private List<TokenRenewer> tokenRenewers = new ArrayList<TokenRenewer>(); + private List<TokenRenewer> tokenRenewers = new ArrayList<>(); public void setTokenRenewers(List<TokenRenewer> tokenRenewerList) { this.tokenRenewers = tokenRenewerList; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java index fee93df..2d96850 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/jwt/DefaultJWTClaimsProvider.java @@ -235,7 +235,7 @@ public class DefaultJWTClaimsProvider implements JWTClaimsProvider { ) { TokenProviderParameters providerParameters = jwtClaimsProviderParameters.getProviderParameters(); - List<String> audiences = new ArrayList<String>(); + List<String> audiences = new ArrayList<>(); String appliesToAddress = providerParameters.getAppliesToAddress(); if (appliesToAddress != null) { audiences.add(appliesToAddress); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java index e302e27..ce4ebf9 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlIssueSamlClaimsTest.java @@ -128,10 +128,10 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert { Map<String, RealmProperties> realms = createSamlRealms(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); - List<AttributeStatementProvider> customProviderList = new ArrayList<AttributeStatementProvider>(); + List<AttributeStatementProvider> customProviderList = new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); providerList.add(samlTokenProvider); @@ -141,7 +141,7 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert { issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler)); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); @@ -150,7 +150,7 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert { addService(issueOperation); // Add Relationship list - List<Relationship> relationshipList = new ArrayList<Relationship>(); + List<Relationship> relationshipList = new ArrayList<>(); Relationship rs = createRelationship(); relationshipList.add(rs); @@ -319,7 +319,7 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert { SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); - List<AttributeStatementProvider> customProviderList = new ArrayList<AttributeStatementProvider>(); + List<AttributeStatementProvider> customProviderList = new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java index e3deba9..9c4b48a 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomAttributeProvider.java @@ -50,7 +50,7 @@ public class CustomAttributeProvider implements AttributeStatementProvider { * Get an AttributeStatementBean using the given parameters. */ public AttributeStatementBean getStatement(TokenProviderParameters providerParameters) { - List<AttributeBean> attributeList = new ArrayList<AttributeBean>(); + List<AttributeBean> attributeList = new ArrayList<>(); TokenRequirements tokenRequirements = providerParameters.getTokenRequirements(); String tokenType = tokenRequirements.getTokenType(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java index 67314b1..931e9b2 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomClaimsHandler.java @@ -42,7 +42,7 @@ import org.opensaml.saml.saml2.core.AttributeValue; */ public class CustomClaimsHandler implements ClaimsHandler { - private static List<URI> knownURIs = new ArrayList<URI>(); + private static List<URI> knownURIs = new ArrayList<>(); private static final URI ROLE_CLAIM = URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role";); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java index 08b40af..20646e1 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/CustomUserClaimsHandler.java @@ -35,7 +35,7 @@ import org.apache.cxf.sts.claims.ProcessedClaimCollection; */ public class CustomUserClaimsHandler implements ClaimsHandler { - private static List<URI> knownURIs = new ArrayList<URI>(); + private static List<URI> knownURIs = new ArrayList<>(); static { knownURIs.add(ClaimTypes.FIRSTNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java index 79be5bc..4d8a8a8 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/CancelSCTUnitTest.java @@ -78,7 +78,7 @@ public class CancelSCTUnitTest extends org.junit.Assert { cancelOperation.setTokenStore(tokenStore); // Add Token Canceller - List<TokenCanceller> cancellerList = new ArrayList<TokenCanceller>(); + List<TokenCanceller> cancellerList = new ArrayList<>(); TokenCanceller sctCanceller = new SCTCanceller(); sctCanceller.setVerifyProofOfPossession(false); cancellerList.add(sctCanceller); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java index 02de7f8..c2bcd5a 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java @@ -68,7 +68,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -120,7 +120,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -180,7 +180,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -238,7 +238,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -317,7 +317,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -386,7 +386,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -460,7 +460,7 @@ public class IssueEncryptedUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java index 753318d..27688ba 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTClaimsUnitTest.java @@ -105,7 +105,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new JWTTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -221,7 +221,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new JWTTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -298,7 +298,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { Map<String, RealmProperties> realms = createSamlRealms(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); JWTTokenProvider tokenProvider = new JWTTokenProvider(); tokenProvider.setRealmMap(realms); providerList.add(tokenProvider); @@ -308,7 +308,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler)); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); @@ -317,7 +317,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { addService(issueOperation); // Add Relationship list - List<Relationship> relationshipList = new ArrayList<Relationship>(); + List<Relationship> relationshipList = new ArrayList<>(); Relationship rs = createRelationship(); relationshipList.add(rs); @@ -444,7 +444,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { Map<String, RealmProperties> realms = createSamlRealms(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); JWTTokenProvider tokenProvider = new JWTTokenProvider(); tokenProvider.setRealmMap(realms); providerList.add(tokenProvider); @@ -454,7 +454,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler)); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); @@ -463,7 +463,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { addService(issueOperation); // Add Relationship list - List<Relationship> relationshipList = new ArrayList<Relationship>(); + List<Relationship> relationshipList = new ArrayList<>(); Relationship rs = createRelationship(); rs.setType(Relationship.FED_TYPE_IDENTITY); rs.setIdentityMapper(new CustomIdentityMapper()); @@ -696,7 +696,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java index 86848dd..2ff231c 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTOnbehalfofUnitTest.java @@ -95,12 +95,12 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new JWTTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -185,12 +185,12 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new JWTTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new UsernameTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -283,7 +283,7 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); JWTTokenProvider tokenProvider = new JWTTokenProvider(); providerList.add(tokenProvider); issueOperation.setTokenProviders(providerList); @@ -292,7 +292,7 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert { issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler)); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java index d59ecd8..7af994a 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTRealmUnitTest.java @@ -83,7 +83,7 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); JWTTokenProvider provider = new JWTTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); @@ -156,7 +156,7 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); JWTTokenProvider provider = new JWTTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); @@ -229,7 +229,7 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); JWTTokenProvider provider = new JWTTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); @@ -304,7 +304,7 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); JWTTokenProvider provider = new JWTTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java index edd2290..4e5f6d4 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueJWTUnitTest.java @@ -84,7 +84,7 @@ public class IssueJWTUnitTest extends org.junit.Assert { issueOperation.setTokenStore(tokenStore); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new JWTTokenProvider()); issueOperation.setTokenProviders(providerList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java index b506c66..08d3bcd 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueOnbehalfofUnitTest.java @@ -104,12 +104,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -175,12 +175,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -246,12 +246,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -327,12 +327,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -408,12 +408,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -489,12 +489,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -572,12 +572,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -650,12 +650,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -726,12 +726,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new UsernameTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -804,12 +804,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new UsernameTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -876,7 +876,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); providerList.add(samlTokenProvider); issueOperation.setTokenProviders(providerList); @@ -885,7 +885,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler)); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); @@ -986,12 +986,12 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); @@ -1083,9 +1083,9 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setAttributeStatementProviders(customProviderList); @@ -1093,7 +1093,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { issueOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); issueOperation.setTokenValidators(validatorList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java index d3650be..bd67643 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSCTUnitTest.java @@ -87,7 +87,7 @@ public class IssueSCTUnitTest extends org.junit.Assert { issueOperation.setTokenStore(tokenStore); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SCTProvider()); issueOperation.setTokenProviders(providerList); @@ -160,7 +160,7 @@ public class IssueSCTUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SCTProvider()); issueOperation.setTokenProviders(providerList); @@ -239,7 +239,7 @@ public class IssueSCTUnitTest extends org.junit.Assert { issueOperation.setReturnReferences(false); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SCTProvider()); issueOperation.setTokenProviders(providerList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java index 1519abf..95f8556 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlClaimsUnitTest.java @@ -385,10 +385,10 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { * @param issueOperation */ private void addTokenProvider(TokenIssueOperation issueOperation) { - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new CustomAttributeProvider()); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setAttributeStatementProviders(customProviderList); @@ -478,11 +478,11 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { Map<String, RealmProperties> realms = createSamlRealms(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); providerList.add(samlTokenProvider); @@ -492,7 +492,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler)); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); @@ -501,7 +501,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { addService(issueOperation); // Add Relationship list - List<Relationship> relationshipList = new ArrayList<Relationship>(); + List<Relationship> relationshipList = new ArrayList<>(); Relationship rs = createRelationship(); relationshipList.add(rs); @@ -625,11 +625,11 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { Map<String, RealmProperties> realms = createSamlRealms(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); providerList.add(samlTokenProvider); @@ -639,7 +639,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { issueOperation.setDelegationHandlers(Collections.singletonList(delegationHandler)); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); @@ -648,7 +648,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { addService(issueOperation); // Add Relationship list - List<Relationship> relationshipList = new ArrayList<Relationship>(); + List<Relationship> relationshipList = new ArrayList<>(); Relationship rs = createRelationship(); rs.setType(Relationship.FED_TYPE_IDENTITY); rs.setIdentityMapper(new CustomIdentityMapper()); @@ -901,7 +901,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java index a7aca83..92da743 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlRealmUnitTest.java @@ -77,7 +77,7 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider provider = new SAMLTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); @@ -153,7 +153,7 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider provider = new SAMLTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); @@ -229,7 +229,7 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider provider = new SAMLTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); @@ -307,7 +307,7 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider provider = new SAMLTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); @@ -406,7 +406,7 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider provider = new SAMLTokenProvider(); provider.setRealmMap(createRealms()); providerList.add(provider); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java index 1db76c6..86f2a7e 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java @@ -103,7 +103,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -175,7 +175,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -248,7 +248,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -320,7 +320,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -423,7 +423,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { issueOperation.setEncryptIssuedToken(true); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -500,7 +500,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -591,7 +591,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -689,7 +689,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -781,7 +781,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -899,7 +899,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { issueOperation.setReturnReferences(false); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -966,7 +966,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -986,7 +986,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { stsProperties.setIssuer("STS"); SignatureProperties sigProperties = new SignatureProperties(); - List<String> acceptedC14nAlgorithms = new ArrayList<String>(); + List<String> acceptedC14nAlgorithms = new ArrayList<>(); acceptedC14nAlgorithms.add(WSConstants.C14N_EXCL_OMIT_COMMENTS); acceptedC14nAlgorithms.add(WSConstants.C14N_EXCL_WITH_COMMENTS); sigProperties.setAcceptedC14nAlgorithms(acceptedC14nAlgorithms); @@ -1056,7 +1056,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -1076,7 +1076,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { stsProperties.setIssuer("STS"); SignatureProperties sigProperties = new SignatureProperties(); - List<String> acceptedSignatureAlgorithms = new ArrayList<String>(); + List<String> acceptedSignatureAlgorithms = new ArrayList<>(); String signatureAlgorithm = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";; acceptedSignatureAlgorithms.add(signatureAlgorithm); acceptedSignatureAlgorithms.add(WSConstants.RSA_SHA1); @@ -1143,7 +1143,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -1249,7 +1249,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -1341,7 +1341,7 @@ public class IssueSamlUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); issueOperation.setTokenProviders(providerList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java index f6ee62b..a372ea5 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java @@ -61,7 +61,7 @@ public class IssueUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -103,7 +103,7 @@ public class IssueUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -153,7 +153,7 @@ public class IssueUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -217,7 +217,7 @@ public class IssueUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -270,7 +270,7 @@ public class IssueUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -313,7 +313,7 @@ public class IssueUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -358,7 +358,7 @@ public class IssueUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); @@ -404,7 +404,7 @@ public class IssueUnitTest extends org.junit.Assert { TokenIssueOperation issueOperation = new TokenIssueOperation(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new DummyTokenProvider()); issueOperation.setTokenProviders(providerList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java index 1725440..a201d34 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/RenewSamlUnitTest.java @@ -93,14 +93,14 @@ public class RenewSamlUnitTest extends org.junit.Assert { renewOperation.setTokenStore(tokenStore); // Add Token Renewer - List<TokenRenewer> renewerList = new ArrayList<TokenRenewer>(); + List<TokenRenewer> renewerList = new ArrayList<>(); TokenRenewer tokenRenewer = new SAMLTokenRenewer(); tokenRenewer.setVerifyProofOfPossession(false); renewerList.add(tokenRenewer); renewOperation.setTokenRenewers(renewerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); renewOperation.setTokenValidators(validatorList); @@ -184,7 +184,7 @@ public class RenewSamlUnitTest extends org.junit.Assert { renewOperation.setTokenStore(tokenStore); // Add Token Renewer - List<TokenRenewer> renewerList = new ArrayList<TokenRenewer>(); + List<TokenRenewer> renewerList = new ArrayList<>(); TokenRenewer tokenRenewer = new SAMLTokenRenewer(); tokenRenewer.setVerifyProofOfPossession(false); tokenRenewer.setAllowRenewalAfterExpiry(true); @@ -192,7 +192,7 @@ public class RenewSamlUnitTest extends org.junit.Assert { renewOperation.setTokenRenewers(renewerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); renewOperation.setTokenValidators(validatorList); @@ -278,7 +278,7 @@ public class RenewSamlUnitTest extends org.junit.Assert { renewOperation.setTokenStore(tokenStore); // Add Token Renewer - List<TokenRenewer> renewerList = new ArrayList<TokenRenewer>(); + List<TokenRenewer> renewerList = new ArrayList<>(); TokenRenewer tokenRenewer = new SAMLTokenRenewer(); tokenRenewer.setVerifyProofOfPossession(false); tokenRenewer.setAllowRenewalAfterExpiry(true); @@ -286,7 +286,7 @@ public class RenewSamlUnitTest extends org.junit.Assert { renewOperation.setTokenRenewers(renewerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); renewOperation.setTokenValidators(validatorList); @@ -372,7 +372,7 @@ public class RenewSamlUnitTest extends org.junit.Assert { renewOperation.setTokenStore(tokenStore); // Add Token Renewer - List<TokenRenewer> renewerList = new ArrayList<TokenRenewer>(); + List<TokenRenewer> renewerList = new ArrayList<>(); TokenRenewer tokenRenewer = new SAMLTokenRenewer(); tokenRenewer.setVerifyProofOfPossession(false); tokenRenewer.setAllowRenewalAfterExpiry(true); @@ -380,7 +380,7 @@ public class RenewSamlUnitTest extends org.junit.Assert { renewOperation.setTokenRenewers(renewerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); renewOperation.setTokenValidators(validatorList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java index e4b8a11..b9b5742 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTTransformationTest.java @@ -96,12 +96,12 @@ public class ValidateJWTTransformationTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new JWTTokenValidator()); validateOperation.setTokenValidators(validatorList); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); validateOperation.setTokenProviders(providerList); @@ -177,14 +177,14 @@ public class ValidateJWTTransformationTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); JWTTokenValidator validator = new JWTTokenValidator(); validator.setRealmCodec(new CustomJWTRealmCodec()); validatorList.add(validator); validateOperation.setTokenValidators(validatorList); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); providerList.add(samlTokenProvider); validateOperation.setTokenProviders(providerList); @@ -271,12 +271,12 @@ public class ValidateJWTTransformationTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); validateOperation.setTokenValidators(validatorList); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new JWTTokenProvider()); validateOperation.setTokenProviders(providerList); @@ -475,7 +475,7 @@ public class ValidateJWTTransformationTest extends org.junit.Assert { SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java index f89725f..17e6165 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateJWTUnitTest.java @@ -70,7 +70,7 @@ public class ValidateJWTUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new JWTTokenValidator()); validateOperation.setTokenValidators(validatorList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java index 82d2405..0c200a8 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSCTUnitTest.java @@ -79,7 +79,7 @@ public class ValidateSCTUnitTest extends org.junit.Assert { validateOperation.setTokenStore(tokenStore); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SCTValidator()); validateOperation.setTokenValidators(validatorList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java index 2a6da59..d4fccad 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateSamlUnitTest.java @@ -75,7 +75,7 @@ public class ValidateSamlUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); validateOperation.setTokenValidators(validatorList); @@ -136,7 +136,7 @@ public class ValidateSamlUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new SAMLTokenValidator()); validateOperation.setTokenValidators(validatorList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java index 177f216..7d3d0d5 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateTokenTransformationUnitTest.java @@ -102,12 +102,12 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new UsernameTokenValidator()); validateOperation.setTokenValidators(validatorList); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); providerList.add(new SAMLTokenProvider()); validateOperation.setTokenProviders(providerList); @@ -183,14 +183,14 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); UsernameTokenValidator validator = new UsernameTokenValidator(); validator.setUsernameTokenRealmCodec(new CustomUsernameTokenRealmCodec()); validatorList.add(validator); validateOperation.setTokenValidators(validatorList); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); providerList.add(samlTokenProvider); validateOperation.setTokenProviders(providerList); @@ -327,18 +327,18 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { Map<String, RealmProperties> realms = createSamlRealms(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); providerList.add(samlTokenProvider); validateOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); @@ -350,7 +350,7 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { validateOperation.setServices(Collections.singletonList(service)); // Add Relationship list - List<Relationship> relationshipList = new ArrayList<Relationship>(); + List<Relationship> relationshipList = new ArrayList<>(); Relationship rs = createRelationship(); relationshipList.add(rs); @@ -453,15 +453,15 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new UsernameTokenValidator()); validateOperation.setTokenValidators(validatorList); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new CustomAttributeProvider()); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setAttributeStatementProviders(customProviderList); @@ -550,18 +550,18 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { Map<String, RealmProperties> realms = createSamlRealms(); // Add Token Provider - List<TokenProvider> providerList = new ArrayList<TokenProvider>(); + List<TokenProvider> providerList = new ArrayList<>(); SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); providerList.add(samlTokenProvider); validateOperation.setTokenProviders(providerList); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); SAMLTokenValidator samlTokenValidator = new SAMLTokenValidator(); samlTokenValidator.setSamlRealmCodec(new IssuerSAMLRealmCodec()); validatorList.add(samlTokenValidator); @@ -573,7 +573,7 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { validateOperation.setServices(Collections.singletonList(service)); // Add Relationship list - List<Relationship> relationshipList = new ArrayList<Relationship>(); + List<Relationship> relationshipList = new ArrayList<>(); Relationship rs = createRelationship(); rs.setType(Relationship.FED_TYPE_IDENTITY); rs.setIdentityMapper(new CustomIdentityMapper()); @@ -839,7 +839,7 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider(); samlTokenProvider.setRealmMap(realms); List<AttributeStatementProvider> customProviderList = - new ArrayList<AttributeStatementProvider>(); + new ArrayList<>(); customProviderList.add(new ClaimsAttributeStatementProvider()); samlTokenProvider.setAttributeStatementProviders(customProviderList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java index 099371d..72b74df 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUnitTest.java @@ -57,7 +57,7 @@ public class ValidateUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new DummyTokenValidator()); validateOperation.setTokenValidators(validatorList); @@ -103,7 +103,7 @@ public class ValidateUnitTest extends org.junit.Assert { requestCollectionOperation.setValidateOperation(validateOperation); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new DummyTokenValidator()); validateOperation.setTokenValidators(validatorList); @@ -167,7 +167,7 @@ public class ValidateUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new DummyTokenValidator()); validateOperation.setTokenValidators(validatorList); @@ -204,7 +204,7 @@ public class ValidateUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new DummyTokenValidator()); validateOperation.setTokenValidators(validatorList); @@ -257,7 +257,7 @@ public class ValidateUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new DummyTokenValidator()); validateOperation.setTokenValidators(validatorList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java index 09f0ac6..84ec510 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateUsernameTokenUnitTest.java @@ -66,7 +66,7 @@ public class ValidateUsernameTokenUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new UsernameTokenValidator()); validateOperation.setTokenValidators(validatorList); @@ -123,7 +123,7 @@ public class ValidateUsernameTokenUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new UsernameTokenValidator()); validateOperation.setTokenValidators(validatorList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java index a8a6d59..80c9f71 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/ValidateX509TokenUnitTest.java @@ -67,7 +67,7 @@ public class ValidateX509TokenUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new X509TokenValidator()); validateOperation.setTokenValidators(validatorList); @@ -130,7 +130,7 @@ public class ValidateX509TokenUnitTest extends org.junit.Assert { TokenValidateOperation validateOperation = new TokenValidateOperation(); // Add Token Validator - List<TokenValidator> validatorList = new ArrayList<TokenValidator>(); + List<TokenValidator> validatorList = new ArrayList<>(); validatorList.add(new X509TokenValidator()); validateOperation.setTokenValidators(validatorList); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java index 5cba585..7bdd214 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java @@ -254,7 +254,7 @@ public class SAMLClaimsTest extends org.junit.Assert { staticClaims.put(APPLICATION_APPLIES_TO, endpointClaimsMap); claimsHandler.setEndpointClaims(staticClaims); - List<URI> supportedClaims = new ArrayList<URI>(); + List<URI> supportedClaims = new ArrayList<>(); supportedClaims.add(CLAIM_APPLICATION); claimsHandler.setSupportedClaims(supportedClaims); @@ -309,7 +309,7 @@ public class SAMLClaimsTest extends org.junit.Assert { staticClaims.put(APPLICATION_APPLIES_TO, endpointClaimsMap); claimsHandler.setEndpointClaims(staticClaims); - List<URI> supportedClaims = new ArrayList<URI>(); + List<URI> supportedClaims = new ArrayList<>(); supportedClaims.add(CLAIM_APPLICATION); claimsHandler.setSupportedClaims(supportedClaims); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java index ad90fe4..de3681e 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java @@ -208,7 +208,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert { // expected on the wrong attribute provider } - List<AttributeStatementProvider> customProviderList = new ArrayList<AttributeStatementProvider>(); + List<AttributeStatementProvider> customProviderList = new ArrayList<>(); customProviderList.add(new CustomAttributeProvider()); ((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customProviderList);
