http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java index 494643b..d1dd189 100644 --- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java +++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java @@ -108,7 +108,7 @@ public class WSDLServiceBuilder { private static final Logger LOG = LogUtils.getL7dLogger(WSDLServiceBuilder.class); private Bus bus; - private Map<String, Element> schemaList = new HashMap<String, Element>(); + private Map<String, Element> schemaList = new HashMap<>(); private boolean recordOriginal = true; private boolean allowRefs; private boolean ignoreUnknownBindings;
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java index ebeac13..8657098 100644 --- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java +++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl/interceptors/DocLiteralInInterceptorTest.java @@ -249,7 +249,7 @@ public class DocLiteralInInterceptorTest extends Assert { // we expect a wrapped document assertEquals(1, params.size()); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("ns", NS); XPathUtils xu = new XPathUtils(ns); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java ---------------------------------------------------------------------- diff --git a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java index 78474ee..a690c86 100644 --- a/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java +++ b/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java @@ -113,7 +113,7 @@ public class WSDLManagerImplTest extends Assert { @Test public void testXMLStreamReaderWrapper() throws Exception { - final Map<String, String> map = new HashMap<String, String>(); + final Map<String, String> map = new HashMap<>(); map.put("org.apache.cxf.test.wsdl11.port", "99999"); String wsdlUrl = getClass().getResource("hello_world_wrap.wsdl").toString(); WSDLManagerImpl builder = new WSDLManagerImpl(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java index e396074..16b715c 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/rest/RESTSecurityTokenServiceImpl.java @@ -67,14 +67,14 @@ public class RESTSecurityTokenServiceImpl extends SecurityTokenServiceImpl imple public static final Map<String, String> DEFAULT_CLAIM_TYPE_MAP; public static final Map<String, String> DEFAULT_TOKEN_TYPE_MAP; - private static final Map<String, String> DEFAULT_KEY_TYPE_MAP = new HashMap<String, String>(); + private static final Map<String, String> DEFAULT_KEY_TYPE_MAP = new HashMap<>(); private static final String CLAIM_TYPE = "ClaimType"; private static final String CLAIM_TYPE_NS = "http://schemas.xmlsoap.org/ws/2005/05/identity";; private static final Logger LOG = LogUtils.getL7dLogger(RESTSecurityTokenServiceImpl.class); static { - DEFAULT_CLAIM_TYPE_MAP = new HashMap<String, String>(); + DEFAULT_CLAIM_TYPE_MAP = new HashMap<>(); DEFAULT_CLAIM_TYPE_MAP.put("emailaddress", CLAIM_TYPE_NS + "/claims/emailaddress"); DEFAULT_CLAIM_TYPE_MAP.put("role", CLAIM_TYPE_NS + "/claims/role"); DEFAULT_CLAIM_TYPE_MAP.put("surname", CLAIM_TYPE_NS + "/claims/surname"); @@ -83,7 +83,7 @@ public class RESTSecurityTokenServiceImpl extends SecurityTokenServiceImpl imple DEFAULT_CLAIM_TYPE_MAP.put("upn", CLAIM_TYPE_NS + "/claims/upn"); DEFAULT_CLAIM_TYPE_MAP.put("nameidentifier", CLAIM_TYPE_NS + "/claims/nameidentifier"); - DEFAULT_TOKEN_TYPE_MAP = new HashMap<String, String>(); + DEFAULT_TOKEN_TYPE_MAP = new HashMap<>(); DEFAULT_TOKEN_TYPE_MAP.put("saml", WSConstants.WSS_SAML2_TOKEN_TYPE); DEFAULT_TOKEN_TYPE_MAP.put("saml2.0", WSConstants.WSS_SAML2_TOKEN_TYPE); DEFAULT_TOKEN_TYPE_MAP.put("saml1.1", WSConstants.WSS_SAML_TOKEN_TYPE); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/CacheIdentityMapper.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/CacheIdentityMapper.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/CacheIdentityMapper.java index 5d47e73..a1240bf 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/CacheIdentityMapper.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/cache/CacheIdentityMapper.java @@ -34,7 +34,7 @@ public class CacheIdentityMapper implements IdentityMapper { CacheIdentityMapper() { - Map<String, String> identities = new HashMap<String, String>(); + Map<String, String> identities = new HashMap<>(); identities.put("REALM_A", "user_aaa"); identities.put("REALM_B", "user_bbb"); identities.put("REALM_C", "user_ccc"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 8d579cf..35cc60a 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 @@ -301,7 +301,7 @@ public class JexlIssueSamlClaimsTest extends org.junit.Assert { private Map<String, RealmProperties> createSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 50eca9d..da58c48 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 @@ -675,7 +675,7 @@ public class IssueJWTClaimsUnitTest extends org.junit.Assert { private Map<String, RealmProperties> createSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 409abf8..c51d917 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 @@ -482,7 +482,7 @@ public class IssueJWTOnbehalfofUnitTest extends org.junit.Assert { private Map<String, RealmProperties> createSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 f568573..0f91ed2 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 @@ -391,7 +391,7 @@ public class IssueJWTRealmUnitTest extends org.junit.Assert { * Create some JWT Realms */ private Map<String, RealmProperties> createRealms() { - Map<String, RealmProperties> realms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> realms = new HashMap<>(); RealmProperties realm = new RealmProperties(); realm.setIssuer("A-Issuer"); realms.put("A", realm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 44806e7..4445be9 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 @@ -1304,7 +1304,7 @@ public class IssueOnbehalfofUnitTest extends org.junit.Assert { private Map<String, RealmProperties> createSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 c4a0d74..a800e2a 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 @@ -880,7 +880,7 @@ public class IssueSamlClaimsUnitTest extends org.junit.Assert { private Map<String, RealmProperties> createSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 be17670..69368eb 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 @@ -485,7 +485,7 @@ public class IssueSamlRealmUnitTest extends org.junit.Assert { * Create some SAML Realms */ private Map<String, RealmProperties> createRealms() { - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 a59a9bd..c63b06c 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 @@ -417,7 +417,7 @@ public class ValidateJWTTransformationTest extends org.junit.Assert { private Map<String, RealmProperties> createSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 50483ee..90d4011 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 @@ -714,7 +714,7 @@ public class ValidateTokenTransformationUnitTest extends org.junit.Assert { private Map<String, RealmProperties> createSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java index d8b784c..a758d4c 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTClaimsTest.java @@ -187,7 +187,7 @@ public class JWTClaimsTest extends org.junit.Assert { ClaimsManager claimsManager = new ClaimsManager(); StaticClaimsHandler claimsHandler = new StaticClaimsHandler(); - Map<String, String> staticClaimsMap = new HashMap<String, String>(); + Map<String, String> staticClaimsMap = new HashMap<>(); staticClaimsMap.put(CLAIM_STATIC_COMPANY.toString(), CLAIM_STATIC_COMPANY_VALUE); claimsHandler.setGlobalClaims(staticClaimsMap); claimsManager.setClaimHandlers(Collections.singletonList((ClaimsHandler)claimsHandler)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java index 49c4b59..2e92b5a 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderRealmTest.java @@ -51,7 +51,7 @@ public class JWTTokenProviderRealmTest extends org.junit.Assert { providerParameters.setRealm("A"); // Create Realms - Map<String, RealmProperties> jwtRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> jwtRealms = new HashMap<>(); RealmProperties jwtRealm = new RealmProperties(); jwtRealm.setIssuer("A-Issuer"); jwtRealms.put("A", jwtRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/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 bf65806..1e6a21e 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 @@ -202,7 +202,7 @@ public class SAMLClaimsTest extends org.junit.Assert { ClaimsManager claimsManager = new ClaimsManager(); StaticClaimsHandler claimsHandler = new StaticClaimsHandler(); - Map<String, String> staticClaimsMap = new HashMap<String, String>(); + Map<String, String> staticClaimsMap = new HashMap<>(); staticClaimsMap.put(CLAIM_STATIC_COMPANY.toString(), CLAIM_STATIC_COMPANY_VALUE); claimsHandler.setGlobalClaims(staticClaimsMap); claimsManager.setClaimHandlers(Collections.singletonList((ClaimsHandler)claimsHandler)); @@ -247,10 +247,10 @@ public class SAMLClaimsTest extends org.junit.Assert { StaticEndpointClaimsHandler claimsHandler = new StaticEndpointClaimsHandler(); // Create claims map for specific application - Map<String, String> endpointClaimsMap = new HashMap<String, String>(); + Map<String, String> endpointClaimsMap = new HashMap<>(); endpointClaimsMap.put(CLAIM_APPLICATION.toString(), CLAIM_APPLICATION_VALUE); - Map<String, Map<String, String>> staticClaims = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, String>> staticClaims = new HashMap<>(); staticClaims.put(APPLICATION_APPLIES_TO, endpointClaimsMap); claimsHandler.setEndpointClaims(staticClaims); @@ -302,10 +302,10 @@ public class SAMLClaimsTest extends org.junit.Assert { StaticEndpointClaimsHandler claimsHandler = new StaticEndpointClaimsHandler(); // Create claims map for specific application - Map<String, String> endpointClaimsMap = new HashMap<String, String>(); + Map<String, String> endpointClaimsMap = new HashMap<>(); endpointClaimsMap.put(CLAIM_APPLICATION.toString(), CLAIM_APPLICATION_VALUE); - Map<String, Map<String, String>> staticClaims = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, String>> staticClaims = new HashMap<>(); staticClaims.put(APPLICATION_APPLIES_TO, endpointClaimsMap); claimsHandler.setEndpointClaims(staticClaims); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java index 2636a25..83f086d 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java @@ -56,7 +56,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { providerParameters.setRealm("A"); // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java index 7aeff71..cf45739 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java @@ -297,7 +297,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert { private Map<String, RealmProperties> getSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java index 26d0322..697d84c 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/JWTTokenValidatorRealmTest.java @@ -163,7 +163,7 @@ public class JWTTokenValidatorRealmTest extends org.junit.Assert { private Map<String, RealmProperties> getRealms() { // Create Realms - Map<String, RealmProperties> realms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> realms = new HashMap<>(); RealmProperties realm = new RealmProperties(); realm.setIssuer("A-Issuer"); realms.put("A", realm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java index 4f0bd0a..82bdaa6 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java @@ -189,7 +189,7 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert { private Map<String, RealmProperties> getSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java index 4cc7c51..cf9f75f 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java @@ -198,7 +198,7 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert { private Map<String, RealmProperties> getSamlRealms() { // Create Realms - Map<String, RealmProperties> samlRealms = new HashMap<String, RealmProperties>(); + Map<String, RealmProperties> samlRealms = new HashMap<>(); RealmProperties samlRealm = new RealmProperties(); samlRealm.setIssuer("A-Issuer"); samlRealms.put("A", samlRealm); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java index 899d9c8..0eef807 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/AsymmetricEncryptionTest.java @@ -107,7 +107,7 @@ public class AsymmetricEncryptionTest extends AbstractBusClientServerTestBase { stsClient.setTokenType("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0";); stsClient.setKeyType("http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java index c1e4d13..acae8fe 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SAMLBatchUnitTest.java @@ -149,7 +149,7 @@ public class SAMLBatchUnitTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName(port); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, @@ -174,7 +174,7 @@ public class SAMLBatchUnitTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName(port); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java index 4e7acc2..0d441a5 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java @@ -158,7 +158,7 @@ public class SimpleBatchSTSClient implements Configurable, InterceptorProvider { protected Message message; protected String context; - protected Map<String, Object> ctx = new HashMap<String, Object>(); + protected Map<String, Object> ctx = new HashMap<>(); protected List<Interceptor<? extends Message>> in = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java index 280daba..0bf1302 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java @@ -231,7 +231,7 @@ public class ServerCachingTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java index 905c9b2..89965a4 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JWTUnitTest.java @@ -99,7 +99,7 @@ public class JWTUnitTest extends AbstractBusClientServerTestBase { Map<String, Object> properties = msgProperties; if (properties == null) { - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, @@ -133,7 +133,7 @@ public class JWTUnitTest extends AbstractBusClientServerTestBase { Map<String, Object> properties = msgProperties; if (properties == null) { - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java index fc3bf8f..e833ebc 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/jwt/JaxrsJWTTest.java @@ -118,7 +118,7 @@ public class JaxrsJWTTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java index 3685290..9057545 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/SAMLRenewUnitTest.java @@ -298,7 +298,7 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase { stsClient.setTokenType(tokenType); stsClient.setKeyType("http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, @@ -327,7 +327,7 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, @@ -349,7 +349,7 @@ public class SAMLRenewUnitTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java index c4fe4cb..9c11236 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java @@ -94,7 +94,7 @@ public class SecurityContextTokenCancelTest extends AbstractBusClientServerTestB stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( "security.callback-handler", @@ -119,7 +119,7 @@ public class SecurityContextTokenCancelTest extends AbstractBusClientServerTestB stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName(port); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put(SecurityConstants.SIGNATURE_USERNAME, "myservicekey"); properties.put( http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java index 6d47aad..642258c 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java @@ -161,7 +161,7 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java index 13986c9..aeee6c2 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java @@ -202,7 +202,7 @@ public class Soap12Test extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Soap12_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java index 7575a15..cdc3a2e 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java @@ -260,7 +260,7 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase { stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); } - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put(SecurityConstants.CALLBACK_HANDLER, "org.apache.cxf.systest.sts.common.CommonCallbackHandler"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java index d172474..c72c898 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java @@ -420,7 +420,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { } SecurityToken wstoken = new SecurityToken(id, samlToken, null, null); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.TOKEN, wstoken); properties.put(SecurityConstants.TOKEN_ID, wstoken.getId()); @@ -506,7 +506,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { Map<String, Object> properties = msgProperties; if (properties == null) { - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, @@ -620,7 +620,7 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java index 9288487..eace131 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java @@ -219,7 +219,7 @@ public class STSTokenOutInterceptorTest extends AbstractBusClientServerTestBase stsClient.setAllowRenewingAfterExpiry(true); stsClient.setEnableLifetime(true); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(SecurityConstants.CALLBACK_HANDLER, "org.apache.cxf.systest.sts.common.CommonCallbackHandler"); props.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey"); props.put(SecurityConstants.ENCRYPT_PROPERTIES, "clientKeystore.properties"); @@ -244,7 +244,7 @@ public class STSTokenOutInterceptorTest extends AbstractBusClientServerTestBase stsClient.setAllowRenewingAfterExpiry(true); stsClient.setEnableLifetime(true); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(SecurityConstants.USERNAME, "alice"); props.put(SecurityConstants.CALLBACK_HANDLER, "org.apache.cxf.systest.sts.common.CommonCallbackHandler"); stsClient.setProperties(props); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java index 80aa2e0..f95edbc 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java @@ -157,7 +157,7 @@ public class STSTokenRetrieverTest extends AbstractBusClientServerTestBase { stsClient.setAllowRenewingAfterExpiry(true); stsClient.setEnableLifetime(true); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(SecurityConstants.CALLBACK_HANDLER, "org.apache.cxf.systest.sts.common.CommonCallbackHandler"); props.put(SecurityConstants.ENCRYPT_USERNAME, "mystskey"); props.put(SecurityConstants.ENCRYPT_PROPERTIES, "clientKeystore.properties"); @@ -182,7 +182,7 @@ public class STSTokenRetrieverTest extends AbstractBusClientServerTestBase { stsClient.setAllowRenewingAfterExpiry(true); stsClient.setEnableLifetime(true); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(SecurityConstants.USERNAME, "alice"); props.put(SecurityConstants.CALLBACK_HANDLER, "org.apache.cxf.systest.sts.common.CommonCallbackHandler"); stsClient.setProperties(props); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java index cfd3d1b..638cac0 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java @@ -352,7 +352,7 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.username", "alice"); properties.put("security.callback-handler", "org.apache.cxf.systest.sts.common.CommonCallbackHandler"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java index 71a6689..b98c7b6 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java @@ -347,7 +347,7 @@ public class TemplateTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.username", "alice"); properties.put("security.callback-handler", "org.apache.cxf.systest.sts.common.CommonCallbackHandler"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java index 45110b5..d190577 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java @@ -436,7 +436,7 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { stsClient.setServiceName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService";); stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port";); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.username", "alice"); properties.put("security.callback-handler", "org.apache.cxf.systest.sts.common.CommonCallbackHandler"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java index b8ab009..24a6ee4 100644 --- a/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java +++ b/services/sts/systests/sts-itests/src/test/java/org/apache/cxf/systest/sts/itests/unit/STSUnitTest.java @@ -98,7 +98,7 @@ public class STSUnitTest extends BasicSTSIntegrationTest { stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port";); stsClient.setEnableAppliesTo(false); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.USERNAME, "alice"); properties.put( SecurityConstants.CALLBACK_HANDLER, new CommonCallbackHandler() http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDVersion.java ---------------------------------------------------------------------- diff --git a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDVersion.java b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDVersion.java index 8e6abe6..053fb22 100644 --- a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDVersion.java +++ b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDVersion.java @@ -74,14 +74,14 @@ public abstract class WSDVersion { } public void addVersionTransformer(Dispatch<Object> dispatch) { StaxTransformFeature feature = new StaxTransformFeature(); - Map<String, String> outElements = new HashMap<String, String>(); + Map<String, String> outElements = new HashMap<>(); outElements.put("{" + NS_1_1 + "}*", "{" + NS_1_0 + "}*"); outElements.put("{" + INSTANCE_1_1.getAddressingNamespace() + "}*", "{" + getAddressingNamespace() + "}*"); feature.setOutTransformElements(outElements); - Map<String, String> inElements = new HashMap<String, String>(); + Map<String, String> inElements = new HashMap<>(); inElements.put("{" + NS_1_0 + "}*", "{" + NS_1_1 + "}*"); inElements.put("{" + getAddressingNamespace() + "}*", @@ -91,7 +91,7 @@ public abstract class WSDVersion { feature.initialize(((DispatchImpl)dispatch).getClient(), ((DispatchImpl)dispatch).getClient().getBus()); - Map<String, String> nsMap = new HashMap<String, String>(); + Map<String, String> nsMap = new HashMap<>(); nsMap.put("tns", NS_1_0); nsMap.put("wsa", getAddressingNamespace()); ((DispatchImpl)dispatch).getClient().getEndpoint().getEndpointInfo() @@ -117,7 +117,7 @@ public abstract class WSDVersion { return "http://www.w3.org/2005/08/addressing";; } public void addVersionTransformer(Dispatch<Object> dispatch) { - Map<String, String> nsMap = new HashMap<String, String>(); + Map<String, String> nsMap = new HashMap<>(); nsMap.put("tns", NS_1_1); nsMap.put("wsa", getAddressingNamespace()); ((DispatchImpl)dispatch).getClient().getEndpoint().getEndpointInfo() http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java ---------------------------------------------------------------------- diff --git a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java index 78e4f36..061f757 100644 --- a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java +++ b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java @@ -244,7 +244,7 @@ public class WSDiscoveryServiceImpl implements WSDiscoveryService { Bus b = BusFactory.getAndSetThreadDefaultBus(bus); try { udpEndpoint = new EndpointImpl(bus, new WSDiscoveryProvider()); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("jaxws.provider.interpretNullAsOneway", "true"); udpEndpoint.setProperties(props); if ("true".equals(preferIPv6AddressesValue) && "false".equals(preferIPv4StackValue)) { @@ -453,7 +453,7 @@ public class WSDiscoveryServiceImpl implements WSDiscoveryService { context.createMarshaller().marshal(mt, r); XMLStreamReader domReader = StaxUtils.createXMLStreamReader(doc); - Map<String, String> inMap = new HashMap<String, String>(); + Map<String, String> inMap = new HashMap<>(); inMap.put("{" + WSDVersion.INSTANCE_1_1.getNamespace() + "}*", "{" + WSDVersion.INSTANCE_1_0.getNamespace() + "}*"); inMap.put("{" + WSDVersion.INSTANCE_1_1.getAddressingNamespace() + "}*", @@ -477,7 +477,7 @@ public class WSDiscoveryServiceImpl implements WSDiscoveryService { private Document mapFromOld(Document doc) throws XMLStreamException { XMLStreamReader domReader = StaxUtils.createXMLStreamReader(doc); - Map<String, String> inMap = new HashMap<String, String>(); + Map<String, String> inMap = new HashMap<>(); inMap.put("{" + WSDVersion.INSTANCE_1_0.getNamespace() + "}*", "{" + WSDVersion.INSTANCE_1_1.getNamespace() + "}*"); inMap.put("{" + WSDVersion.INSTANCE_1_0.getAddressingNamespace() + "}*", http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java ---------------------------------------------------------------------- diff --git a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java index 6df85b3..1b7cf36 100644 --- a/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java +++ b/services/wsn/wsn-api/src/main/java/org/apache/cxf/wsn/util/CXFWSNHelper.java @@ -63,7 +63,7 @@ public class CXFWSNHelper extends WSNHelper { serviceInterface.getSimpleName() + "Port")); jwfb.setAddress(address); if (extraClasses != null && extraClasses.length > 0) { - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("jaxb.additionalContextClasses", extraClasses); jwfb.getClientFactoryBean().getServiceFactory().setProperties(props); } @@ -75,7 +75,7 @@ public class CXFWSNHelper extends WSNHelper { public Endpoint publish(String address, Object o, Class<?> ... extraClasses) { Endpoint endpoint = Endpoint.create(SOAPBinding.SOAP12HTTP_BINDING, o); if (extraClasses != null && extraClasses.length > 0) { - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("jaxb.additionalContextClasses", extraClasses); endpoint.setProperties(props); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java ---------------------------------------------------------------------- diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java index 79e5705..c43c3d2 100644 --- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java +++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java @@ -135,7 +135,7 @@ public abstract class JmsPublisher extends AbstractPublisher implements Consumer protected void start() throws PublisherRegistrationFailedFault { if (demand) { try { - producers = new HashMap<Destination, Object>(); + producers = new HashMap<>(); advisories = new ArrayList<>(); for (TopicExpressionType topic : this.topic) { ConsumerEventSource advisory http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java ---------------------------------------------------------------------- diff --git a/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java b/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java index 3162c39..5b81655 100644 --- a/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java +++ b/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java @@ -282,7 +282,7 @@ public class LdapCertificateRepo implements CertificateRepo { public void saveCertificate(X509Certificate cert, UseKeyWithType key) { Applications application = Applications.fromUri(key.getApplication()); String dn = null; - Map<String, String> attrs = new HashMap<String, String>(); + Map<String, String> attrs = new HashMap<>(); if (application == Applications.PKIX) { dn = key.getIdentifier() + "," + rootDN; } else if (application == Applications.SERVICE_NAME) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java ---------------------------------------------------------------------- diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java index 3beb9c1..26f175b 100644 --- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java +++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisJaxWsImpl.java @@ -33,7 +33,7 @@ import org.apache.cxf.systest.aegis.bean.Item; @WebService(endpointInterface = "org.apache.cxf.systest.aegis.AegisJaxWs") public class AegisJaxWsImpl implements AegisJaxWs { - Map<Integer, Item> items = new HashMap<Integer, Item>(); + Map<Integer, Item> items = new HashMap<>(); public void addItem(Item item) { items.put(item.getKey(), item); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java index 04ac405..e774c6c 100644 --- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java +++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java @@ -55,7 +55,7 @@ public class SportsServiceImpl implements SportsService { public Map<String, Map<Integer, Integer>> testComplexMapResult() { CustomerMap result = new CustomerMap(); - Map<Integer, Integer> map1 = new HashMap<Integer, Integer>(); + Map<Integer, Integer> map1 = new HashMap<>(); map1.put(1, 3); result.put("key1", map1); return result; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java ---------------------------------------------------------------------- diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java index ef0eee1..5d13af7 100644 --- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java +++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/mtom/MtomTest.java @@ -78,7 +78,7 @@ public class MtomTest extends AbstractJUnit4SpringContextTests { jaxwsFac.setDataBinding(new AegisDatabinding()); jaxwsFac.setAddress("http://localhost:"; + PORT + "/jaxWsMtom"); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); if (enableClientMTOM) { props.put("mtom-enabled", Boolean.TRUE); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java ---------------------------------------------------------------------- diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java index a5adcbe..fe61768 100644 --- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java +++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/HashMapAdapter.java @@ -89,7 +89,7 @@ public class HashMapAdapter extends XmlAdapter<HashMapAdapter.HashMapType, Map<S } public Map<String, byte[]> unmarshal(HashMapType arg0) throws Exception { - Map<String, byte[]> hashMap = new HashMap<String, byte[]>(); + Map<String, byte[]> hashMap = new HashMap<>(); if (arg0 != null && arg0.entry != null) { for (HashMapEntryType myHashEntryType : arg0.entry) { if (myHashEntryType.key != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java index 20d412f..d462c46 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java @@ -52,8 +52,8 @@ public class AtomBookStore { @Context protected UriInfo uField; private HttpHeaders headers; - private Map<Long, Book> books = new HashMap<Long, Book>(); - private Map<Long, CD> cds = new HashMap<Long, CD>(); + private Map<Long, Book> books = new HashMap<>(); + private Map<Long, CD> cds = new HashMap<>(); private long bookId = 123; private long cdId = 123; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java index 51c60d4..7407370 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java @@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; public class Book { private String name; private long id; - private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>(); + private Map<Long, Chapter> chapters = new HashMap<>(); public Book() { init(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookBean.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookBean.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookBean.java index c16a542..b1fed3b 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookBean.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookBean.java @@ -34,8 +34,8 @@ import javax.xml.bind.annotation.XmlRootElement; public class BookBean { private String name; private long id; - private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>(); - private Map<Long, String> comments = new HashMap<Long, String>(); + private Map<Long, Chapter> chapters = new HashMap<>(); + private Map<Long, String> comments = new HashMap<>(); public BookBean() { init(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java index 0c76ac4..4744b52 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java @@ -46,7 +46,7 @@ import org.apache.cxf.phase.PhaseInterceptorChain; @Path("/bookstore") public class BookContinuationStore implements BookAsyncInterface { - private Map<String, String> books = new HashMap<String, String>(); + private Map<String, String> books = new HashMap<>(); private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationStore.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationStore.java index d852805..8781ba7 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationStore.java @@ -45,7 +45,7 @@ import org.apache.cxf.phase.PhaseInterceptorChain; @Path("/bookstore") public class BookCxfContinuationStore { - private Map<String, String> books = new HashMap<String, String>(); + private Map<String, String> books = new HashMap<>(); private Map<String, Continuation> suspended = new HashMap<String, Continuation>(); private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS, http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNoXmlRootElement.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNoXmlRootElement.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNoXmlRootElement.java index fc58280..026b0a0 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNoXmlRootElement.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNoXmlRootElement.java @@ -31,7 +31,7 @@ import javax.ws.rs.Produces; public class BookNoXmlRootElement { private String name; private long id; - private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>(); + private Map<Long, Chapter> chapters = new HashMap<>(); public BookNoXmlRootElement() { init(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java index b060e7a..6d2ac5b 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java @@ -113,7 +113,7 @@ public class BookServer extends AbstractBusTestServerBase { providers.add(new StreamingResponseProvider<Object>()); providers.add(new ContentTypeModifyingMBW()); JAXBElementProvider<?> jaxbProvider = new JAXBElementProvider<Object>(); - Map<String, String> jaxbElementClassMap = new HashMap<String, String>(); + Map<String, String> jaxbElementClassMap = new HashMap<>(); jaxbElementClassMap.put(BookNoXmlRootElement.class.getName(), "BookNoXmlRootElement"); jaxbProvider.setJaxbElementClassMap(jaxbElementClassMap); providers.add(jaxbProvider); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java index 1167308..2c3dce7 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java @@ -500,7 +500,7 @@ public class BookServer20 extends AbstractBusTestServerBase { configurable.register(new PreMatchDynamicContainerRequestFilter()); configurable.register(RESPONSE_FILTER); - Map<Class<?>, Integer> contracts = new HashMap<Class<?>, Integer>(); + Map<Class<?>, Integer> contracts = new HashMap<>(); contracts.put(ContainerResponseFilter.class, 2); configurable.register(new PostMatchDynamicContainerRequestResponseFilter(), contracts); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java index dde2889..e0423a3 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java @@ -112,8 +112,8 @@ import org.junit.Assert; @GZIP(threshold = 1) public class BookStore { - private Map<Long, Book> books = new HashMap<Long, Book>(); - private Map<Long, CD> cds = new HashMap<Long, CD>(); + private Map<Long, Book> books = new HashMap<>(); + private Map<Long, CD> cds = new HashMap<>(); private long bookId = 123; private long cdId = 123; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreDispatch.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreDispatch.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreDispatch.java index f5f4ac7..a29f70f 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreDispatch.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreDispatch.java @@ -30,7 +30,7 @@ import javax.ws.rs.Produces; @Path("/") public class BookStoreDispatch { - private Map<Long, Book> books = new HashMap<Long, Book>(); + private Map<Long, Book> books = new HashMap<>(); private Long mainId = 123L; public BookStoreDispatch() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java index 35baca5..019ade2 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java @@ -27,7 +27,7 @@ import javax.ws.rs.core.Response; public class BookStoreNoAnnotations { - private Map<Long, Book> books = new HashMap<Long, Book>(); + private Map<Long, Book> books = new HashMap<>(); public BookStoreNoAnnotations() { Book b = new Book(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java index 4693cb7..d0667df 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java @@ -34,7 +34,7 @@ import org.apache.cxf.message.MessageUtils; public class BookStoreNoAnnotationsImpl implements BookStoreNoAnnotationsInterface, HttpHeadersContext { - private Map<Long, Book> books = new HashMap<Long, Book>(); + private Map<Long, Book> books = new HashMap<>(); @Context private UriInfo ui; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java index 4e4ea16..eae6aed 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStorePerRequest.java @@ -36,7 +36,7 @@ import javax.ws.rs.core.Response; public class BookStorePerRequest { private HttpHeaders httpHeaders; - private Map<Long, Book> books = new HashMap<Long, Book>(); + private Map<Long, Book> books = new HashMap<>(); private List<String> bookIds; private List<String> setterBookIds; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java index f010672..90255ef 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java @@ -61,7 +61,7 @@ import org.apache.cxf.staxutils.StaxUtils; @Produces("application/json") public class BookStoreSpring { - private Map<Long, Book> books = new HashMap<Long, Book>(); + private Map<Long, Book> books = new HashMap<>(); private Long mainId = 123L; @Context private UriInfo ui; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreStorage.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreStorage.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreStorage.java index c5902e8..f9abc6a 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreStorage.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreStorage.java @@ -28,7 +28,7 @@ import javax.ws.rs.Path; @Path("/bookstorestorage/") public abstract class BookStoreStorage implements LifecycleInterface { - protected Map<Long, Book> books = new HashMap<Long, Book>(); + protected Map<Long, Book> books = new HashMap<>(); protected long bookId = 123; protected int postConstructCalls; protected int preDestroyCalls; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookType.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookType.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookType.java index b6611ca..911b7e5 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookType.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookType.java @@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; public class BookType { private String name; private long id; - private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>(); + private Map<Long, Chapter> chapters = new HashMap<>(); public BookType() { init(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java index 30f3f18..bc1527d 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java @@ -53,7 +53,7 @@ public class CustomOutInterceptor extends AbstractPhaseInterceptor<Message> { Map<String, List<String>> headers = (Map<String, List<String>>) message.get(Message.PROTOCOL_HEADERS); if (headers == null) { - headers = new HashMap<String, List<String>>(); + headers = new HashMap<>(); message.put(Message.PROTOCOL_HEADERS, headers); } headers.put("BookId", Arrays.asList("321")); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java index 0b8792b..dd2c0ea 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java @@ -2097,7 +2097,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase { @Test public void testPostGetBookAdapterList() throws Exception { JAXBElementProvider<?> provider = new JAXBElementProvider<Object>(); - Map<String, String> outMap = new HashMap<String, String>(); + Map<String, String> outMap = new HashMap<>(); outMap.put("Books", "CollectionWrapper"); outMap.put("books", "Book"); provider.setOutTransformElements(outMap); @@ -2112,7 +2112,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase { @Test public void testPostGetBookAdapterListJSON() throws Exception { JAXBElementProvider<?> provider = new JAXBElementProvider<Object>(); - Map<String, String> outMap = new HashMap<String, String>(); + Map<String, String> outMap = new HashMap<>(); outMap.put("Books", "CollectionWrapper"); outMap.put("books", "Book"); provider.setOutTransformElements(outMap); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java index 93407f6..0b453c7 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerODataSearchTest.java @@ -34,7 +34,7 @@ public class JAXRSClientServerODataSearchTest extends AbstractBusClientServerTes @BeforeClass public static void startServers() throws Exception { - final Map< String, Object > properties = new HashMap< String, Object >(); + final Map< String, Object > properties = new HashMap<>(); properties.put("search.query.parameter.name", "$filter"); properties.put("search.parser", new ODataParser< Book >(Book.class)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java index 0032e36..7473896 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java @@ -122,7 +122,7 @@ public class JAXRSClientServerResourceCreatedSpringProviderTest extends Abstract checkPetStoreInfo(resourceEls.get(0)); Element el = (Element)resourceEls.get(0).getParentNode().getParentNode(); - Map<String, String> namespaces = new HashMap<String, String>(); + Map<String, String> namespaces = new HashMap<>(); namespaces.put("xsd", "http://www.w3.org/2001/XMLSchema";); namespaces.put("ns", "http://pets";); namespaces.put("wadl", "http://wadl.dev.java.net/2009/02";);
