You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/26 12:17:11 UTC
[cxf] branch master updated: More diamond operator cleanup
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new fa3c4d4 More diamond operator cleanup
fa3c4d4 is described below
commit fa3c4d45a9891bc17882cf43a5ef8653f1659da0
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Oct 26 13:16:54 2018 +0100
More diamond operator cleanup
---
.../common/KeystorePasswordCallback.java | 2 +-
.../bus/managers/ServerLifeCycleManagerImpl.java | 2 +-
.../apache/cxf/bus/osgi/ManagedWorkQueueList.java | 2 +-
.../annotation/AbstractAnnotationVisitor.java | 2 +-
.../cxf/common/injection/ResourceInjector.java | 3 +--
.../org/apache/cxf/common/logging/Log4jLogger.java | 2 +-
.../cxf/common/util/SpringClasspathScanner.java | 4 ++--
.../DefaultSchemaValidationTypeProvider.java | 2 +-
.../service/factory/SimpleMethodDispatcher.java | 6 ++---
.../src/main/java/cxf/server/BankImpl.java | 3 +--
.../demo/jaxrs/server/socket/StreamingService.java | 3 +--
.../controllers/MemoryOAuthDataProvider.java | 2 +-
.../apache/cxf/cdi/JAXRSCdiResourceExtension.java | 2 +-
.../apache/cxf/binding/corba/utils/CorbaUtils.java | 2 +-
.../cxf/aegis/custom/service/ServiceImpl.java | 2 +-
.../apache/cxf/jaxrs/ext/MessageContextImpl.java | 2 +-
.../apache/cxf/jaxrs/ext/multipart/Attachment.java | 2 +-
.../cxf/jaxrs/ext/multipart/AttachmentBuilder.java | 2 +-
.../apache/cxf/jaxrs/impl/AsyncResponseImpl.java | 3 +--
.../apache/cxf/jaxrs/impl/ConfigurationImpl.java | 2 +-
.../org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 2 +-
.../apache/cxf/jaxrs/impl/ResponseBuilderImpl.java | 2 +-
.../apache/cxf/jaxrs/model/MethodDispatcher.java | 4 ++--
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 26 +++++++++++-----------
.../cxf/jaxrs/provider/ServerProviderFactory.java | 12 +++++-----
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 2 +-
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 3 +--
.../org/apache/cxf/jaxrs/utils/InjectionUtils.java | 4 ++--
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 4 ++--
.../apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 4 ++--
.../org/apache/cxf/jaxrs/impl/MetadataMapTest.java | 6 ++---
.../jaxrs/provider/JAXBElementProviderTest.java | 6 ++---
.../cxf/jaxrs/client/ClientProviderFactory.java | 6 ++---
.../apache/cxf/jaxrs/client/spec/ClientImpl.java | 2 +-
.../cxf/jaxrs/provider/json/JSONProvider.java | 2 +-
.../provider/aegis/AegisElementProviderTest.java | 3 +--
.../cxf/jaxrs/provider/json/JSONProviderTest.java | 2 +-
.../ext/search/DefaultParamConverterProvider.java | 2 +-
.../jpa/AbstractJPATypedQueryVisitorTest.java | 12 ++++------
.../lucene/AbstractLuceneQueryVisitorTest.java | 10 ++++-----
.../ext/search/sql/SQLPrinterVisitorTest.java | 2 +-
.../sci/JaxrsServletContainerInitializer.java | 2 +-
.../cxf/rs/security/jose/jaxrs/JoseJaxrsUtils.java | 2 +-
.../security/jose/jaxrs/JwsWriterInterceptor.java | 2 +-
.../cxf/rs/security/jose/jwe/JweJsonConsumer.java | 2 +-
.../client/MemoryClientCodeStateManager.java | 2 +-
.../client/MemoryClientTokenContextManager.java | 2 +-
.../services/AbstractAccessTokenValidator.java | 2 +-
.../oauth2/services/AuthorizationService.java | 2 +-
.../saml/sso/KeystorePasswordCallback.java | 2 +-
.../http_jetty/JettyHTTPServerEngineFactory.java | 6 ++---
.../http/netty/client/NettyHttpClientHandler.java | 2 +-
.../netty/server/NettyHttpServerEngineFactory.java | 6 ++---
.../http_undertow/UndertowHTTPServerEngine.java | 2 +-
.../UndertowHTTPServerEngineFactory.java | 6 ++---
.../transport/http/DestinationRegistryImpl.java | 2 +-
.../transport/http/HttpServletRequestSnapshot.java | 2 +-
.../cxf/transport/servlet/AbstractHTTPServlet.java | 2 +-
.../cxf/transport/http/policy/PolicyUtilsTest.java | 4 ++--
.../ws/addressing/impl/DefaultMessageIdCache.java | 2 +-
.../ws/policy/ClientPolicyInFaultInterceptor.java | 3 +--
.../ws/policy/ServerPolicyOutFaultInterceptor.java | 3 +--
.../cxf/ws/policy/PolicyDataEngineImplTest.java | 2 +-
.../apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java | 4 ++--
.../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 4 ++--
.../ws/rm/soap/RetransmissionQueueImplTest.java | 8 +++----
.../cxf/ws/security/sts/provider/STSException.java | 2 +-
.../security/wss4j/CryptoCoverageCheckerTest.java | 3 +--
.../security/wss4j/KeystorePasswordCallback.java | 2 +-
.../cxf/sts/operation/IssueSamlUnitTest.java | 10 ++++-----
.../apache/cxf/sts/operation/IssueUnitTest.java | 2 +-
.../sts/token/provider/SAMLProviderRealmTest.java | 2 +-
.../cxf/systest/jaxrs/BookContinuationStore.java | 2 +-
.../systest/jaxrs/BookCxfContinuationStore.java | 3 +--
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 3 +--
.../systest/jaxrs/JAXRSClientServerBookTest.java | 6 ++---
.../systest/handlers/HandlerInvocationTest.java | 2 +-
.../cxf/systest/jaxws/AnyClientServerTest.java | 2 +-
.../kerberos/common/KeystorePasswordCallback.java | 2 +-
.../cxf/systest/ldap/jaxrs/UserServiceImpl.java | 2 +-
.../security/oauth/MemoryOAuthDataProvider.java | 2 +-
.../HelloWorldWithContinuationsJMS.java | 3 +--
.../HelloWorldWithContinuationsJMS2.java | 3 +--
.../jms/security/KeystorePasswordCallback.java | 2 +-
.../HelloImplWithWrapppedContinuation.java | 2 +-
.../HelloImplWithWrapppedContinuation.java | 2 +-
.../systest/type_test/AbstractTypeTestClient2.java | 14 ++++++------
.../systest/type_test/AbstractTypeTestClient3.java | 4 ++--
.../systest/type_test/AbstractTypeTestClient4.java | 2 +-
.../cxf/systest/ws/rm/sec/UTPasswordCallback.java | 2 +-
.../examples/common/CommonPasswordCallback.java | 2 +-
.../ws/common/KeystorePasswordCallback.java | 2 +-
.../cxf/systest/ws/common/UTPasswordCallback.java | 2 +-
.../cxf/systest/ws/addressing/MAPTestBase.java | 4 ++--
.../corba/processors/wsdl/WSDLToCorbaHelper.java | 2 +-
95 files changed, 156 insertions(+), 177 deletions(-)
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
index 1d6cc83..2bf52fa 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
@@ -34,7 +34,7 @@ import org.apache.ws.security.WSPasswordCallback;
public class KeystorePasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public KeystorePasswordCallback() {
passwords.put("myclientkey", "ckpass");
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
index 8180956..a129dad 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
@@ -35,7 +35,7 @@ import org.apache.cxf.extension.BusExtension;
public class ServerLifeCycleManagerImpl implements ServerLifeCycleManager, BusExtension {
private CopyOnWriteArrayList<ServerLifeCycleListener> listeners =
- new CopyOnWriteArrayList<ServerLifeCycleListener>();
+ new CopyOnWriteArrayList<>();
public ServerLifeCycleManagerImpl() {
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java b/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
index 6b5a959..cd71e40 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
@@ -44,7 +44,7 @@ public class ManagedWorkQueueList implements ManagedServiceFactory, PropertyChan
private static final Logger LOG = LogUtils.getL7dLogger(ManagedWorkQueueList.class);
private Map<String, AutomaticWorkQueueImpl> queues =
- new ConcurrentHashMap<String, AutomaticWorkQueueImpl>(4, 0.75f, 2);
+ new ConcurrentHashMap<>(4, 0.75f, 2);
private ServiceTracker<ConfigurationAdmin, ConfigurationAdmin> configAdminTracker;
public String getName() {
diff --git a/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java b/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java
index 3093b82..803afc5 100644
--- a/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java
+++ b/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java
@@ -31,7 +31,7 @@ public abstract class AbstractAnnotationVisitor implements AnnotationVisitor {
private final List<Class<? extends Annotation>> targetAnnotations =
- new ArrayList<Class<? extends Annotation>>();
+ new ArrayList<>();
protected AbstractAnnotationVisitor(Class<? extends Annotation> ann) {
diff --git a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
index b40ec61..ecc7ec9 100644
--- a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
+++ b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
@@ -53,8 +53,7 @@ import org.apache.cxf.resource.ResourceResolver;
public class ResourceInjector extends AbstractAnnotationVisitor {
private static final Logger LOG = LogUtils.getL7dLogger(ResourceInjector.class);
- private static final List<Class<? extends Annotation>> ANNOTATIONS =
- new ArrayList<Class<? extends Annotation>>();
+ private static final List<Class<? extends Annotation>> ANNOTATIONS = new ArrayList<>();
static {
ANNOTATIONS.add(Resource.class);
diff --git a/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
index a0e6b86..10ed8c5 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
@@ -43,7 +43,7 @@ import org.apache.log4j.spi.LoggingEvent;
*/
public class Log4jLogger extends AbstractDelegatingLogger {
private static final Map<Level, org.apache.log4j.Level> TO_LOG4J =
- new HashMap<Level, org.apache.log4j.Level>();
+ new HashMap<>();
private static final org.apache.log4j.Level TRACE;
diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
index c3e3f46..fa7e0f7 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
@@ -68,9 +68,9 @@ class SpringClasspathScanner extends ClasspathScanner {
MetadataReaderFactory factory = new CachingMetadataReaderFactory(resolver);
final Map< Class< ? extends Annotation >, Collection< Class< ? > > > classes =
- new HashMap< Class< ? extends Annotation >, Collection< Class< ? > > >();
+ new HashMap<>();
final Map< Class< ? extends Annotation >, Collection< String > > matchingInterfaces =
- new HashMap< Class< ? extends Annotation >, Collection< String > >();
+ new HashMap<>();
final Map<String, String[]> nonMatchingClasses = new HashMap<>();
for (Class< ? extends Annotation > annotation: annotations) {
diff --git a/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java b/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
index 7f8a157..1835e5a 100644
--- a/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
+++ b/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
@@ -31,7 +31,7 @@ import org.apache.cxf.service.model.OperationInfo;
*/
public class DefaultSchemaValidationTypeProvider implements SchemaValidationTypeProvider {
private final Map<String, SchemaValidationType> operationMap =
- new HashMap<String, SchemaValidationType>();
+ new HashMap<>();
public DefaultSchemaValidationTypeProvider(Map<String, SchemaValidationType> operationMap) {
this.operationMap.putAll(operationMap);
diff --git a/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java b/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
index 95cd4e8..3471833 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
@@ -31,11 +31,11 @@ public class SimpleMethodDispatcher
implements org.apache.cxf.service.invoker.MethodDispatcher {
private Map<Method, Map<BindingInfo, BindingOperationInfo>> infoMap =
- new ConcurrentHashMap<Method, Map<BindingInfo, BindingOperationInfo>>(16, 0.75f, 2);
+ new ConcurrentHashMap<>(16, 0.75f, 2);
private Map<OperationInfo, Method> opToMethod =
- new ConcurrentHashMap<OperationInfo, Method>(16, 0.75f, 2);
+ new ConcurrentHashMap<>(16, 0.75f, 2);
private Map<Method, OperationInfo> methodToOp =
- new ConcurrentHashMap<Method, OperationInfo>(16, 0.75f, 2);
+ new ConcurrentHashMap<>(16, 0.75f, 2);
public SimpleMethodDispatcher() {
//complete
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
index f0d7733..05b31c7 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
@@ -35,8 +35,7 @@ import cxf.common.Bank;
public class BankImpl implements Bank {
- private Map<String, W3CEndpointReference> accountList =
- new HashMap<String, W3CEndpointReference>();
+ private Map<String, W3CEndpointReference> accountList = new HashMap<>();
private Map<String, Endpoint> endpointList = new HashMap<>();
public BankImpl() {
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
index eebd7fd..cb6980d 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
@@ -59,8 +59,7 @@ public class StreamingService {
}
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
new ArrayBlockingQueue<Runnable>(10));
- private Map<String, BlockingQueue<String>> sparkResponses =
- new ConcurrentHashMap<String, BlockingQueue<String>>();
+ private Map<String, BlockingQueue<String>> sparkResponses = new ConcurrentHashMap<>();
private PrintStream sparkOutputStream;
public StreamingService(BufferedReader sparkInputStream, PrintStream sparkOutputStream) {
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
index 2728ce8..bd7c0e5 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
@@ -51,7 +51,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
public static final String CLIENT_SECRET = "secret";
private static final ConcurrentHashMap<String, OAuthPermission> AVAILABLE_PERMISSIONS =
- new ConcurrentHashMap<String, OAuthPermission>();
+ new ConcurrentHashMap<>();
static {
AVAILABLE_PERMISSIONS
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 9c5b48c..b5d72c4 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -84,7 +84,7 @@ public class JAXRSCdiResourceExtension implements Extension {
private final List< Bean< ? > > providerBeans = new ArrayList< Bean< ? > >();
private final List< Bean< ? extends Feature > > featureBeans = new ArrayList< Bean< ? extends Feature > >();
private final List< CreationalContext< ? > > disposableCreationalContexts =
- new ArrayList< CreationalContext< ? > >();
+ new ArrayList<>();
private final List< Lifecycle > disposableLifecycles =
new ArrayList<>();
private final Set< Type > contextTypes = new LinkedHashSet<>();
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
index 2c40ac9..9be0963 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
@@ -89,7 +89,7 @@ public final class CorbaUtils {
}
}
private static final ThreadLocal<LastExport> LAST_EXPORT_CACHE =
- new ThreadLocal<LastExport>();
+ new ThreadLocal<>();
private CorbaUtils() {
//utility class
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
index 8ddbef1..d3e26e1 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
@@ -58,7 +58,7 @@ public class ServiceImpl implements Service {
}
Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>> map =
- new HashMap<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>>();
+ new HashMap<>();
Collection<NoDefaultConstructorBean> collection = new ArrayList<>();
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
index d406bb0..2afd929 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
@@ -201,7 +201,7 @@ public class MessageContextImpl implements MessageContext {
private void convertToAttachments(Object value) {
List<?> handlers = (List<?>)value;
List<org.apache.cxf.message.Attachment> atts =
- new ArrayList<org.apache.cxf.message.Attachment>();
+ new ArrayList<>();
for (int i = 1; i < handlers.size(); i++) {
Attachment handler = (Attachment)handlers.get(i);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
index 878ea42..d2e7909 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
@@ -51,7 +51,7 @@ public class Attachment implements Transferable {
private DataHandler handler;
private MultivaluedMap<String, String> headers =
- new MetadataMap<String, String>(false, true);
+ new MetadataMap<>(false, true);
private Object object;
private Providers providers;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
index bca6532..4b61044 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
@@ -29,7 +29,7 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
*/
public class AttachmentBuilder {
private MultivaluedMap<String, String> headers =
- new MetadataMap<String, String>(false, true);
+ new MetadataMap<>(false, true);
private Object object;
private DataHandler dataHandler;
private ContentDisposition contentDisposition;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index cb134eb..3b1cd9b 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -206,8 +206,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
@Override
public Map<Class<?>, Collection<Class<?>>> register(Object callback, Object... callbacks)
throws NullPointerException {
- Map<Class<?>, Collection<Class<?>>> map =
- new HashMap<Class<?>, Collection<Class<?>>>();
+ Map<Class<?>, Collection<Class<?>>> map = new HashMap<>();
Object[] allCallbacks = new Object[1 + callbacks.length];
allCallbacks[0] = callback;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
index 68c8365..6a7f1ce 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
@@ -40,7 +40,7 @@ public class ConfigurationImpl implements Configuration {
private Map<String, Object> props = new HashMap<>();
private RuntimeType runtimeType;
private Map<Object, Map<Class<?>, Integer>> providers =
- new LinkedHashMap<Object, Map<Class<?>, Integer>>();
+ new LinkedHashMap<>();
private Map<Feature, Boolean> features = new LinkedHashMap<>();
public ConfigurationImpl(RuntimeType rt) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
index a83d8d6..1f43398 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
@@ -170,7 +170,7 @@ public class HttpHeadersImpl implements HttpHeaders {
= MessageUtils.getContextualBoolean(message, HEADER_SPLIT_PROPERTY, false);
if (splitIndividualValue) {
Map<String, List<String>> newHeaders =
- new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
newHeaders.put(entry.getKey(), getRequestHeader(entry.getKey()));
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
index e9be8b3..629859e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
@@ -68,7 +68,7 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
}
ResponseImpl r = new ResponseImpl(status, null, reasonPhrase);
MetadataMap<String, Object> m =
- new MetadataMap<String, Object>(metadata, false, true);
+ new MetadataMap<>(metadata, false, true);
r.addMetadata(m);
r.setEntity(entity, annotations);
reset();
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java
index 1036b7f..c7d0cdf 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/MethodDispatcher.java
@@ -27,9 +27,9 @@ import java.util.concurrent.ConcurrentHashMap;
public class MethodDispatcher {
private Map<OperationResourceInfo, Method> oriToMethod =
- new LinkedHashMap<OperationResourceInfo, Method>();
+ new LinkedHashMap<>();
private Map<Method, OperationResourceInfo> methodToOri =
- new LinkedHashMap<Method, OperationResourceInfo>();
+ new LinkedHashMap<>();
private ConcurrentHashMap<Method, Method> proxyMethodMap = new ConcurrentHashMap<>();
public MethodDispatcher() {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index e7466e0..8e2eb37 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -95,25 +95,25 @@ public abstract class ProviderFactory {
private static final String PROVIDER_CACHE_CHECK_ALL = "org.apache.cxf.jaxrs.provider.cache.checkAllCandidates";
protected Map<NameKey, ProviderInfo<ReaderInterceptor>> readerInterceptors =
- new NameKeyMap<ProviderInfo<ReaderInterceptor>>(true);
+ new NameKeyMap<>(true);
protected Map<NameKey, ProviderInfo<WriterInterceptor>> writerInterceptors =
- new NameKeyMap<ProviderInfo<WriterInterceptor>>(true);
+ new NameKeyMap<>(true);
private List<ProviderInfo<MessageBodyReader<?>>> messageReaders =
- new ArrayList<ProviderInfo<MessageBodyReader<?>>>();
+ new ArrayList<>();
private List<ProviderInfo<MessageBodyWriter<?>>> messageWriters =
- new ArrayList<ProviderInfo<MessageBodyWriter<?>>>();
+ new ArrayList<>();
private List<ProviderInfo<ContextResolver<?>>> contextResolvers =
- new ArrayList<ProviderInfo<ContextResolver<?>>>(1);
+ new ArrayList<>();
private List<ProviderInfo<ContextProvider<?>>> contextProviders =
- new ArrayList<ProviderInfo<ContextProvider<?>>>(1);
+ new ArrayList<>();
private List<ProviderInfo<ParamConverterProvider>> paramConverters =
- new ArrayList<ProviderInfo<ParamConverterProvider>>(1);
+ new ArrayList<>(1);
private boolean paramConverterContextsAvailable;
// List of injected providers
private Collection<ProviderInfo<?>> injectedProviders =
- new HashSet<ProviderInfo<?>>();
+ new HashSet<>();
private Bus bus;
@@ -561,9 +561,9 @@ public abstract class ProviderFactory {
@SuppressWarnings("unchecked")
protected void setCommonProviders(List<ProviderInfo<? extends Object>> theProviders) {
List<ProviderInfo<ReaderInterceptor>> readInts =
- new LinkedList<ProviderInfo<ReaderInterceptor>>();
+ new LinkedList<>();
List<ProviderInfo<WriterInterceptor>> writeInts =
- new LinkedList<ProviderInfo<WriterInterceptor>>();
+ new LinkedList<>();
for (ProviderInfo<? extends Object> provider : theProviders) {
Class<?> providerCls = ClassHelper.getRealClass(bus, provider.getProvider());
@@ -943,7 +943,7 @@ public abstract class ProviderFactory {
names = names == null ? Collections.<String>emptySet() : names;
MultivaluedMap<ProviderInfo<T>, String> map =
- new MetadataMap<ProviderInfo<T>, String>();
+ new MetadataMap<>();
for (Map.Entry<NameKey, ProviderInfo<T>> entry : boundFilters.entrySet()) {
String entryName = entry.getKey().getName();
ProviderInfo<T> provider = entry.getValue();
@@ -1186,7 +1186,7 @@ public abstract class ProviderFactory {
+ " can not be instantiated", ex);
}
Map<Class<?>, ThreadLocalProxy<?>> proxies =
- new LinkedHashMap<Class<?>, ThreadLocalProxy<?>>();
+ new LinkedHashMap<>();
for (int i = 0; i < paramTypes.length; i++) {
if (cArgs[i] instanceof ThreadLocalProxy) {
@SuppressWarnings("unchecked")
@@ -1367,7 +1367,7 @@ public abstract class ProviderFactory {
Object[] providers,
ProviderInfo<Application> application) {
List<ProviderInfo<? extends Object>> theProviders =
- new ArrayList<ProviderInfo<? extends Object>>(providers.length);
+ new ArrayList<>(providers.length);
for (Object o : providers) {
if (o == null) {
continue;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
index d651b91..9fde2c2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
@@ -76,14 +76,14 @@ public final class ServerProviderFactory extends ProviderFactory {
private static final String WADL_PROVIDER_NAME = "org.apache.cxf.jaxrs.model.wadl.WadlGenerator";
private static final String MAKE_DEFAULT_WAE_LEAST_SPECIFIC = "default.wae.mapper.least.specific";
private List<ProviderInfo<ExceptionMapper<?>>> exceptionMappers =
- new ArrayList<ProviderInfo<ExceptionMapper<?>>>(1);
+ new ArrayList<>(1);
private List<ProviderInfo<ContainerRequestFilter>> preMatchContainerRequestFilters =
- new ArrayList<ProviderInfo<ContainerRequestFilter>>(1);
+ new ArrayList<>(1);
private Map<NameKey, ProviderInfo<ContainerRequestFilter>> postMatchContainerRequestFilters =
- new NameKeyMap<ProviderInfo<ContainerRequestFilter>>(true);
+ new NameKeyMap<>(true);
private Map<NameKey, ProviderInfo<ContainerResponseFilter>> containerResponseFilters =
- new NameKeyMap<ProviderInfo<ContainerResponseFilter>>(false);
+ new NameKeyMap<>(false);
private RequestPreprocessor requestPreprocessor;
private ApplicationInfo application;
private Set<DynamicFeature> dynamicFeatures = new LinkedHashSet<>();
@@ -234,9 +234,9 @@ public final class ServerProviderFactory extends ProviderFactory {
List<ProviderInfo<ContainerRequestFilter>> postMatchRequestFilters =
- new LinkedList<ProviderInfo<ContainerRequestFilter>>();
+ new LinkedList<>();
List<ProviderInfo<ContainerResponseFilter>> postMatchResponseFilters =
- new LinkedList<ProviderInfo<ContainerResponseFilter>>();
+ new LinkedList<>();
List<ProviderInfo<? extends Object>> theProviders =
prepareProviders(custom, busGlobal, allProviders.toArray(), application);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
index 5c03be4..f03b5c5 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
@@ -96,7 +96,7 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> {
private Map<String, Templates> inMediaTemplates;
private Map<String, Templates> outMediaTemplates;
private ConcurrentHashMap<String, Templates> annotationTemplates =
- new ConcurrentHashMap<String, Templates>();
+ new ConcurrentHashMap<>();
private List<String> inClassesToHandle;
private List<String> outClassesToHandle;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index 87f3a79..eaa81d2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -295,8 +295,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
throw new ServletException("At least one resource class should be specified");
}
String[] classNames = StringUtils.split(serviceBeans, splitChar);
- Map<Class<?>, Map<String, List<String>>> map =
- new HashMap<Class<?>, Map<String, List<String>>>();
+ Map<Class<?>, Map<String, List<String>>> map = new HashMap<>();
for (String cName : classNames) {
Map<String, List<String>> props = new HashMap<>();
String theName = getClassNameAndProperties(cName, props);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 7d3f47d..21b7539 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -628,7 +628,7 @@ public final class InjectionUtils {
}
Map<String, MultivaluedMap<String, String>> parsedValues =
- new HashMap<String, MultivaluedMap<String, String>>();
+ new HashMap<>();
for (Map.Entry<String, List<String>> entry : values.entrySet()) {
String memberKey = entry.getKey();
String beanKey = null;
@@ -823,7 +823,7 @@ public final class InjectionUtils {
MultivaluedMap<String, String> values,
boolean isbean) {
List<MultivaluedMap<String, String>> valuesList =
- new ArrayList<MultivaluedMap<String, String>>();
+ new ArrayList<>();
if (isbean && InjectionUtils.isSupportedCollectionOrArray(type)) {
Class<?> realType = InjectionUtils.getActualType(genericType);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index e9cbc96..cadc028 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -329,7 +329,7 @@ public final class JAXRSUtils {
if (!candidateList.isEmpty()) {
Map<ClassResourceInfo, MultivaluedMap<String, String>> cris =
- new LinkedHashMap<ClassResourceInfo, MultivaluedMap<String, String>>(candidateList.size());
+ new LinkedHashMap<>(candidateList.size());
ClassResourceInfo firstCri = null;
for (Map.Entry<ClassResourceInfo, MultivaluedMap<String, String>> entry : candidateList.entrySet()) {
ClassResourceInfo cri = entry.getKey();
@@ -1249,7 +1249,7 @@ public final class JAXRSUtils {
boolean decode,
boolean decodePlus) {
MultivaluedMap<String, String> map =
- new MetadataMap<String, String>(new LinkedHashMap<String, List<String>>());
+ new MetadataMap<>(new LinkedHashMap<String, List<String>>());
getStructuredParams(map, query, sep, decode, decodePlus);
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index 884ad6e..7a68b78 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -213,7 +213,7 @@ public class HttpHeadersImplTest extends Assert {
Message m = new MessageImpl();
// this is what happens at runtime and is tested in the system tests
Map<String, List<String>> headers =
- new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("content-type", Collections.singletonList("text/plain"));
m.put(Message.PROTOCOL_HEADERS, headers);
HttpHeaders h = new HttpHeadersImpl(m);
@@ -226,7 +226,7 @@ public class HttpHeadersImplTest extends Assert {
Message m = new MessageImpl();
// this is what happens at runtime and is tested in the system tests
Map<String, List<String>> headers =
- new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers.put("A", Collections.<String>emptyList());
m.put(Message.PROTOCOL_HEADERS, headers);
HttpHeaders h = new HttpHeadersImpl(m);
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
index ac0f105..9934063 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
@@ -294,7 +294,7 @@ public class MetadataMapTest extends Assert {
list.add("bar");
values.put("baz", list);
MultivaluedMap<String, String> map =
- new MetadataMap<String, String>(values, false, true, true);
+ new MetadataMap<>(values, false, true, true);
map.add("baz", "baz");
}
@@ -305,7 +305,7 @@ public class MetadataMapTest extends Assert {
list.add("bar");
values.put("baz", list);
MultivaluedMap<String, String> map =
- new MetadataMap<String, String>(values, false, true, true);
+ new MetadataMap<>(values, false, true, true);
map.addFirst("baz", "bar2");
}
@@ -313,7 +313,7 @@ public class MetadataMapTest extends Assert {
public void testReadOnlyPutSingle() {
Map<String, List<String>> values = new HashMap<>();
MultivaluedMap<String, String> map =
- new MetadataMap<String, String>(values, false, true, true);
+ new MetadataMap<>(values, false, true, true);
map.putSingle("baz", "baz");
}
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index 10bd2a3..73464f5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -216,16 +216,14 @@ public class JAXBElementProviderTest extends Assert {
provider.setSingleJaxbContext(true);
provider.init(Collections.singletonList(cri));
- List<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook> list =
- new ArrayList<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook>();
+ List<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook> list = new ArrayList<>();
for (int i = 0; i < 10; i++) {
org.apache.cxf.jaxrs.fortest.jaxb.SuperBook o =
new org.apache.cxf.jaxrs.fortest.jaxb.SuperBook();
o.setName("name #" + i);
list.add(o);
}
- XmlList<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook> xmlList =
- new XmlList<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook>(list);
+ XmlList<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook> xmlList = new XmlList<>(list);
Method m = XmlListResource.class.getMethod("testJaxb2", new Class[]{});
JAXBContext context = provider.getJAXBContext(m.getReturnType(), m.getGenericReturnType());
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
index 8100309..5a9ab7e 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
@@ -37,11 +37,11 @@ import org.apache.cxf.message.Message;
public final class ClientProviderFactory extends ProviderFactory {
private List<ProviderInfo<ClientRequestFilter>> clientRequestFilters =
- new ArrayList<ProviderInfo<ClientRequestFilter>>(1);
+ new ArrayList<>(1);
private List<ProviderInfo<ClientResponseFilter>> clientResponseFilters =
- new ArrayList<ProviderInfo<ClientResponseFilter>>(1);
+ new ArrayList<>(1);
private List<ProviderInfo<ResponseExceptionMapper<?>>> responseExceptionMappers =
- new ArrayList<ProviderInfo<ResponseExceptionMapper<?>>>(1);
+ new ArrayList<>(1);
private RxInvokerProvider<?> rxInvokerProvider;
private ClientProviderFactory(Bus bus) {
super(bus);
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index 54b9835..410b8c7 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -268,7 +268,7 @@ public class ClientImpl implements Client {
ClientProviderFactory.getInstance(WebClient.getConfig(targetClient).getEndpoint());
List<Object> providers = new LinkedList<>();
List<org.apache.cxf.feature.Feature> cxfFeatures =
- new LinkedList<org.apache.cxf.feature.Feature>();
+ new LinkedList<>();
Configuration cfg = configImpl.getConfiguration();
for (Object p : cfg.getInstances()) {
if (p instanceof org.apache.cxf.feature.Feature) {
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
index c061ecd..b710728 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
@@ -98,7 +98,7 @@ public class JSONProvider<T> extends AbstractJAXBProvider<T> {
}
private ConcurrentHashMap<String, String> namespaceMap =
- new ConcurrentHashMap<String, String>();
+ new ConcurrentHashMap<>();
private boolean serializeAsArray;
private List<String> arrayKeys;
private List<String> primitiveArrayKeys;
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
index 6fa9cc4..fbaa9dd 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisElementProviderTest.java
@@ -127,8 +127,7 @@ public class AegisElementProviderTest extends Assert {
@Test
public void testReadWriteComplexMap() throws Exception {
- Map<AegisTestBean, AegisSuperBean> testMap =
- new HashMap<AegisTestBean, AegisSuperBean>();
+ Map<AegisTestBean, AegisSuperBean> testMap = new HashMap<>();
Class<InterfaceWithMap> iwithMapClass = InterfaceWithMap.class;
Method method = iwithMapClass.getMethod("mapFunction");
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index 073caf2..361256e 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -1485,7 +1485,7 @@ public class JSONProviderTest extends Assert {
@Test
public void testWriteWithXmlRootElementAndPackageInfo() throws Exception {
JSONProvider<org.apache.cxf.jaxrs.resources.jaxb.Book2> provider =
- new JSONProvider<org.apache.cxf.jaxrs.resources.jaxb.Book2>();
+ new JSONProvider<>();
org.apache.cxf.jaxrs.resources.jaxb.Book2 book =
new org.apache.cxf.jaxrs.resources.jaxb.Book2(333);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
index 7586479..84f53df 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/DefaultParamConverterProvider.java
@@ -36,7 +36,7 @@ import org.apache.lucene.document.DateTools.Resolution;
*/
public class DefaultParamConverterProvider implements ParamConverterProvider {
private final Map< Class< ? >, ParamConverter< ? > > converters =
- new HashMap< Class< ? >, ParamConverter< ? > >();
+ new HashMap<>();
/**
* Date type converter.
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
index e79d6c3..c3d7a4e 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitorTest.java
@@ -208,8 +208,7 @@ public abstract class AbstractJPATypedQueryVisitorTest extends Assert {
new JPACriteriaQueryVisitor<Book, Tuple>(em, Book.class, Tuple.class);
filter.accept(jpa);
- List<SingularAttribute<Book, ?>> selections =
- new ArrayList<SingularAttribute<Book, ?>>();
+ List<SingularAttribute<Book, ?>> selections = new ArrayList<>();
selections.add(Book_.id);
jpa.selectTuple(selections);
@@ -232,8 +231,7 @@ public abstract class AbstractJPATypedQueryVisitorTest extends Assert {
new JPACriteriaQueryVisitor<Book, Book>(em, Book.class, Book.class);
filter.accept(jpa);
- List<SingularAttribute<Book, ?>> selections =
- new ArrayList<SingularAttribute<Book, ?>>();
+ List<SingularAttribute<Book, ?>> selections = new ArrayList<>();
selections.add(Book_.id);
return jpa.getOrderedTypedQuery(selections, asc).getResultList();
@@ -245,8 +243,7 @@ public abstract class AbstractJPATypedQueryVisitorTest extends Assert {
new JPACriteriaQueryVisitor<Book, BookInfo>(em, Book.class, BookInfo.class);
filter.accept(jpa);
- List<SingularAttribute<Book, ?>> selections =
- new ArrayList<SingularAttribute<Book, ?>>();
+ List<SingularAttribute<Book, ?>> selections = new ArrayList<>();
selections.add(Book_.id);
selections.add(Book_.bookTitle);
@@ -262,8 +259,7 @@ public abstract class AbstractJPATypedQueryVisitorTest extends Assert {
new JPACriteriaQueryVisitor<Book, Object[]>(em, Book.class, Object[].class);
filter.accept(jpa);
- List<SingularAttribute<Book, ?>> selections =
- new ArrayList<SingularAttribute<Book, ?>>();
+ List<SingularAttribute<Book, ?>> selections = new ArrayList<>();
selections.add(Book_.id);
selections.add(Book_.bookTitle);
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
index 3a9f642..63764d4 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/AbstractLuceneQueryVisitorTest.java
@@ -140,7 +140,7 @@ public abstract class AbstractLuceneQueryVisitorTest extends Assert {
protected Query createTermQuery(String expression, boolean useAnalyzer) throws Exception {
SearchCondition<SearchBean> filter = getParser().parse(expression);
SearchConditionVisitor<SearchBean, Query> lucene =
- new LuceneQueryVisitor<SearchBean>(useAnalyzer ? analyzer : null);
+ new LuceneQueryVisitor<>(useAnalyzer ? analyzer : null);
lucene.visit(filter);
return lucene.getQuery();
}
@@ -157,7 +157,7 @@ public abstract class AbstractLuceneQueryVisitorTest extends Assert {
boolean useAnalyzer) throws Exception {
SearchCondition<SearchBean> filter = getParser().parse(expression);
LuceneQueryVisitor<SearchBean> lucene =
- new LuceneQueryVisitor<SearchBean>(useAnalyzer ? analyzer : null);
+ new LuceneQueryVisitor<>(useAnalyzer ? analyzer : null);
lucene.setPrimitiveFieldTypeMap(Collections.<String, Class<?>>singletonMap("intfield", cls));
lucene.visit(filter);
return lucene.getQuery();
@@ -170,7 +170,7 @@ public abstract class AbstractLuceneQueryVisitorTest extends Assert {
protected Query createTermQuery(String fieldName, String expression, boolean useAnalyzer) throws Exception {
SearchCondition<SearchBean> filter = getParser().parse(expression);
LuceneQueryVisitor<SearchBean> lucene =
- new LuceneQueryVisitor<SearchBean>("ct", fieldName, useAnalyzer ? analyzer : null);
+ new LuceneQueryVisitor<>("ct", fieldName, useAnalyzer ? analyzer : null);
lucene.visit(filter);
return lucene.getQuery();
}
@@ -179,7 +179,7 @@ public abstract class AbstractLuceneQueryVisitorTest extends Assert {
throws Exception {
SearchCondition<SearchBean> filter = getParser().parse(expression);
LuceneQueryVisitor<SearchBean> lucene =
- new LuceneQueryVisitor<SearchBean>("ct", fieldName);
+ new LuceneQueryVisitor<>("ct", fieldName);
lucene.setPrimitiveFieldTypeMap(Collections.<String, Class<?>>singletonMap(fieldName, cls));
lucene.visit(filter);
return lucene.getQuery();
@@ -196,7 +196,7 @@ public abstract class AbstractLuceneQueryVisitorTest extends Assert {
protected Query createPhraseQuery(String fieldName, String expression, boolean useAnalyzer) throws Exception {
SearchCondition<SearchBean> filter = getParser().parse(expression);
LuceneQueryVisitor<SearchBean> lucene =
- new LuceneQueryVisitor<SearchBean>(fieldName, useAnalyzer ? analyzer : null);
+ new LuceneQueryVisitor<>(fieldName, useAnalyzer ? analyzer : null);
lucene.visit(filter);
return lucene.getQuery();
}
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
index 70a5e9a..18e0d9f 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/sql/SQLPrinterVisitorTest.java
@@ -144,7 +144,7 @@ public class SQLPrinterVisitorTest extends Assert {
public void testSQL5WithColumns() throws SearchParseException {
SearchCondition<Condition> filter = parser.parse("name==test");
SQLPrinterVisitor<Condition> visitor =
- new SQLPrinterVisitor<Condition>("table", "NAMES");
+ new SQLPrinterVisitor<>("table", "NAMES");
filter.accept(visitor);
String sql = visitor.getQuery();
assertTrue("SELECT NAMES FROM table WHERE name = 'test'".equals(sql));
diff --git a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
index 569ac0d..2cfb0b6 100644
--- a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
+++ b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
@@ -164,7 +164,7 @@ public class JaxrsServletContainerInitializer implements ServletContainerInitial
final Set< Class< ? > > classes) {
final Map< Class< ? extends Annotation >, Collection< Class< ? > > > grouped =
- new HashMap< Class< ? extends Annotation >, Collection< Class< ? > > >();
+ new HashMap<>();
grouped.put(Provider.class, new ArrayList< Class< ? > >());
grouped.put(Path.class, new ArrayList< Class< ? > >());
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JoseJaxrsUtils.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JoseJaxrsUtils.java
index d5709c2..a6ff692 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JoseJaxrsUtils.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JoseJaxrsUtils.java
@@ -34,7 +34,7 @@ import org.apache.cxf.rs.security.jose.common.JoseHeaders;
public final class JoseJaxrsUtils {
private static final String HTTP_PREFIX = "http.";
private static final Set<String> DEFAULT_PROTECTED_HTTP_HEADERS =
- new HashSet<String>(Arrays.asList(HttpHeaders.CONTENT_TYPE, HttpHeaders.ACCEPT));
+ new HashSet<>(Arrays.asList(HttpHeaders.CONTENT_TYPE, HttpHeaders.ACCEPT));
private JoseJaxrsUtils() {
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java
index 7f8664f..0f3ef57 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsWriterInterceptor.java
@@ -50,7 +50,7 @@ import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider;
@Priority(Priorities.JWS_WRITE_PRIORITY)
public class JwsWriterInterceptor extends AbstractJwsWriterProvider implements WriterInterceptor {
private static final Set<String> DEFAULT_PROTECTED_HTTP_HEADERS =
- new HashSet<String>(Arrays.asList(HttpHeaders.CONTENT_TYPE, HttpHeaders.ACCEPT));
+ new HashSet<>(Arrays.asList(HttpHeaders.CONTENT_TYPE, HttpHeaders.ACCEPT));
private Set<String> protectedHttpHeaders = DEFAULT_PROTECTED_HTTP_HEADERS;
private boolean protectHttpHeaders;
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
index 9fb2f84..937ce5f 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
@@ -39,7 +39,7 @@ public class JweJsonConsumer {
private JweHeaders sharedUnprotectedHeader;
private List<JweJsonEncryptionEntry> recipients = new LinkedList<>();
private Map<JweJsonEncryptionEntry, JweHeaders> recipientsMap =
- new LinkedHashMap<JweJsonEncryptionEntry, JweHeaders>();
+ new LinkedHashMap<>();
private byte[] aad;
private byte[] iv;
private byte[] cipherBytes;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java
index a87e9cc..668910f 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java
@@ -33,7 +33,7 @@ import org.apache.cxf.rt.security.crypto.MessageDigestUtils;
public class MemoryClientCodeStateManager implements ClientCodeStateManager {
private Map<String, MultivaluedMap<String, String>> map =
- new ConcurrentHashMap<String, MultivaluedMap<String, String>>();
+ new ConcurrentHashMap<>();
private boolean generateNonce;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java
index 022ea3c..bdb7b77 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientTokenContextManager.java
@@ -25,7 +25,7 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
public class MemoryClientTokenContextManager implements ClientTokenContextManager {
private ConcurrentHashMap<String, ClientTokenContext> map =
- new ConcurrentHashMap<String, ClientTokenContext>();
+ new ConcurrentHashMap<>();
@Override
public void setClientTokenContext(MessageContext mc, ClientTokenContext request) {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
index dd4fd89..dc793c8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
@@ -57,7 +57,7 @@ public abstract class AbstractAccessTokenValidator {
private int maxValidationDataCacheSize;
private ConcurrentHashMap<String, AccessTokenValidation> accessTokenValidations =
- new ConcurrentHashMap<String, AccessTokenValidation>();
+ new ConcurrentHashMap<>();
private JoseJwtConsumer jwtTokenConsumer;
private boolean persistJwtEncoding = true;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationService.java
index 263bc36..8c19404 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationService.java
@@ -42,7 +42,7 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
public class AuthorizationService {
private Map<String, RedirectionBasedGrantService> servicesMap =
- new HashMap<String, RedirectionBasedGrantService>();
+ new HashMap<>();
@Context
public void setMessageContext(MessageContext context) {
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/KeystorePasswordCallback.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/KeystorePasswordCallback.java
index 1696e18..eac4d5c 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/KeystorePasswordCallback.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/KeystorePasswordCallback.java
@@ -34,7 +34,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
public class KeystorePasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public KeystorePasswordCallback() {
passwords.put("Alice", "abcd!1234");
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
index 2e5d624..375a817 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
@@ -60,7 +60,7 @@ public class JettyHTTPServerEngineFactory {
// Still use the static map to hold the port information
// in the same JVM
private static ConcurrentHashMap<Integer, JettyHTTPServerEngine> portMap =
- new ConcurrentHashMap<Integer, JettyHTTPServerEngine>();
+ new ConcurrentHashMap<>();
@@ -70,7 +70,7 @@ public class JettyHTTPServerEngineFactory {
* to new Engines when bound to the reference id.
*/
private Map<String, ThreadingParameters> threadingParametersMap =
- new TreeMap<String, ThreadingParameters>();
+ new TreeMap<>();
private ThreadingParameters fallbackThreadingParameters;
@@ -79,7 +79,7 @@ public class JettyHTTPServerEngineFactory {
* configure a subsequently created JettyHTTPServerEngine.
*/
private Map<String, TLSServerParameters> tlsParametersMap =
- new TreeMap<String, TLSServerParameters>();
+ new TreeMap<>();
/**
diff --git a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientHandler.java b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientHandler.java
index 3595a1a..160d99e 100644
--- a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientHandler.java
+++ b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientHandler.java
@@ -29,7 +29,7 @@ import io.netty.handler.codec.http.HttpResponse;
public class NettyHttpClientHandler extends ChannelDuplexHandler {
private final BlockingQueue<NettyHttpClientRequest> sendedQueue =
- new LinkedBlockingDeque<NettyHttpClientRequest>();
+ new LinkedBlockingDeque<>();
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
index 9fd1700..93bb2ca 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
@@ -44,7 +44,7 @@ public class NettyHttpServerEngineFactory implements BusLifeCycleListener {
LogUtils.getL7dLogger(NettyHttpServerEngineFactory.class);
private static ConcurrentHashMap<Integer, NettyHttpServerEngine> portMap =
- new ConcurrentHashMap<Integer, NettyHttpServerEngine>();
+ new ConcurrentHashMap<>();
private Bus bus;
@@ -55,10 +55,10 @@ public class NettyHttpServerEngineFactory implements BusLifeCycleListener {
* to new Engines when bound to the reference id.
*/
private Map<String, ThreadingParameters> threadingParametersMap =
- new TreeMap<String, ThreadingParameters>();
+ new TreeMap<>();
private Map<String, TLSServerParameters> tlsServerParametersMap =
- new TreeMap<String, TLSServerParameters>();
+ new TreeMap<>();
public NettyHttpServerEngineFactory() {
// Empty
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
index 9ea3f6b..9088e80 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
@@ -107,7 +107,7 @@ public class UndertowHTTPServerEngine implements ServerEngine {
private boolean configFinalized;
private ConcurrentMap<String, UndertowHTTPHandler> registedPaths =
- new CopyOnWriteMap<String, UndertowHTTPHandler>();
+ new CopyOnWriteMap<>();
private boolean continuationsEnabled = true;
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactory.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactory.java
index 24d058e..ac269e4 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactory.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactory.java
@@ -59,7 +59,7 @@ public class UndertowHTTPServerEngineFactory {
// Still use the static map to hold the port information
// in the same JVM
private static ConcurrentHashMap<Integer, UndertowHTTPServerEngine> portMap =
- new ConcurrentHashMap<Integer, UndertowHTTPServerEngine>();
+ new ConcurrentHashMap<>();
@@ -69,7 +69,7 @@ public class UndertowHTTPServerEngineFactory {
* to new Engines when bound to the reference id.
*/
private Map<String, ThreadingParameters> threadingParametersMap =
- new TreeMap<String, ThreadingParameters>();
+ new TreeMap<>();
private ThreadingParameters fallbackThreadingParameters;
@@ -78,7 +78,7 @@ public class UndertowHTTPServerEngineFactory {
* configure a subsequently created UndertowHTTPServerEngine.
*/
private Map<String, TLSServerParameters> tlsParametersMap =
- new TreeMap<String, TLSServerParameters>();
+ new TreeMap<>();
/**
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
index 6b0ca7a..837e0a9 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/DestinationRegistryImpl.java
@@ -42,7 +42,7 @@ public class DestinationRegistryImpl implements DestinationRegistry, ServletConf
private ConcurrentMap<String, AbstractHTTPDestination> destinations
= new ConcurrentHashMap<>();
private Map<String, AbstractHTTPDestination> decodedDestinations =
- new ConcurrentHashMap<String, AbstractHTTPDestination>();
+ new ConcurrentHashMap<>();
public DestinationRegistryImpl() {
}
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java
index 89661b0..69fcfc0 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpServletRequestSnapshot.java
@@ -60,7 +60,7 @@ public class HttpServletRequestSnapshot extends HttpServletRequestWrapper {
private Principal principal;
private Enumeration<String> requestHeaderNames;
private Map<String, Enumeration<String>> headersMap =
- new java.util.concurrent.ConcurrentHashMap<String, Enumeration<String>>();
+ new java.util.concurrent.ConcurrentHashMap<>();
private String requestedSessionId;
public HttpServletRequestSnapshot(HttpServletRequest request) {
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index 4abb520..4bb766f 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -107,7 +107,7 @@ public abstract class AbstractHTTPServlet extends HttpServlet implements Filter
private String dispatcherServletName;
private Map<String, String> redirectAttributes;
private Map<String, String> staticContentTypes =
- new HashMap<String, String>(DEFAULT_STATIC_CONTENT_TYPES);
+ new HashMap<>(DEFAULT_STATIC_CONTENT_TYPES);
private boolean redirectQueryCheck;
private boolean useXForwardedHeaders;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
index 9d32ca6..5284270 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/policy/PolicyUtilsTest.java
@@ -101,7 +101,7 @@ public class PolicyUtilsTest extends Assert {
public AssertionInfo getClientPolicyAssertionInfo(HTTPClientPolicy policy) {
JaxbAssertion<HTTPClientPolicy> assertion =
- new JaxbAssertion<HTTPClientPolicy>(new ClientPolicyCalculator().getDataClassName(), false);
+ new JaxbAssertion<>(new ClientPolicyCalculator().getDataClassName(), false);
assertion.setData(policy);
return new AssertionInfo(assertion);
}
@@ -155,7 +155,7 @@ public class PolicyUtilsTest extends Assert {
public AssertionInfo getServerPolicyAssertionInfo(HTTPServerPolicy policy) {
JaxbAssertion<HTTPServerPolicy> assertion =
- new JaxbAssertion<HTTPServerPolicy>(new ServerPolicyCalculator().getDataClassName(), false);
+ new JaxbAssertion<>(new ServerPolicyCalculator().getDataClassName(), false);
assertion.setData(policy);
return new AssertionInfo(assertion);
}
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/DefaultMessageIdCache.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/DefaultMessageIdCache.java
index 1f744f5..8a002b7 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/DefaultMessageIdCache.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/DefaultMessageIdCache.java
@@ -35,7 +35,7 @@ public class DefaultMessageIdCache implements MessageIdCache {
* The set of message IDs.
*/
private final Map<String, Boolean> messageIdSet =
- new ConcurrentHashMap<String, Boolean>();
+ new ConcurrentHashMap<>();
public boolean checkUniquenessAndCacheId(String messageId) {
return this.messageIdSet.put(messageId, Boolean.TRUE) == null;
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
index c7cfa18..9163a5b 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
@@ -75,8 +75,7 @@ public class ClientPolicyInFaultInterceptor extends AbstractPolicyInterceptor {
Conduit conduit = exchange.getConduit(msg);
LOG.fine("conduit: " + conduit);
- List<Interceptor<? extends Message>> faultInterceptors =
- new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> faultInterceptors = new ArrayList<>();
Collection<Assertion> assertions = new ArrayList<>();
// 1. Check overridden policy
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
index 12223cd..662232f 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
@@ -84,8 +84,7 @@ public class ServerPolicyOutFaultInterceptor extends AbstractPolicyInterceptor {
Exception ex = exchange.get(Exception.class);
- List<Interceptor<? extends Message>> faultInterceptors =
- new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> faultInterceptors = new ArrayList<>();
Collection<Assertion> assertions = new ArrayList<>();
// 1. Check overridden policy
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
index 2c458b0..4fc6955 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyDataEngineImplTest.java
@@ -62,7 +62,7 @@ public class PolicyDataEngineImplTest extends Assert {
public AssertionInfo getTestPolicyAssertionInfo(TestPolicy policy) {
JaxbAssertion<TestPolicy> assertion =
- new JaxbAssertion<TestPolicy>(TEST_POLICY_NAME, false);
+ new JaxbAssertion<>(TEST_POLICY_NAME, false);
assertion.setData(policy);
return new AssertionInfo(assertion);
}
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
index eebefbb..b62831d 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java
@@ -76,9 +76,9 @@ public class RedeliveryQueueImpl implements RedeliveryQueue {
private static final Logger LOG = LogUtils.getL7dLogger(RedeliveryQueueImpl.class);
private Map<String, List<RedeliverCandidate>> candidates =
- new HashMap<String, List<RedeliverCandidate>>();
+ new HashMap<>();
private Map<String, List<RedeliverCandidate>> suspendedCandidates =
- new HashMap<String, List<RedeliverCandidate>>();
+ new HashMap<>();
private RMManager manager;
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index 97514d2..d3b3abd 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
@@ -110,9 +110,9 @@ public class RetransmissionQueueImpl implements RetransmissionQueue {
private static final Logger LOG = LogUtils.getL7dLogger(RetransmissionQueueImpl.class);
private Map<String, List<ResendCandidate>> candidates =
- new HashMap<String, List<ResendCandidate>>();
+ new HashMap<>();
private Map<String, List<ResendCandidate>> suspendedCandidates =
- new HashMap<String, List<ResendCandidate>>();
+ new HashMap<>();
private Resender resender;
private RMManager manager;
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
index 391fc94..14e5c89 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java
@@ -226,7 +226,7 @@ public class RetransmissionQueueImplTest extends Assert {
messageNumbers,
new boolean[] {true, false});
List<RetransmissionQueueImpl.ResendCandidate> sequenceList =
- new ArrayList<RetransmissionQueueImpl.ResendCandidate>();
+ new ArrayList<>();
queue.getUnacknowledged().put("sequence1", sequenceList);
SoapMessage message1 = setUpMessage("sequence1", messageNumbers[0]);
setupMessagePolicies(message1);
@@ -256,7 +256,7 @@ public class RetransmissionQueueImplTest extends Assert {
messageNumbers,
new boolean[] {false, false});
List<RetransmissionQueueImpl.ResendCandidate> sequenceList =
- new ArrayList<RetransmissionQueueImpl.ResendCandidate>();
+ new ArrayList<>();
queue.getUnacknowledged().put("sequence1", sequenceList);
SoapMessage message1 = setUpMessage("sequence1", messageNumbers[0]);
setupMessagePolicies(message1);
@@ -283,7 +283,7 @@ public class RetransmissionQueueImplTest extends Assert {
messageNumbers,
new boolean[] {true, true});
List<RetransmissionQueueImpl.ResendCandidate> sequenceList =
- new ArrayList<RetransmissionQueueImpl.ResendCandidate>();
+ new ArrayList<>();
queue.getUnacknowledged().put("sequence1", sequenceList);
SoapMessage message1 = setUpMessage("sequence1", messageNumbers[0]);
setupMessagePolicies(message1);
@@ -320,7 +320,7 @@ public class RetransmissionQueueImplTest extends Assert {
messageNumbers,
null);
List<RetransmissionQueueImpl.ResendCandidate> sequenceList =
- new ArrayList<RetransmissionQueueImpl.ResendCandidate>();
+ new ArrayList<>();
queue.getUnacknowledged().put("sequence1", sequenceList);
SoapMessage message1 = setUpMessage("sequence1", messageNumbers[0], false);
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/STSException.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/STSException.java
index 7540de0..52e08e5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/STSException.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/STSException.java
@@ -51,7 +51,7 @@ public class STSException extends RuntimeException {
* A map of Fault Code to Fault Strings
*/
private static final java.util.Map<QName, String> FAULT_CODE_MAP =
- new java.util.HashMap<QName, String>();
+ new java.util.HashMap<>();
static {
FAULT_CODE_MAP.put(INVALID_REQUEST, "The request was invalid or malformed");
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
index d2f2154..0cb8b11 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageCheckerTest.java
@@ -55,8 +55,7 @@ public class CryptoCoverageCheckerTest extends AbstractSecurityTest {
SortedSet<Phase> phases = new TreeSet<>();
phases.add(new Phase(Phase.PRE_PROTOCOL, 1));
- List<Interceptor<? extends Message>> lst =
- new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> lst = new ArrayList<>();
lst.add(new MustUnderstandInterceptor());
lst.add(new WSS4JInInterceptor());
lst.add(new SAAJInInterceptor());
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/KeystorePasswordCallback.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/KeystorePasswordCallback.java
index a4243d8..c171171 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/KeystorePasswordCallback.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/KeystorePasswordCallback.java
@@ -34,7 +34,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
public class KeystorePasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public KeystorePasswordCallback() {
passwords.put("Alice", "abcd!1234");
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
index 07e8d3e..4958258 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java
@@ -556,7 +556,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
// Now add UseKey
UseKeyType useKey = createUseKey(crypto, "myclientkey");
JAXBElement<UseKeyType> useKeyType =
- new JAXBElement<UseKeyType>(QNameConstants.USE_KEY, UseKeyType.class, useKey);
+ new JAXBElement<>(QNameConstants.USE_KEY, UseKeyType.class, useKey);
request.getAny().add(useKeyType);
RequestSecurityTokenResponseCollectionType response =
@@ -653,7 +653,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
EntropyType entropyType = new EntropyType();
entropyType.getAny().add(binarySecretTypeJaxb);
JAXBElement<EntropyType> entropyJaxbType =
- new JAXBElement<EntropyType>(QNameConstants.ENTROPY, EntropyType.class, entropyType);
+ new JAXBElement<>(QNameConstants.ENTROPY, EntropyType.class, entropyType);
request.getAny().add(entropyJaxbType);
RequestSecurityTokenResponseCollectionType response =
@@ -746,7 +746,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
EntropyType entropyType = new EntropyType();
entropyType.getAny().add(binarySecretTypeJaxb);
JAXBElement<EntropyType> entropyJaxbType =
- new JAXBElement<EntropyType>(QNameConstants.ENTROPY, EntropyType.class, entropyType);
+ new JAXBElement<>(QNameConstants.ENTROPY, EntropyType.class, entropyType);
request.getAny().add(entropyJaxbType);
RequestSecurityTokenResponseCollectionType response =
@@ -840,7 +840,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
EntropyType entropyType = new EntropyType();
entropyType.getAny().add(encryptedKeyElement);
JAXBElement<EntropyType> entropyJaxbType =
- new JAXBElement<EntropyType>(QNameConstants.ENTROPY, EntropyType.class, entropyType);
+ new JAXBElement<>(QNameConstants.ENTROPY, EntropyType.class, entropyType);
request.getAny().add(entropyJaxbType);
RequestSecurityTokenResponseCollectionType response =
@@ -1180,7 +1180,7 @@ public class IssueSamlUnitTest extends org.junit.Assert {
UseKeyType useKey = createUseKey(crypto, "myclientkey");
JAXBElement<UseKeyType> useKeyType =
- new JAXBElement<UseKeyType>(QNameConstants.USE_KEY, UseKeyType.class, useKey);
+ new JAXBElement<>(QNameConstants.USE_KEY, UseKeyType.class, useKey);
request.getAny().add(useKeyType);
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
index 79bc9b0..15141ff 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueUnitTest.java
@@ -382,7 +382,7 @@ public class IssueUnitTest extends org.junit.Assert {
request.getAny().add(createAppliesToElement("http://dummy-service.com/dummy"));
LifetimeType lifetime = createLifetime(300L * 5L);
JAXBElement<LifetimeType> lifetimeJaxb =
- new JAXBElement<LifetimeType>(QNameConstants.LIFETIME, LifetimeType.class, lifetime);
+ new JAXBElement<>(QNameConstants.LIFETIME, LifetimeType.class, lifetime);
request.getAny().add(lifetimeJaxb);
// Mock up message context
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 e604a0b..8ae75ba 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
@@ -117,7 +117,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert {
// Create Realms
Map<String, org.apache.cxf.sts.token.realm.SAMLRealm> samlRealms =
- new HashMap<String, org.apache.cxf.sts.token.realm.SAMLRealm>();
+ new HashMap<>();
org.apache.cxf.sts.token.realm.SAMLRealm samlRealm = new org.apache.cxf.sts.token.realm.SAMLRealm();
samlRealm.setIssuer("A-Issuer");
samlRealms.put("A", samlRealm);
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 4744b52..4013c90 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
@@ -48,7 +48,7 @@ public class BookContinuationStore implements BookAsyncInterface {
private Map<String, String> books = new HashMap<>();
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
- new ArrayBlockingQueue<Runnable>(10));
+ new ArrayBlockingQueue<>(10));
public BookContinuationStore() {
init();
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 8781ba7..5edc28a 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
@@ -46,8 +46,7 @@ import org.apache.cxf.phase.PhaseInterceptorChain;
public class BookCxfContinuationStore {
private Map<String, String> books = new HashMap<>();
- private Map<String, Continuation> suspended =
- new HashMap<String, Continuation>();
+ private Map<String, Continuation> suspended = new HashMap<>();
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
new ArrayBlockingQueue<Runnable>(10));
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index 5067ba4..915e4ef 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -818,8 +818,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
Book b1 = new Book("CXF in Action", 123L);
Book b2 = new Book("CXF Rocks", 124L);
- List<JAXBElement<Book>> books =
- new ArrayList<JAXBElement<Book>>();
+ List<JAXBElement<Book>> books = new ArrayList<>();
books.add(new JAXBElement<Book>(new QName("bookRootElement"),
Book.class, b1));
books.add(new JAXBElement<Book>(new QName("bookRootElement"),
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 f6bdf23..bf66622 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
@@ -1141,8 +1141,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
BookStore.class);
Book b1 = new Book("CXF in Action", 123L);
Book b2 = new Book("CXF Rocks", 124L);
- List<JAXBElement<Book>> books =
- new ArrayList<JAXBElement<Book>>();
+ List<JAXBElement<Book>> books = new ArrayList<>();
books.add(new JAXBElement<Book>(new QName("bookRootElement"),
Book.class, b1));
books.add(new JAXBElement<Book>(new QName("bookRootElement"),
@@ -1190,8 +1189,7 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
Collections.singletonList(provider));
BookNoXmlRootElement b1 = new BookNoXmlRootElement("CXF in Action", 123L);
BookNoXmlRootElement b2 = new BookNoXmlRootElement("CXF Rocks", 124L);
- List<JAXBElement<BookNoXmlRootElement>> books =
- new ArrayList<JAXBElement<BookNoXmlRootElement>>();
+ List<JAXBElement<BookNoXmlRootElement>> books = new ArrayList<>();
books.add(new JAXBElement<BookNoXmlRootElement>(new QName("bookNoXmlRootElement"),
BookNoXmlRootElement.class, b1));
books.add(new JAXBElement<BookNoXmlRootElement>(new QName("bookNoXmlRootElement"),
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
index d7722a2..71aac2f 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
@@ -1216,7 +1216,7 @@ public class HandlerInvocationTest extends AbstractBusClientServerTestBase {
@Test
public void testMustUnderstandSoapFaultOneWay() {
TestMustUnderstandHandler<SOAPMessageContext> handler =
- new TestMustUnderstandHandler<SOAPMessageContext>();
+ new TestMustUnderstandHandler<>();
addHandlersToChain((BindingProvider)handlerTest, handler);
try {
handlerTest.pingOneWay();
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
index c20a0d5..56826a1 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AnyClientServerTest.java
@@ -115,7 +115,7 @@ public final class AnyClientServerTest extends AbstractBusClientServerTestBase {
updateAddressPort(port, PORT);
List<org.apache.hello_world_soap_http.any_types.SayHi1.Port> list =
- new ArrayList<org.apache.hello_world_soap_http.any_types.SayHi1.Port>();
+ new ArrayList<>();
org.apache.hello_world_soap_http.any_types.SayHi1.Port port1 =
new org.apache.hello_world_soap_http.any_types.SayHi1.Port();
port1.setRequestType("hello");
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
index ca85349..7b472d9 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java
@@ -35,7 +35,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
public class KeystorePasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public KeystorePasswordCallback() {
passwords.put("Alice", "abcd!1234");
diff --git a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/UserServiceImpl.java b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/UserServiceImpl.java
index d17eef3..f5e3b55 100644
--- a/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/UserServiceImpl.java
+++ b/systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/UserServiceImpl.java
@@ -63,7 +63,7 @@ public class UserServiceImpl implements UserService {
}
LdapQueryVisitor<User> visitor =
- new LdapQueryVisitor<User>(Collections.singletonMap("name", "cn"));
+ new LdapQueryVisitor<>(Collections.singletonMap("name", "cn"));
visitor.setEncodeQueryValues(encodeQueryValues);
sc.accept(visitor.visitor());
String parsedQuery = visitor.getQuery();
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
index 06bcbc8..8bd17c3 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
@@ -43,7 +43,7 @@ import org.apache.cxf.rs.security.oauth.provider.OAuthServiceException;
public class MemoryOAuthDataProvider implements OAuthDataProvider {
private static final ConcurrentHashMap<String, OAuthPermission> AVAILABLE_PERMISSIONS =
- new ConcurrentHashMap<String, OAuthPermission>();
+ new ConcurrentHashMap<>();
static {
AVAILABLE_PERMISSIONS
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS.java
index c67a7b9..ef39920 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS.java
@@ -42,8 +42,7 @@ import org.apache.cxf.continuations.ContinuationProvider;
wsdlLocation = "org/apache/cxf/systest/jms/continuations/test.wsdl")
public class HelloWorldWithContinuationsJMS implements HelloContinuation {
- private Map<String, Continuation> suspended =
- new HashMap<String, Continuation>();
+ private Map<String, Continuation> suspended = new HashMap<>();
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
new ArrayBlockingQueue<Runnable>(10));
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS2.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS2.java
index ca6b595..98edaea 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS2.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldWithContinuationsJMS2.java
@@ -42,8 +42,7 @@ import org.apache.cxf.continuations.ContinuationProvider;
wsdlLocation = "org/apache/cxf/systest/jms/continuations/test.wsdl")
public class HelloWorldWithContinuationsJMS2 implements HelloContinuation {
- private Map<String, Continuation> suspended =
- new HashMap<String, Continuation>();
+ private Map<String, Continuation> suspended = new HashMap<>();
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
new ArrayBlockingQueue<Runnable>(10));
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/KeystorePasswordCallback.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/KeystorePasswordCallback.java
index 2dc7095..476573b 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/KeystorePasswordCallback.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/KeystorePasswordCallback.java
@@ -35,7 +35,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
public class KeystorePasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public KeystorePasswordCallback() {
passwords.put("Alice", "abcd!1234");
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/HelloImplWithWrapppedContinuation.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/HelloImplWithWrapppedContinuation.java
index 7020040..99298c9 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/HelloImplWithWrapppedContinuation.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/HelloImplWithWrapppedContinuation.java
@@ -37,7 +37,7 @@ public class HelloImplWithWrapppedContinuation implements HelloContinuation {
private Map<String, Continuation> suspended =
- new HashMap<String, Continuation>();
+ new HashMap<>();
@Resource
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java
index 169db7a..ef3c07b 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/HelloImplWithWrapppedContinuation.java
@@ -37,7 +37,7 @@ public class HelloImplWithWrapppedContinuation implements HelloContinuation {
private Map<String, Continuation> suspended =
- new HashMap<String, Continuation>();
+ new HashMap<>();
@Resource
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
index 2fc05d0..71eb3d9 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
@@ -1451,7 +1451,7 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
yOrig.setSg03AbstractBaseElementA(elementB);
Holder<StructWithSubstitutionGroupAbstract> y =
- new Holder<StructWithSubstitutionGroupAbstract>(yOrig);
+ new Holder<>(yOrig);
Holder<StructWithSubstitutionGroupAbstract> z = new Holder<>();
StructWithSubstitutionGroupAbstract ret;
if (testDocLiteral) {
@@ -1589,9 +1589,9 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
yOrig.setSg02BaseElementA(y2);
Holder<StructWithMultipleSubstitutionGroups> y =
- new Holder<StructWithMultipleSubstitutionGroups>(yOrig);
+ new Holder<>(yOrig);
Holder<StructWithMultipleSubstitutionGroups> z =
- new Holder<StructWithMultipleSubstitutionGroups>();
+ new Holder<>();
StructWithMultipleSubstitutionGroups ret;
if (testDocLiteral) {
ret = docClient.testStructWithMultipleSubstitutionGroups(x, y, z);
@@ -1647,9 +1647,9 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
yOrig.setSg03AbstractBaseElementA(elementB);
Holder<ChoiceWithSubstitutionGroupAbstract> y =
- new Holder<ChoiceWithSubstitutionGroupAbstract>(yOrig);
+ new Holder<>(yOrig);
Holder<ChoiceWithSubstitutionGroupAbstract> z =
- new Holder<ChoiceWithSubstitutionGroupAbstract>();
+ new Holder<>();
ChoiceWithSubstitutionGroupAbstract ret;
if (testDocLiteral) {
ret = docClient.testChoiceWithSubstitutionGroupAbstract(x, y, z);
@@ -1809,9 +1809,9 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
yOrig.setSg01BaseElementA(elementB);
Holder<ChoiceWithSubstitutionGroup> y =
- new Holder<ChoiceWithSubstitutionGroup>(yOrig);
+ new Holder<>(yOrig);
Holder<ChoiceWithSubstitutionGroup> z =
- new Holder<ChoiceWithSubstitutionGroup>();
+ new Holder<>();
assertTrue("yoo: ", equals(y.value, y.value));
ChoiceWithSubstitutionGroup ret;
if (testDocLiteral) {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
index cfe7ba2..f5c5dde 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
@@ -1330,9 +1330,9 @@ public abstract class AbstractTypeTestClient3 extends AbstractTypeTestClient2 {
yOriginal.getValue().add(new BigInteger("3200"));
Holder<MultipleOccursSequenceInSequence> y =
- new Holder<MultipleOccursSequenceInSequence>(yOriginal);
+ new Holder<>(yOriginal);
Holder<MultipleOccursSequenceInSequence> z =
- new Holder<MultipleOccursSequenceInSequence>();
+ new Holder<>();
MultipleOccursSequenceInSequence ret;
if (testDocLiteral) {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
index 6c62762..6c57527 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
@@ -757,7 +757,7 @@ public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
yOriginal.setVarInteger(200);
Holder<StructWithNillableStruct> y =
- new Holder<StructWithNillableStruct>(yOriginal);
+ new Holder<>(yOriginal);
Holder<StructWithNillableStruct> z = new Holder<>();
StructWithNillableStruct ret;
if (testDocLiteral) {
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java
index 64dd0fe..0231709 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/UTPasswordCallback.java
@@ -34,7 +34,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
public class UTPasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java
index fe4d33c..16c1e75 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java
@@ -33,7 +33,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
public class CommonPasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public CommonPasswordCallback() {
passwords.put("Alice", "ecilA");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
index 55f275e..48bcb14 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
@@ -35,7 +35,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
public class KeystorePasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public KeystorePasswordCallback() {
passwords.put("Alice", "abcd!1234");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java
index 63c6fed..e35fcd5 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/UTPasswordCallback.java
@@ -34,7 +34,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
public class UTPasswordCallback implements CallbackHandler {
private Map<String, String> passwords =
- new HashMap<String, String>();
+ new HashMap<>();
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
index 5e21eaf..b575df5 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
@@ -83,7 +83,7 @@ public abstract class MAPTestBase extends AbstractClientServerTestBase implement
new QName("http://apache.org/hello_world_soap_http", "SOAPServiceAddressing");
private static Map<Object, Map<String, String>> messageIDs =
- new HashMap<Object, Map<String, String>>();
+ new HashMap<>();
protected Greeter greeter;
private String verified;
@@ -140,7 +140,7 @@ public abstract class MAPTestBase extends AbstractClientServerTestBase implement
ReferenceParametersType params =
ContextUtils.WSA_OBJECT_FACTORY.createReferenceParametersType();
JAXBElement<String> param =
- new JAXBElement<String>(CUSTOMER_NAME, String.class, CUSTOMER_KEY);
+ new JAXBElement<>(CUSTOMER_NAME, String.class, CUSTOMER_KEY);
params.getAny().add(param);
target.setReferenceParameters(params);
greeter = createGreeter(target);
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
index 7b9d6d6..8da06ea 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
@@ -96,7 +96,7 @@ public class WSDLToCorbaHelper {
protected static final String[] DISCRIMINATORTYPES
= new String[] {"long", "short", "boolean", "char"};
protected static final Set<String> SUPPORTEDDISTYPES =
- new TreeSet<String>(Arrays.asList(DISCRIMINATORTYPES));
+ new TreeSet<>(Arrays.asList(DISCRIMINATORTYPES));
protected static final CorbaPrimitiveMap CORBAPRIMITIVEMAP = new CorbaPrimitiveMap();