http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java index 6d8eda7..b81015d 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java @@ -119,7 +119,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String encodedAssertion = Base64UrlUtility.encode(assertion); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, Constants.CLIENT_AUTH_SAML2_BEARER); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, encodedAssertion); @@ -185,7 +185,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { // Create the JWT Token String token = OAuth2TestUtils.createToken("resourceOwner", "alice", address, true, true); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, token); @@ -209,7 +209,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String assertion = OAuth2TestUtils.createToken(audienceURI, false, true); String encodedAssertion = Base64UrlUtility.encode(assertion); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, Constants.CLIENT_AUTH_SAML2_BEARER); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, encodedAssertion); @@ -230,7 +230,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String assertion = OAuth2TestUtils.createToken(audienceURI, true, true); String encodedAssertion = Base64UrlUtility.encode(assertion); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, Constants.CLIENT_AUTH_SAML2_BEARER); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, encodedAssertion); @@ -273,7 +273,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String encodedAssertion = Base64UrlUtility.encode(assertion); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, Constants.CLIENT_AUTH_SAML2_BEARER); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, encodedAssertion); @@ -294,7 +294,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String assertion = OAuth2TestUtils.createToken(audienceURI, true, false); String encodedAssertion = Base64UrlUtility.encode(assertion); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, Constants.CLIENT_AUTH_SAML2_BEARER); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, encodedAssertion); @@ -338,7 +338,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String encodedAssertion = Base64UrlUtility.encode(assertion); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, Constants.CLIENT_AUTH_SAML2_BEARER); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, encodedAssertion); @@ -358,7 +358,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { // Create the JWT Token String token = OAuth2TestUtils.createToken("resourceOwner", "bob", address, true, true); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, token); @@ -380,7 +380,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String token = OAuth2TestUtils.createToken("resourceOwner", "alice", address, true, false); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, token); @@ -401,7 +401,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { // Create the JWT Token String token = OAuth2TestUtils.createToken(null, "alice", address, true, true); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, token); @@ -423,7 +423,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String token = OAuth2TestUtils.createToken("resourceOwner", "alice", address, false, true); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, token); @@ -445,7 +445,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { String token = OAuth2TestUtils.createToken("resourceOwner", "alice", address + "/badtoken", true, true); - Map<String, String> extraParams = new HashMap<String, String>(); + Map<String, String> extraParams = new HashMap<>(); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_TYPE, "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"); extraParams.put(Constants.CLIENT_AUTH_ASSERTION_PARAM, token); @@ -481,7 +481,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { Bus springBus = bf.createBus(busFile.toString()); bean.setBus(springBus); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java index d54b863..728a434 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/MemoryClientDataProvider.java @@ -30,7 +30,7 @@ import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException; public class MemoryClientDataProvider implements ClientRegistrationProvider { - private Map<String, Client> clients = new HashMap<String, Client>(); + private Map<String, Client> clients = new HashMap<>(); @Override public Client getClient(String clientId) throws OAuthServiceException { return clients.get(clientId); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java index e88c015..bb6340e 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlAuthorizationTest.java @@ -90,7 +90,7 @@ public class JAXRSSamlAuthorizationTest extends AbstractBusClientServerTestBase public void testPostBookAdminRoleWithGoodSubjectName() throws Exception { String address = "https://localhost:"; + PORT + "/saml-roles2/bookstore/books"; - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("saml.roles", Collections.singletonList("admin")); props.put("saml.subject.name", "[email protected]"); WebClient wc = createWebClient(address, props); @@ -103,7 +103,7 @@ public class JAXRSSamlAuthorizationTest extends AbstractBusClientServerTestBase public void testPostBookAdminWithWeakClaims() throws Exception { String address = "https://localhost:"; + PORT + "/saml-claims/bookstore/books"; - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); WebClient wc = createWebClient(address, props); wc.type(MediaType.APPLICATION_XML).accept(MediaType.APPLICATION_XML); try { @@ -118,7 +118,7 @@ public class JAXRSSamlAuthorizationTest extends AbstractBusClientServerTestBase public void testPostBookAdminWithWeakClaims2() throws Exception { String address = "https://localhost:"; + PORT + "/saml-claims/bookstore/books"; - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("saml.roles", Collections.singletonList("admin")); props.put("saml.auth", Collections.singletonList("password")); WebClient wc = createWebClient(address, props); @@ -135,7 +135,7 @@ public class JAXRSSamlAuthorizationTest extends AbstractBusClientServerTestBase public void testPostBookAdminWithClaims() throws Exception { String address = "https://localhost:"; + PORT + "/saml-claims/bookstore/books"; - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("saml.roles", Collections.singletonList("admin")); props.put("saml.auth", Collections.singletonList("smartcard")); WebClient wc = createWebClient(address, props); @@ -153,7 +153,7 @@ public class JAXRSSamlAuthorizationTest extends AbstractBusClientServerTestBase Bus springBus = bf.createBus(busFile.toString()); bean.setBus(springBus); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.saml-callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.SamlCallbackHandler"); if (extraProperties != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java index b9c6318..3798dbc 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java @@ -236,7 +236,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { Bus springBus = bf.createBus(busFile.toString()); bean.setBus(springBus); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(SecurityConstants.CALLBACK_HANDLER, "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put(SecurityConstants.SAML_CALLBACK_HANDLER, samlCallbackHandler); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java index 82fdaee..c1b2d7d 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java @@ -141,7 +141,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { String address = "https://localhost:"; + test.port + "/xmlsigconstraints"; // Successful test with "bob" - Map<String, Object> newProperties = new HashMap<String, Object>(); + Map<String, Object> newProperties = new HashMap<>(); newProperties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); newProperties.put("security.signature.username", "bob"); @@ -183,7 +183,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { Bus springBus = bf.createBus(busFile.toString()); bean.setBus(springBus); - Map<String, Object> newProperties = new HashMap<String, Object>(properties); + Map<String, Object> newProperties = new HashMap<>(properties); if (newProperties.isEmpty()) { newProperties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); @@ -260,7 +260,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { Bus springBus = bf.createBus(busFile.toString()); bean.setBus(springBus); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.signature.username", "alice"); @@ -316,7 +316,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { @Test public void testPostEncryptedBook() throws Exception { String address = "https://localhost:"; + test.port + "/xmlenc/bookstore/books"; - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); @@ -340,7 +340,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { } String address = "https://localhost:"; + test.port + "/xmlenc/bookstore/books"; - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); @@ -358,7 +358,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { @Test public void testPostEncryptedBookSHA256() throws Exception { String address = "https://localhost:"; + test.port + "/xmlenc/bookstore/books"; - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); @@ -378,7 +378,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { @Test public void testPostEncryptedBookIssuerSerial() throws Exception { String address = "https://localhost:"; + test.port + "/xmlenc/bookstore/books"; - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); @@ -397,7 +397,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { @Test public void testPostEncryptedSignedBook() throws Exception { String address = "https://localhost:"; + test.port + "/xmlsec-validate/bookstore/books"; - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); @@ -413,7 +413,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { @Test public void testPostEncryptedSignedBookInvalid() throws Exception { String address = "https://localhost:"; + test.port + "/xmlsec-validate/bookstore/books"; - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); @@ -439,7 +439,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { @Test public void testPostEncryptedSignedBookUseReqSigCert() throws Exception { String address = "https://localhost:"; + test.port + "/xmlsec-useReqSigCert/bookstore/books"; - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); @@ -572,7 +572,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { Bus springBus = bf.createBus(busFile.toString()); bean.setBus(springBus); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); @@ -616,7 +616,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { Bus springBus = bf.createBus(busFile.toString()); bean.setBus(springBus); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.encryption.username", "bob"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java ---------------------------------------------------------------------- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java index 609414b..f0cbd6f 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingCustomHeadersTest.java @@ -64,11 +64,11 @@ public class HTraceTracingCustomHeadersTest extends AbstractBusClientServerTestB @Ignore public static class Server extends AbstractBusTestServerBase { protected void run() { - final Map<String, String> properties = new HashMap<String, String>(); + final Map<String, String> properties = new HashMap<>(); properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, StandardOutSpanReceiver.class.getName()); properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName()); - final Map<String, Object> headers = new HashMap<String, Object>(); + final Map<String, Object> headers = new HashMap<>(); headers.put(TracerHeaders.HEADER_SPAN_ID, CUSTOM_HEADER_SPAN_ID); final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); @@ -92,7 +92,7 @@ public class HTraceTracingCustomHeadersTest extends AbstractBusClientServerTestB @Before public void setUp() { - final Map<String, String> properties = new HashMap<String, String>(); + final Map<String, String> properties = new HashMap<>(); properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, StandardOutSpanReceiver.class.getName()); properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName()); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java ---------------------------------------------------------------------- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java index 26dfe20..f786f92 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/htrace/HTraceTracingTest.java @@ -67,7 +67,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase { @Ignore public static class Server extends AbstractBusTestServerBase { protected void run() { - final Map<String, String> properties = new HashMap<String, String>(); + final Map<String, String> properties = new HashMap<>(); properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TestSpanReceiver.class.getName()); properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName()); @@ -93,7 +93,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase { public void setUp() { TestSpanReceiver.clear(); - final Map<String, String> properties = new HashMap<String, String>(); + final Map<String, String> properties = new HashMap<>(); properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, StandardOutSpanReceiver.class.getName()); properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName()); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java ---------------------------------------------------------------------- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java index 21ec90c..adc5b3d 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java @@ -119,7 +119,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase { .sampled(true) .build(); - final Map<String, List<String>> headers = new HashMap<String, List<String>>(); + final Map<String, List<String>> headers = new HashMap<>(); headers.put(BraveHttpHeaders.SpanId.getName(), Arrays.asList(Long.toString(spanId.spanId))); headers.put(BraveHttpHeaders.TraceId.getName(), Arrays.asList(Long.toString(spanId.traceId))); headers.put(BraveHttpHeaders.Sampled.getName(), Arrays.asList(Boolean.toString(spanId.sampled()))); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java ---------------------------------------------------------------------- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java index 45d066c..5776ac4 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/htrace/HTraceTracingTest.java @@ -105,7 +105,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase { @Test public void testThatNewInnerSpanIsCreated() throws MalformedURLException { final SpanId spanId = SpanId.fromRandom(); - final Map<String, List<String>> headers = new HashMap<String, List<String>>(); + final Map<String, List<String>> headers = new HashMap<>(); headers.put(TracerHeaders.DEFAULT_HEADER_SPAN_ID, Arrays.asList(spanId.toString())); final BookStoreService service = createJaxWsService(headers); @@ -211,7 +211,7 @@ public class HTraceTracingTest extends AbstractBusClientServerTestBase { } private static Tracer createTracer() { - final Map<String, String> properties = new HashMap<String, String>(); + final Map<String, String> properties = new HashMap<>(); properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TestSpanReceiver.class.getName()); properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName()); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java ---------------------------------------------------------------------- diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java index e820d54..45e09ec 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java @@ -97,7 +97,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { callbackHandler.setSignAssertion(true); callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER); - Map<String, Object> outProperties = new HashMap<String, Object>(); + Map<String, Object> outProperties = new HashMap<>(); outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED); outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler); @@ -136,7 +136,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { callbackHandler.setConditions(conditions); - Map<String, Object> outProperties = new HashMap<String, Object>(); + Map<String, Object> outProperties = new HashMap<>(); outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED); outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler); @@ -174,7 +174,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { callbackHandler.setConditions(conditions); - Map<String, Object> outProperties = new HashMap<String, Object>(); + Map<String, Object> outProperties = new HashMap<>(); outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED); outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler); @@ -216,7 +216,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { callbackHandler.setConditions(conditions); - Map<String, Object> outProperties = new HashMap<String, Object>(); + Map<String, Object> outProperties = new HashMap<>(); outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED); outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler); @@ -254,7 +254,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { callbackHandler.setConditions(conditions); - Map<String, Object> outProperties = new HashMap<String, Object>(); + Map<String, Object> outProperties = new HashMap<>(); outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED); outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java ---------------------------------------------------------------------- diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java index f1b547c..3b49345 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java @@ -42,7 +42,7 @@ public class Server extends AbstractBusTestServerBase { Bus bus = BusFactory.getDefaultBus(); setBus(bus); - Map<String, Object> inProperties = new HashMap<String, Object>(); + Map<String, Object> inProperties = new HashMap<>(); inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED); inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new KeystorePasswordCallback()); inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "bob.properties"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java ---------------------------------------------------------------------- diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java index 76b4dfd..e242279 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/tx/MyBeanLocator.java @@ -28,7 +28,7 @@ import org.apache.cxf.configuration.ConfiguredBeanLocator; public class MyBeanLocator implements ConfiguredBeanLocator { ConfiguredBeanLocator cbl; - Map<String, Object> registry = new HashMap<String, Object>(); + Map<String, Object> registry = new HashMap<>(); public MyBeanLocator(ConfiguredBeanLocator cbl) { this.cbl = cbl; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/ClientServerSessionTest.java ---------------------------------------------------------------------- diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/ClientServerSessionTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/ClientServerSessionTest.java index e7108c8..842f356 100644 --- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/ClientServerSessionTest.java +++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/ClientServerSessionTest.java @@ -67,7 +67,7 @@ public class ClientServerSessionTest extends AbstractBusClientServerTestBase { = CastUtils.cast((Map<?, ?>)bp.getRequestContext().get("javax.xml.ws.http.request.headers")); if (headers == null) { - headers = new HashMap<String, List<String>>(); + headers = new HashMap<>(); bp.getRequestContext() .put("javax.xml.ws.http.request.headers", headers); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java index da14d8d..33a90c1 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java @@ -32,7 +32,7 @@ import org.apache.cxf.testutil.common.TestUtil; * Everything else is designed to be spring-loaded. */ public class BusServer extends AbstractBusTestServerBase { - public static final Map<String, String> PORTMAP = new HashMap<String, String>(); + public static final Map<String, String> PORTMAP = new HashMap<>(); public static void resetPortMap() { PORTMAP.clear(); for (int x = 0; x < 9; x++) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java index 9e829b1..508a2be 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java @@ -67,7 +67,7 @@ public class ClientServerSessionTest extends AbstractBusClientServerTestBase { = CastUtils.cast((Map<?, ?>)bp.getRequestContext().get("javax.xml.ws.http.request.headers")); if (headers == null) { - headers = new HashMap<String, List<String>>(); + headers = new HashMap<>(); bp.getRequestContext() .put("javax.xml.ws.http.request.headers", headers); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java index 02b68018..2f33272 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java @@ -32,7 +32,7 @@ import org.apache.cxf.testutil.common.TestUtil; * Everything else is designed to be spring-loaded. */ public class BusServer extends AbstractBusTestServerBase { - public static final Map<String, String> PORTMAP = new HashMap<String, String>(); + public static final Map<String, String> PORTMAP = new HashMap<>(); public static void resetPortMap() { PORTMAP.clear(); for (int x = 0; x < 9; x++) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java index bd1a980..bb95324 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java @@ -38,7 +38,7 @@ public class Server extends AbstractBusTestServerBase { Object implementor = new PutLastTradedPriceImpl(); String address = "http://localhost:"; + PORT + "/SOAPDocLitBareService/SoapPort"; ep = Endpoint.create(implementor); - Map<String, Object> props = new HashMap<String, Object>(2); + Map<String, Object> props = new HashMap<>(2); props.put(Endpoint.WSDL_SERVICE, new QName("http://apache.org/hello_world_doc_lit_bare";, "SOAPService")); props.put(Endpoint.WSDL_PORT, new QName("http://apache.org/hello_world_doc_lit_bare";, "SoapPort")); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java index 4e22cc8..df693ae 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java @@ -50,13 +50,13 @@ public class ControlImpl implements Control { private Map<String, Endpoint> endpoints; ControlImpl() { - implementors = new HashMap<String, Greeter>(); + implementors = new HashMap<>(); implementors.put(FailoverTest.REPLICA_A, new GreeterImplA()); implementors.put(FailoverTest.REPLICA_B, new GreeterImplB()); implementors.put(FailoverTest.REPLICA_C, new GreeterImplC()); implementors.put(FailoverTest.REPLICA_D, new GreeterImplD()); implementors.put(FailoverTest.REPLICA_E, new GreeterImplE()); - endpoints = new HashMap<String, Endpoint>(); + endpoints = new HashMap<>(); } public boolean startGreeter(String address) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorAddressOverrideTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorAddressOverrideTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorAddressOverrideTest.java index b0173e2..e3082fb 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorAddressOverrideTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorAddressOverrideTest.java @@ -65,7 +65,7 @@ public class LoadDistributorAddressOverrideTest extends FailoverAddressOverride startTarget(REPLICA_C); setupGreeterA(); verifyStrategy(greeter, SequentialStrategy.class, 3); - Map< String, Integer > responseCounts = new HashMap< String, Integer >(); + Map< String, Integer > responseCounts = new HashMap<>(); for (int i = 0; i < 12; ++i) { String response = greeter.greetMe("fred"); assertNotNull("expected non-null response", response); @@ -86,7 +86,7 @@ public class LoadDistributorAddressOverrideTest extends FailoverAddressOverride startTarget(REPLICA_C); setupGreeterA(); verifyStrategy(greeter, SequentialStrategy.class, 3); - Map< String, Integer > responseCounts = new HashMap< String, Integer >(); + Map< String, Integer > responseCounts = new HashMap<>(); for (int i = 0; i < 12; ++i) { String response = greeter.greetMe("fred"); assertNotNull("expected non-null response", response); @@ -117,7 +117,7 @@ public class LoadDistributorAddressOverrideTest extends FailoverAddressOverride fail("unexpected conduit selector: " + conduitSelector); } - Map< String, Integer > responseCounts = new HashMap< String, Integer >(); + Map< String, Integer > responseCounts = new HashMap<>(); for (int i = 0; i < 12; ++i) { try { String response = greeter.greetMe("fred"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorTest.java index d38a98a..59567d2 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/LoadDistributorTest.java @@ -92,7 +92,7 @@ public class LoadDistributorTest extends FailoverTest { } - Map< String, Integer > responseCounts = new HashMap< String, Integer >(); + Map< String, Integer > responseCounts = new HashMap<>(); for (int i = 0; i < 12; ++i) { String response = greeter.greetMe("fred"); assertNotNull("expected non-null response", response); @@ -123,7 +123,7 @@ public class LoadDistributorTest extends FailoverTest { } else { fail("unexpected conduit selector: " + conduitSelector); } - Map< String, Integer > responseCounts = new HashMap< String, Integer >(); + Map< String, Integer > responseCounts = new HashMap<>(); for (int i = 0; i < 12; ++i) { String response = greeter.greetMe("fred"); assertNotNull("expected non-null response", response); @@ -154,7 +154,7 @@ public class LoadDistributorTest extends FailoverTest { fail("unexpected conduit selector: " + conduitSelector); } - Map< String, Integer > responseCounts = new HashMap< String, Integer >(); + Map< String, Integer > responseCounts = new HashMap<>(); for (int i = 0; i < 12; ++i) { try { String response = greeter.greetMe("fred"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java index b58121e..3db444b 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java @@ -57,7 +57,7 @@ public class GenericExceptionTest extends AbstractBusClientServerTestBase { Document doc = StaxUtils.read(ins); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("xsd", "http://www.w3.org/2001/XMLSchema";); ns.put("wsdl", "http://schemas.xmlsoap.org/wsdl/";); ns.put("tns", "http://cxf.apache.org/test/HelloService";); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java index 6aa51eb..69b61ac 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java @@ -87,7 +87,7 @@ public class MultiplexClientServerTest extends AbstractBusClientServerTestBase { public static void startServers() throws Exception { createStaticBus("org/apache/cxf/systest/factory_pattern/cxf_multiplex.xml"); // requires ws-a support to propagate reference parameters - Map<String, String> props = new HashMap<String, String>(); + Map<String, String> props = new HashMap<>(); if (System.getProperty("org.apache.activemq.default.directory.prefix") != null) { props.put("org.apache.activemq.default.directory.prefix", System.getProperty("org.apache.activemq.default.directory.prefix")); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java index 30baa73..f5d250a 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java @@ -79,8 +79,8 @@ public class LifeCycleTest extends Assert { manager = bus.getExtension(ServerLifeCycleManager.class); recursiveCount = 0; recursiveEndpoints = new Endpoint[RECURSIVE_LIMIT]; - startNotificationMap = new HashMap<String, Integer>(); - stopNotificationMap = new HashMap<String, Integer>(); + startNotificationMap = new HashMap<>(); + stopNotificationMap = new HashMap<>(); } @After http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java index d8a617c..f1c24f6 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java @@ -73,7 +73,7 @@ public class MtomServerTest extends AbstractBusClientServerTestBase { sf.setBus(getStaticBus()); String address = "http://localhost:"; + PORT1 + "/EchoService"; sf.setAddress(address); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(Message.MTOM_ENABLED, "true"); sf.setProperties(props); sf.create(); @@ -135,7 +135,7 @@ public class MtomServerTest extends AbstractBusClientServerTestBase { sf.setBus(getStaticBus()); String address = "http://localhost:"; + PORT2 + "/EchoService"; sf.setAddress(address); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(Message.MTOM_ENABLED, "true"); sf.setProperties(props); Server server = sf.create(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java index 012357c..db0618e 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java @@ -53,7 +53,7 @@ public class Server extends AbstractBusTestServerBase { Object implementor = new OOBHdrServiceImpl(); Endpoint ep = Endpoint.create(implementor); - Map<String, Object> props = new HashMap<String, Object>(2); + Map<String, Object> props = new HashMap<>(2); props.put(Endpoint.WSDL_SERVICE, new QName("http://apache.org/hello_world_doc_lit_bare";, "SOAPService")); props.put(Endpoint.WSDL_PORT, new QName("http://apache.org/hello_world_doc_lit_bare";, "SoapPort")); @@ -61,7 +61,7 @@ public class Server extends AbstractBusTestServerBase { ep.publish("http://localhost:"; + PORT + "/SOAPDocLitBareService/SoapPort"); ep = Endpoint.create(implementor); - props = new HashMap<String, Object>(2); + props = new HashMap<>(2); props.put(Endpoint.WSDL_SERVICE, new QName("http://apache.org/hello_world_doc_lit_bare";, "SOAPService")); props.put(Endpoint.WSDL_PORT, new QName("http://apache.org/hello_world_doc_lit_bare";, "SoapPort")); @@ -70,7 +70,7 @@ public class Server extends AbstractBusTestServerBase { ep.publish("http://localhost:"; + PORT + "/SOAPDocLitBareService/SoapPortNoHeader"); ep = Endpoint.create(implementor); - props = new HashMap<String, Object>(2); + props = new HashMap<>(2); props.put(Endpoint.WSDL_SERVICE, new QName("http://apache.org/hello_world_doc_lit_bare";, "SOAPService")); props.put(Endpoint.WSDL_PORT, new QName("http://apache.org/hello_world_doc_lit_bare";, "SoapPort")); @@ -79,7 +79,7 @@ public class Server extends AbstractBusTestServerBase { ep.publish("http://localhost:"; + PORT + "/SOAPDocLitBareService/SoapPortHeader"); ep = Endpoint.create(new OOBHdrPropertyServiceImpl()); - props = new HashMap<String, Object>(2); + props = new HashMap<>(2); props.put(Endpoint.WSDL_SERVICE, new QName("http://apache.org/hello_world_doc_lit_bare";, "SOAPService")); props.put(Endpoint.WSDL_PORT, new QName("http://apache.org/hello_world_doc_lit_bare";, "SoapPort")); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java index 7c5a5af..dc70594 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java @@ -117,7 +117,7 @@ public class Soap12ClientServerTest extends AbstractBusClientServerTestBase { Document doc = StaxUtils.read(respin); assertNotNull(doc); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("soap11", Soap11.SOAP_NAMESPACE); XPathUtils xu = new XPathUtils(ns); Node fault = (Node) xu.getValue("/soap11:Envelope/soap11:Body/soap11:Fault", doc, XPathConstants.NODE); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server11.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server11.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server11.java index ef57ae7..a2ed840 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server11.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server11.java @@ -34,7 +34,7 @@ public class Server11 extends AbstractBusTestServerBase { String address = "http://localhost:"; + PORT + "/SoapContext/GreeterPort"; // enable the options of stack trace and the exception cause message - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("exceptionMessageCauseEnabled", "true"); properties.put("faultStackTraceEnabled", "true"); JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server12.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server12.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server12.java index 8148985..40ff971 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server12.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Server12.java @@ -33,7 +33,7 @@ public class Server12 extends AbstractBusTestServerBase { Object implementor = new GreeterImpl12(); String address = "http://localhost:"; + PORT + "/SoapContext/SoapPort"; // enable the options of stack trace and the exception cause message - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put("exceptionMessageCauseEnabled", "true"); properties.put("faultStackTraceEnabled", "true"); JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java ---------------------------------------------------------------------- diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java index cdf81bd..ece5721 100755 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java @@ -79,14 +79,14 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase { bus.getOutFaultInterceptors().add(new LoggingOutInterceptor(serverlogOut)); - Map<String, String> inElements = new HashMap<String, String>(); + Map<String, String> inElements = new HashMap<>(); inElements.put("{http://cxf.apache.org/greeter_control/types}dontPingMe";, "{http://cxf.apache.org/greeter_control/types}pingMe";); servertransIn.setInTransformElements(inElements); bus.getInInterceptors().add(servertransIn); - Map<String, String> outElements = new HashMap<String, String>(); + Map<String, String> outElements = new HashMap<>(); outElements.put("{http://cxf.apache.org/greeter_control/types}faultDetail";, "{http://cxf.apache.org/greeter_control/types}noFaultDetail";); servertransOut.setOutTransformElements(outElements); @@ -157,13 +157,13 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase { bus.getOutFaultInterceptors().add(new LoggingOutInterceptor(logOut)); TransformInInterceptor transIn = new TransformInInterceptor(); - Map<String, String> inElements = new HashMap<String, String>(); + Map<String, String> inElements = new HashMap<>(); inElements.put("{http://cxf.apache.org/greeter_control/types}noFaultDetail";, "{http://cxf.apache.org/greeter_control/types}faultDetail";); bus.getInInterceptors().add(transIn); TransformOutInterceptor transOut = new TransformOutInterceptor(); - Map<String, String> outElements = new HashMap<String, String>(); + Map<String, String> outElements = new HashMap<>(); outElements.put("{http://cxf.apache.org/greeter_control/types}pingMe";, "{http://cxf.apache.org/greeter_control/types}dontPingMe";); transOut.setOutTransformElements(outElements); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java index d83a9b8..0526ae8 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java @@ -101,7 +101,7 @@ public abstract class AbstractClientPersistenceTest extends AbstractBusClientSer GreeterImpl implementor = new GreeterImpl(); String address = "http://localhost:"; + port + "/SoapContext/GreeterPort"; ep = Endpoint.create(implementor); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE); ep.setProperties(properties); ep.publish(address); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java index 3554046..7365067 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java @@ -105,7 +105,7 @@ public class ControlImpl extends org.apache.cxf.greeter_control.ControlImpl { el = ((Document)el).getDocumentElement(); } - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("ns", "http://cxf.apache.org/greeter_control/types";); XPathUtils xp = new XPathUtils(ns); String s = (String)xp.getValue("/ns:greetMe/ns:requestType", http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java index de9cba7..2254fb8 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java @@ -65,7 +65,7 @@ public class DecoupledBareTest extends AbstractBusClientServerTestBase { Object implementor = new DocLitBareGreeterImpl(); String address = "http://localhost:"; + PORT + "/SoapContext/SoapPort"; ep = Endpoint.create(implementor); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE); ep.setProperties(properties); ep.publish(address); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java index 681ae5a..f8550ca 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java @@ -74,7 +74,7 @@ public class DecoupledClientServerOnewayTest extends AbstractBusClientServerTest String address = "http://localhost:"; + PORT + "/SoapContext/GreeterPort"; ep = Endpoint.create(implementor); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE); ep.setProperties(properties); ep.publish(address); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java index ce09119..de4d87d 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java @@ -72,7 +72,7 @@ public class DecoupledClientServerTest extends AbstractBusClientServerTestBase { String address = "http://localhost:"; + PORT + "/SoapContext/GreeterPort"; ep = Endpoint.create(implementor); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.TRUE); ep.setProperties(properties); ep.publish(address); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java index 1a75bda..59249aa 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java @@ -444,7 +444,7 @@ public class DeliveryAssuranceOnewayTest extends AbstractBusClientServerTestBase el = ((Document)el).getDocumentElement(); } - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("ns", "http://cxf.apache.org/greeter_control/types";); XPathUtils xp = new XPathUtils(ns); String s = (String)xp.getValue("/ns:greetMe/ns:requestType", http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java index 069ba76..8d50e26 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java @@ -318,7 +318,7 @@ public class MessageCallbackOnewayTest extends AbstractBusClientServerTestBase { el = ((Document)el).getDocumentElement(); } - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("ns", "http://cxf.apache.org/greeter_control/types";); XPathUtils xp = new XPathUtils(ns); String s = (String)xp.getValue("/ns:greetMe/ns:requestType", http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java index 4503f76..dbf0b84 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ProtocolVariationsTest.java @@ -221,7 +221,7 @@ public class ProtocolVariationsTest extends AbstractBusClientServerTestBase { // rewrite the outgoing message's WS-RM namespace to 1.1 TransformOutInterceptor trans = new TransformOutInterceptor(); - Map<String, String> outElements = new HashMap<String, String>(); + Map<String, String> outElements = new HashMap<>(); outElements.put("{" + RM10Constants.NAMESPACE_URI + "}*", "{" + RM11Constants.NAMESPACE_URI + "}*"); trans.setOutTransformElements(outElements); @@ -250,7 +250,7 @@ public class ProtocolVariationsTest extends AbstractBusClientServerTestBase { // rewrite the outgoing message's WS-A namespace to an invalid one TransformOutInterceptor trans = new TransformOutInterceptor(); - Map<String, String> outElements = new HashMap<String, String>(); + Map<String, String> outElements = new HashMap<>(); outElements.put("{" + Names200408.WSA_NAMESPACE_NAME + "}*", "{http://cxf.apache.org/invalid}*";); trans.setOutTransformElements(outElements); @@ -279,7 +279,7 @@ public class ProtocolVariationsTest extends AbstractBusClientServerTestBase { // rewrite the outgoing message's WS-RM namespace to an invalid one TransformOutInterceptor trans = new TransformOutInterceptor(); - Map<String, String> outElements = new HashMap<String, String>(); + Map<String, String> outElements = new HashMap<>(); outElements.put("{" + RM10Constants.NAMESPACE_URI + "}*", "{http://cxf.apache.org/invalid}*";); trans.setOutTransformElements(outElements); @@ -306,7 +306,7 @@ public class ProtocolVariationsTest extends AbstractBusClientServerTestBase { // remove the outgoing message's WS-RM header TransformOutInterceptor trans = new TransformOutInterceptor(); - Map<String, String> outElements = new HashMap<String, String>(); + Map<String, String> outElements = new HashMap<>(); outElements.put("{" + RM10Constants.NAMESPACE_URI + "}Sequence", ""); trans.setOutTransformElements(outElements); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java index 918d86b..c5378f7 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java @@ -1670,7 +1670,7 @@ public class SequenceTest extends AbstractBusClientServerTestBase { private static String parseResponse(DOMSource domResponse) { Element el = ((Document)domResponse.getNode()).getDocumentElement(); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("soap", "http://schemas.xmlsoap.org/soap/envelope/";); ns.put("ns", "http://cxf.apache.org/greeter_control/types";); XPathUtils xp = new XPathUtils(ns); @@ -1716,10 +1716,10 @@ public class SequenceTest extends AbstractBusClientServerTestBase { private static class RMMemoryStore implements RMStore { // during this particular test, the operations are expected to be invoked sequentially so use just HashMap - Map<Identifier, SourceSequence> ssmap = new HashMap<Identifier, SourceSequence>(); - Map<Identifier, DestinationSequence> dsmap = new HashMap<Identifier, DestinationSequence>(); - Map<Identifier, Collection<RMMessage>> ommap = new HashMap<Identifier, Collection<RMMessage>>(); - Map<Identifier, Collection<RMMessage>> immap = new HashMap<Identifier, Collection<RMMessage>>(); + Map<Identifier, SourceSequence> ssmap = new HashMap<>(); + Map<Identifier, DestinationSequence> dsmap = new HashMap<>(); + Map<Identifier, Collection<RMMessage>> ommap = new HashMap<>(); + Map<Identifier, Collection<RMMessage>> immap = new HashMap<>(); Set<Identifier> ssclosed = new HashSet<>(); @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java index cf4d901..aa392c2 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java @@ -104,9 +104,9 @@ public class WSRMWithWSSecurityPolicyTest extends AbstractBusClientServerTestBas Client client = ClientProxy.getClient(greeter); QName operationQName = new QName("http://cxf.apache.org/greeter_control";, "greetMe"); BindingOperationInfo boi = client.getEndpoint().getBinding().getBindingInfo().getOperation(operationQName); - Map<String, Object> invocationContext = new HashMap<String, Object>(); - Map<String, Object> requestContext = new HashMap<String, Object>(); - Map<String, Object> responseContext = new HashMap<String, Object>(); + Map<String, Object> invocationContext = new HashMap<>(); + Map<String, Object> requestContext = new HashMap<>(); + Map<String, Object> responseContext = new HashMap<>(); invocationContext.put(Client.REQUEST_CONTEXT, requestContext); invocationContext.put(Client.RESPONSE_CONTEXT, responseContext); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java index dbea49b..dd138fa 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java @@ -112,7 +112,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); @@ -157,7 +157,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); @@ -205,7 +205,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); @@ -254,7 +254,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); @@ -299,7 +299,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); @@ -347,7 +347,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); @@ -400,7 +400,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature Encrypt"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("encryptionPropFile", "bob.properties"); @@ -447,7 +447,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature Encrypt"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("encryptionPropFile", "bob.properties"); @@ -500,7 +500,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); @@ -576,7 +576,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); @@ -700,7 +700,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "UsernameToken Encrypt"); outProps.put("encryptionPropFile", "bob.properties"); outProps.put("user", "alice"); @@ -749,7 +749,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, test.getPort()); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "UsernameToken Encrypt"); outProps.put("encryptionPropFile", "bob.properties"); outProps.put("user", "alice"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java index 89975fc..c952860 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java @@ -52,7 +52,7 @@ public class MGF256AlgorithmSuiteLoader implements AlgorithmSuiteLoader { AssertionBuilderRegistry reg = bus.getExtension(AssertionBuilderRegistry.class); if (reg != null) { String ns = "http://cxf.apache.org/custom/security-policy";; - final Map<QName, Assertion> assertions = new HashMap<QName, Assertion>(); + final Map<QName, Assertion> assertions = new HashMap<>(); QName qName = new QName(ns, "Basic256GCMMGFSHA256"); assertions.put(qName, new PrimitiveAssertion(qName)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java index 23d55ef..8417820 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java @@ -138,7 +138,7 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase { service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, PORT); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put("action", "Timestamp Signature"); outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java index b97f5a7..a29903a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java @@ -392,7 +392,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase UTPasswordCallback callback = new UTPasswordCallback(); callback.setAliasPassword(username, password); - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN); outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT); outProps.put(WSHandlerConstants.PW_CALLBACK_REF, callback); @@ -401,7 +401,7 @@ public class JavaFirstPolicyServiceTest extends AbstractBusClientServerTestBase } private Map<String, Object> getNoPasswordProperties(String username) { - Map<String, Object> outProps = new HashMap<String, Object>(); + Map<String, Object> outProps = new HashMap<>(); outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN); outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_NONE); outProps.put(WSHandlerConstants.USER, username); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/CommonPasswordCallback.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/CommonPasswordCallback.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/CommonPasswordCallback.java index a8a3270..5a1722a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/CommonPasswordCallback.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/CommonPasswordCallback.java @@ -30,7 +30,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback; public class CommonPasswordCallback implements CallbackHandler { - private Map<String, String> passwords = new HashMap<String, String>(); + private Map<String, String> passwords = new HashMap<>(); public CommonPasswordCallback() { passwords.put("abc", "abc"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java index 44f8cdf..b5ea117 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java @@ -438,7 +438,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { if (nd instanceof Document) { nd = ((Document)nd).getDocumentElement(); } - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("ns2", "http://www.example.org/schema/DoubleIt";); XPathUtils xp = new XPathUtils(ns); Object o = xp.getValue("//ns2:DoubleItResponse/doubledNumber", nd, XPathConstants.STRING); @@ -466,7 +466,7 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { if (el instanceof Document) { el = ((Document)el).getDocumentElement(); } - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("ns2", "http://www.example.org/schema/DoubleIt";); XPathUtils xp = new XPathUtils(ns); String o = (String)xp.getValue("//ns2:DoubleIt/numberToDouble", el, XPathConstants.STRING); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java index 6c43376..91d54af 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java @@ -148,7 +148,7 @@ public class WSSecurityClientTest extends AbstractBusClientServerTestBase { updateAddressPort(greeter, test.getPort()); Client client = ClientProxy.getClient(greeter); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("action", "UsernameToken"); props.put("user", "alice"); props.put("passwordType", "PasswordText"); @@ -196,7 +196,7 @@ public class WSSecurityClientTest extends AbstractBusClientServerTestBase { updateAddressPort(greeter, test.getPort()); Client client = ClientProxy.getClient(greeter); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("action", "UsernameToken"); props.put("user", "alice"); props.put("passwordType", "PasswordText");
