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/25 13:33:30 UTC
[cxf] branch master updated: Final diamond operator merge
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 02fbea2 Final diamond operator merge
02fbea2 is described below
commit 02fbea2b202db56b45efb69b48389c7ad30db391
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Oct 25 14:33:12 2018 +0100
Final diamond operator merge
---
core/src/main/java/org/apache/cxf/BusFactory.java | 2 +-
.../cxf/attachment/AttachmentDeserializer.java | 2 +-
.../cxf/attachment/AttachmentSerializer.java | 2 +-
.../apache/cxf/attachment/ContentDisposition.java | 2 +-
.../apache/cxf/bus/blueprint/ConfigurerImpl.java | 2 +-
.../bus/blueprint/NamespaceHandlerRegisterer.java | 2 +-
.../cxf/bus/extension/ExtensionManagerBus.java | 2 +-
.../cxf/bus/extension/ExtensionManagerImpl.java | 2 +-
.../cxf/bus/extension/ExtensionRegistry.java | 2 +-
.../bus/managers/BindingFactoryManagerImpl.java | 4 +-
.../bus/managers/ConduitInitiatorManagerImpl.java | 4 +-
.../managers/DestinationFactoryManagerImpl.java | 4 +-
.../apache/cxf/bus/managers/HeaderManagerImpl.java | 2 +-
.../cxf/bus/managers/WorkQueueManagerImpl.java | 2 +-
.../cxf/bus/osgi/CXFExtensionBundleListener.java | 2 +-
.../apache/cxf/bus/spring/BusEntityResolver.java | 2 +-
.../apache/cxf/common/jaxb/JAXBContextCache.java | 2 +-
.../java/org/apache/cxf/common/util/ASMHelper.java | 2 +-
.../java/org/apache/cxf/common/util/CacheMap.java | 4 +-
.../cxf/common/util/WeakIdentityHashMap.java | 2 +-
.../cxf/configuration/spring/ConfigurerImpl.java | 2 +-
.../AbstractInterceptorProvidingDataBinding.java | 8 +--
.../databinding/stax/StaxDataBindingFeature.java | 2 +-
.../org/apache/cxf/endpoint/ClientCallback.java | 2 +-
.../java/org/apache/cxf/endpoint/ClientImpl.java | 2 +-
.../org/apache/cxf/extension/RegistryImpl.java | 4 +-
.../org/apache/cxf/helpers/HttpHeaderHelper.java | 2 +-
.../AbstractAttributedInterceptorProvider.java | 8 +--
.../AbstractBasicInterceptorProvider.java | 8 +--
.../cxf/interceptor/AnnotationInterceptors.java | 2 +-
.../service/factory/SimpleMethodDispatcher.java | 2 +-
.../service/model/AbstractMessageContainer.java | 2 +-
.../service/model/AbstractPropertiesHolder.java | 2 +-
.../org/apache/cxf/service/model/BindingInfo.java | 2 +-
.../cxf/service/model/BindingOperationInfo.java | 2 +-
.../apache/cxf/service/model/InterfaceInfo.java | 2 +-
.../apache/cxf/service/model/OperationInfo.java | 2 +-
.../org/apache/cxf/service/model/ServiceInfo.java | 2 +-
.../cxf/staxutils/AbstractDOMStreamReader.java | 2 +-
.../cxf/staxutils/StreamWriterContentHandler.java | 2 +-
.../transform/DelegatingNamespaceContext.java | 4 +-
.../cxf/transport/MultipleEndpointObserver.java | 4 +-
.../transport/common/gzip/GZIPOutInterceptor.java | 2 +-
.../cxf/workqueue/AutomaticWorkQueueImpl.java | 2 +-
.../cxf/ws/addressing/EndpointReferenceUtils.java | 6 +-
.../common/annotation/AnnotationProcessorTest.java | 2 +-
.../org/apache/cxf/common/util/CacheMapTest.java | 2 +-
.../interceptor/OutgoingChainInterceptorTest.java | 2 +-
.../common/gzip/GZIPAcceptEncodingTest.java | 2 +-
.../bank/src/main/java/cxf/client/Client.java | 2 +-
.../main/java/demo/hw/server/HelloWorldImpl.java | 2 +-
.../java/demo/hw/server/IntegerUserMapAdapter.java | 2 +-
.../src/main/java/minimalosgi/Activator.java | 2 +-
.../controllers/MemoryOAuthDataProvider.java | 8 +--
.../cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 2 +-
.../cxf/binding/coloc/ColocMessageObserver.java | 2 +-
.../cxf/binding/corba/CorbaBindingFactory.java | 2 +-
.../apache/cxf/binding/corba/utils/CorbaUtils.java | 2 +-
.../interceptor/SoapPreProtocolOutInterceptor.java | 2 +-
.../interceptor/TibcoSoapActionInterceptor.java | 2 +-
.../cxf/binding/soap/saaj/SAAJInInterceptor.java | 3 +-
.../interceptor/SoapActionInInterceptorTest.java | 4 +-
.../apache/cxf/aegis/type/collection/MapType.java | 8 +--
.../cxf/aegis/type/encoded/MarshalRegistry.java | 4 +-
.../cxf/aegis/type/encoded/SoapRefRegistry.java | 4 +-
.../cxf/aegis/util/stax/JDOMStreamReader.java | 3 +-
.../cxf/aegis/type/encoded/StructTypeTest.java | 2 +-
.../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 2 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 2 +-
.../throttling/ThrottlingResponseInterceptor.java | 2 +-
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 2 +-
.../apache/cxf/jaxrs/ext/MessageContextImpl.java | 2 +-
.../apache/cxf/jaxrs/ext/multipart/Attachment.java | 2 +-
.../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 2 +-
.../apache/cxf/jaxrs/impl/ConfigurationImpl.java | 2 +-
.../cxf/jaxrs/impl/HttpServletRequestFilter.java | 4 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 6 +-
.../org/apache/cxf/jaxrs/impl/MetadataMap.java | 6 +-
.../apache/cxf/jaxrs/impl/ResponseBuilderImpl.java | 2 +-
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 2 +-
.../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java | 12 ++--
.../org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 2 +-
.../cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 2 +-
.../cxf/jaxrs/model/AbstractResourceInfo.java | 2 +-
.../apache/cxf/jaxrs/model/ClassResourceInfo.java | 2 +-
.../apache/cxf/jaxrs/model/MethodDispatcher.java | 2 +-
.../cxf/jaxrs/provider/MultipartProvider.java | 4 +-
.../apache/cxf/jaxrs/provider/ProviderCache.java | 4 +-
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 4 +-
.../JAXRSServerFactoryBeanDefinitionParser.java | 2 +-
.../cxf/jaxrs/utils/AccumulatingIntersector.java | 2 +-
.../org/apache/cxf/jaxrs/utils/InjectionUtils.java | 12 ++--
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 10 +--
.../cxf/jaxrs/utils/multipart/AttachmentUtils.java | 4 +-
.../validation/JAXRSParameterNameProvider.java | 4 +-
.../cxf/jaxrs/JAXRSServiceFactoryBeanTest.java | 4 +-
.../cxf/jaxrs/SelectMethodCandidatesTest.java | 24 +++----
.../cxf/jaxrs/ext/multipart/AttachmentTest.java | 2 +-
.../apache/cxf/jaxrs/ext/xml/XMLSourceTest.java | 12 ++--
.../apache/cxf/jaxrs/impl/HttpHeadersImplTest.java | 4 +-
.../jaxrs/impl/MediaTypeHeaderProviderTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/MetadataMapTest.java | 60 ++++++++---------
.../org/apache/cxf/jaxrs/impl/RequestImplTest.java | 2 +-
.../cxf/jaxrs/impl/RequestPreprocessorTest.java | 2 +-
.../cxf/jaxrs/impl/ResponseBuilderImplTest.java | 50 +++++++-------
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 26 ++++----
.../cxf/jaxrs/impl/SecurityContextImplTest.java | 2 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 2 +-
.../apache/cxf/jaxrs/model/URITemplateTest.java | 78 +++++++++++-----------
.../cxf/jaxrs/provider/DataSourceProviderTest.java | 4 +-
.../jaxrs/provider/FormEncodingProviderTest.java | 14 ++--
.../jaxrs/provider/JAXBElementProviderTest.java | 4 +-
.../jaxrs/provider/PrimitiveTextProviderTest.java | 2 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/FormUtilsTest.java | 6 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 34 +++++-----
.../java/org/apache/cxf/jaxws/DispatchImpl.java | 2 +-
.../java/org/apache/cxf/jaxws/EndpointImpl.java | 8 +--
.../apache/cxf/jaxws/WrapperClassGenerator.java | 2 +-
.../cxf/jaxws/context/WrappedMessageContext.java | 2 +-
.../cxf/jaxws/interceptors/SwAOutInterceptor.java | 2 +-
.../java/org/apache/cxf/jaxws/JaxWsClientTest.java | 4 +-
.../cxf/management/counters/CounterRepository.java | 2 +-
.../management/counters/CounterRepositoryTest.java | 6 +-
.../cxf/jaxrs/client/ClientConfiguration.java | 8 +--
.../apache/cxf/jaxrs/client/LocalClientState.java | 4 +-
.../cxf/jaxrs/client/ThreadLocalClientState.java | 2 +-
.../cxf/jaxrs/openapi/parse/OpenApiParseUtils.java | 2 +-
.../cxf/jaxrs/swagger/parse/SwaggerParseUtils.java | 2 +-
.../apache/cxf/jaxrs/json/basic/JsonMapObject.java | 4 +-
.../json/basic/JsonMapObjectReaderWriter.java | 2 +-
.../json/basic/JsonMapObjectReaderWriterTest.java | 2 +-
.../provider/aegis/AbstractAegisProvider.java | 2 +-
.../provider/aegis/AegisElementProviderTest.java | 4 +-
.../apache/cxf/jaxrs/ext/search/Beanspector.java | 4 +-
.../cxf/jaxrs/ext/search/SearchContextImpl.java | 2 +-
.../ext/search/lucene/LuceneQueryVisitor.java | 2 +-
.../cxf/jaxrs/ext/search/odata/ODataParser.java | 2 +-
.../search/lucene/LuceneQueryVisitorFiqlTest.java | 2 +-
.../cors/CrossOriginResourceSharingFilter.java | 4 +-
.../cxf/rs/security/jose/jaxrs/JoseJaxrsUtils.java | 4 +-
.../security/jose/jwe/JweJsonEncryptionEntry.java | 2 +-
.../cxf/rs/security/jose/jwe/JweJsonProducer.java | 2 +-
.../cxf/rs/security/jose/jwk/JsonWebKeys.java | 6 +-
.../jose/jws/JwsCompactReaderWriterTest.java | 2 +-
.../cxf/rs/security/oauth/utils/OAuthUtils.java | 4 +-
.../grants/saml/AbstractSaml2BearerGrant.java | 2 +-
.../oauth2/client/ClientCodeRequestFilter.java | 4 +-
.../oauth2/client/JoseClientCodeStateManager.java | 2 +-
.../client/MemoryClientCodeStateManager.java | 2 +-
.../common/AbstractFormImplicitResponse.java | 2 +-
.../cxf/rs/security/oauth2/common/AccessToken.java | 2 +-
.../oauth2/common/AccessTokenRegistration.java | 2 +-
.../rs/security/oauth2/common/OAuthContext.java | 2 +-
.../oauth2/common/OAuthRedirectionState.java | 2 +-
.../security/oauth2/common/ServerAccessToken.java | 2 +-
.../filters/AccessTokenIntrospectionClient.java | 2 +-
.../oauth2/filters/AccessTokenValidatorClient.java | 2 +-
.../rs/security/oauth2/grants/AbstractGrant.java | 2 +-
.../oauth2/grants/code/AuthorizationCodeGrant.java | 2 +-
.../grants/code/AuthorizationCodeRegistration.java | 2 +-
.../oauth2/grants/code/JwtRequestCodeFilter.java | 2 +-
.../oauth2/grants/code/JwtRequestCodeGrant.java | 2 +-
.../grants/code/ServerAuthorizationCodeGrant.java | 2 +-
.../oauth2/grants/jwt/AbstractJwtBearerGrant.java | 2 +-
.../oauth2/grants/refresh/RefreshTokenGrant.java | 2 +-
.../oauth2/provider/AbstractOAuthDataProvider.java | 2 +-
.../DefaultEncryptingOAuthDataProvider.java | 2 +-
.../oauth2/provider/OAuthJSONProvider.java | 2 +-
.../services/AuthorizationMetadataService.java | 2 +-
.../hawk/HawkAccessTokenValidatorClient.java | 2 +-
.../cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +-
.../oauth2/grants/TokenGrantHandlerTest.java | 2 +-
.../oauth2/provider/OAuthJSONProviderTest.java | 2 +-
.../rs/security/oidc/common/AbstractUserInfo.java | 14 ++--
.../cxf/rs/security/oidc/common/ClaimsRequest.java | 2 +-
.../rs/security/oidc/rp/OidcClaimsValidator.java | 2 +-
.../security/oidc/rp/OidcIdTokenRequestFilter.java | 2 +-
.../oidc/rp/OidcRpAuthenticationFilter.java | 2 +-
.../cxf/transport/http/asyncclient/Activator.java | 2 +-
.../JettyHTTPServerEngineFactoryHolder.java | 4 +-
.../http_jetty/spring/JettySpringTypesFactory.java | 4 +-
.../http/netty/server/NettyHttpServerEngine.java | 2 +-
.../NettyHttpServerEngineFactoryHolder.java | 4 +-
.../server/servlet/NettyHttpServletRequest.java | 2 +-
.../netty/server/servlet/NettyHttpSession.java | 2 +-
.../server/session/DefaultHttpSessionStore.java | 2 +-
.../server/spring/NettySpringTypesFactory.java | 4 +-
.../UndertowHTTPServerEngineFactoryHolder.java | 4 +-
.../spring/UndertowSpringTypesFactory.java | 4 +-
.../org/apache/cxf/transport/http/Cookies.java | 2 +-
.../transport/http/DestinationRegistryImpl.java | 2 +-
.../org/apache/cxf/transport/http/Headers.java | 8 +--
.../transport/http/auth/DigestAuthSupplier.java | 2 +-
.../osgi/ConfigAdminHttpConduitConfigurer.java | 2 +-
.../https/httpclient/PublicSuffixMatcher.java | 8 +--
.../servlet/ServletContextResourceResolver.java | 2 +-
.../apache/cxf/transport/http/HTTPConduitTest.java | 2 +-
.../http/HTTPConduitURLConnectionTest.java | 2 +-
.../transport/http/HTTPConduitURLEasyMockTest.java | 2 +-
.../org/apache/cxf/transport/jms/JMSConduit.java | 2 +-
.../apache/cxf/transport/jms/JMSMessageUtils.java | 4 +-
.../cxf/transport/local/LocalTransportFactory.java | 2 +-
.../org/apache/cxf/transport/udp/UDPConduit.java | 2 +-
.../cxf/transport/websocket/WebSocketUtils.java | 2 +-
.../websocket/ahc/AhcWebSocketConduit.java | 2 +-
.../jetty/WebSocketVirtualServletRequest.java | 2 +-
.../jetty/WebSocketVirtualServletResponse.java | 2 +-
.../undertow/WebSocketUndertowServletRequest.java | 2 +-
.../undertow/WebSocketUndertowServletResponse.java | 2 +-
.../transport/websocket/WebSocketUtilsTest.java | 2 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 2 +-
.../cxf/ws/addressing/impl/MAPAggregatorTest.java | 2 +-
.../apache/cxf/ws/policy/EffectivePolicyImpl.java | 2 +-
.../apache/cxf/ws/policy/EndpointPolicyImpl.java | 10 +--
.../apache/cxf/ws/policy/PolicyInInterceptor.java | 4 +-
.../PolicyInterceptorProviderRegistryImpl.java | 4 +-
.../apache/cxf/ws/policy/PolicyRegistryImpl.java | 2 +-
.../cxf/ws/policy/EffectivePolicyImplTest.java | 8 +--
.../cxf/ws/policy/EndpointPolicyImplTest.java | 2 +-
.../org/apache/cxf/ws/policy/PolicyEngineTest.java | 8 +--
.../PolicyInterceptorProviderRegistryImplTest.java | 8 +--
.../cxf/ws/policy/PolicyInterceptorsTest.java | 4 +-
.../java/org/apache/cxf/ws/rm/Destination.java | 2 +-
.../org/apache/cxf/ws/rm/DestinationSequence.java | 2 +-
.../main/java/org/apache/cxf/ws/rm/RMManager.java | 2 +-
.../src/main/java/org/apache/cxf/ws/rm/Source.java | 2 +-
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 2 +-
.../java/org/apache/cxf/wsdl11/SchemaUtil.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLManagerImpl.java | 4 +-
.../org/apache/cxf/wsdl11/WSDLServiceBuilder.java | 2 +-
.../systest/sts/batch/SimpleBatchSTSClient.java | 8 +--
.../apache/cxf/wsn/AbstractCreatePullPoint.java | 2 +-
.../apache/cxf/wsn/AbstractNotificationBroker.java | 4 +-
.../apache/cxf/systest/jaxb/MTOMBase64Test.java | 2 +-
.../java/org/apache/cxf/systest/jaxb/MTOMTest.java | 2 +-
.../org/apache/cxf/systest/jaxrs/BookServer.java | 6 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 2 +-
.../cxf/systest/jaxrs/CustomOutInterceptor.java | 2 +-
.../cxf/systest/jaxrs/JAXRSLocalTransportTest.java | 4 +-
.../cxf/systest/jaxrs/JAXRSMultipartTest.java | 22 +++---
.../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 2 +-
.../apache/cxf/systest/jaxrs/MultipartStore.java | 12 ++--
.../cxf/systest/jaxrs/jaxws/HelloWorldImpl.java | 2 +-
.../systest/jaxrs/jaxws/IntegerUserMapAdapter.java | 2 +-
.../security/oauth/MemoryOAuthDataProvider.java | 8 +--
.../security/oauth2/grants/JAXRSOAuth2Test.java | 2 +-
.../security/oauth2/tls/JAXRSOAuth2TlsTest.java | 2 +-
.../cxf/systest/http_undertow/websocket/Book.java | 2 +-
.../websocket/BookStorePerRequest.java | 2 +-
.../websocket/BookStoreWebSocket.java | 2 +-
.../apache/cxf/systest/http/HTTPConduitTest.java | 2 +-
.../systest/https/conduit/HTTPSConduitTest.java | 2 +-
.../apache/cxf/tools/common/model/JavaModel.java | 6 +-
.../org/apache/cxf/tools/util/ClassCollector.java | 2 +-
.../cxf/tools/corba/processors/idl/IDLLexer.java | 2 +-
.../tools/corba/processors/idl/WSDLASTVisitor.java | 2 +-
.../tools/corba/utils/TestWSDLCorbaWriterImpl.java | 18 ++---
.../processor/internal/jaxws/FaultBean.java | 2 +-
.../cxf/tools/wsdlto/WSDLToJavaContainer.java | 2 +-
.../apache/cxf/tools/wsdlto/core/PluginLoader.java | 6 +-
.../wsdlto/javascript/JavaScriptContainer.java | 2 +-
.../jaxws/processor/WSDLToJavaProcessor.java | 2 +-
.../processor/internal/ParameterProcessor.java | 2 +-
264 files changed, 554 insertions(+), 556 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/BusFactory.java b/core/src/main/java/org/apache/cxf/BusFactory.java
index 2790556..22a8f5d 100644
--- a/core/src/main/java/org/apache/cxf/BusFactory.java
+++ b/core/src/main/java/org/apache/cxf/BusFactory.java
@@ -74,7 +74,7 @@ public abstract class BusFactory {
volatile boolean stale;
}
- protected static final Map<Thread, BusHolder> THREAD_BUSSES = new WeakHashMap<Thread, BusHolder>();
+ protected static final Map<Thread, BusHolder> THREAD_BUSSES = new WeakHashMap<>();
protected static final ThreadLocal<BusHolder> THREAD_BUS = new ThreadLocal<>();
private static final Logger LOG = LogUtils.getL7dLogger(BusFactory.class);
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 5245447..785b583 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -344,7 +344,7 @@ public class AttachmentDeserializer {
private Map<String, List<String>> loadPartHeaders(InputStream in) throws IOException {
StringBuilder buffer = new StringBuilder(128);
StringBuilder b = new StringBuilder(128);
- Map<String, List<String>> heads = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> heads = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
// loop until we hit the end or a null line
while (readLine(in, b)) {
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
index df94235..1ca083f 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
@@ -261,7 +261,7 @@ public class AttachmentSerializer {
Map<String, List<String>> headers = null;
Iterator<String> it = a.getHeaderNames();
if (it.hasNext()) {
- headers = new LinkedHashMap<String, List<String>>();
+ headers = new LinkedHashMap<>();
while (it.hasNext()) {
String key = it.next();
headers.put(key, Collections.singletonList(a.getHeader(key)));
diff --git a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
index b70d3d9..fad1bfb 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
@@ -40,7 +40,7 @@ public class ContentDisposition {
private String value;
private String type;
- private Map<String, String> params = new LinkedHashMap<String, String>();
+ private Map<String, String> params = new LinkedHashMap<>();
public ContentDisposition(String value) {
this.value = value;
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
index f90567d..993d03b 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
@@ -46,7 +46,7 @@ public class ConfigurerImpl implements Configurer {
BlueprintContainer container;
private final Map<String, List<MatcherHolder>> wildCardBeanDefinitions
- = new TreeMap<String, List<MatcherHolder>>();
+ = new TreeMap<>();
static class MatcherHolder implements Comparable<MatcherHolder> {
Matcher matcher;
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java b/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
index 14d4ced..5cc2b50 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/NamespaceHandlerRegisterer.java
@@ -38,7 +38,7 @@ public final class NamespaceHandlerRegisterer {
try {
Object handler = factory.createNamespaceHandler();
for (String namespace : namespaces) {
- Dictionary<String, String> properties = new Hashtable<String, String>();
+ Dictionary<String, String> properties = new Hashtable<>();
properties.put("osgi.service.blueprint.namespace", namespace);
bc.registerService(NamespaceHandler.class.getName(), handler, properties);
LOG.fine("Registered blueprint namespace handler for " + namespace);
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index 50c1b0e..de67988 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -65,7 +65,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
protected String id;
private BusState state;
private final Collection<Feature> features = new CopyOnWriteArrayList<>();
- private final Map<String, Object> properties = new ConcurrentHashMap<String, Object>(16, 0.75f, 4);
+ private final Map<String, Object> properties = new ConcurrentHashMap<>(16, 0.75f, 4);
private final ExtensionManagerImpl extensionManager;
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index e45aecd..2e17a5c 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -51,7 +51,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
private final ClassLoader loader;
private ResourceManager resourceManager;
- private Map<String, Extension> all = new ConcurrentHashMap<String, Extension>();
+ private Map<String, Extension> all = new ConcurrentHashMap<>();
private List<Extension> ordered = new CopyOnWriteArrayList<>();
private final Map<Class<?>, Object> activated;
private final Bus bus;
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
index dcd583f..bc592c4 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentMap;
*/
public final class ExtensionRegistry {
private static ConcurrentMap<String, Extension> extensions
- = new ConcurrentHashMap<String, Extension>(16, 0.75f, 4);
+ = new ConcurrentHashMap<>(16, 0.75f, 4);
private ExtensionRegistry() {
//singleton
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
index 45578b7..002fb2c 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
@@ -52,10 +52,10 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
Bus bus;
public BindingFactoryManagerImpl() {
- bindingFactories = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
+ bindingFactories = new ConcurrentHashMap<>(8, 0.75f, 4);
}
public BindingFactoryManagerImpl(Bus b) {
- bindingFactories = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
+ bindingFactories = new ConcurrentHashMap<>(8, 0.75f, 4);
setBus(b);
}
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
index 6268773..e1a0433 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
@@ -49,10 +49,10 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
private Bus bus;
public ConduitInitiatorManagerImpl() {
- conduitInitiators = new ConcurrentHashMap<String, ConduitInitiator>(8, 0.75f, 4);
+ conduitInitiators = new ConcurrentHashMap<>(8, 0.75f, 4);
}
public ConduitInitiatorManagerImpl(Bus b) {
- conduitInitiators = new ConcurrentHashMap<String, ConduitInitiator>(8, 0.75f, 4);
+ conduitInitiators = new ConcurrentHashMap<>(8, 0.75f, 4);
setBus(b);
}
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
index 7aa6819..7122a5f 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
@@ -52,10 +52,10 @@ public final class DestinationFactoryManagerImpl implements DestinationFactoryMa
private Bus bus;
public DestinationFactoryManagerImpl() {
- destinationFactories = new ConcurrentHashMap<String, DestinationFactory>(8, 0.75f, 4);
+ destinationFactories = new ConcurrentHashMap<>(8, 0.75f, 4);
}
public DestinationFactoryManagerImpl(Bus b) {
- destinationFactories = new ConcurrentHashMap<String, DestinationFactory>(8, 0.75f, 4);
+ destinationFactories = new ConcurrentHashMap<>(8, 0.75f, 4);
setBus(b);
}
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
index ccb0fab..774cf1b 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
@@ -30,7 +30,7 @@ import org.apache.cxf.headers.HeaderProcessor;
@NoJSR250Annotations(unlessNull = "bus")
public class HeaderManagerImpl implements HeaderManager {
- Map<String, HeaderProcessor> processors = new ConcurrentHashMap<String, HeaderProcessor>(4, 0.75f, 2);
+ Map<String, HeaderProcessor> processors = new ConcurrentHashMap<>(4, 0.75f, 2);
Bus bus;
public HeaderManagerImpl() {
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
index ec3df12..149b768 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
@@ -49,7 +49,7 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
LogUtils.getL7dLogger(WorkQueueManagerImpl.class);
Map<String, AutomaticWorkQueue> namedQueues
- = new ConcurrentHashMap<String, AutomaticWorkQueue>(4, 0.75f, 2);
+ = new ConcurrentHashMap<>(4, 0.75f, 2);
boolean inShutdown;
InstrumentationManager imanager;
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
index 3b6ff67..6c5f989 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
@@ -45,7 +45,7 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener {
private static final Logger LOG = LogUtils.getL7dLogger(CXFActivator.class);
private long id;
private ConcurrentMap<Long, List<OSGiExtension>> extensions
- = new ConcurrentHashMap<Long, List<OSGiExtension>>(16, 0.75f, 4);
+ = new ConcurrentHashMap<>(16, 0.75f, 4);
public CXFExtensionBundleListener(long bundleId) {
this.id = bundleId;
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
index ce7e83c..725f51b 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
@@ -58,7 +58,7 @@ public class BusEntityResolver extends DelegatingEntityResolver {
try {
Properties mappings = PropertiesLoaderUtils.loadAllProperties("META-INF/spring.schemas",
classLoader);
- schemaMappings = new ConcurrentHashMap<String, String>(mappings.size());
+ schemaMappings = new ConcurrentHashMap<>(mappings.size());
CollectionUtils.mergePropertiesIntoMap(mappings, schemaMappings);
} catch (IOException e) {
//ignore
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
index 11e128d..3890e0f 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
@@ -267,7 +267,7 @@ public final class JAXBContextCache {
if (typeRefs == null || typeRefs.isEmpty()) {
if (cachedContextAndSchemasInternalMap == null) {
cachedContextAndSchemasInternalMap
- = new CacheMap<String, CachedContextAndSchemasInternal>();
+ = new CacheMap<>();
}
cachedContextAndSchemasInternalMap.put((defaultNs != null) ? defaultNs : "",
cachedContextAndSchemasInternal);
diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
index 007e379..9855311 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
@@ -365,7 +365,7 @@ public class ASMHelper {
}
public static class TypeHelperClassLoader extends ClassLoader {
- ConcurrentHashMap<String, Class<?>> defined = new ConcurrentHashMap<String, Class<?>>();
+ ConcurrentHashMap<String, Class<?>> defined = new ConcurrentHashMap<>();
TypeHelperClassLoader(ClassLoader parent) {
super(parent);
diff --git a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
index 4562fb77..17aeb80 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
@@ -44,8 +44,8 @@ import java.util.WeakHashMap;
* </b>
*/
public class CacheMap<K, V> implements Map<K, V> {
- Map<K, V> mainDataMap = new WeakHashMap<K, V>();
- Map<K, V> extraKeyMap = new WeakIdentityHashMap<K, V>();
+ Map<K, V> mainDataMap = new WeakHashMap<>();
+ Map<K, V> extraKeyMap = new WeakIdentityHashMap<>();
public CacheMap() {
diff --git a/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java b/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
index 6fafd5e..53ce7f0 100644
--- a/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
@@ -70,7 +70,7 @@ public class WeakIdentityHashMap<K, V> implements Map<K, V> {
public Set<Map.Entry<K, V>> entrySet() {
reap();
- Set<Map.Entry<K, V>> ret = new HashSet<Map.Entry<K, V>>();
+ Set<Map.Entry<K, V>> ret = new HashSet<>();
for (Map.Entry<IdentityWeakReference, V> ref : backingStore.entrySet()) {
final K key = ref.getKey().get();
if (key != null) {
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
index 8409fe3..cc13d7f 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
@@ -59,7 +59,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport
private Set<ApplicationContext> appContexts;
private final Map<String, List<MatcherHolder>> wildCardBeanDefinitions
- = new TreeMap<String, List<MatcherHolder>>();
+ = new TreeMap<>();
private BeanFactory beanFactory;
static class MatcherHolder implements Comparable<MatcherHolder> {
diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java
index 5d38e2d..7f023e8 100644
--- a/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java
@@ -33,13 +33,13 @@ public abstract class AbstractInterceptorProvidingDataBinding
extends AbstractDataBinding implements InterceptorProvider {
protected ModCountCopyOnWriteArrayList<Interceptor<? extends Message>> inInterceptors
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
protected ModCountCopyOnWriteArrayList<Interceptor<? extends Message>> outInterceptors
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
protected ModCountCopyOnWriteArrayList<Interceptor<? extends Message>> outFaultInterceptors
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
protected ModCountCopyOnWriteArrayList<Interceptor<? extends Message>> inFaultInterceptors
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
public AbstractInterceptorProvidingDataBinding() {
}
diff --git a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
index aef966f..ed4ed86 100644
--- a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
+++ b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
@@ -43,7 +43,7 @@ public class StaxDataBindingFeature extends AbstractFeature {
}
private void removeDatabindingInterceptor(List<Interceptor<? extends Message>> inInterceptors) {
- List<Interceptor<? extends Message>> remove = new LinkedList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> remove = new LinkedList<>();
for (Interceptor<? extends Message> i : inInterceptors) {
if (i instanceof AbstractInDatabindingInterceptor) {
remove.add(i);
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientCallback.java b/core/src/main/java/org/apache/cxf/endpoint/ClientCallback.java
index 061044c..ed35858 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientCallback.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientCallback.java
@@ -33,7 +33,7 @@ import org.apache.cxf.message.Message;
*
* The default behavior of this expects the following pattern:
* <ol>
- * <li>ClientCallback cb = new ClientCallback();</li>
+ * <li>ClientCallback cb = new ClientCallback();<>
* <li>client.invoke(cb, "someMethod", ....);</li>
* <li>cb.wait();</li>
* <li>// CXF calls notify on the callback object when the operation is complete.</li>
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index ee0abff..d3ceb22 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -96,7 +96,7 @@ public class ClientImpl
protected PhaseChainCache outboundChainCache = new PhaseChainCache();
protected PhaseChainCache inboundChainCache = new PhaseChainCache();
- protected Map<String, Object> currentRequestContext = new ConcurrentHashMap<String, Object>(8, 0.75f, 4);
+ protected Map<String, Object> currentRequestContext = new ConcurrentHashMap<>(8, 0.75f, 4);
protected Thread latestContextThread;
protected Map<Thread, EchoContext> requestContext
= Collections.synchronizedMap(new WeakHashMap<Thread, EchoContext>());
diff --git a/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java b/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
index a16ac7c..3950647 100644
--- a/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
@@ -35,9 +35,9 @@ public class RegistryImpl<K, T> implements Registry<K, T> {
protected RegistryImpl(Map<K, T> e) {
if (null == e) {
- e = new ConcurrentHashMap<K, T>(16, 0.75f, 4);
+ e = new ConcurrentHashMap<>(16, 0.75f, 4);
} else if (!(e instanceof ConcurrentHashMap)) {
- e = new ConcurrentHashMap<K, T>(e);
+ e = new ConcurrentHashMap<>(e);
}
entries = e;
}
diff --git a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
index a4befe2..c6edbac 100644
--- a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
+++ b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
@@ -44,7 +44,7 @@ public final class HttpHeaderHelper {
private static final String ISO88591 = Charset.forName("ISO-8859-1").name();
private static Map<String, String> internalHeaders = new HashMap<>();
- private static ConcurrentHashMap<String, String> encodings = new ConcurrentHashMap<String, String>();
+ private static ConcurrentHashMap<String, String> encodings = new ConcurrentHashMap<>();
private static Pattern charsetPattern = Pattern.compile("\"|'");
static {
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
index fb20cb4..c1bcac8 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
@@ -30,13 +30,13 @@ public abstract class AbstractAttributedInterceptorProvider extends ConcurrentHa
private static final long serialVersionUID = -1915876045710441978L;
private List<Interceptor<? extends Message>> in
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> out
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> outFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> inFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
public Object put(String s, Object o) {
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
index a0970b1..6473ef6 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
@@ -27,13 +27,13 @@ import org.apache.cxf.message.Message;
public abstract class AbstractBasicInterceptorProvider implements InterceptorProvider {
private List<Interceptor<? extends Message>> in
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> out
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> outFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> inFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
return outFault;
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
index 6f3bd1a..7966f58 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
@@ -124,7 +124,7 @@ public class AnnotationInterceptors {
if (i == null) {
return null;
}
- List<Interceptor<? extends Message>> m = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> m = new ArrayList<>();
for (Interceptor<?> i2 : i) {
m.add(i2);
}
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 fe92280..95cd4e8 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
@@ -47,7 +47,7 @@ public class SimpleMethodDispatcher
methodToOp.put(m, o);
Map<BindingInfo, BindingOperationInfo> biToBop
- = new ConcurrentHashMap<BindingInfo, BindingOperationInfo>(4, 0.75f, 2);
+ = new ConcurrentHashMap<>(4, 0.75f, 2);
infoMap.put(m, biToBop);
}
diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java b/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
index b5fb936..b9fc265 100644
--- a/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
+++ b/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
@@ -32,7 +32,7 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
protected QName mName;
private OperationInfo operation;
private Map<QName, MessagePartInfo> messageParts
- = new LinkedHashMap<QName, MessagePartInfo>(4);
+ = new LinkedHashMap<>(4);
private List<MessagePartInfo> outOfBandParts;
private String documentation;
diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
index 4a85df5..449d9bb 100644
--- a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
+++ b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
@@ -32,7 +32,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
private AbstractPropertiesHolder delegate;
private boolean delegateProperties;
- private AtomicReference<Map<String, Object>> propertyMap = new AtomicReference<Map<String, Object>>();
+ private AtomicReference<Map<String, Object>> propertyMap = new AtomicReference<>();
private AtomicReference<Object[]> extensors = new AtomicReference<>();
private Map<QName, Object> extensionAttributes;
private String documentation;
diff --git a/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java b/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java
index 3128cc5..8af2cf4 100644
--- a/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java
@@ -39,7 +39,7 @@ public class BindingInfo extends AbstractDescriptionElement implements NamedItem
final String bindingId;
Map<QName, BindingOperationInfo> operations
- = new ConcurrentHashMap<QName, BindingOperationInfo>(4, 0.75f, 2);
+ = new ConcurrentHashMap<>(4, 0.75f, 2);
public BindingInfo(ServiceInfo service, String bindingId) {
this.service = service;
diff --git a/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java b/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
index 2e9b865..e70a061 100644
--- a/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
@@ -62,7 +62,7 @@ public class BindingOperationInfo extends AbstractPropertiesHolder {
Collection<FaultInfo> of = opinfo.getFaults();
if (of != null && !of.isEmpty()) {
- faults = new ConcurrentHashMap<QName, BindingFaultInfo>(of.size(), 0.75f, 2);
+ faults = new ConcurrentHashMap<>(of.size(), 0.75f, 2);
for (FaultInfo fault : of) {
faults.put(fault.getFaultName(), new BindingFaultInfo(fault, this));
}
diff --git a/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java b/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
index 6dc7bbf..d3a7178 100644
--- a/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
@@ -36,7 +36,7 @@ public class InterfaceInfo extends AbstractDescriptionElement implements NamedIt
QName name;
ServiceInfo service;
- Map<QName, OperationInfo> operations = new ConcurrentHashMap<QName, OperationInfo>(4, 0.75f, 2);
+ Map<QName, OperationInfo> operations = new ConcurrentHashMap<>(4, 0.75f, 2);
public InterfaceInfo(ServiceInfo info, QName q) {
name = q;
diff --git a/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java b/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
index 69aa5f3..89bed6e 100644
--- a/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
@@ -159,7 +159,7 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
*/
public synchronized void addFault(FaultInfo fault) {
if (faults == null) {
- faults = new ConcurrentHashMap<QName, FaultInfo>(4, 0.75f, 2);
+ faults = new ConcurrentHashMap<>(4, 0.75f, 2);
}
faults.put(fault.getFaultName(), fault);
}
diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java b/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
index 16c6ef0..7f1d66d 100644
--- a/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
@@ -137,7 +137,7 @@ public class ServiceInfo extends AbstractDescriptionElement implements NamedItem
}
private void initMessagesMap() {
- messages = new ConcurrentHashMap<QName, MessageInfo>(16, 0.75f, 2);
+ messages = new ConcurrentHashMap<>(16, 0.75f, 2);
for (OperationInfo operation : getInterface().getOperations()) {
if (operation.getInput() != null) {
messages.put(operation.getInput().getName(), operation.getInput());
diff --git a/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
index ba683e2..c07d3bd 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
@@ -34,7 +34,7 @@ import javax.xml.stream.XMLStreamReader;
public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
protected int currentEvent = XMLStreamConstants.START_DOCUMENT;
- private FastStack<ElementFrame<T, I>> frames = new FastStack<ElementFrame<T, I>>();
+ private FastStack<ElementFrame<T, I>> frames = new FastStack<>();
private ElementFrame<T, I> frame;
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
index 39a82ee..6734441 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
@@ -39,7 +39,7 @@ import org.apache.cxf.common.util.StringUtils;
public class StreamWriterContentHandler implements ContentHandler, LexicalHandler {
XMLStreamWriter writer;
- Map<String, String> mapping = new LinkedHashMap<String, String>();
+ Map<String, String> mapping = new LinkedHashMap<>();
boolean inCDATA;
public StreamWriterContentHandler(XMLStreamWriter w) {
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java b/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
index 45a5deb..a0f3e2b 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
@@ -37,8 +37,8 @@ public class DelegatingNamespaceContext implements NamespaceContext {
public DelegatingNamespaceContext(NamespaceContext nc, Map<String, String> nsMap) {
this.nc = nc;
this.nsMap = nsMap;
- namespaces = new LinkedList<Map<String, String>>();
- prefixes = new LinkedList<Map<String, String>>();
+ namespaces = new LinkedList<>();
+ prefixes = new LinkedList<>();
}
public void down() {
diff --git a/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java b/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
index 4693846..611852b 100644
--- a/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
+++ b/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
@@ -48,9 +48,9 @@ public class MultipleEndpointObserver implements MessageObserver {
protected Bus bus;
protected List<Interceptor<? extends Message>> bindingInterceptors
- = new CopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new CopyOnWriteArrayList<>();
protected List<Interceptor<? extends Message>> routingInterceptors
- = new CopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new CopyOnWriteArrayList<>();
private Set<Endpoint> endpoints = new CopyOnWriteArraySet<>();
private ClassLoader loader;
diff --git a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
index f4303df..555a306 100644
--- a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
@@ -326,7 +326,7 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
Map<String, List<String>> protocolHeaders = CastUtils.cast((Map<?, ?>)message
.get(Message.PROTOCOL_HEADERS));
if (protocolHeaders == null) {
- protocolHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ protocolHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
message.put(Message.PROTOCOL_HEADERS, protocolHeaders);
}
List<String> header = CastUtils.cast((List<?>)protocolHeaders.get(name));
diff --git a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
index 2ec50a8..ef1578f 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
@@ -614,7 +614,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
}
public Dictionary<String, String> getProperties() {
- Dictionary<String, String> properties = new Hashtable<String, String>();
+ Dictionary<String, String> properties = new Hashtable<>();
NumberFormat nf = NumberFormat.getIntegerInstance();
properties.put("name", nf.format(getName()));
properties.put("highWaterMark", nf.format(getHighWaterMark()));
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
index 866f081..a1dfb97 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
@@ -254,7 +254,7 @@ public final class EndpointReferenceUtils {
private static final Set<Class<?>> ADDRESSING_CLASSES = new HashSet<>();
private static final AtomicReference<Reference<JAXBContext>> ADDRESSING_CONTEXT
- = new AtomicReference<Reference<JAXBContext>>(new SoftReference<JAXBContext>(null));
+ = new AtomicReference<>(new SoftReference<JAXBContext>(null));
static {
ADDRESSING_CLASSES.add(WSA_WSDL_OBJECT_FACTORY.getClass());
ADDRESSING_CLASSES.add(org.apache.cxf.ws.addressing.ObjectFactory.class);
@@ -560,8 +560,8 @@ public final class EndpointReferenceUtils {
Schema schema = serviceInfo.getProperty(Schema.class.getName(), Schema.class);
if (schema == null) {
SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Map<String, byte[]> schemaSourcesMap = new LinkedHashMap<String, byte[]>();
- Map<String, Source> schemaSourcesMap2 = new LinkedHashMap<String, Source>();
+ Map<String, byte[]> schemaSourcesMap = new LinkedHashMap<>();
+ Map<String, Source> schemaSourcesMap2 = new LinkedHashMap<>();
XMLStreamWriter writer = null;
try {
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index c6ba10d..926dd01 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -42,7 +42,7 @@ public class AnnotationProcessorTest extends Assert {
AnnotatedGreeterImpl greeterImpl = new AnnotatedGreeterImpl();
AnnotationProcessor processor = new AnnotationProcessor(greeterImpl);
- List<Class<? extends Annotation>> expectedAnnotations = new ArrayList<Class<? extends Annotation>>();
+ List<Class<? extends Annotation>> expectedAnnotations = new ArrayList<>();
AnnotationVisitor visitor = EasyMock.createMock(AnnotationVisitor.class);
diff --git a/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
index 62cc4c5..a28576c 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CacheMapTest.java
@@ -32,7 +32,7 @@ public class CacheMapTest {
@Test
public void testRemove() {
- Map<Object, Object> definitions = new CacheMap<Object, Object>();
+ Map<Object, Object> definitions = new CacheMap<>();
Object putValue = new Object();
diff --git a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
index 6b1d461..846418f 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
@@ -66,7 +66,7 @@ public class OutgoingChainInterceptorTest extends Assert {
phases = new ArrayList<>();
phases.add(new Phase(Phase.SEND, 1000));
- empty = new ArrayList<Interceptor<? extends Message>>();
+ empty = new ArrayList<>();
bus = control.createMock(Bus.class);
PhaseManager pm = new PhaseManagerImpl();
diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
index c23dfb9..4b8ce35 100644
--- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
@@ -131,7 +131,7 @@ public class GZIPAcceptEncodingTest extends Assert {
private void setAcceptEncoding(String enc) {
Map<String, List<String>> protocolHeaders
- = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
protocolHeaders.put(HttpHeaderHelper.getHeaderKey(HttpHeaderHelper.ACCEPT_ENCODING), Collections
.singletonList(enc));
inMessage.put(Message.PROTOCOL_HEADERS, protocolHeaders);
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
index 56be9aa..f78a631 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
@@ -43,7 +43,7 @@ public final class Client {
System.out.print("Invoking createAccount for Mr. John... ");
- javax.xml.ws.Holder<Account> account = new javax.xml.ws.Holder<Account>(new Account());
+ javax.xml.ws.Holder<Account> account = new javax.xml.ws.Holder<>(new Account());
try {
if (port.createAccount("John", account)) {
System.out.println("success");
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorldImpl.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorldImpl.java
index 47a4226..a325eb4 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorldImpl.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorldImpl.java
@@ -27,7 +27,7 @@ import javax.jws.WebService;
@WebService(endpointInterface = "demo.hw.server.HelloWorld",
serviceName = "HelloWorld")
public class HelloWorldImpl implements HelloWorld {
- Map<Integer, User> users = new LinkedHashMap<Integer, User>();
+ Map<Integer, User> users = new LinkedHashMap<>();
public String sayHi(String text) {
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
index 9f02674..ea77c93 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
@@ -38,7 +38,7 @@ public class IntegerUserMapAdapter extends XmlAdapter<IntegerUserMap, Map<Intege
}
public Map<Integer, User> unmarshal(IntegerUserMap v) throws Exception {
- Map<Integer, User> map = new LinkedHashMap<Integer, User>();
+ Map<Integer, User> map = new LinkedHashMap<>();
for (IntegerUserMap.IntegerUserEntry e : v.getEntries()) {
map.put(e.getId(), e.getUser());
}
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
index ceff7f6..f662227 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/Activator.java
@@ -51,7 +51,7 @@ public class Activator implements BundleActivator {
public Object addingService(ServiceReference serviceReference) {
try {
HttpService service = (HttpService)_context.getService(serviceReference);
- Dictionary<String, String> initParams = new Hashtable<String, String>();
+ Dictionary<String, String> initParams = new Hashtable<>();
initParams.put("javax.ws.rs.Application", SampleApplication.class.getName());
service.registerServlet(_path, new SampleServlet(), initParams, null);
return service;
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 7da40ab..2728ce8 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
@@ -62,13 +62,13 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
Collections.singletonList("ROLE_ADMIN")));
}
- protected ConcurrentHashMap<String, Client> clientAuthInfo = new ConcurrentHashMap<String, Client>();
+ protected ConcurrentHashMap<String, Client> clientAuthInfo = new ConcurrentHashMap<>();
- protected MetadataMap<String, String> userRegisteredClients = new MetadataMap<String, String>();
+ protected MetadataMap<String, String> userRegisteredClients = new MetadataMap<>();
- protected MetadataMap<String, String> userAuthorizedClients = new MetadataMap<String, String>();
+ protected MetadataMap<String, String> userAuthorizedClients = new MetadataMap<>();
- protected ConcurrentHashMap<String, Token> oauthTokens = new ConcurrentHashMap<String, Token>();
+ protected ConcurrentHashMap<String, Token> oauthTokens = new ConcurrentHashMap<>();
protected MD5SequenceGenerator tokenGenerator = new MD5SequenceGenerator();
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
index 696110a..34e91d5 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
@@ -389,7 +389,7 @@ public class Java2WADLMojo extends AbstractMojo {
}
if (resourceClasses.isEmpty() && basePackages != null) {
try {
- List<Class<? extends Annotation>> anns = new ArrayList<Class<? extends Annotation>>();
+ List<Class<? extends Annotation>> anns = new ArrayList<>();
anns.add(Path.class);
final Map< Class< ? extends Annotation >, Collection< Class< ? > > > discoveredClasses =
ClasspathScanner.findClasses(ClasspathScanner.parsePackages(basePackages),
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
index def033c..01582d0 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
@@ -167,7 +167,7 @@ public class ColocMessageObserver extends ChainInitiationObserver {
}
protected List<Interceptor<? extends Message>> addColocInterceptors() {
- List<Interceptor<? extends Message>> list = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> list = new ArrayList<>();
list.add(new ColocInInterceptor());
return list;
}
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
index 78c1b53..c0434dc 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
@@ -111,7 +111,7 @@ public class CorbaBindingFactory extends AbstractWSDLBindingFactory
}
public Set<String> getUriPrefixes() {
- Set<String> uriPrefixes = new java.util.HashSet<String>();
+ Set<String> uriPrefixes = new java.util.HashSet<>();
uriPrefixes.add("IOR");
uriPrefixes.add("ior");
uriPrefixes.add("file");
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 6a0d263..2c40ac9 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
@@ -305,7 +305,7 @@ public final class CorbaUtils {
seenTypes.push(new QName(unionType.getName()));
TypeCode discTC = getTypeCode(orb, unionType.getDiscriminator(), typeMap, seenTypes);
- Map<String, UnionMember> members = new LinkedHashMap<String, UnionMember>();
+ Map<String, UnionMember> members = new LinkedHashMap<>();
List<Unionbranch> branches = unionType.getUnionbranch();
for (Iterator<Unionbranch> branchIter = branches.iterator(); branchIter.hasNext();) {
Unionbranch branch = branchIter.next();
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
index d4be2d5..b6e1e1b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
@@ -114,7 +114,7 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
String action = getSoapAction(message, boi);
if (message.getVersion() instanceof Soap11) {
- Map<String, List<String>> tempReqHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> tempReqHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
Map<String, List<String>> reqHeaders
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (reqHeaders != null) {
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
index ef4378c..1cfaa23 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
@@ -47,7 +47,7 @@ public class TibcoSoapActionInterceptor extends AbstractPhaseInterceptor<SoapMes
//need to flip to a case sensitive map. The default
//is a case insensitive map, but in this case, we need
//to use a case sensitive map to make sure both versions go out
- headers = new TreeMap<String, Object>(headers);
+ headers = new TreeMap<>(headers);
soapMessage.put(Message.PROTOCOL_HEADERS, headers);
headers.put(SOAPACTION_TIBCO, headers.get(SoapBindingConstants.SOAP_ACTION));
}
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
index b56387b..6f3a50d 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
@@ -86,8 +86,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
private static final String BODY_FILLED_IN = SAAJInInterceptor.class.getName() + ".BODY_DONE";
private SAAJPreInInterceptor preInterceptor = SAAJPreInInterceptor.INSTANCE;
- private List<PhaseInterceptor<? extends Message>> extras
- = new ArrayList<PhaseInterceptor<? extends Message>>(1);
+ private List<PhaseInterceptor<? extends Message>> extras = new ArrayList<>(1);
public SAAJInInterceptor() {
super(Phase.PRE_PROTOCOL);
extras.add(preInterceptor);
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index a18af63..d786d56 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -173,8 +173,8 @@ public class SoapActionInInterceptorTest extends Assert {
private SoapMessage setUpMessage(String contentType, SoapVersion version, String prop) {
SoapMessage message = control.createMock(SoapMessage.class);
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
- Map<String, List<String>> partHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> partHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
if (version instanceof Soap11 && prop != null) {
headers.put("SOAPAction", Collections.singletonList(prop));
} else if (version instanceof Soap12 && prop != null) {
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
index 5fcf2c0..40553ae 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
@@ -129,13 +129,13 @@ public class MapType extends AegisType {
if (cls.equals(Map.class)) {
map = new HashMap<>();
} else if (cls.equals(Hashtable.class)) {
- map = new Hashtable<Object, Object>();
+ map = new Hashtable<>();
} else if (cls.equals(ConcurrentMap.class)) {
- map = new ConcurrentHashMap<Object, Object>();
+ map = new ConcurrentHashMap<>();
} else if (cls.equals(ConcurrentNavigableMap.class)) {
- map = new ConcurrentSkipListMap<Object, Object>();
+ map = new ConcurrentSkipListMap<>();
} else if (cls.equals(SortedMap.class) || cls.equals(NavigableMap.class)) {
- map = new TreeMap<Object, Object>();
+ map = new TreeMap<>();
} else if (cls.isInterface()) {
map = new HashMap<>();
} else {
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java
index c1d8bd9..6d03be7 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java
@@ -36,14 +36,14 @@ public class MarshalRegistry implements Iterable<Object> {
* All objects instances with ids. It is CRITICAL that is be an IdentityHashMap to assure we don't
* exclude instances that are equivilant but different instances.
*/
- private final Map<Object, String> instances = new IdentityHashMap<Object, String>();
+ private final Map<Object, String> instances = new IdentityHashMap<>();
/**
* The objects not yet marshaled. The is maintained as a map for debugging purposes. It is IMPORTANT
* that this be a LinkedHashMap so we write the objects in the order they were discovered in the object
* graphs (and writes them in numeric order).
*/
- private final Map<String, Object> notMarshalled = new LinkedHashMap<String, Object>();
+ private final Map<String, Object> notMarshalled = new LinkedHashMap<>();
/**
* The next id.
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java
index 84bfe16..d0a59f7 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java
@@ -42,12 +42,12 @@ public class SoapRefRegistry {
/**
* The unmarshaled object instances by id.
*/
- private final SortedMap<String, Object> instances = new TreeMap<String, Object>();
+ private final SortedMap<String, Object> instances = new TreeMap<>();
/**
* The unresolved SOAP references by referenced id.
*/
- private final SortedMap<String, List<SoapRef>> unresolvedRefs = new TreeMap<String, List<SoapRef>>();
+ private final SortedMap<String, List<SoapRef>> unresolvedRefs = new TreeMap<>();
/**
* Get the SoapRefRegistry stored in the context, and if necessary create a new one.
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
index 166ab36..9ceee96 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java
@@ -47,8 +47,7 @@ public class JDOMStreamReader extends AbstractDOMStreamReader<Element, Integer>
private Content content;
- private FastStack<Map<String, Namespace>> namespaceStack
- = new FastStack<Map<String, Namespace>>();
+ private FastStack<Map<String, Namespace>> namespaceStack = new FastStack<>();
private List<Namespace> namespaces = new ArrayList<>();
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
index 0e90dac..bd9601f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
@@ -172,7 +172,7 @@ public class StructTypeTest extends AbstractEncodedTest {
private void validatePurchaseOrder(Element element) throws Exception {
Element poRefElement = null;
- Map<String, Element> blocks = new TreeMap<String, Element>();
+ Map<String, Element> blocks = new TreeMap<>();
for (Node n = element.getFirstChild(); n != null; n = n.getNextSibling()) {
if (n instanceof Element) {
Element child = (Element) n;
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index 243fe9d..012dced 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -200,7 +200,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
Class<?> cls;
private Map<String, Object> contextProperties = new HashMap<>();
- private List<XmlAdapter<?, ?>> adapters = new ArrayList<XmlAdapter<?, ?>>();
+ private List<XmlAdapter<?, ?>> adapters = new ArrayList<>();
private Map<String, Object> marshallerProperties = new HashMap<>();
private Map<String, Object> unmarshallerProperties = new HashMap<>();
private Unmarshaller.Listener unmarshallerListener;
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index f8a25ab..3030423 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -958,7 +958,7 @@ public final class JAXBEncoderDecoder {
//anyway.
NamespaceContext c = source.getNamespaceContext();
- final Map<String, String> nsMap = new TreeMap<String, String>();
+ final Map<String, String> nsMap = new TreeMap<>();
try {
if (c instanceof W3CNamespaceContext) {
Element element = ((W3CNamespaceContext)c).getElement();
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
index 2252a8d..c8b690e 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
@@ -52,7 +52,7 @@ public class ThrottlingResponseInterceptor extends AbstractPhaseInterceptor<Mess
Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers == null) {
- headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
message.put(Message.PROTOCOL_HEADERS, headers);
}
for (Map.Entry<String, String> e : rsp.getResponseHeaders().entrySet()) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index aa73e64..1451a25 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -370,7 +370,7 @@ public class JAXRSInvoker extends AbstractInvoker {
@SuppressWarnings("unchecked")
protected MultivaluedMap<String, String> getTemplateValues(Message msg) {
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
MultivaluedMap<String, String> oldValues =
(MultivaluedMap<String, String>)msg.get(URITemplate.TEMPLATE_PARAMETERS);
if (oldValues != null) {
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 c17580f..d406bb0 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
@@ -218,7 +218,7 @@ public class MessageContextImpl implements MessageContext {
Attachment root = (Attachment)handlers.get(0);
String rootContentType = root.getContentType().toString();
- MultivaluedMap<String, String> rootHeaders = new MetadataMap<String, String>(root.getHeaders());
+ MultivaluedMap<String, String> rootHeaders = new MetadataMap<>(root.getHeaders());
if (!AttachmentUtil.isMtomEnabled(outMessage)) {
rootHeaders.putSingle(Message.CONTENT_TYPE, rootContentType);
}
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 dc0b719..878ea42 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
@@ -71,7 +71,7 @@ public class Attachment implements Transferable {
public Attachment(String id, DataHandler dh, MultivaluedMap<String, String> headers) {
handler = dh;
- this.headers = new MetadataMap<String, String>(headers, false, true);
+ this.headers = new MetadataMap<>(headers, false, true);
this.headers.putSingle("Content-ID", id);
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
index f9cecdd..9273119 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
@@ -217,7 +217,7 @@ public class XMLSource {
* @return the xml:base value
*/
public URI getBaseURI() {
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("xml", XML_NAMESPACE);
return getLink("/*/@xml:base", map);
}
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 f486854..68c8365 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
@@ -41,7 +41,7 @@ public class ConfigurationImpl implements Configuration {
private RuntimeType runtimeType;
private Map<Object, Map<Class<?>, Integer>> providers =
new LinkedHashMap<Object, Map<Class<?>, Integer>>();
- private Map<Feature, Boolean> features = new LinkedHashMap<Feature, Boolean>();
+ private Map<Feature, Boolean> features = new LinkedHashMap<>();
public ConfigurationImpl(RuntimeType rt) {
this.runtimeType = rt;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
index 119b891..7b7eea6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
@@ -83,7 +83,7 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
Map<String, String[]> map1 = super.getParameterMap();
if (isPostFormRequest) {
readFromParamsIfNeeded();
- Map<String, String[]> map2 = new LinkedHashMap<String, String[]>();
+ Map<String, String[]> map2 = new LinkedHashMap<>();
map2.putAll(map1);
for (Map.Entry<String, List<String>> e : formParams.entrySet()) {
map2.put(e.getKey(), e.getValue().toArray(new String[]{}));
@@ -117,7 +117,7 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
if (m.containsKey(FormUtils.FORM_PARAM_MAP)) {
formParams = (MultivaluedMap<String, String>)m.get(FormUtils.FORM_PARAM_MAP);
} else {
- formParams = new MetadataMap<String, String>();
+ formParams = new MetadataMap<>();
MediaType mt = JAXRSUtils.toMediaType((String)m.get(Message.CONTENT_TYPE));
String enc = HttpUtils.getEncoding(mt, StandardCharsets.UTF_8.name());
String body = FormUtils.readBody(m.getContent(InputStream.class), enc);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 2cc524b..e05ec06 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -47,7 +47,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
private static final Pattern COMPLEX_PARAMETERS =
Pattern.compile("(([\\w-]+=\"[^\"]*\")|([\\w-]+=[\\w-/\\+]+))");
- private static Map<String, MediaType> map = new ConcurrentHashMap<String, MediaType>();
+ private static Map<String, MediaType> map = new ConcurrentHashMap<>();
private static final int MAX_MT_CACHE_SIZE =
SystemPropertyAction.getInteger("org.apache.cxf.jaxrs.max_mediatype_cache_size", 200);
@@ -94,7 +94,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
Map<String, String> parameters = Collections.emptyMap();
if (paramsStart != -1) {
- parameters = new LinkedHashMap<String, String>();
+ parameters = new LinkedHashMap<>();
String paramString = mType.substring(paramsStart + 1);
if (paramString.contains("\"")) {
@@ -161,7 +161,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
boolean mTypeNextEmpty = StringUtils.isEmpty(mTypeNext);
if (mTypeNextEmpty || mTypeNext.startsWith(";")) {
if (!mTypeNextEmpty) {
- Map<String, String> parameters = new LinkedHashMap<String, String>();
+ Map<String, String> parameters = new LinkedHashMap<>();
StringTokenizer st = new StringTokenizer(mType.substring(2).trim(), ";");
while (st.hasMoreTokens()) {
addParameter(parameters, st.nextToken());
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
index f10734a..03283b2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
@@ -39,11 +39,11 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
private Map<K, List<V>> m;
public MetadataMap() {
- this.m = new LinkedHashMap<K, List<V>>();
+ this.m = new LinkedHashMap<>();
}
public MetadataMap(int size) {
- this.m = new LinkedHashMap<K, List<V>>(size);
+ this.m = new LinkedHashMap<>(size);
}
public MetadataMap(Map<K, List<V>> store) {
@@ -68,7 +68,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
boolean readOnly, boolean caseInsensitive) {
if (copyStore) {
- this.m = new LinkedHashMap<K, List<V>>();
+ this.m = new LinkedHashMap<>();
if (store != null) {
for (Map.Entry<K, List<V>> entry : store.entrySet()) {
List<V> values = new ArrayList<>(entry.getValue());
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 7edee82..e9be8b3 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
@@ -48,7 +48,7 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
private String reasonPhrase;
private boolean statusSet;
private Object entity;
- private MultivaluedMap<String, Object> metadata = new MetadataMap<String, Object>();
+ private MultivaluedMap<String, Object> metadata = new MetadataMap<>();
private Annotation[] annotations;
public ResponseBuilderImpl() {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index 39bf577..3e4864f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -151,7 +151,7 @@ public final class ResponseImpl extends Response {
}
public MultivaluedMap<String, String> getStringHeaders() {
- MetadataMap<String, String> headers = new MetadataMap<String, String>(metadata.size());
+ MetadataMap<String, String> headers = new MetadataMap<>(metadata.size());
for (Map.Entry<String, List<Object>> entry : metadata.entrySet()) {
String headerName = entry.getKey();
headers.put(headerName, toListOfStrings(headerName, entry.getValue()));
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index c373b46..e17d916 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -55,8 +55,8 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
private boolean leadingSlash;
private String fragment;
private String schemeSpecificPart;
- private MultivaluedMap<String, String> query = new MetadataMap<String, String>();
- private MultivaluedMap<String, String> matrix = new MetadataMap<String, String>();
+ private MultivaluedMap<String, String> query = new MetadataMap<>();
+ private MultivaluedMap<String, String> matrix = new MetadataMap<>();
private Map<String, Object> resolvedTemplates;
private Map<String, Object> resolvedTemplatesPathEnc;
@@ -351,7 +351,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
Set<String> pathEncodeVars = alreadyResolvedTsPathEnc.isEmpty() && !encodePathSlash
? Collections.<String>emptySet() : new HashSet<>();
- Map<String, Object> theMap = new LinkedHashMap<String, Object>();
+ Map<String, Object> theMap = new LinkedHashMap<>();
for (String var : uniqueVars) {
boolean isPathEncVar = !isQuery && alreadyResolvedTsPathEnc.containsKey(var);
@@ -420,8 +420,8 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
builder.host = host;
builder.paths = new ArrayList<>(paths);
builder.fragment = fragment;
- builder.query = new MetadataMap<String, String>(query);
- builder.matrix = new MetadataMap<String, String>(matrix);
+ builder.query = new MetadataMap<>(query);
+ builder.matrix = new MetadataMap<>(matrix);
builder.schemeSpecificPart = schemeSpecificPart;
builder.leadingSlash = leadingSlash;
builder.originalPathEmpty = originalPathEmpty;
@@ -1009,7 +1009,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
throw new IllegalArgumentException();
}
if (map == null) {
- map = new LinkedHashMap<String, Object>();
+ map = new LinkedHashMap<>();
}
for (Map.Entry<String, Object> entry : values.entrySet()) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
index 286f6b1..1871895 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
@@ -139,7 +139,7 @@ public class UriInfoImpl implements UriInfo {
}
public MultivaluedMap<String, String> getPathParameters(boolean decode) {
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
if (templateParams == null) {
return values;
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index ae42a2e..dac6f10 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -173,7 +173,7 @@ public class JAXRSInInterceptor extends AbstractPhaseInterceptor<Message> {
throw ExceptionUtils.toNotFoundException(null, resp);
}
- MultivaluedMap<String, String> matchedValues = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> matchedValues = new MetadataMap<>();
OperationResourceInfo ori = null;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
index 86e9888..3a66ca4 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
@@ -350,7 +350,7 @@ public abstract class AbstractResourceInfo {
V proxy) {
Map<T, V> proxies = proxyMap.get(serviceClass);
if (proxies == null) {
- proxies = new ConcurrentHashMap<T, V>();
+ proxies = new ConcurrentHashMap<>();
proxyMap.put(serviceClass, proxies);
}
if (!proxies.containsKey(f)) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
index 3512e43..b14f15c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
@@ -52,7 +52,7 @@ public class ClassResourceInfo extends BeanResourceInfo {
private MethodDispatcher methodDispatcher;
private ResourceProvider resourceProvider;
private ConcurrentHashMap<SubresourceKey, ClassResourceInfo> subResources
- = new ConcurrentHashMap<SubresourceKey, ClassResourceInfo>();
+ = new ConcurrentHashMap<>();
private boolean enableStatic;
private boolean createdFromModel;
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 a2d2128..1036b7f 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
@@ -30,7 +30,7 @@ public class MethodDispatcher {
new LinkedHashMap<OperationResourceInfo, Method>();
private Map<Method, OperationResourceInfo> methodToOri =
new LinkedHashMap<Method, OperationResourceInfo>();
- private ConcurrentHashMap<Method, Method> proxyMethodMap = new ConcurrentHashMap<Method, Method>();
+ private ConcurrentHashMap<Method, Method> proxyMethodMap = new ConcurrentHashMap<>();
public MethodDispatcher() {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index 691be86..c2a8210 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -155,7 +155,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
return getAttachmentCollection(t, infos, anns);
}
if (c.isAssignableFrom(Map.class)) {
- Map<String, Object> map = new LinkedHashMap<String, Object>(infos.size());
+ Map<String, Object> map = new LinkedHashMap<>(infos.size());
Class<?> actual = getActualType(t, 1);
for (Attachment a : infos) {
map.put(a.getContentType().toString(), fromAttachment(a, actual, actual, anns));
@@ -365,7 +365,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
dh = getHandlerForObject(obj, cls, genericType, anns, mimeType, id);
}
String contentId = getContentId(anns, id);
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.putSingle("Content-Type", mimeType);
return new Attachment(contentId, dh, headers);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
index 83d8ed4..b2476b1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
@@ -42,10 +42,10 @@ public class ProviderCache {
} }).intValue();
private final Map<String, List<ProviderInfo<MessageBodyReader<?>>>>
- readerProviderCache = new ConcurrentHashMap<String, List<ProviderInfo<MessageBodyReader<?>>>>();
+ readerProviderCache = new ConcurrentHashMap<>();
private final Map<String, List<ProviderInfo<MessageBodyWriter<?>>>>
- writerProviderCache = new ConcurrentHashMap<String, List<ProviderInfo<MessageBodyWriter<?>>>>();
+ writerProviderCache = new ConcurrentHashMap<>();
private boolean checkAllCandidates;
public ProviderCache(boolean checkAllCandidates) {
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 bddc5ed..87f3a79 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
@@ -230,7 +230,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
return;
}
String[] values = StringUtils.split(value, splitChar);
- List<Interceptor<? extends Message>> list = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> list = new ArrayList<>();
for (String interceptorVal : values) {
Map<String, List<String>> props = new HashMap<>();
String theValue = getClassNameAndProperties(interceptorVal, props);
@@ -319,7 +319,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
return Collections.< Feature >emptyList();
}
String[] classNames = StringUtils.split(featuresList, splitChar);
- List< Feature > features = new ArrayList< Feature >();
+ List< Feature > features = new ArrayList<>();
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/spring/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index d6954df..661af93 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -266,7 +266,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends AbstractBeanDefiniti
Collection<Class<?>> classes,
Class<? extends Annotation> serviceClassAnnotation) {
AutowireCapableBeanFactory beanFactory = context.getAutowireCapableBeanFactory();
- final List< Object > providers = new ArrayList< Object >();
+ final List< Object > providers = new ArrayList<>();
for (final Class< ? > clazz: classes) {
if (serviceClassAnnotation != null && clazz.getAnnotation(serviceClassAnnotation) == null) {
continue;
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AccumulatingIntersector.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AccumulatingIntersector.java
index fb7c910..34bf7e5 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AccumulatingIntersector.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AccumulatingIntersector.java
@@ -47,7 +47,7 @@ public class AccumulatingIntersector implements MimeTypesIntersector {
Map<String, String> parameters = userType.getParameters();
if (addRequiredParamsIfPossible) {
- parameters = new LinkedHashMap<String, String>(parameters);
+ parameters = new LinkedHashMap<>(parameters);
for (Map.Entry<String, String> entry : requiredType.getParameters().entrySet()) {
if (!parameters.containsKey(entry.getKey())) {
parameters.put(entry.getKey(), entry.getValue());
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 77e4d07..7d3f47d 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
@@ -643,7 +643,7 @@ public final class InjectionUtils {
MultivaluedMap<String, String> value = parsedValues.get(beanKey);
if (value == null) {
- value = new MetadataMap<String, String>();
+ value = new MetadataMap<>();
parsedValues.put(beanKey, value);
}
value.put(memberKey, entry.getValue());
@@ -760,7 +760,7 @@ public final class InjectionUtils {
Type secondType = InjectionUtils.getType(paramType.getActualTypeArguments(), 1);
if (secondType instanceof ParameterizedType) {
- MultivaluedMap<Object, Object> theValues = new MetadataMap<Object, Object>();
+ MultivaluedMap<Object, Object> theValues = new MetadataMap<>();
ParameterizedType valueParamType = (ParameterizedType) secondType;
Class<?> valueType = (Class<?>) InjectionUtils.getType(valueParamType
.getActualTypeArguments(), 0);
@@ -868,7 +868,7 @@ public final class InjectionUtils {
MultivaluedMap<String, String> splitValues =
(idx < valuesList.size()) ? valuesList.get(idx) : null;
if (splitValues == null) {
- splitValues = new MetadataMap<String, String>();
+ splitValues = new MetadataMap<>();
valuesList.add(splitValues);
}
splitValues.add(memberKey, value);
@@ -1031,7 +1031,7 @@ public final class InjectionUtils {
Object value = null;
if (InjectionUtils.isSupportedCollectionOrArray(paramType)) {
- MultivaluedMap<String, String> paramValuesMap = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> paramValuesMap = new MetadataMap<>();
paramValuesMap.put("", paramValues);
value = InjectionUtils.injectIntoCollectionOrArray(paramType, genericType, paramAnns,
paramValuesMap, false, decoded, pathParam, message);
@@ -1261,7 +1261,7 @@ public final class InjectionUtils {
}
public static MultivaluedMap<String, Object> extractValuesFromBean(Object bean, String baseName) {
- MultivaluedMap<String, Object> values = new MetadataMap<String, Object>();
+ MultivaluedMap<String, Object> values = new MetadataMap<>();
fillInValuesFromBean(bean, baseName, values);
return values;
}
@@ -1336,7 +1336,7 @@ public final class InjectionUtils {
public static Map<Parameter, Class<?>> getParametersFromBeanClass(Class<?> beanClass,
ParameterType type,
boolean checkIgnorable) {
- Map<Parameter, Class<?>> params = new LinkedHashMap<Parameter, Class<?>>();
+ Map<Parameter, Class<?>> params = new LinkedHashMap<>();
for (Method m : beanClass.getMethods()) {
String methodName = m.getName();
boolean startsFromGet = methodName.startsWith("get");
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 1917c2b..e9cbc96 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
@@ -301,7 +301,7 @@ public final class JAXRSUtils {
BUNDLE,
path).toString());
if (resources.size() == 1) {
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
return resources.get(0).getURITemplate().match(path, values)
? Collections.singletonMap(resources.get(0), values) : null;
}
@@ -311,7 +311,7 @@ public final class JAXRSUtils {
new ClassResourceInfoComparator(message));
for (ClassResourceInfo cri : resources) {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
if (cri.getURITemplate().match(path, map)) {
candidateList.put(cri, map);
LOG.fine(() -> new org.apache.cxf.common.i18n.Message("CRI_SELECTED_POSSIBLY",
@@ -405,7 +405,7 @@ public final class JAXRSUtils {
boolean added = false;
URITemplate uriTemplate = ori.getURITemplate();
- MultivaluedMap<String, String> map = new MetadataMap<String, String>(values);
+ MultivaluedMap<String, String> map = new MetadataMap<>(values);
if (uriTemplate != null && uriTemplate.match(path, map)) {
String finalGroup = map.getFirst(URITemplate.FINAL_MATCH_GROUP);
boolean finalPath = StringUtils.isEmpty(finalGroup) || PATH_SEGMENT_SEP.equals(finalGroup);
@@ -941,7 +941,7 @@ public final class JAXRSUtils {
List<PathSegment> segments = JAXRSUtils.getPathSegments(
(String)m.get(Message.REQUEST_URI), decode);
if (!segments.isEmpty()) {
- MultivaluedMap<String, String> params = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> params = new MetadataMap<>();
for (PathSegment ps : segments) {
MultivaluedMap<String, String> matrix = ps.getMatrixParameters();
for (Map.Entry<String, List<String>> entry : matrix.entrySet()) {
@@ -982,7 +982,7 @@ public final class JAXRSUtils {
(MultivaluedMap<String, String>)m.get(FormUtils.FORM_PARAM_MAP);
if (params == null) {
- params = new MetadataMap<String, String>();
+ params = new MetadataMap<>();
m.put(FormUtils.FORM_PARAM_MAP, params);
if (mt == null || mt.isCompatible(MediaType.APPLICATION_FORM_URLENCODED_TYPE)) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
index 3cb0cc8..0b6c19e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/multipart/AttachmentUtils.java
@@ -228,7 +228,7 @@ public final class AttachmentUtils {
public static MultivaluedMap<String, String> populateFormMap(MessageContext mc,
boolean errorIfMissing) {
- MultivaluedMap<String, String> data = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> data = new MetadataMap<>();
FormUtils.populateMapFromMultipart(data,
AttachmentUtils.getMultipartBody(mc),
PhaseInterceptorChain.getCurrentMessage(),
@@ -242,7 +242,7 @@ public final class AttachmentUtils {
private static Map<String, Attachment> fromListToMap(List<Attachment> atts,
boolean preferContentDisposition) {
- Map<String, Attachment> map = new LinkedHashMap<String, Attachment>();
+ Map<String, Attachment> map = new LinkedHashMap<>();
for (Attachment a : atts) {
String contentId = null;
if (preferContentDisposition) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSParameterNameProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSParameterNameProvider.java
index a60b14c..dbccd36 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSParameterNameProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSParameterNameProvider.java
@@ -31,7 +31,7 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils;
public class JAXRSParameterNameProvider implements ParameterNameProvider {
@Override
public List<String> getParameterNames(final Constructor< ? > constructor) {
- final List< String > parameterNames = new ArrayList< String >();
+ final List< String > parameterNames = new ArrayList<>();
for (int i = 0; i < constructor.getParameterTypes().length; ++i) {
parameterNames.add("arg" + i);
@@ -43,7 +43,7 @@ public class JAXRSParameterNameProvider implements ParameterNameProvider {
@Override
public List<String> getParameterNames(final Method method) {
final List< Parameter > parameters = ResourceUtils.getParameters(method);
- final List< String > parameterNames = new ArrayList< String >();
+ final List< String > parameterNames = new ArrayList<>();
for (int i = 0; i < parameters.size(); ++i) {
final StringBuilder sb = new StringBuilder();
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
index f046a07..f94be08 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBeanTest.java
@@ -53,7 +53,7 @@ public class JAXRSServiceFactoryBeanTest extends Assert {
ClassResourceInfo rootCri = resources.get(0);
assertNotNull(rootCri.getURITemplate());
URITemplate template = rootCri.getURITemplate();
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(template.match("/bookstore/books/123", values));
assertFalse(rootCri.hasSubResources());
MethodDispatcher md = rootCri.getMethodDispatcher();
@@ -93,7 +93,7 @@ public class JAXRSServiceFactoryBeanTest extends Assert {
ClassResourceInfo rootCri = resources.get(0);
assertNotNull(rootCri.getURITemplate());
URITemplate template = rootCri.getURITemplate();
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(template.match("/bookstore/books/123", values));
assertTrue(rootCri.hasSubResources());
MethodDispatcher md = rootCri.getMethodDispatcher();
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
index bda14df..b671632 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
@@ -119,7 +119,7 @@ public class SelectMethodCandidatesTest extends Assert {
EasyMock.replay(e);
ex.put(Endpoint.class, e);
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, m,
"/books",
"POST",
@@ -149,7 +149,7 @@ public class SelectMethodCandidatesTest extends Assert {
Message m = createMessage();
m.put(Message.CONTENT_TYPE, "text/xml");
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, m,
"/",
"POST",
@@ -196,7 +196,7 @@ public class SelectMethodCandidatesTest extends Assert {
EasyMock.replay(e);
ex.put(Endpoint.class, e);
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, m,
"/books",
"PUT",
@@ -244,7 +244,7 @@ public class SelectMethodCandidatesTest extends Assert {
EasyMock.replay(e);
ex.put(Endpoint.class, e);
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, m,
"/service/all",
"PUT",
@@ -328,7 +328,7 @@ public class SelectMethodCandidatesTest extends Assert {
EasyMock.replay(e);
ex.put(Endpoint.class, e);
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources,
m,
"/",
@@ -493,7 +493,7 @@ public class SelectMethodCandidatesTest extends Assert {
EasyMock.replay(e);
ex.put(Endpoint.class, e);
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
Map<ClassResourceInfo, MultivaluedMap<String, String>> mResources
= JAXRSUtils.selectResourceClass(resources, path, m);
@@ -531,7 +531,7 @@ public class SelectMethodCandidatesTest extends Assert {
Message m = prepareMessage();
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, m,
path,
"PUT",
@@ -593,7 +593,7 @@ public class SelectMethodCandidatesTest extends Assert {
EasyMock.replay(e);
ex.put(Endpoint.class, e);
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, m,
"/books",
methodName,
@@ -650,7 +650,7 @@ public class SelectMethodCandidatesTest extends Assert {
String contentTypes = "*/*";
String acceptContentTypes = "text/xml,*/*";
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources,
createMessage(),
path,
@@ -672,7 +672,7 @@ public class SelectMethodCandidatesTest extends Assert {
String contentTypes = "*/*";
String acceptContentTypes = "application/xml;q=0.5,application/json";
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, createMessage(),
"/1/2/3/d/resource1",
"GET",
@@ -697,7 +697,7 @@ public class SelectMethodCandidatesTest extends Assert {
//If acceptContentTypes does not specify a specific Mime type, the
//method is declared with a most specific ProduceMime type is selected.
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, createMessage(),
"/1/2/3/d",
"GET",
@@ -774,7 +774,7 @@ public class SelectMethodCandidatesTest extends Assert {
String contentTypes = "*/*";
String acceptContentTypes = "application/bar,application/foo;q=0.8";
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, null,
"/1/2/3/d/custom",
"GET",
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
index 51ce53d..7877612 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentTest.java
@@ -37,7 +37,7 @@ public class AttachmentTest extends Assert {
}
private Attachment createAttachment(String id) {
- MetadataMap<String, String> map = new MetadataMap<String, String>();
+ MetadataMap<String, String> map = new MetadataMap<>();
map.add("foo", "bar");
return new Attachment(id,
new DataHandler(new ByteArrayDataSource(new byte[]{1}, "application/octet-stream")),
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
index 5727384..d20b4b3 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/xml/XMLSourceTest.java
@@ -166,7 +166,7 @@ public class XMLSourceTest extends Assert {
InputStream is = new ByteArrayInputStream(data.getBytes());
XMLSource xp = new XMLSource(is);
xp.setBuffering();
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("x", "http://baz");
Bar2 bar = xp.getNode("/x:foo/x:bar", map, Bar2.class);
assertNotNull(bar);
@@ -178,7 +178,7 @@ public class XMLSourceTest extends Assert {
InputStream is = new ByteArrayInputStream(data.getBytes());
XMLSource xp = new XMLSource(is);
xp.setBuffering();
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("x", "http://baz");
Bar2 bar = xp.getNode("/x:foo/x:bar", map, Bar2.class);
assertNotNull(bar);
@@ -192,7 +192,7 @@ public class XMLSourceTest extends Assert {
InputStream is = new ByteArrayInputStream(data.getBytes());
XMLSource xp = new XMLSource(is);
xp.setBuffering();
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("x", "http://baz");
Bar2 bar = xp.getNode("/x:foo/x:bar", map, Bar2.class);
assertNotNull(bar);
@@ -204,7 +204,7 @@ public class XMLSourceTest extends Assert {
InputStream is = new ByteArrayInputStream(data.getBytes());
XMLSource xp = new XMLSource(is);
xp.setBuffering();
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("x", "http://foo");
map.put("y", "http://baz");
Bar2 bar = xp.getNode("/x:foo/y:bar", map, Bar2.class);
@@ -217,7 +217,7 @@ public class XMLSourceTest extends Assert {
InputStream is = new ByteArrayInputStream(data.getBytes());
XMLSource xp = new XMLSource(is);
xp.setBuffering();
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("x", "http://baz");
Bar2 bar = xp.getNode("/x:foo/x:bar", map, Bar2.class);
assertNotNull(bar);
@@ -240,7 +240,7 @@ public class XMLSourceTest extends Assert {
InputStream is = new ByteArrayInputStream(data.getBytes());
XMLSource xp = new XMLSource(is);
xp.setBuffering();
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("x", "http://baz");
Bar2[] bars = xp.getNodes("/x:foo/x:bar", map, Bar2.class);
assertNotNull(bars);
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 e041834..884ad6e 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
@@ -495,7 +495,7 @@ public class HttpHeadersImplTest extends Assert {
private MetadataMap<String, String> createHeaders() {
- MetadataMap<String, String> hs = new MetadataMap<String, String>();
+ MetadataMap<String, String> hs = new MetadataMap<>();
hs.add("Accept", "text/bar;q=0.6");
hs.add("Accept", "text/*;q=1,application/xml");
hs.putSingle("Content-Type", "*/*");
@@ -509,7 +509,7 @@ public class HttpHeadersImplTest extends Assert {
}
private MetadataMap<String, String> createHeader(String name, String... values) {
- MetadataMap<String, String> hs = new MetadataMap<String, String>();
+ MetadataMap<String, String> hs = new MetadataMap<>();
List<String> list = new ArrayList<>();
list.addAll(Arrays.asList(values));
hs.put(name, list);
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
index 3bb0c97..f68e8ac 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProviderTest.java
@@ -201,7 +201,7 @@ public class MediaTypeHeaderProviderTest extends Assert {
MediaTypeHeaderProvider provider =
new MediaTypeHeaderProvider();
- Map<String, String> params = new LinkedHashMap<String, String>();
+ Map<String, String> params = new LinkedHashMap<>();
params.put("foo", "bar");
params.put("q", "0.2");
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 a4ee1db..ac0f105 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
@@ -38,7 +38,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutSingle() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
List<Object> value1 = new ArrayList<>();
value1.add("bar");
value1.add("foo");
@@ -53,7 +53,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutSingleNullKey() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle(null, "null");
m.putSingle(null, "null2");
assertEquals(1, m.get(null).size());
@@ -62,7 +62,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutSingleNullKeyCaseSensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
+ MetadataMap<String, Object> m = new MetadataMap<>(false, true);
m.putSingle(null, "null");
m.putSingle(null, "null2");
assertEquals(1, m.get(null).size());
@@ -71,7 +71,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutSingleNullKeyCaseSensitive2() {
- MetadataMap<String, Object> map = new MetadataMap<String, Object>(false, true);
+ MetadataMap<String, Object> map = new MetadataMap<>(false, true);
Object obj1 = new Object();
Object obj2 = new Object();
map.putSingle("key", obj1);
@@ -86,7 +86,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testAddFirst() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.addFirst("baz", "foo");
List<Object> values = m.get("baz");
assertEquals(1, values.size());
@@ -101,7 +101,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testAddFirstUnmodifiableListFirst() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.put("baz", Arrays.<Object>asList("foo"));
List<Object> values = m.get("baz");
assertEquals(1, values.size());
@@ -116,7 +116,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testAddAll() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
List<Object> values = new ArrayList<>();
values.add("foo");
m.addAll("baz", values);
@@ -133,7 +133,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutSingleCaseInsensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
+ MetadataMap<String, Object> m = new MetadataMap<>(false, true);
List<Object> value1 = new ArrayList<>();
value1.add("bar");
value1.add("foo");
@@ -158,7 +158,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testContainsKeyCaseInsensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
+ MetadataMap<String, Object> m = new MetadataMap<>(false, true);
m.putSingle("a", "b");
assertTrue(m.containsKey("a"));
assertTrue(m.containsKey("A"));
@@ -166,7 +166,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testContainsKeyCaseSensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("a", "b");
assertTrue(m.containsKey("a"));
assertFalse(m.containsKey("A"));
@@ -175,7 +175,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testKeySetCaseInsensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
+ MetadataMap<String, Object> m = new MetadataMap<>(false, true);
m.putSingle("a", "b");
assertTrue(m.keySet().contains("a"));
assertTrue(m.keySet().contains("A"));
@@ -183,7 +183,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testKeySetCaseSensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("a", "b");
assertTrue(m.keySet().contains("a"));
assertFalse(m.keySet().contains("A"));
@@ -191,7 +191,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutAllCaseInsensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
+ MetadataMap<String, Object> m = new MetadataMap<>(false, true);
List<Object> value1 = new ArrayList<>();
value1.add("bar");
value1.add("foo");
@@ -202,7 +202,7 @@ public class MetadataMapTest extends Assert {
assertEquals("bar", values.get(0));
assertEquals("foo", values.get(1));
- MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(false, true);
+ MetadataMap<String, Object> m2 = new MetadataMap<>(false, true);
List<Object> value2 = new ArrayList<>();
value2.add("bar2");
value2.add("foo2");
@@ -219,7 +219,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testRemoveCaseInsensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
+ MetadataMap<String, Object> m = new MetadataMap<>(false, true);
List<Object> value1 = new ArrayList<>();
value1.add("bar");
value1.add("foo");
@@ -234,7 +234,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testAddAndGetFirst() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("baz", "bar");
List<Object> value = m.get("baz");
@@ -253,9 +253,9 @@ public class MetadataMapTest extends Assert {
@Test
public void testCopyAndUpdate() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("baz", "bar");
- MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(m);
+ MetadataMap<String, Object> m2 = new MetadataMap<>(m);
m.remove("baz");
m.add("baz", "foo");
assertEquals("bar", m2.getFirst("baz"));
@@ -265,25 +265,25 @@ public class MetadataMapTest extends Assert {
@Test(expected = UnsupportedOperationException.class)
public void testReadOnlyRemove() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("baz", "bar");
- MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(m, true, false);
+ MetadataMap<String, Object> m2 = new MetadataMap<>(m, true, false);
m2.remove("baz");
}
@Test(expected = UnsupportedOperationException.class)
public void testReadOnlyAdd() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("baz", "bar");
- MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(m, true, false);
+ MetadataMap<String, Object> m2 = new MetadataMap<>(m, true, false);
m2.add("bar", "foo");
}
@Test(expected = UnsupportedOperationException.class)
public void testReadOnlyAddFirst() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("baz", "bar");
- MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(m, true, false);
+ MetadataMap<String, Object> m2 = new MetadataMap<>(m, true, false);
m2.addFirst("baz", "bar2");
}
@@ -319,9 +319,9 @@ public class MetadataMapTest extends Assert {
@Test
public void testGetCaseInsensitive() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Baz", "bar");
- MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(m, true, true);
+ MetadataMap<String, Object> m2 = new MetadataMap<>(m, true, true);
assertEquals("bar", m2.getFirst("baZ"));
assertEquals("bar", m2.getFirst("Baz"));
assertTrue(m2.containsKey("BaZ"));
@@ -333,7 +333,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testGetFirstEmptyMap() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
assertNull(m.getFirst("key"));
m.add("key", "1");
m.get("key").clear();
@@ -342,14 +342,14 @@ public class MetadataMapTest extends Assert {
@Test
public void testCompareIgnoreValueOrder() {
- MetadataMap<String, String> m = new MetadataMap<String, String>();
+ MetadataMap<String, String> m = new MetadataMap<>();
m.add("baz", "bar1");
m.add("baz", "bar2");
List<String> values = m.get("baz");
assertEquals("bar1", values.get(0));
assertEquals("bar2", values.get(1));
- MetadataMap<String, String> m2 = new MetadataMap<String, String>();
+ MetadataMap<String, String> m2 = new MetadataMap<>();
m2.add("baz", "bar2");
m2.add("baz", "bar1");
values = m2.get("baz");
@@ -360,7 +360,7 @@ public class MetadataMapTest extends Assert {
assertTrue(m.equalsIgnoreValueOrder(m));
assertTrue(m2.equalsIgnoreValueOrder(m));
- MetadataMap<String, String> m3 = new MetadataMap<String, String>();
+ MetadataMap<String, String> m3 = new MetadataMap<>();
m3.add("baz", "bar1");
assertFalse(m.equalsIgnoreValueOrder(m3));
assertFalse(m2.equalsIgnoreValueOrder(m3));
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
index bf1e407..efaa89f 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
@@ -50,7 +50,7 @@ public class RequestImplTest extends Assert {
@Before
public void setUp() {
m = new MessageImpl();
- metadata = new MetadataMap<String, String>();
+ metadata = new MetadataMap<>();
m.put(Message.PROTOCOL_HEADERS, metadata);
m.put(Message.HTTP_REQUEST_METHOD, "GET");
}
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
index 1d4a3b0..01e7932 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestPreprocessorTest.java
@@ -111,7 +111,7 @@ public class RequestPreprocessorTest extends Assert {
m.put(Message.REQUEST_URI, pathInfo);
m.put(Message.QUERY_STRING, query);
m.put(Message.HTTP_REQUEST_METHOD, method);
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
if (methodHeader != null) {
headers.put("X-HTTP-Method-Override", Collections.singletonList(methodHeader));
}
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
index dff991f..1d4ac18 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImplTest.java
@@ -65,7 +65,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testAllow() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Allow", "HEAD");
m.add("Allow", "GET");
checkBuild(Response.ok().allow("HEAD").allow("GET").build(), 200, null, m);
@@ -73,20 +73,20 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testEncoding() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Content-Encoding", "gzip");
checkBuild(Response.ok().encoding("gzip").build(), 200, null, m);
}
@Test
public void testEntity() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
checkBuild(Response.ok().entity("Hello").build(), 200, "Hello", m);
}
@Test
public void testEntityAnnotations() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
Annotation[] annotations = new Annotation[1];
Annotation produces = new Produces() {
@Override
@@ -108,7 +108,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testReplaceAll() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Content-Type", "text/plain");
checkBuild(Response.ok().type("image/png").tag("removeme").replaceAll(m).build(), 200, null, m);
@@ -116,14 +116,14 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testAllowReset() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Allow", "POST");
checkBuild(Response.ok().allow("HEAD").allow("GET").allow().allow("POST").build(), 200, null, m);
}
@Test
public void testAllowSet() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Allow", "HEAD");
m.add("Allow", "GET");
// LinkedHashSet so we get a predictable order
@@ -160,21 +160,21 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testAbsoluteLocation() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("Location", URI.create("http://localhost/rest"));
checkBuild(Response.ok().location(URI.create("http://localhost/rest")).build(), 200, null, m);
}
@Test
public void testLanguage() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("Content-Language", "de");
checkBuild(Response.ok().language("de").build(), 200, null, m);
}
@Test
public void testLanguageReplace() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("Content-Language", "en");
checkBuild(Response.ok().language("de").language((Locale)null)
.language("en").build(), 200, null, m);
@@ -182,14 +182,14 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testLinkStr() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("Link", Link.valueOf("<http://example.com/page3>;rel=\"next\""));
checkBuild(Response.ok().link("http://example.com/page3", "next").build(), 200, null, m);
}
@Test
public void testLinkStrMultiple() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Link", Link.valueOf("<http://example.com/page1>;rel=\"previous\""));
m.add("Link", Link.valueOf("<http://example.com/page3>;rel=\"next\""));
checkBuild(Response.ok().link("http://example.com/page1", "previous")
@@ -198,7 +198,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testLinkStrMultipleSameRel() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Link", Link.valueOf("<http://example.com/page2.pdf>;rel=\"alternate\""));
m.add("Link", Link.valueOf("<http://example.com/page2.txt>;rel=\"alternate\""));
checkBuild(Response.ok().link("http://example.com/page2.pdf", "alternate")
@@ -207,7 +207,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testLinkURI() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
URI uri = URI.create("http://example.com/page3");
m.putSingle("Link", Link.valueOf("<http://example.com/page3>;rel=\"next\""));
checkBuild(Response.ok().link(uri, "next").build(), 200, null, m);
@@ -215,7 +215,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testLinks() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Link", Link.valueOf("<http://example.com/page1>;rel=\"previous\""));
m.add("Link", Link.valueOf("<http://example.com/page3>;rel=\"next\""));
RuntimeDelegateImpl delegate = new RuntimeDelegateImpl();
@@ -229,7 +229,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testLinks2() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Link", Link.valueOf("<http://example.com/page1>;rel=\"previous\""));
m.add("Link", Link.valueOf("<http://example.com/page3>;rel=\"next\""));
RuntimeDelegateImpl delegate = new RuntimeDelegateImpl();
@@ -246,7 +246,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testLinksNoReset() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Link", Link.valueOf("<http://example.com/page1>;rel=\"previous\""));
m.add("Link", Link.valueOf("<http://example.com/page3>;rel=\"next\""));
RuntimeDelegateImpl delegate = new RuntimeDelegateImpl();
@@ -259,7 +259,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testLinksWithReset() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Link", Link.valueOf("<http://example.com/page3>;rel=\"next\""));
RuntimeDelegateImpl delegate = new RuntimeDelegateImpl();
Link.Builder linkBuilder = delegate.createLinkBuilder();
@@ -274,7 +274,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testAddHeader() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("Content-Language", "en");
checkBuild(Response.ok().header(HttpHeaders.CONTENT_LANGUAGE, "de")
.header(HttpHeaders.CONTENT_LANGUAGE, null)
@@ -284,7 +284,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testAddCookie() {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Set-Cookie", new NewCookie("a", "b"));
m.add("Set-Cookie", new NewCookie("c", "d"));
checkBuild(Response.ok().cookie(new NewCookie("a", "b"))
@@ -325,7 +325,7 @@ public class ResponseBuilderImplTest extends Assert {
SimpleDateFormat format = HttpUtils.getHttpDateFormat();
Date date = format.parse("Tue, 21 Oct 2008 17:00:00 GMT");
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("Expires", date);
checkBuild(Response.ok()
.expires(format.parse("Tue, 21 Oct 2008 17:00:00 GMT"))
@@ -347,7 +347,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testVariant() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("Content-Type", MediaType.TEXT_XML_TYPE);
m.putSingle("Content-Language", new Locale("en"));
m.putSingle("Content-Encoding", "gzip");
@@ -383,7 +383,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testCreatedNoEntity() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.putSingle("Location", URI.create("http://foo"));
checkBuild(Response.created(new URI("http://foo")).build(),
@@ -404,7 +404,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testVariantsArray() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Content-Type", MediaType.APPLICATION_JSON_TYPE);
m.add("Content-Language", new Locale("en_uk"));
m.add("Content-Language", new Locale("en_gb"));
@@ -419,7 +419,7 @@ public class ResponseBuilderImplTest extends Assert {
@Test
public void testVariantsList() throws Exception {
- MetadataMap<String, Object> m = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> m = new MetadataMap<>();
m.add("Content-Type", MediaType.TEXT_XML_TYPE);
m.add("Content-Language", new Locale("en", "UK"));
m.add("Content-Language", new Locale("en", "GB"));
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 443952b..450d74c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -107,7 +107,7 @@ public class ResponseImplTest extends Assert {
+ " Value=\"urn:oasis:names:tc:xacml:1.0:status:ok\"/></Status></Result></Response>";
- MultivaluedMap<String, Object> headers = new MetadataMap<String, Object>();
+ MultivaluedMap<String, Object> headers = new MetadataMap<>();
headers.putSingle("Content-Type", "text/xml");
r.addMetadata(headers);
r.setEntity(new ByteArrayInputStream(content.getBytes()), null);
@@ -147,7 +147,7 @@ public class ResponseImplTest extends Assert {
assertEquals("Wrong status", ri.getStatus(), 200);
assertSame("Wrong entity", entity, ri.getEntity());
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
ri.addMetadata(meta);
ri.getMetadata();
assertSame("Wrong metadata", meta, ri.getMetadata());
@@ -255,7 +255,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetHeaderString() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
ri.addMetadata(meta);
assertNull(ri.getHeaderString("a"));
meta.putSingle("a", "aValue");
@@ -267,7 +267,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetHeaderStrings() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
meta.add("Set-Cookie", NewCookie.valueOf("a=b"));
ri.addMetadata(meta);
MultivaluedMap<String, String> headers = ri.getStringHeaders();
@@ -278,7 +278,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetCookies() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
meta.add("Set-Cookie", NewCookie.valueOf("a=b"));
meta.add("Set-Cookie", NewCookie.valueOf("c=d"));
ri.addMetadata(meta);
@@ -291,7 +291,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetContentLength() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
ri.addMetadata(meta);
assertEquals(-1, ri.getLength());
meta.add("Content-Length", "10");
@@ -311,7 +311,7 @@ public class ResponseImplTest extends Assert {
public void doTestDate(String dateHeader) {
boolean date = HttpHeaders.DATE.equals(dateHeader);
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
meta.add(dateHeader, "Tue, 21 Oct 2008 17:00:00 GMT");
ri.addMetadata(meta);
assertEquals(HttpUtils.getHttpDate("Tue, 21 Oct 2008 17:00:00 GMT"),
@@ -321,7 +321,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testEntityTag() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
meta.add(HttpHeaders.ETAG, "1234");
ri.addMetadata(meta);
assertEquals("\"1234\"", ri.getEntityTag().toString());
@@ -330,7 +330,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testLocation() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
meta.add(HttpHeaders.LOCATION, "http://localhost:8080");
ri.addMetadata(meta);
assertEquals("http://localhost:8080", ri.getLocation().toString());
@@ -339,7 +339,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetLanguage() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
meta.add(HttpHeaders.CONTENT_LANGUAGE, "en-US");
ri.addMetadata(meta);
assertEquals("en_US", ri.getLanguage().toString());
@@ -348,7 +348,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetMediaType() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
meta.add(HttpHeaders.CONTENT_TYPE, "text/xml");
ri.addMetadata(meta);
assertEquals("text/xml", ri.getMediaType().toString());
@@ -374,7 +374,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetLinks() {
ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
ri.addMetadata(meta);
assertFalse(ri.hasLink("next"));
assertNull(ri.getLink("next"));
@@ -404,7 +404,7 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetLinksNoRel() {
try (ResponseImpl ri = new ResponseImpl(200)) {
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ MetadataMap<String, Object> meta = new MetadataMap<>();
ri.addMetadata(meta);
Set<Link> links = ri.getLinks();
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
index dbe86da..6f1e9cb 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
@@ -35,7 +35,7 @@ public class SecurityContextImplTest extends Assert {
public void testAuthenticationScheme() {
Message m = new MessageImpl();
Map<String, List<String>> requestHeaders
- = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
List<String> values = new ArrayList<>();
values.add("Digest realm=\"custom\"");
requestHeaders.put("Authorization", values);
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
index bc36bb0..0dd0a04 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriInfoImplTest.java
@@ -344,7 +344,7 @@ public class UriInfoImplTest extends Assert {
@Test
public void testGetTemplateParameters() {
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
new URITemplate("/bar").match("/baz", values);
UriInfoImpl u = new UriInfoImpl(mockMessage("http://localhost:8080/baz", "/bar"),
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
index 7d2ac29..719dee4 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
@@ -58,7 +58,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchBasic() throws Exception {
URITemplate uriTemplate = new URITemplate("/customers/{id}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/customers/123/", values);
assertTrue(match);
@@ -69,7 +69,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchWithMatrixAndTemplate() throws Exception {
URITemplate uriTemplate = new URITemplate("/customers/{id}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/customers/123;123456/", values);
assertTrue(match);
@@ -80,7 +80,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchWithMatrixWithEmptyPath() throws Exception {
URITemplate uriTemplate = new URITemplate("/");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/;a=b", values);
assertTrue(match);
@@ -91,7 +91,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchWithMatrixWithEmptyPath2() throws Exception {
URITemplate uriTemplate = new URITemplate("/");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/;a=b/b/c", values);
assertTrue(match);
@@ -102,7 +102,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchWithMatrixOnClearPath1() throws Exception {
URITemplate uriTemplate = new URITemplate("/customers/{id}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/customers;123456/123/", values);
assertTrue(match);
@@ -113,7 +113,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchWithMatrixOnClearPath2() throws Exception {
URITemplate uriTemplate = new URITemplate("/customers/{id}/orders/{order}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/customers;123456/123/orders;456/3", values));
assertEquals("123", values.getFirst("id"));
@@ -124,7 +124,7 @@ public class URITemplateTest extends Assert {
public void testMatchWithMultipleMatrixParams() throws Exception {
URITemplate uriTemplate =
new URITemplate("renderwidget/id/{id}/type/{type}/size/{size}/locale/{locale}/{properties}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("renderwidget/id/1007/type/1/size/1/locale/en_US/properties;a=b",
values));
@@ -135,7 +135,7 @@ public class URITemplateTest extends Assert {
public void testMatchWithMultipleMatrixParams2() throws Exception {
URITemplate uriTemplate =
new URITemplate("renderwidget/id/{id}/type/{type}/size/{size}/locale/{locale}/{properties}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match(
"renderwidget/id/1007/type/1/size/1/locale/en_US/properties;numResults=1;foo=bar",
@@ -146,7 +146,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchWithMatrixOnClearPath3() throws Exception {
URITemplate uriTemplate = new URITemplate("/{id}/customers/");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/123/customers;123456/", values);
assertTrue(match);
@@ -157,7 +157,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchWithMatrixOnClearPath4() throws Exception {
URITemplate uriTemplate = new URITemplate("/customers");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/customers;123456/123/orders;456/3", values));
}
@@ -165,7 +165,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchWithMatrixOnClearPath5() throws Exception {
URITemplate uriTemplate = new URITemplate("/customers");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/customers;a=b", values));
String finalGroup = values.getFirst(URITemplate.FINAL_MATCH_GROUP);
@@ -175,7 +175,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchBasicTwoParametersVariation1() throws Exception {
URITemplate uriTemplate = new URITemplate("/customers/{name}/{department}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/customers/john/CS", values);
assertTrue(match);
@@ -188,7 +188,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMatchBasicTwoParametersVariation2() throws Exception {
URITemplate uriTemplate = new URITemplate("/customers/name/{name}/dep/{department}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/customers/name/john/dep/CS", values);
assertTrue(match);
@@ -202,7 +202,7 @@ public class URITemplateTest extends Assert {
public void testURITemplateWithSubResource() throws Exception {
// So "/customers" is the URITemplate for the root resource class
URITemplate uriTemplate = new URITemplate("/customers");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/customers/123", values);
assertTrue(match);
@@ -214,7 +214,7 @@ public class URITemplateTest extends Assert {
public void testURITemplateWithSubResourceVariation2() throws Exception {
// So "/customers" is the URITemplate for the root resource class
URITemplate uriTemplate = new URITemplate("/customers");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/customers/name/john/dep/CS", values);
assertTrue(match);
@@ -229,7 +229,7 @@ public class URITemplateTest extends Assert {
*/
public void testURITemplateWithSubResourceVariation3() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/{bookId}/");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/books/123/chapter/1", values);
assertTrue(match);
@@ -240,7 +240,7 @@ public class URITemplateTest extends Assert {
@Test
public void testURITemplateWithSubResourceVariation4() throws Exception {
URITemplate uriTemplate = new URITemplate("/");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/books/123/chapter/1", values);
assertTrue(match);
@@ -265,7 +265,7 @@ public class URITemplateTest extends Assert {
private void doTestBasicCustomExpression(String expression) {
URITemplate uriTemplate = new URITemplate(expression);
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/books/123/chapter/1", values);
assertTrue(match);
@@ -278,7 +278,7 @@ public class URITemplateTest extends Assert {
@Test
public void testBasicCustomExpression2() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/{bookId:123}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/books/123/chapter/1", values);
assertTrue(match);
@@ -290,7 +290,7 @@ public class URITemplateTest extends Assert {
@Test
public void testBasicCustomExpression3() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/{bookId:\\d\\d\\d}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/books/123/chapter/1", values);
assertTrue(match);
@@ -302,7 +302,7 @@ public class URITemplateTest extends Assert {
@Test
public void testEscaping() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/a.db");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/books/a.db", values));
assertFalse(uriTemplate.match("/books/adbc", values));
@@ -313,7 +313,7 @@ public class URITemplateTest extends Assert {
@Test
public void testEscapingWildCard() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/a*");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/books/a*", values));
assertFalse(uriTemplate.match("/books/a", values));
@@ -323,7 +323,7 @@ public class URITemplateTest extends Assert {
@Test
public void testValueWithLiteralPlus() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/ab+");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/books/ab+", values));
assertFalse(uriTemplate.match("/books/abb", values));
@@ -334,7 +334,7 @@ public class URITemplateTest extends Assert {
@Test
public void testValueWithManyLiteralPluses() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/ab+++++");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/books/ab+++++", values));
assertFalse(uriTemplate.match("/books/ab++++++", values));
@@ -349,7 +349,7 @@ public class URITemplateTest extends Assert {
@Test
public void testValueWithRegExPlus() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/{regex:ab+\\+}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/books/ab+", values));
assertFalse(uriTemplate.match("/books/abb", values));
@@ -361,7 +361,7 @@ public class URITemplateTest extends Assert {
@Test
public void testEncodedSpace() throws Exception {
URITemplate uriTemplate = new URITemplate("/1 2/%203");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/1%202/%203", values));
assertFalse(uriTemplate.match("/1 2/%203", values));
@@ -370,7 +370,7 @@ public class URITemplateTest extends Assert {
@Test
public void testBasicCustomExpression4() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/{bookId:...\\.}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/books/123.", values));
assertEquals("123.", values.getFirst("bookId"));
@@ -384,7 +384,7 @@ public class URITemplateTest extends Assert {
@Test
public void testExpressionWithNestedGroup() throws Exception {
URITemplate uriTemplate = new URITemplate("/{resource:.+\\.(js|css|gif|png)}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/script.js", values));
assertEquals("script.js", values.getFirst("resource"));
@@ -404,7 +404,7 @@ public class URITemplateTest extends Assert {
@Test
public void testExpressionWithNestedGroupAndTwoVars() throws Exception {
URITemplate uriTemplate = new URITemplate("/foo/{bar}/{resource:.+\\.(js|css|gif|png)}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/foo/1/script.js", values));
assertEquals("1", values.getFirst("bar"));
@@ -416,7 +416,7 @@ public class URITemplateTest extends Assert {
@Test
public void testExpressionWithNestedGroupAndTwoVars2() throws Exception {
URITemplate uriTemplate = new URITemplate("/foo/{bar}{resource:(/format/[^/]+?)?}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/foo/1/format", values));
assertEquals("1", values.getFirst("bar"));
@@ -442,7 +442,7 @@ public class URITemplateTest extends Assert {
@Test
public void testExpressionWithTwoVars() throws Exception {
URITemplate uriTemplate = new URITemplate("/{tenant : [^/]*}/resource/{id}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/t1/resource/1", values);
assertTrue(match);
String tenant = values.getFirst("tenant");
@@ -476,7 +476,7 @@ public class URITemplateTest extends Assert {
@Test
public void testExpressionWithNestedGroupAndManySegments() throws Exception {
URITemplate uriTemplate = new URITemplate("/foo/{bar}{resource:(/format/[^/]+?)?}/baz");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/foo/1/format/2/baz/3", values));
assertEquals("1", values.getFirst("bar"));
@@ -490,7 +490,7 @@ public class URITemplateTest extends Assert {
public void testExpressionWithNestedGroup2() throws Exception {
URITemplate uriTemplate =
new URITemplate("/{resource:.+\\.(js|css|gif|png)}/bar");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/script.js/bar/baz", values));
assertEquals("script.js", values.getFirst("resource"));
@@ -502,7 +502,7 @@ public class URITemplateTest extends Assert {
public void testLiteralExpression() throws Exception {
URITemplate uriTemplate =
new URITemplate("/bar");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertTrue(uriTemplate.match("/bar/baz", values));
String finalPath = values.getFirst(URITemplate.FINAL_MATCH_GROUP);
@@ -512,7 +512,7 @@ public class URITemplateTest extends Assert {
@Test
public void testMultipleExpression2() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/{bookId:123}/chapter/{id}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/books/123/chapter/1", values);
assertTrue(match);
@@ -525,7 +525,7 @@ public class URITemplateTest extends Assert {
@Test
public void testFailCustomExpression() throws Exception {
URITemplate uriTemplate = new URITemplate("/books/{bookId:124}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
boolean match = uriTemplate.match("/books/123/chapter/1", values);
assertFalse(match);
@@ -534,7 +534,7 @@ public class URITemplateTest extends Assert {
@Test
public void testBaseTail1() {
URITemplate uriTemplate = new URITemplate("/{base:base.+}/{tail}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertFalse(uriTemplate.match("/base/tails", values));
assertTrue(uriTemplate.match("/base1/tails", values));
assertEquals("base1", values.getFirst("base"));
@@ -544,7 +544,7 @@ public class URITemplateTest extends Assert {
@Test
public void testBaseTail2() {
URITemplate uriTemplate = new URITemplate("/{base:.+base}/{tail}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertFalse(uriTemplate.match("/base/tails", values));
assertFalse(uriTemplate.match("/base1/tails", values));
assertTrue(uriTemplate.match("/1base/tails", values));
@@ -555,7 +555,7 @@ public class URITemplateTest extends Assert {
@Test
public void testBaseTail3() {
URITemplate uriTemplate = new URITemplate("/{base:base.+suffix}/{tail}");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
assertFalse(uriTemplate.match("/base/tails", values));
assertFalse(uriTemplate.match("/base1/tails", values));
assertTrue(uriTemplate.match("/base1suffix/tails", values));
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
index bf792df..17316da 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
@@ -76,7 +76,7 @@ public class DataSourceProviderTest extends Assert {
DataSourceProvider<DataSource> p = new DataSourceProvider<>();
DataSource ds = new InputStreamDataSource(new ByteArrayInputStream("image".getBytes()),
"image/png");
- MultivaluedMap<String, Object> outHeaders = new MetadataMap<String, Object>();
+ MultivaluedMap<String, Object> outHeaders = new MetadataMap<>();
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
p.writeTo(ds, DataSource.class, DataSource.class, new Annotation[]{},
@@ -92,7 +92,7 @@ public class DataSourceProviderTest extends Assert {
p.setUseDataSourceContentType(true);
DataSource ds = new InputStreamDataSource(new ByteArrayInputStream("image".getBytes()),
"image/png");
- MultivaluedMap<String, Object> outHeaders = new MetadataMap<String, Object>();
+ MultivaluedMap<String, Object> outHeaders = new MetadataMap<>();
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
p.writeTo(ds, DataSource.class, DataSource.class, new Annotation[]{},
MediaType.valueOf("image/jpeg"), outHeaders, os);
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index ad2ee19..7177493 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -142,12 +142,12 @@ public class FormEncodingProviderTest extends Assert {
@Test
public void testWriteMultipleValues() throws Exception {
- MultivaluedMap<String, String> mvMap = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> mvMap = new MetadataMap<>();
mvMap.add("a", "a1");
mvMap.add("a", "a2");
FormEncodingProvider<MultivaluedMap<?, ?>> ferp
- = new FormEncodingProvider<MultivaluedMap<?, ?>>();
+ = new FormEncodingProvider<>();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ferp.writeTo(mvMap, MultivaluedMap.class, MultivaluedMap.class,
new Annotation[0], MediaType.APPLICATION_FORM_URLENCODED_TYPE,
@@ -158,13 +158,13 @@ public class FormEncodingProviderTest extends Assert {
@Test
public void testWriteMultipleValues2() throws Exception {
- MultivaluedMap<String, String> mvMap = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> mvMap = new MetadataMap<>();
mvMap.add("a", "a1");
mvMap.add("a", "a2");
mvMap.add("b", "b1");
FormEncodingProvider<MultivaluedMap<?, ?>> ferp
- = new FormEncodingProvider<MultivaluedMap<?, ?>>();
+ = new FormEncodingProvider<>();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ferp.writeTo(mvMap, MultivaluedMap.class, MultivaluedMap.class,
new Annotation[0], MediaType.APPLICATION_FORM_URLENCODED_TYPE,
@@ -175,12 +175,12 @@ public class FormEncodingProviderTest extends Assert {
@Test
public void testWrite() throws Exception {
- MultivaluedMap<String, String> mvMap = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> mvMap = new MetadataMap<>();
mvMap.add("a", "a1");
mvMap.add("b", "b1");
ByteArrayOutputStream bos = new ByteArrayOutputStream();
FormEncodingProvider<MultivaluedMap<?, ?>> ferp
- = new FormEncodingProvider<MultivaluedMap<?, ?>>();
+ = new FormEncodingProvider<>();
ferp.writeTo(mvMap, MultivaluedMap.class, MultivaluedMap.class,
new Annotation[0], MediaType.APPLICATION_FORM_URLENCODED_TYPE,
new MetadataMap<String, Object>(), bos);
@@ -287,7 +287,7 @@ public class FormEncodingProviderTest extends Assert {
@Test
public void testReadableMap() {
FormEncodingProvider<MultivaluedMap<String, String>> ferp
- = new FormEncodingProvider<MultivaluedMap<String, String>>();
+ = new FormEncodingProvider<>();
assertTrue(ferp.isReadable(MultivaluedMap.class, null, null, null));
}
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 c365057..10bd2a3 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
@@ -846,7 +846,7 @@ public class JAXBElementProviderTest extends Assert {
String data = "<?xml version='1.0' encoding='UTF-8'?>"
+ "<tagholder><thetag><group>B</group><name>A</name></thetag></tagholder>";
JAXBElementProvider<TagVO2Holder> provider = new JAXBElementProvider<>();
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("group", "group");
map.put("name", "name");
map.put("*", "{http://tags}*");
@@ -866,7 +866,7 @@ public class JAXBElementProviderTest extends Assert {
+ "<ns2:tagholder xmlns:ns2=\"http://tags2\" attr=\"attribute\"><ns2:thetag><group>B</group>"
+ "<name>A</name></ns2:thetag></ns2:tagholder>";
JAXBElementProvider<TagVO2Holder> provider = new JAXBElementProvider<>();
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
map.put("group", "group");
map.put("name", "name");
map.put("{http://tags2}*", "{http://tags}*");
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index 64e5349..bc10a77 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -183,7 +183,7 @@ public class PrimitiveTextProviderTest extends Assert {
public void testWriteStringISO() throws Exception {
MessageBodyWriter<String> p = new PrimitiveTextProvider<>();
ByteArrayOutputStream os = new ByteArrayOutputStream();
- MultivaluedMap<String, Object> headers = new MetadataMap<String, Object>();
+ MultivaluedMap<String, Object> headers = new MetadataMap<>();
String eWithAcute = "\u00E9";
String helloStringUTF16 = "Hello, my name is F" + eWithAcute + "lix Agn" + eWithAcute + "s";
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index e122a17..db53a30 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -809,7 +809,7 @@ public class ProviderFactoryTest extends Assert {
private Message prepareMessage(String contentType, String acceptType) {
Message message = new MessageImpl();
- Map<String, List<String>> headers = new MetadataMap<String, String>();
+ Map<String, List<String>> headers = new MetadataMap<>();
message.put(Message.PROTOCOL_HEADERS, headers);
Exchange exchange = new ExchangeImpl();
exchange.setInMessage(message);
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
index 60d2aa2..00dfeda 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/FormUtilsTest.java
@@ -54,7 +54,7 @@ public class FormUtilsTest extends Assert {
mockObjects(null);
EasyMock.replay(mockMessage, mockRequest);
- MultivaluedMap<String, String> params = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> params = new MetadataMap<>();
FormUtils.populateMapFromString(params, mockMessage, null, StandardCharsets.UTF_8.name(),
false, mockRequest);
@@ -68,7 +68,7 @@ public class FormUtilsTest extends Assert {
mockObjects("false");
EasyMock.replay(mockMessage, mockRequest);
- MultivaluedMap<String, String> params = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> params = new MetadataMap<>();
FormUtils.populateMapFromString(params, mockMessage, null, StandardCharsets.UTF_8.name(),
false, mockRequest);
@@ -80,7 +80,7 @@ public class FormUtilsTest extends Assert {
mockObjects(null);
EasyMock.replay(mockMessage, mockRequest);
- MultivaluedMap<String, String> params = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> params = new MetadataMap<>();
String postBody = FORM_PARAM1 + "=" + FORM_PARAM_VALUE1 + "&" + FORM_PARAM2 + "=" + FORM_PARAM_VALUE2;
FormUtils.populateMapFromString(params, mockMessage, postBody, StandardCharsets.UTF_8.name(),
false, mockRequest);
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index d2c9d42..2c41ca1 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -140,7 +140,7 @@ public class JAXRSUtilsTest extends Assert {
Message messageImpl = createMessage();
String body = "p1=" + URLEncoder.encode("\u00E4\u00F6\u00FC", enc) + "&p2=2&p2=3";
messageImpl.put(Message.REQUEST_URI, "/foo");
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
String ct = MediaType.APPLICATION_FORM_URLENCODED;
if (setEnc) {
ct += ";charset=" + enc;
@@ -402,7 +402,7 @@ public class JAXRSUtilsTest extends Assert {
//If acceptContentTypes does not specify a specific Mime type, the
//method is declared with a most specific ProduceMime type is selected.
- MetadataMap<String, String> values = new MetadataMap<String, String>();
+ MetadataMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findTargetResourceClass(resources, createMessage2(), "/1/2/",
"GET", values, contentTypes, getTypes("*/*"));
assertNotNull(ori);
@@ -414,7 +414,7 @@ public class JAXRSUtilsTest extends Assert {
assertEquals("First {id} is 1", "1", values.getFirst("id"));
assertEquals("Second id is 2", "2", values.get("id").get(1));
- values = new MetadataMap<String, String>();
+ values = new MetadataMap<>();
ori = findTargetResourceClass(resources, createMessage2(), "/2",
"POST", values, contentTypes, getTypes("*/*"));
assertNotNull(ori);
@@ -425,7 +425,7 @@ public class JAXRSUtilsTest extends Assert {
values.get(URITemplate.FINAL_MATCH_GROUP).size());
assertEquals("Only the first {id} should've been picked up", "2", values.getFirst("id"));
- values = new MetadataMap<String, String>();
+ values = new MetadataMap<>();
ori = findTargetResourceClass(resources, createMessage2(), "/3/4",
"PUT", values, contentTypes, getTypes("*/*"));
assertNotNull(ori);
@@ -963,7 +963,7 @@ public class JAXRSUtilsTest extends Assert {
Class<?>[] argType = {String.class, Set.class, String.class, Set.class};
Method m = Customer.class.getMethod("testCookieParam", argType);
Message messageImpl = createMessage();
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Cookie", "c1=c1Value");
messageImpl.put(Message.PROTOCOL_HEADERS, headers);
List<Object> params = JAXRSUtils.processParameters(new OperationResourceInfo(m,
@@ -987,7 +987,7 @@ public class JAXRSUtilsTest extends Assert {
Class<?>[] argType = {String.class, String.class, Cookie.class};
Method m = Customer.class.getMethod("testMultipleCookieParam", argType);
Message messageImpl = createMessage();
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Cookie", "c1=c1Value; c2=c2Value");
headers.add("Cookie", "c3=c3Value");
messageImpl.put(Message.PROTOCOL_HEADERS, headers);
@@ -1253,11 +1253,11 @@ public class JAXRSUtilsTest extends Assert {
Class<?>[] argType = {Customer.CustomerBean.class};
Method m = Customer.class.getMethod("testPathBean", argType);
- MultivaluedMap<String, String> pathTemplates = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> pathTemplates = new MetadataMap<>();
pathTemplates.add("a", "aValue");
pathTemplates.add("b", "123");
- MultivaluedMap<String, String> complexPathTemplates = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> complexPathTemplates = new MetadataMap<>();
complexPathTemplates.add("c", "1");
complexPathTemplates.add("a", "A");
complexPathTemplates.add("b", "123");
@@ -1328,7 +1328,7 @@ public class JAXRSUtilsTest extends Assert {
Method m = Customer.class.getMethod("testFormBean", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.REQUEST_URI, "/bar");
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.putSingle("Content-Type", MediaType.APPLICATION_FORM_URLENCODED);
messageImpl.put(Message.PROTOCOL_HEADERS, headers);
String body = "a=aValue&b=123&cb=true";
@@ -1353,7 +1353,7 @@ public class JAXRSUtilsTest extends Assert {
Method m = Customer.class.getMethod("testFormBean", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.REQUEST_URI, "/bar");
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.putSingle("Content-Type", MediaType.APPLICATION_FORM_URLENCODED);
messageImpl.put(Message.PROTOCOL_HEADERS, headers);
String body = "a=aValue&b=123&cb=true";
@@ -1380,7 +1380,7 @@ public class JAXRSUtilsTest extends Assert {
Method m = Customer.class.getMethod("testFormBean", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.REQUEST_URI, "/bar");
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.putSingle("Content-Type", MediaType.APPLICATION_FORM_URLENCODED);
messageImpl.put(Message.PROTOCOL_HEADERS, headers);
String body = "g.b=1&g.b=2";
@@ -1556,7 +1556,7 @@ public class JAXRSUtilsTest extends Assert {
Method m = Customer.class.getMethod("testPathSegment", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.REQUEST_URI, "/bar%20foo;p4=0%201");
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
values.add("ps", "bar%20foo;p4=0%201");
List<Object> params = JAXRSUtils.processParameters(new OperationResourceInfo(m,
new ClassResourceInfo(Customer.class)),
@@ -1588,7 +1588,7 @@ public class JAXRSUtilsTest extends Assert {
Message messageImpl = createMessage();
String body = "p1=1&p2=2&p2=3";
messageImpl.put(Message.REQUEST_URI, "/foo");
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
if (useMediaType) {
headers.putSingle("Content-Type", MediaType.APPLICATION_FORM_URLENCODED);
}
@@ -1711,7 +1711,7 @@ public class JAXRSUtilsTest extends Assert {
List.class}),
cri);
ori.setHttpMethod("GET");
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Foo", "bar, baz");
Message m = createMessage();
@@ -1924,7 +1924,7 @@ public class JAXRSUtilsTest extends Assert {
OperationResourceInfo ori = new OperationResourceInfo(Customer.class.getMethods()[0],
cri);
Message m = createMessage();
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("AHeader2", "theAHeader2");
m.put(Message.PROTOCOL_HEADERS, headers);
m.put(Message.QUERY_STRING, "a_value=aValue&query2=b");
@@ -1942,7 +1942,7 @@ public class JAXRSUtilsTest extends Assert {
cri);
Message m = createMessage();
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("AHeader", "theAHeader");
m.put(Message.PROTOCOL_HEADERS, headers);
m.put(Message.QUERY_STRING, "b=bValue");
@@ -2061,7 +2061,7 @@ public class JAXRSUtilsTest extends Assert {
cri);
ori.setHttpMethod("GET");
ori.setURITemplate(new URITemplate("{id1}/{id2}"));
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
values.putSingle("id1", "1");
values.putSingle("id2", "2");
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
index 1374a1d..13e1376 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
@@ -550,7 +550,7 @@ public class DispatchImpl<T> implements Dispatch<T>, BindingProvider, Closeable
}
private Map<String, QName> createPayloadEleOpNameMap(BindingInfo bindingInfo, boolean reverseMapping) {
- Map<String, QName> payloadElementMap = new java.util.HashMap<String, QName>();
+ Map<String, QName> payloadElementMap = new java.util.HashMap<>();
// assume a document binding style, which is default according to W3C spec on WSDL
String bindingStyle = "document";
// if the bindingInfo is a SOAPBindingInfo instance then we can see if it has a style
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
index 9503540..317c49e 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
@@ -116,13 +116,13 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
private List<String> schemaLocations;
private List<Feature> features;
private List<Interceptor<? extends Message>> in
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> out
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> outFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> inFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
@SuppressWarnings("rawtypes")
private List<Handler> handlers = new ModCountCopyOnWriteArrayList<>();
private EndpointContext endpointContext;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
index 5b900f5..3ac03cf 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
@@ -92,7 +92,7 @@ public final class WrapperClassGenerator extends ASMHelper {
}
private List<Annotation> getJaxbAnnos(MessagePartInfo mpi) {
- List<Annotation> list = new java.util.concurrent.CopyOnWriteArrayList<Annotation>();
+ List<Annotation> list = new java.util.concurrent.CopyOnWriteArrayList<>();
Annotation[] anns = getMethodParameterAnnotations(mpi);
if (anns != null) {
for (Annotation anno : anns) {
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
index 5f4bac8..46c8698 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
@@ -398,7 +398,7 @@ public class WrappedMessageContext implements MessageContext {
return Collections.unmodifiableSet(set);
}
public final Set<Entry<String, Object>> entrySet() {
- Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
+ Set<Entry<String, Object>> set = new HashSet<>();
for (Map.Entry<String, Object> s : message.entrySet()) {
set.add(s);
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
index 72c36b7..4eab6cc 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
@@ -79,7 +79,7 @@ public class SwAOutInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(SwAOutInterceptor.class);
private static final Map<String, Method> SWA_REF_METHOD
- = new ConcurrentHashMap<String, Method>(4, 0.75f, 2);
+ = new ConcurrentHashMap<>(4, 0.75f, 2);
private static final Set<String> SWA_REF_NO_METHOD
= Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>(4, 0.75f, 2));
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
index c582c88..9b3be2d 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
@@ -355,7 +355,7 @@ public class JaxWsClientTest extends AbstractJaxWsTest {
if (outbound) {
headers = CastUtils.cast((Map<?, ?>) context.get(MessageContext.HTTP_REQUEST_HEADERS));
if (headers == null) {
- headers = new HashMap<String, List<String>>();
+ headers = new HashMap<>();
context.put(MessageContext.HTTP_REQUEST_HEADERS, headers);
}
headers.put("My-Custom-Header", Collections.singletonList("value"));
@@ -389,7 +389,7 @@ public class JaxWsClientTest extends AbstractJaxWsTest {
if (outbound) {
headers = CastUtils.cast((Map<?, ?>) context.get(MessageContext.HTTP_REQUEST_HEADERS));
if (headers == null) {
- headers = new HashMap<String, List<String>>();
+ headers = new HashMap<>();
context.put(MessageContext.HTTP_REQUEST_HEADERS, headers);
}
headers.put("My-Custom-Header", Collections.singletonList("value"));
diff --git a/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java b/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
index a2cb88d..bf84a94 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
@@ -50,7 +50,7 @@ public class CounterRepository {
private Lock counterCreationLock = new ReentrantLock();
public CounterRepository() {
- counters = new ConcurrentHashMap<ObjectName, Counter>();
+ counters = new ConcurrentHashMap<>();
}
public void setBus(Bus b) {
diff --git a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
index 7e88f99..9c9953f 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/counters/CounterRepositoryTest.java
@@ -36,9 +36,9 @@ import org.junit.Test;
public class CounterRepositoryTest extends Assert {
private Bus bus;
private CounterRepository cr;
- private List<Interceptor<? extends Message>> inlist = new ArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> outlist = new ArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> faultlist = new ArrayList<Interceptor<? extends Message>>();
+ private List<Interceptor<? extends Message>> inlist = new ArrayList<>();
+ private List<Interceptor<? extends Message>> outlist = new ArrayList<>();
+ private List<Interceptor<? extends Message>> faultlist = new ArrayList<>();
//private InstrumentationManager im;
private ObjectName serviceCounter;
private ObjectName operationCounter;
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
index 14a2e21..5305da2 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
@@ -49,13 +49,13 @@ public class ClientConfiguration implements InterceptorProvider, ConduitSelector
private static final Logger LOG = LogUtils.getL7dLogger(ClientConfiguration.class);
private List<Interceptor<? extends Message>> inInterceptors
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> outInterceptors
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> outFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private List<Interceptor<? extends Message>> inFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
private ConduitSelector conduitSelector;
private Bus bus;
private Map<String, Object> requestContext = new HashMap<>();
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
index f2b93ca..ecbe2fc 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
@@ -36,7 +36,7 @@ public class LocalClientState implements ClientState {
private static final String HTTP_SCHEME = "http";
private static final String WS_SCHEME = "ws";
- private MultivaluedMap<String, String> requestHeaders = new MetadataMap<String, String>(false, true);
+ private MultivaluedMap<String, String> requestHeaders = new MetadataMap<>(false, true);
private MultivaluedMap<String, String> templates;
private Response response;
private URI baseURI;
@@ -57,7 +57,7 @@ public class LocalClientState implements ClientState {
}
public LocalClientState(LocalClientState cs) {
- this.requestHeaders = new MetadataMap<String, String>(cs.requestHeaders);
+ this.requestHeaders = new MetadataMap<>(cs.requestHeaders);
this.templates = cs.templates == null ? null : new MetadataMap<String, String>(cs.templates);
this.response = cs.response;
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
index 51866ed..6bc825a 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ThreadLocalClientState.java
@@ -140,7 +140,7 @@ public class ThreadLocalClientState implements ClientState {
private void prepareCheckpointMap() {
if (checkpointMap == null) {
- checkpointMap = new ConcurrentHashMap<Thread, Long>();
+ checkpointMap = new ConcurrentHashMap<>();
}
}
diff --git a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java
index 825d677..4df7afb 100644
--- a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java
+++ b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/parse/OpenApiParseUtils.java
@@ -110,7 +110,7 @@ public final class OpenApiParseUtils {
}
}
- Map<String, List<UserOperation>> userOpsMap = new LinkedHashMap<String, List<UserOperation>>();
+ Map<String, List<UserOperation>> userOpsMap = new LinkedHashMap<>();
Set<String> tags = new HashSet<>();
List<Map<String, Object>> tagsProp = CastUtils.cast((List<?>)map.get("tags"));
if (tagsProp != null) {
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
index e714388..19c8530 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/parse/SwaggerParseUtils.java
@@ -104,7 +104,7 @@ public final class SwaggerParseUtils {
app.setBasePath(StringUtils.isEmpty(relativePath) ? "/" : relativePath);
- Map<String, List<UserOperation>> userOpsMap = new LinkedHashMap<String, List<UserOperation>>();
+ Map<String, List<UserOperation>> userOpsMap = new LinkedHashMap<>();
Set<String> tags = new HashSet<>();
List<Map<String, Object>> tagsProp = CastUtils.cast((List<?>)map.get("tags"));
if (tagsProp != null) {
diff --git a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java
index 3c25160..ff69a1a 100644
--- a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java
+++ b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObject.java
@@ -30,7 +30,7 @@ import org.apache.cxf.helpers.CastUtils;
public class JsonMapObject implements Serializable {
private static final long serialVersionUID = 2620765136328623790L;
Map<String, Integer> updateCount;
- Map<String, Object> values = new LinkedHashMap<String, Object>();
+ Map<String, Object> values = new LinkedHashMap<>();
public JsonMapObject() {
}
@@ -42,7 +42,7 @@ public class JsonMapObject implements Serializable {
public void setProperty(String name, Object value) {
if (values.containsKey(name)) {
if (updateCount == null) {
- updateCount = new LinkedHashMap<String, Integer>();
+ updateCount = new LinkedHashMap<>();
}
Integer count = updateCount.get(name);
count = count == null ? 2 : count++;
diff --git a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
index 572439b..ac10ce2 100644
--- a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
+++ b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
@@ -295,7 +295,7 @@ public class JsonMapObjectReaderWriter {
void put(String key, Object value);
}
private static class MapSettable implements Settable {
- private Map<String, Object> map = new LinkedHashMap<String, Object>();
+ private Map<String, Object> map = new LinkedHashMap<>();
public void put(String key, Object value) {
map.put(key, value);
}
diff --git a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
index 9fb7456..1684f44 100644
--- a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
+++ b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
@@ -33,7 +33,7 @@ public class JsonMapObjectReaderWriterTest extends Assert {
@Test
public void testWriteMap() throws Exception {
- Map<String, Object> map = new LinkedHashMap<String, Object>();
+ Map<String, Object> map = new LinkedHashMap<>();
map.put("a", "aValue");
map.put("b", 123);
map.put("c", Collections.singletonList("cValue"));
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java
index 0b70ac5..307f319 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java
@@ -38,7 +38,7 @@ public abstract class AbstractAegisProvider<T>
implements MessageBodyReader<T>, MessageBodyWriter<T> {
private static Map<java.lang.reflect.Type, AegisContext> classContexts
- = new WeakHashMap<java.lang.reflect.Type, AegisContext>();
+ = new WeakHashMap<>();
protected boolean writeXsiType = true;
protected boolean readXsiType = true;
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 ebcb040..6fa9cc4 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
@@ -144,7 +144,7 @@ public class AegisElementProviderTest extends Assert {
testMap.put(bean, bean2);
MessageBodyWriter<Map<AegisTestBean, AegisSuperBean>> writer
- = new AegisElementProvider<Map<AegisTestBean, AegisSuperBean>>();
+ = new AegisElementProvider<>();
ByteArrayOutputStream os = new ByteArrayOutputStream();
writer.writeTo(testMap, testMap.getClass(), mapType, new Annotation[]{},
@@ -153,7 +153,7 @@ public class AegisElementProviderTest extends Assert {
byte[] bytes = os.toByteArray();
String xml = new String(bytes, "utf-8");
MessageBodyReader<Map<AegisTestBean, AegisSuperBean>> reader
- = new AegisElementProvider<Map<AegisTestBean, AegisSuperBean>>();
+ = new AegisElementProvider<>();
byte[] simpleBytes = xml.getBytes("utf-8");
Map<AegisTestBean, AegisSuperBean> map2 = reader.readFrom(null, mapType, new Annotation[]{},
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
index 87723fb..e5a11a5 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
@@ -39,8 +39,8 @@ public class Beanspector<T> {
private Class<T> tclass;
private T tobj;
- private Map<String, Method> getters = new LinkedHashMap<String, Method>();
- private Map<String, Method> setters = new LinkedHashMap<String, Method>();
+ private Map<String, Method> getters = new LinkedHashMap<>();
+ private Map<String, Method> setters = new LinkedHashMap<>();
public Beanspector(Class<T> tclass) {
if (tclass == null) {
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java
index 310898a..5432eb8 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextImpl.java
@@ -186,7 +186,7 @@ public class SearchContextImpl implements SearchContext {
Map<String, String> props = null;
if (parserProperties == null) {
- props = new LinkedHashMap<String, String>(4);
+ props = new LinkedHashMap<>(4);
props.put(SearchUtils.DATE_FORMAT_PROPERTY,
(String)message.getContextualProperty(SearchUtils.DATE_FORMAT_PROPERTY));
props.put(SearchUtils.TIMEZONE_SUPPORT_PROPERTY,
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitor.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitor.java
index 681c5cf..2b6b9b2 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitor.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitor.java
@@ -59,7 +59,7 @@ public class LuceneQueryVisitor<T> extends AbstractSearchConditionVisitor<T, Que
private String contentsFieldName;
private Map<String, String> contentsFieldMap;
private boolean caseInsensitiveMatch;
- private VisitorState< Stack< List< Query > > > state = new ThreadLocalVisitorState< Stack< List< Query > > >();
+ private VisitorState< Stack< List< Query > > > state = new ThreadLocalVisitorState<>();
private QueryBuilder queryBuilder;
public LuceneQueryVisitor() {
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
index 66395ad..060d859 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
@@ -104,7 +104,7 @@ public class ODataParser<T> extends AbstractSearchConditionParser<T> {
// AND / OR operate on search conditions
if (operator == BinaryOperator.AND || operator == BinaryOperator.OR) {
if (leftSide instanceof SearchCondition && rightSide instanceof SearchCondition) {
- final List< SearchCondition< T > > conditions = new ArrayList< SearchCondition< T > >(2);
+ final List< SearchCondition< T > > conditions = new ArrayList<>(2);
conditions.add((SearchCondition< T >)leftSide);
conditions.add((SearchCondition< T >)rightSide);
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
index bbce073..02adf23 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/lucene/LuceneQueryVisitorFiqlTest.java
@@ -220,7 +220,7 @@ public class LuceneQueryVisitorFiqlTest extends AbstractLuceneQueryVisitorTest {
final LuceneQueryVisitor<SearchBean> visitor = new LuceneQueryVisitor<>();
final ExecutorService executorService = Executors.newFixedThreadPool(5);
- final Collection< Future< ? > > futures = new ArrayList< Future< ? > >();
+ final Collection< Future< ? > > futures = new ArrayList<>();
for (int i = 0; i < 5; ++i) {
final int index = i;
diff --git a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
index f982fa9..1af8a1c 100644
--- a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
+++ b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
@@ -279,7 +279,7 @@ public class CrossOriginResourceSharingFilter implements ContainerRequestFilter,
if (matchedResources == null) {
return null;
}
- MultivaluedMap<String, String> values = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> values = new MetadataMap<>();
OperationResourceInfo ori = findPreflightMethod(matchedResources, requestUri, httpMethod, values, m);
return ori == null ? null : ori.getAnnotatedMethod();
}
@@ -308,7 +308,7 @@ public class CrossOriginResourceSharingFilter implements ContainerRequestFilter,
if (subcri == null) {
return null;
}
- MultivaluedMap<String, String> newValues = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> newValues = new MetadataMap<>();
newValues.putAll(values);
return findPreflightMethod(Collections.singletonMap(subcri, newValues),
values.getFirst(URITemplate.FINAL_MATCH_GROUP),
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 b1f1a38..d5709c2 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
@@ -72,8 +72,8 @@ public final class JoseJaxrsUtils {
if (protectedHttpHeaders == null) {
protectedHttpHeaders = DEFAULT_PROTECTED_HTTP_HEADERS;
}
- Map<String, String> joseHttpHeaders = new HashMap<String, String>();
- Map<String, String> updatedHttpHeaders = new HashMap<String, String>();
+ Map<String, String> joseHttpHeaders = new HashMap<>();
+ Map<String, String> updatedHttpHeaders = new HashMap<>();
for (String headerName : protectedHttpHeaders) {
List<String> headerValues = httpHeaders.get(headerName);
if (headerValues != null) {
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonEncryptionEntry.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonEncryptionEntry.java
index 55f9897..089d475 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonEncryptionEntry.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonEncryptionEntry.java
@@ -46,7 +46,7 @@ public class JweJsonEncryptionEntry implements JsonObject {
}
public String toJson() {
JsonMapObjectReaderWriter jsonWriter = new JsonMapObjectReaderWriter();
- Map<String, Object> recipientsEntry = new LinkedHashMap<String, Object>();
+ Map<String, Object> recipientsEntry = new LinkedHashMap<>();
if (unprotectedHeader != null && !unprotectedHeader.asMap().isEmpty()) {
recipientsEntry.put("header", this.unprotectedHeader);
}
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
index 0f5ae53..312717a 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducer.java
@@ -98,7 +98,7 @@ public class JweJsonProducer {
}
List<JweJsonEncryptionEntry> entries = new ArrayList<>(encryptors.size());
- Map<String, Object> jweJsonMap = new LinkedHashMap<String, Object>();
+ Map<String, Object> jweJsonMap = new LinkedHashMap<>();
byte[] cipherText = null;
byte[] authTag = null;
byte[] iv = null;
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
index 27c1937..0542adf 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JsonWebKeys.java
@@ -69,7 +69,7 @@ public class JsonWebKeys extends JsonMapObject {
if (keys == null) {
return Collections.emptyMap();
}
- Map<String, JsonWebKey> map = new LinkedHashMap<String, JsonWebKey>();
+ Map<String, JsonWebKey> map = new LinkedHashMap<>();
for (JsonWebKey key : keys) {
String kid = key.getKeyId();
if (kid != null) {
@@ -86,7 +86,7 @@ public class JsonWebKeys extends JsonMapObject {
if (keys == null) {
return Collections.emptyMap();
}
- Map<KeyType, List<JsonWebKey>> map = new LinkedHashMap<KeyType, List<JsonWebKey>>();
+ Map<KeyType, List<JsonWebKey>> map = new LinkedHashMap<>();
for (JsonWebKey key : keys) {
KeyType type = key.getKeyType();
if (type != null) {
@@ -106,7 +106,7 @@ public class JsonWebKeys extends JsonMapObject {
if (keys == null) {
return Collections.emptyMap();
}
- Map<KeyOperation, List<JsonWebKey>> map = new LinkedHashMap<KeyOperation, List<JsonWebKey>>();
+ Map<KeyOperation, List<JsonWebKey>> map = new LinkedHashMap<>();
for (JsonWebKey key : keys) {
List<KeyOperation> ops = key.getKeyOperation();
if (ops != null) {
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
index 9299cd3..6d24873 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java
@@ -181,7 +181,7 @@ public class JwsCompactReaderWriterTest extends Assert {
@Test
public void testWriteJwsWithJwkAsMapSignedByMac() throws Exception {
- Map<String, Object> map = new LinkedHashMap<String, Object>();
+ Map<String, Object> map = new LinkedHashMap<>();
map.put(JsonWebKey.KEY_TYPE, JsonWebKey.KEY_TYPE_OCTET);
map.put(JsonWebKey.KEY_OPERATIONS,
new KeyOperation[]{KeyOperation.SIGN, KeyOperation.VERIFY});
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
index 6f44c62..e03dc47 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
@@ -73,7 +73,7 @@ public final class OAuthUtils {
String theURI = wildcard ? uri.substring(0, uri.length() - 1) : uri;
try {
URITemplate template = new URITemplate(theURI);
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
if (template.match(servletPath, map)) {
String finalGroup = map.getFirst(URITemplate.FINAL_MATCH_GROUP);
if (wildcard || StringUtils.isEmpty(finalGroup) || "/".equals(finalGroup)) {
@@ -138,7 +138,7 @@ public final class OAuthUtils {
InputStream stream = mc != null
? mc.getContent(InputStream.class) : oAuthMessage.getBodyAsStream();
String body = FormUtils.readBody(stream, enc);
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
FormUtils.populateMapFromString(map, PhaseInterceptorChain.getCurrentMessage(), body, enc, true,
request);
for (String key : map.keySet()) {
diff --git a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/AbstractSaml2BearerGrant.java b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/AbstractSaml2BearerGrant.java
index 71bf964..b146bef 100644
--- a/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/AbstractSaml2BearerGrant.java
+++ b/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/AbstractSaml2BearerGrant.java
@@ -44,7 +44,7 @@ public abstract class AbstractSaml2BearerGrant implements AccessTokenGrant {
}
protected MultivaluedMap<String, String> initMap() {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
map.putSingle(OAuthConstants.GRANT_TYPE, grantType);
return map;
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
index 7911f9a..f3261f2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java
@@ -303,13 +303,13 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter {
protected MultivaluedMap<String, String> toCodeRequestState(ContainerRequestContext rc, UriInfo ui) {
MultivaluedMap<String, String> state = toRequestState(rc, ui);
if (state == null) {
- state = new MetadataMap<String, String>();
+ state = new MetadataMap<>();
}
return state;
}
protected MultivaluedMap<String, String> toRequestState(ContainerRequestContext rc, UriInfo ui) {
- MultivaluedMap<String, String> requestState = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> requestState = new MetadataMap<>();
requestState.putAll(ui.getQueryParameters(decodeRequestParameters));
if (MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(rc.getMediaType())) {
String body = FormUtils.readBody(rc.getEntityStream(), StandardCharsets.UTF_8.name());
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/JoseClientCodeStateManager.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/JoseClientCodeStateManager.java
index cd1df47..08613fc 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/JoseClientCodeStateManager.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/JoseClientCodeStateManager.java
@@ -57,7 +57,7 @@ public class JoseClientCodeStateManager implements ClientCodeStateManager {
if (theEncryptionProvider == null && theSigProvider == null) {
throw new OAuthServiceException("The state can not be protected");
}
- MultivaluedMap<String, String> redirectMap = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> redirectMap = new MetadataMap<>();
if (generateNonce && theSigProvider != null) {
JwsCompactProducer nonceProducer = new JwsCompactProducer(OAuthUtils.generateRandomTokenKey());
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 989f9c7..a87e9cc 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
@@ -41,7 +41,7 @@ public class MemoryClientCodeStateManager implements ClientCodeStateManager {
public MultivaluedMap<String, String> toRedirectState(MessageContext mc,
MultivaluedMap<String, String> requestState) {
String stateParam = OAuthUtils.generateRandomTokenKey();
- MultivaluedMap<String, String> redirectMap = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> redirectMap = new MetadataMap<>();
if (generateNonce) {
String nonceParam = MessageDigestUtils.generate(CryptoUtils.generateSecureRandomBytes(16));
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AbstractFormImplicitResponse.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AbstractFormImplicitResponse.java
index 6244faa..e94ec80 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AbstractFormImplicitResponse.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AbstractFormImplicitResponse.java
@@ -25,7 +25,7 @@ public abstract class AbstractFormImplicitResponse {
private String responseType;
private String redirectUri;
private String state;
- private Map<String, String> parameters = new LinkedHashMap<String, String>();
+ private Map<String, String> parameters = new LinkedHashMap<>();
public String getRedirectUri() {
return redirectUri;
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
index ebbf9a7..ba203bf 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
@@ -47,7 +47,7 @@ public abstract class AccessToken implements Serializable {
private String encodedToken;
- private Map<String, String> parameters = new LinkedHashMap<String, String>();
+ private Map<String, String> parameters = new LinkedHashMap<>();
protected AccessToken() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenRegistration.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenRegistration.java
index fee9597..1fd5ef2 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenRegistration.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenRegistration.java
@@ -37,7 +37,7 @@ public class AccessTokenRegistration {
private String clientCodeVerifier;
private String responseType;
private String grantCode;
- private Map<String, String> extraProperties = new LinkedHashMap<String, String>();
+ private Map<String, String> extraProperties = new LinkedHashMap<>();
/**
* Sets the {@link Client} instance
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java
index 4d50336..f69eb20 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthContext.java
@@ -40,7 +40,7 @@ public class OAuthContext {
private String tokenAudience;
private String tokenIssuer;
private String[] tokenRequestParts;
- private Map<String, String> tokenExtraProperties = new LinkedHashMap<String, String>();
+ private Map<String, String> tokenExtraProperties = new LinkedHashMap<>();
public OAuthContext(UserSubject resourceOwnerSubject,
UserSubject clientSubject,
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthRedirectionState.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthRedirectionState.java
index ca4cfe3..e583949 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthRedirectionState.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthRedirectionState.java
@@ -34,7 +34,7 @@ public class OAuthRedirectionState implements Serializable {
private String nonce;
private String clientCodeChallenge;
private String responseType;
- private Map<String, String> extraProperties = new LinkedHashMap<String, String>();
+ private Map<String, String> extraProperties = new LinkedHashMap<>();
public OAuthRedirectionState() {
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
index 141d35b..a50038a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
@@ -52,7 +52,7 @@ public abstract class ServerAccessToken extends AccessToken {
private String nonce;
private String responseType;
private String grantCode;
- private Map<String, String> extraProperties = new LinkedHashMap<String, String>();
+ private Map<String, String> extraProperties = new LinkedHashMap<>();
protected ServerAccessToken() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenIntrospectionClient.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenIntrospectionClient.java
index 5a8c8de..527018d 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenIntrospectionClient.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenIntrospectionClient.java
@@ -51,7 +51,7 @@ public class AccessTokenIntrospectionClient implements AccessTokenValidator {
MultivaluedMap<String, String> extraProps)
throws OAuthServiceException {
WebClient client = WebClient.fromClient(tokenValidatorClient, true);
- MultivaluedMap<String, String> props = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> props = new MetadataMap<>();
props.putSingle(OAuthConstants.TOKEN_ID, authSchemeData);
try {
TokenIntrospection response = client.post(props, TokenIntrospection.class);
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
index dfb502c..230c5e5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
@@ -49,7 +49,7 @@ public class AccessTokenValidatorClient implements AccessTokenValidator {
MultivaluedMap<String, String> extraProps)
throws OAuthServiceException {
WebClient client = WebClient.fromClient(tokenValidatorClient, true);
- MultivaluedMap<String, String> props = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> props = new MetadataMap<>();
props.putSingle(OAuthConstants.AUTHORIZATION_SCHEME_TYPE, authScheme);
props.putSingle(OAuthConstants.AUTHORIZATION_SCHEME_DATA, authSchemeData);
if (extraProps != null) {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/AbstractGrant.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/AbstractGrant.java
index 773652e..5c8d168 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/AbstractGrant.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/AbstractGrant.java
@@ -59,7 +59,7 @@ public abstract class AbstractGrant implements AccessTokenGrant {
}
public MultivaluedMap<String, String> toMap() {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
map.putSingle(OAuthConstants.GRANT_TYPE, getType());
if (scope != null) {
map.putSingle(OAuthConstants.SCOPE, scope);
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
index 94e088a..e3cb39a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
@@ -97,7 +97,7 @@ public class AuthorizationCodeGrant implements AccessTokenGrant {
* {@inheritDoc}
*/
public MultivaluedMap<String, String> toMap() {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
map.putSingle(OAuthConstants.GRANT_TYPE, OAuthConstants.AUTHORIZATION_CODE_GRANT);
map.putSingle(OAuthConstants.AUTHORIZATION_CODE_VALUE, getCode());
if (getRedirectUri() != null) {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeRegistration.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeRegistration.java
index 7a4940f..4886c76 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeRegistration.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeRegistration.java
@@ -41,7 +41,7 @@ public class AuthorizationCodeRegistration {
private String responseType;
private String clientCodeChallenge;
private boolean preauthorizedTokenAvailable;
- private Map<String, String> extraProperties = new LinkedHashMap<String, String>();
+ private Map<String, String> extraProperties = new LinkedHashMap<>();
/**
* Sets the {@link Client} reference
* @param client the client
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java
index fc63fe0..4ef8dc9 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java
@@ -83,7 +83,7 @@ public class JwtRequestCodeFilter extends OAuthJoseJwtConsumer implements Author
throw new SecurityException();
}
- MultivaluedMap<String, String> newParams = new MetadataMap<String, String>(params);
+ MultivaluedMap<String, String> newParams = new MetadataMap<>(params);
Map<String, Object> claimsMap = claims.asMap();
for (Map.Entry<String, Object> entry : claimsMap.entrySet()) {
String key = entry.getKey();
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeGrant.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeGrant.java
index a15f399..b3845e5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeGrant.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeGrant.java
@@ -56,7 +56,7 @@ public class JwtRequestCodeGrant extends AuthorizationCodeGrant {
}
public MultivaluedMap<String, String> toMap() {
String request = getRequest();
- MultivaluedMap<String, String> newMap = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> newMap = new MetadataMap<>();
newMap.putSingle("request", request);
return newMap;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java
index faf9a4d..e936b69 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java
@@ -53,7 +53,7 @@ public class ServerAuthorizationCodeGrant extends AuthorizationCodeGrant {
private String clientCodeChallenge;
private String nonce;
private boolean preauthorizedTokenAvailable;
- private Map<String, String> extraProperties = new LinkedHashMap<String, String>();
+ private Map<String, String> extraProperties = new LinkedHashMap<>();
public ServerAuthorizationCodeGrant() {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtBearerGrant.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtBearerGrant.java
index 9e367c1..8ef87a7 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtBearerGrant.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtBearerGrant.java
@@ -44,7 +44,7 @@ public abstract class AbstractJwtBearerGrant implements AccessTokenGrant {
}
protected MultivaluedMap<String, String> initMap() {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
map.putSingle(OAuthConstants.GRANT_TYPE, grantType);
return map;
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrant.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrant.java
index f5b6bc0..ef1c513 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrant.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrant.java
@@ -43,7 +43,7 @@ public class RefreshTokenGrant implements AccessTokenGrant {
}
public MultivaluedMap<String, String> toMap() {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
map.putSingle(OAuthConstants.GRANT_TYPE, OAuthConstants.REFRESH_TOKEN_GRANT);
map.putSingle(OAuthConstants.REFRESH_TOKEN, refreshToken);
if (scope != null) {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index 4f07fdd..4e1c794 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -153,7 +153,7 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl
}
}
if (!at.getExtraProperties().isEmpty()) {
- Map<String, String> actualExtraProps = new HashMap<String, String>();
+ Map<String, String> actualExtraProps = new HashMap<>();
for (Map.Entry<String, String> entry : at.getExtraProperties().entrySet()) {
if (JoseConstants.HEADER_X509_THUMBPRINT_SHA256.equals(entry.getKey())) {
claims.setClaim(JwtConstants.CLAIM_CONFIRMATION,
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java
index 77f0be4..90b9aaf 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java
@@ -40,7 +40,7 @@ public class DefaultEncryptingOAuthDataProvider extends AbstractOAuthDataProvide
protected SecretKey key;
private Set<String> tokens = Collections.synchronizedSet(new HashSet<>());
private Set<String> refreshTokens = Collections.synchronizedSet(new HashSet<>());
- private ConcurrentHashMap<String, String> clientsMap = new ConcurrentHashMap<String, String>();
+ private ConcurrentHashMap<String, String> clientsMap = new ConcurrentHashMap<>();
public DefaultEncryptingOAuthDataProvider(String algo, int keySize) {
this(new KeyProperties(algo, keySize));
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
index 6fd50e4..df1abe4 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProvider.java
@@ -305,7 +305,7 @@ public class OAuthJSONProvider implements MessageBodyWriter<Object>,
if (!str.startsWith("{") || !str.endsWith("}")) {
throw new IOException("JSON Sequence is broken");
}
- Map<String, String> map = new LinkedHashMap<String, String>();
+ Map<String, String> map = new LinkedHashMap<>();
str = str.substring(1, str.length() - 1).trim();
String[] jsonPairs = str.split(",");
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
index 29d0ef7..0d98779 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadataService.java
@@ -54,7 +54,7 @@ public class AuthorizationMetadataService {
@GET
@Produces("application/json")
public String getConfiguration(@Context UriInfo ui) {
- Map<String, Object> cfg = new LinkedHashMap<String, Object>();
+ Map<String, Object> cfg = new LinkedHashMap<>();
String baseUri = getBaseUri(ui);
prepareConfigurationData(cfg, baseUri);
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorClient.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorClient.java
index a1fa491..dbada7c 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorClient.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/HawkAccessTokenValidatorClient.java
@@ -39,7 +39,7 @@ public class HawkAccessTokenValidatorClient extends AbstractHawkAccessTokenValid
MultivaluedMap<String, String> extraProps)
throws OAuthServiceException {
if (isRemoteSignatureValidation()) {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
if (extraProps != null) {
map.putAll(extraProps);
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
index 436b84a..47105e8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
@@ -312,7 +312,7 @@ public final class OAuthUtils {
String theURI = wildcard ? uri.substring(0, uri.length() - 1) : uri;
try {
URITemplate template = new URITemplate(theURI);
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
if (template.match(servletPath, map)) {
String finalGroup = map.getFirst(URITemplate.FINAL_MATCH_GROUP);
if (wildcard || StringUtils.isEmpty(finalGroup) || "/".equals(finalGroup)) {
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
index 163e8fb..ac2f85d 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/TokenGrantHandlerTest.java
@@ -74,7 +74,7 @@ public class TokenGrantHandlerTest extends Assert {
}
private MultivaluedMap<String, String> createMap(String grant) {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
map.putSingle(OAuthConstants.GRANT_TYPE, grant);
return map;
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
index cfd9f2b..c14cbc1 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/OAuthJSONProviderTest.java
@@ -186,7 +186,7 @@ public class OAuthJSONProviderTest extends Assert {
token.setExpiresIn(12345);
token.setRefreshToken("5678");
token.setApprovedScope("read");
- Map<String, String> params = new LinkedHashMap<String, String>();
+ Map<String, String> params = new LinkedHashMap<>();
params.put(OAuthConstants.HAWK_TOKEN_KEY, "test_mac_secret");
params.put(OAuthConstants.HAWK_TOKEN_ALGORITHM, OAuthConstants.HMAC_ALGO_SHA_1);
params.put("my_parameter", "http://abc");
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java
index d3e02dd..355d9f5 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/AbstractUserInfo.java
@@ -182,7 +182,7 @@ public abstract class AbstractUserInfo extends JwtClaims {
public void setAggregatedClaims(AggregatedClaims claims) {
setAddClaimNames(claims.getClaimNames());
- Map<String, Map<String, String>> sources = new LinkedHashMap<String, Map<String, String>>();
+ Map<String, Map<String, String>> sources = new LinkedHashMap<>();
for (Map.Entry<String, String> entry : claims.getClaimNames().entrySet()) {
String source = entry.getValue();
String jwt = claims.getClaimSources().get(source);
@@ -219,8 +219,8 @@ public abstract class AbstractUserInfo extends JwtClaims {
AggregatedClaims claims = new AggregatedClaims();
- Map<String, String> namesMap = new LinkedHashMap<String, String>();
- Map<String, String> sourcesMap = new LinkedHashMap<String, String>();
+ Map<String, String> namesMap = new LinkedHashMap<>();
+ Map<String, String> sourcesMap = new LinkedHashMap<>();
for (Map.Entry<String, String> entry : names.entrySet()) {
String source = entry.getValue();
Map<String, String> sourceValue = sources.get(source);
@@ -236,11 +236,11 @@ public abstract class AbstractUserInfo extends JwtClaims {
}
public void setDistributedClaims(DistributedClaims claims) {
setAddClaimNames(claims.getClaimNames());
- Map<String, Map<String, String>> sources = new LinkedHashMap<String, Map<String, String>>();
+ Map<String, Map<String, String>> sources = new LinkedHashMap<>();
for (Map.Entry<String, String> entry : claims.getClaimNames().entrySet()) {
String source = entry.getValue();
DistributedClaimSource distSource = claims.getClaimSources().get(source);
- Map<String, String> mapSource = new LinkedHashMap<String, String>();
+ Map<String, String> mapSource = new LinkedHashMap<>();
mapSource.put(OidcUtils.ENDPOINT_CLAIM_SOURCE_PROPERTY, distSource.getEndpoint());
if (distSource.getAccessToken() != null) {
mapSource.put(OidcUtils.TOKEN_CLAIM_SOURCE_PROPERTY, distSource.getAccessToken());
@@ -257,8 +257,8 @@ public abstract class AbstractUserInfo extends JwtClaims {
return null;
}
DistributedClaims claims = new DistributedClaims();
- Map<String, String> namesMap = new LinkedHashMap<String, String>();
- Map<String, DistributedClaimSource> sourcesMap = new LinkedHashMap<String, DistributedClaimSource>();
+ Map<String, String> namesMap = new LinkedHashMap<>();
+ Map<String, DistributedClaimSource> sourcesMap = new LinkedHashMap<>();
for (Map.Entry<String, String> entry : names.entrySet()) {
String source = entry.getValue();
Map<String, String> sourceValue = sources.get(source);
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/ClaimsRequest.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/ClaimsRequest.java
index c493077..ea773f5 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/ClaimsRequest.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/common/ClaimsRequest.java
@@ -50,7 +50,7 @@ public class ClaimsRequest extends JsonMapObject {
if (claimsMap.values().iterator().next() instanceof ClaimRequirement) {
return CastUtils.cast((Map<?, ?>)claimsMap);
}
- Map<String, ClaimRequirement> claims = new LinkedHashMap<String, ClaimRequirement>();
+ Map<String, ClaimRequirement> claims = new LinkedHashMap<>();
Map<String, Map<String, ?>> parsedMap = CastUtils.cast((Map<?, ?>)claimsProp);
for (Map.Entry<String, Map<String, ?>> entry : parsedMap.entrySet()) {
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClaimsValidator.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClaimsValidator.java
index 222d421..6dfaf2b 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClaimsValidator.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClaimsValidator.java
@@ -42,7 +42,7 @@ public class OidcClaimsValidator extends OAuthJoseJwtConsumer {
private WebClient jwkSetClient;
private boolean supportSelfIssuedProvider;
private boolean strictTimeValidation;
- private ConcurrentHashMap<String, JsonWebKey> keyMap = new ConcurrentHashMap<String, JsonWebKey>();
+ private ConcurrentHashMap<String, JsonWebKey> keyMap = new ConcurrentHashMap<>();
/**
* Validate core JWT claims
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
index 9b0b641..04126ce 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcIdTokenRequestFilter.java
@@ -59,7 +59,7 @@ public class OidcIdTokenRequestFilter implements ContainerRequestFilter {
}
private MultivaluedMap<String, String> toFormData(ContainerRequestContext rc) {
- MultivaluedMap<String, String> requestState = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> requestState = new MetadataMap<>();
if (MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(rc.getMediaType())) {
String body = FormUtils.readBody(rc.getEntityStream(), StandardCharsets.UTF_8.name());
FormUtils.populateMapFromString(requestState, JAXRSUtils.getCurrentMessage(), body,
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
index 3d77a89..9268d78 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
@@ -107,7 +107,7 @@ public class OidcRpAuthenticationFilter implements ContainerRequestFilter {
return true;
}
private MultivaluedMap<String, String> toRequestState(ContainerRequestContext rc) {
- MultivaluedMap<String, String> requestState = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> requestState = new MetadataMap<>();
requestState.putAll(rc.getUriInfo().getQueryParameters(true));
if (MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(rc.getMediaType())) {
String body = FormUtils.readBody(rc.getEntityStream(), StandardCharsets.UTF_8.name());
diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java
index af69975..4717570 100644
--- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java
+++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java
@@ -40,7 +40,7 @@ public class Activator implements BundleActivator {
public void start(BundleContext context) throws Exception {
conduitConfigurer = new ConduitConfigurer(context);
conduitConfigurer.open();
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, Object> properties = new Hashtable<>();
properties.put(Constants.SERVICE_PID, "org.apache.cxf.transport.http.async");
context.registerService(ManagedService.class.getName(), conduitConfigurer, properties);
}
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index 347726a..11f1af3 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -83,7 +83,7 @@ public class JettyHTTPServerEngineFactoryHolder {
factory = new JettyHTTPServerEngineFactory(defaultBus);
Map<String, ThreadingParameters> threadingParametersMap
- = new TreeMap<String, ThreadingParameters>();
+ = new TreeMap<>();
if (config.getIdentifiedThreadingParameters() != null) {
for (ThreadingParametersIdentifiedType threads : config.getIdentifiedThreadingParameters()) {
@@ -99,7 +99,7 @@ public class JettyHTTPServerEngineFactoryHolder {
}
//SSL
- Map<String, TLSServerParameters> sslMap = new TreeMap<String, TLSServerParameters>();
+ Map<String, TLSServerParameters> sslMap = new TreeMap<>();
if (config.getIdentifiedTLSServerParameters() != null) {
for (TLSServerParametersIdentifiedType t : config.getIdentifiedTLSServerParameters()) {
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
index a3f20c6..e40d686 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettySpringTypesFactory.java
@@ -50,7 +50,7 @@ public final class JettySpringTypesFactory {
}
private static Map<String, ThreadingParameters> toThreadingParameters(
List <ThreadingParametersIdentifiedType> list) {
- Map<String, ThreadingParameters> map = new TreeMap<String, ThreadingParameters>();
+ Map<String, ThreadingParameters> map = new TreeMap<>();
for (ThreadingParametersIdentifiedType t : list) {
ThreadingParameters parameter =
toThreadingParameters(t.getThreadingParameters());
@@ -68,7 +68,7 @@ public final class JettySpringTypesFactory {
private static Map<String, TLSServerParameters> toTLSServerParamenters(
List <TLSServerParametersIdentifiedType> list) {
- Map<String, TLSServerParameters> map = new TreeMap<String, TLSServerParameters>();
+ Map<String, TLSServerParameters> map = new TreeMap<>();
for (TLSServerParametersIdentifiedType t : list) {
try {
TLSServerParameters parameter = new TLSServerParametersConfig(t.getTlsServerParameters());
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
index 00673cf..182d997 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
@@ -69,7 +69,7 @@ public class NettyHttpServerEngine implements ServerEngine {
private NettyHttpServletPipelineFactory servletPipeline;
- private Map<String, NettyHttpContextHandler> handlerMap = new ConcurrentHashMap<String, NettyHttpContextHandler>();
+ private Map<String, NettyHttpContextHandler> handlerMap = new ConcurrentHashMap<>();
/**
* This field holds the TLS ServerParameters that are programatically
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
index 4fe1e9f..7895d01 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
@@ -74,7 +74,7 @@ public class NettyHttpServerEngineFactoryHolder {
factory = new NettyHttpServerEngineFactory();
Map<String, ThreadingParameters> threadingParametersMap
- = new TreeMap<String, ThreadingParameters>();
+ = new TreeMap<>();
if (config.getIdentifiedThreadingParameters() != null) {
for (ThreadingParametersIdentifiedType threads : config.getIdentifiedThreadingParameters()) {
@@ -88,7 +88,7 @@ public class NettyHttpServerEngineFactoryHolder {
}
//SSL
- Map<String, TLSServerParameters> sslMap = new TreeMap<String, TLSServerParameters>();
+ Map<String, TLSServerParameters> sslMap = new TreeMap<>();
if (config.getIdentifiedTLSServerParameters() != null) {
for (TLSServerParametersIdentifiedType t : config.getIdentifiedTLSServerParameters()) {
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
index b0d564d..20136b3 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
@@ -72,7 +72,7 @@ public class NettyHttpServletRequest implements HttpServletRequest {
private QueryStringDecoder queryStringDecoder;
- private Map<String, Object> attributes = new ConcurrentHashMap<String, Object>();
+ private Map<String, Object> attributes = new ConcurrentHashMap<>();
private String characterEncoding;
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpSession.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpSession.java
index 5d000d7..773766d 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpSession.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpSession.java
@@ -137,7 +137,7 @@ public class NettyHttpSession implements HttpSession {
@Override
public void setAttribute(String name, Object value) {
if (attributes == null) {
- attributes = new ConcurrentHashMap<String, Object>();
+ attributes = new ConcurrentHashMap<>();
}
attributes.put(name, value);
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/session/DefaultHttpSessionStore.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/session/DefaultHttpSessionStore.java
index 6221bf9..b0d27e9 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/session/DefaultHttpSessionStore.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/session/DefaultHttpSessionStore.java
@@ -35,7 +35,7 @@ public class DefaultHttpSessionStore implements HttpSessionStore {
private static final Logger LOG = LogUtils.getL7dLogger(DefaultHttpSessionStore.class);
private static final Map<String, NettyHttpSession> SESSIONS
- = new ConcurrentHashMap<String, NettyHttpSession>();
+ = new ConcurrentHashMap<>();
@Override
public NettyHttpSession createSession() {
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
index 806f2df..c7ce115 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
@@ -53,7 +53,7 @@ public final class NettySpringTypesFactory {
private static Map<String, ThreadingParameters> toThreadingParameters(
List<ThreadingParametersIdentifiedType> list) {
- Map<String, ThreadingParameters> map = new TreeMap<String, ThreadingParameters>();
+ Map<String, ThreadingParameters> map = new TreeMap<>();
for (ThreadingParametersIdentifiedType t : list) {
ThreadingParameters parameter = toThreadingParameters(t.getThreadingParameters());
map.put(t.getId(), parameter);
@@ -69,7 +69,7 @@ public final class NettySpringTypesFactory {
private static Map<String, TLSServerParameters> toTLSServerParamenters(
List <TLSServerParametersIdentifiedType> list) {
- Map<String, TLSServerParameters> map = new TreeMap<String, TLSServerParameters>();
+ Map<String, TLSServerParameters> map = new TreeMap<>();
for (TLSServerParametersIdentifiedType t : list) {
try {
TLSServerParameters parameter = new TLSServerParametersConfig(t.getTlsServerParameters());
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
index cb225cb..7e049b8 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
@@ -79,7 +79,7 @@ public class UndertowHTTPServerEngineFactoryHolder {
factory = new UndertowHTTPServerEngineFactory();
Map<String, ThreadingParameters> threadingParametersMap
- = new TreeMap<String, ThreadingParameters>();
+ = new TreeMap<>();
if (config.getIdentifiedThreadingParameters() != null) {
for (ThreadingParametersIdentifiedType threads : config.getIdentifiedThreadingParameters()) {
@@ -95,7 +95,7 @@ public class UndertowHTTPServerEngineFactoryHolder {
}
//SSL
- Map<String, TLSServerParameters> sslMap = new TreeMap<String, TLSServerParameters>();
+ Map<String, TLSServerParameters> sslMap = new TreeMap<>();
if (config.getIdentifiedTLSServerParameters() != null) {
for (TLSServerParametersIdentifiedType t : config.getIdentifiedTLSServerParameters()) {
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
index 3a7e1ff..081eeab 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
@@ -50,7 +50,7 @@ public final class UndertowSpringTypesFactory {
}
private static Map<String, ThreadingParameters> toThreadingParameters(
List <ThreadingParametersIdentifiedType> list) {
- Map<String, ThreadingParameters> map = new TreeMap<String, ThreadingParameters>();
+ Map<String, ThreadingParameters> map = new TreeMap<>();
for (ThreadingParametersIdentifiedType t : list) {
ThreadingParameters parameter =
toThreadingParameters(t.getThreadingParameters());
@@ -68,7 +68,7 @@ public final class UndertowSpringTypesFactory {
private static Map<String, TLSServerParameters> toTLSServerParamenters(
List <TLSServerParametersIdentifiedType> list) {
- Map<String, TLSServerParameters> map = new TreeMap<String, TLSServerParameters>();
+ Map<String, TLSServerParameters> map = new TreeMap<>();
for (TLSServerParametersIdentifiedType t : list) {
try {
TLSServerParameters parameter = new TLSServerParametersConfig(t.getTlsServerParameters());
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
index 7a64392..27d53b5 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
@@ -30,7 +30,7 @@ public class Cookies {
/**
* Variables for holding session state if sessions are supposed to be maintained
*/
- private final Map<String, Cookie> sessionCookies = new ConcurrentHashMap<String, Cookie>(4, 0.75f, 4);
+ private final Map<String, Cookie> sessionCookies = new ConcurrentHashMap<>(4, 0.75f, 4);
private boolean maintainSession;
public Map<String, Cookie> getSessionCookies() {
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 711d759..6b0ca7a 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
@@ -40,7 +40,7 @@ import org.apache.cxf.transport.servlet.ServletConfigAware;
public class DestinationRegistryImpl implements DestinationRegistry, ServletConfigAware {
private static final String SLASH = "/";
private ConcurrentMap<String, AbstractHTTPDestination> destinations
- = new ConcurrentHashMap<String, AbstractHTTPDestination>();
+ = new ConcurrentHashMap<>();
private Map<String, AbstractHTTPDestination> decodedDestinations =
new ConcurrentHashMap<String, AbstractHTTPDestination>();
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index dd4d0d1..48fc0ef 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -83,7 +83,7 @@ public class Headers {
this.headers = getSetProtocolHeaders(message);
}
public Headers() {
- this.headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ this.headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
this.message = null;
}
@@ -109,7 +109,7 @@ public class Headers {
* enabled.
*/
static String toString(Map<String, List<Object>> headers, boolean logSensitiveHeaders) {
- Map<String, List<Object>> filteredHeaders = new TreeMap<String, List<Object>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<Object>> filteredHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
filteredHeaders.putAll(headers);
if (!logSensitiveHeaders) {
for (String filteredKey : SENSITIVE_HEADERS) {
@@ -266,10 +266,10 @@ public class Headers {
Map<String, List<String>> headers =
CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (null == headers) {
- headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
} else if (headers instanceof HashMap) {
Map<String, List<String>> headers2
- = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
headers2.putAll(headers);
headers = headers2;
}
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
index c38d216..d2e1de9 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
@@ -39,7 +39,7 @@ public class DigestAuthSupplier implements HttpAuthSupplier {
};
final MessageDigest md5Helper;
- Map<URI, DigestInfo> authInfo = new ConcurrentHashMap<URI, DigestInfo>();
+ Map<URI, DigestInfo> authInfo = new ConcurrentHashMap<>();
public DigestAuthSupplier() {
MessageDigest md = null;
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ConfigAdminHttpConduitConfigurer.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ConfigAdminHttpConduitConfigurer.java
index ccf7346..ee38720 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ConfigAdminHttpConduitConfigurer.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/ConfigAdminHttpConduitConfigurer.java
@@ -100,7 +100,7 @@ class ConfigAdminHttpConduitConfigurer implements ManagedServiceFactory, HTTPCon
}
Map<String, PidInfo> props
- = new ConcurrentHashMap<String, PidInfo>(4, 0.75f, 2);
+ = new ConcurrentHashMap<>(4, 0.75f, 2);
CopyOnWriteArrayList<PidInfo> sorted = new CopyOnWriteArrayList<>();
public String getName() {
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
index e35518c..f589c00 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixMatcher.java
@@ -57,11 +57,11 @@ public final class PublicSuffixMatcher {
if (rules == null) {
throw new IllegalArgumentException("Domain suffix rules are null");
}
- this.rules = new ConcurrentHashMap<String, DomainType>(rules.size());
+ this.rules = new ConcurrentHashMap<>(rules.size());
for (String rule: rules) {
this.rules.put(rule, domainType);
}
- this.exceptions = new ConcurrentHashMap<String, DomainType>();
+ this.exceptions = new ConcurrentHashMap<>();
if (exceptions != null) {
for (String exception: exceptions) {
this.exceptions.put(exception, domainType);
@@ -73,8 +73,8 @@ public final class PublicSuffixMatcher {
if (lists == null) {
throw new IllegalArgumentException("Domain suffix lists are null");
}
- this.rules = new ConcurrentHashMap<String, DomainType>();
- this.exceptions = new ConcurrentHashMap<String, DomainType>();
+ this.rules = new ConcurrentHashMap<>();
+ this.exceptions = new ConcurrentHashMap<>();
for (PublicSuffixList list: lists) {
final DomainType domainType = list.getType();
for (String rule: list.getRules()) {
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
index fb99256..75a94f4 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
@@ -36,7 +36,7 @@ import org.apache.cxf.resource.ResourceResolver;
public class ServletContextResourceResolver implements ResourceResolver {
ServletContext servletContext;
- Map<String, URL> urlMap = new ConcurrentHashMap<String, URL>();
+ Map<String, URL> urlMap = new ConcurrentHashMap<>();
public ServletContextResourceResolver(ServletContext sc) {
servletContext = sc;
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
index 848e90a..12ddbfd 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
@@ -68,7 +68,7 @@ public class HTTPConduitTest extends Assert {
*/
private Message getNewMessage() throws Exception {
Message message = new MessageImpl();
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
List<String> contentTypes = new ArrayList<>();
contentTypes.add("text/xml");
contentTypes.add("charset=utf8");
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
index 92963cd..a6a9fa2 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
@@ -60,7 +60,7 @@ public class HTTPConduitURLConnectionTest extends Assert {
*/
private Message getNewMessage() {
Message message = new MessageImpl();
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
List<String> contentTypes = new ArrayList<>();
contentTypes.add("text/xml");
contentTypes.add("charset=utf8");
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
index 15a1ce0..9d9edb4 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
@@ -287,7 +287,7 @@ public class HTTPConduitURLEasyMockTest extends Assert {
}
private void setUpHeaders(Message message) {
- Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, List<String>> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
List<String> contentTypes = new ArrayList<>();
contentTypes.add("text/xml;charset=utf8");
headers.put("content-type", contentTypes);
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
index bafe979..7b60ae3 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
@@ -70,7 +70,7 @@ public class JMSConduit extends AbstractConduit implements JMSExchangeSender, Me
private static final String CORRELATED = JMSConduit.class.getName() + ".correlated";
private JMSConfiguration jmsConfig;
- private Map<String, Exchange> correlationMap = new ConcurrentHashMap<String, Exchange>();
+ private Map<String, Exchange> correlationMap = new ConcurrentHashMap<>();
private JMSListenerContainer jmsListener;
private String conduitId;
private final AtomicLong messageCount = new AtomicLong(0);
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
index 200d72d..2602887 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSMessageUtils.java
@@ -106,7 +106,7 @@ final class JMSMessageUtils {
if (responseCode != null) {
inMessage.put(org.apache.cxf.message.Message.RESPONSE_CODE, Integer.valueOf(responseCode));
}
- Map<String, List<String>> protHeaders = new TreeMap<String, List<String>>();
+ Map<String, List<String>> protHeaders = new TreeMap<>();
for (String name : messageHeaders.getPropertyKeys()) {
String val = (String)messageHeaders.getProperty(name);
protHeaders.put(name, Collections.singletonList(val));
@@ -172,7 +172,7 @@ final class JMSMessageUtils {
Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message
.get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
if (null == headers) {
- headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
message.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, headers);
}
return contentType;
diff --git a/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java b/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
index 44e5e6b..6a4ebe3 100644
--- a/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
+++ b/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java
@@ -71,7 +71,7 @@ public class LocalTransportFactory extends AbstractTransportFactory
}
private ConcurrentMap<String, Destination> destinations
- = new ConcurrentHashMap<String, Destination>();
+ = new ConcurrentHashMap<>();
private Set<String> messageFilterProperties;
private Set<String> messageIncludeProperties;
diff --git a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
index 9c62ce3..edeacd2 100644
--- a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
+++ b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
@@ -76,7 +76,7 @@ public class UDPConduit extends AbstractConduit {
Bus bus;
NioDatagramConnector connector = new NioDatagramConnector();
ConcurrentHashMap<String, Queue<ConnectFuture>> connections
- = new ConcurrentHashMap<String, Queue<ConnectFuture>>();
+ = new ConcurrentHashMap<>();
public UDPConduit(EndpointReferenceType t,
final Bus bus) {
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketUtils.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketUtils.java
index 730e70d..8bcc67d 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketUtils.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketUtils.java
@@ -57,7 +57,7 @@ public final class WebSocketUtils {
* @throws IOException
*/
public static Map<String, String> readHeaders(InputStream in, boolean req) throws IOException {
- Map<String, String> headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+ Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
String line;
int del;
if (req) {
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
index 4136a73..8e92be3 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
@@ -70,7 +70,7 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
private String requestIdKey = WebSocketConstants.DEFAULT_REQUEST_ID_KEY;
private String responseIdKey = WebSocketConstants.DEFAULT_RESPONSE_ID_KEY;
- private Map<String, RequestResponse> uncorrelatedRequests = new ConcurrentHashMap<String, RequestResponse>();
+ private Map<String, RequestResponse> uncorrelatedRequests = new ConcurrentHashMap<>();
public AhcWebSocketConduit(Bus b, EndpointInfo ei, EndpointReferenceType t) throws IOException {
super(b, ei, t);
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java
index e511c3e..acc47c9 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletRequest.java
@@ -86,7 +86,7 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest {
LOG.log(Level.WARNING, "invalid path: {0} not within {1}", new Object[]{path, origin});
throw new InvalidPathException();
}
- this.attributes = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+ this.attributes = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
Object v = websocket.getAttribute("org.apache.cxf.transport.endpoint.address");
if (v != null) {
attributes.put("org.apache.cxf.transport.endpoint.address", v);
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
index c441e8e..68c3586 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/WebSocketVirtualServletResponse.java
@@ -49,7 +49,7 @@ public class WebSocketVirtualServletResponse implements HttpServletResponse {
public WebSocketVirtualServletResponse(WebSocketServletHolder websocket) {
this.webSocketHolder = websocket;
- this.responseHeaders = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+ this.responseHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
this.outputStream = createOutputStream();
}
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
index 7aa3e76..15b4f1f 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletRequest.java
@@ -89,7 +89,7 @@ public class WebSocketUndertowServletRequest implements HttpServletRequest {
if (!path.startsWith(origin)) {
throw new InvalidPathException();
}*/
- this.attributes = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER);
+ this.attributes = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
Object v = channel.getAttribute("org.apache.cxf.transport.endpoint.address");
if (v != null) {
attributes.put("org.apache.cxf.transport.endpoint.address", v);
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
index 5404fc6..2df9258 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/undertow/WebSocketUndertowServletResponse.java
@@ -53,7 +53,7 @@ public class WebSocketUndertowServletResponse implements HttpServletResponse {
public WebSocketUndertowServletResponse(WebSocketChannel channel) {
this.channel = channel;
- this.responseHeaders = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+ this.responseHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
this.outputStream = createOutputStream();
}
diff --git a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
index bef5347..2e81c3f 100644
--- a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
+++ b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/WebSocketUtilsTest.java
@@ -38,7 +38,7 @@ public class WebSocketUtilsTest extends Assert {
static {
- TEST_HEADERS_MAP = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+ TEST_HEADERS_MAP = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
TEST_HEADERS_MAP.put(WebSocketUtils.SC_KEY, "200");
TEST_HEADERS_MAP.put("Content-Type", "text/xml;charset=utf-8");
TEST_HEADERS_MAP.put(WebSocketConstants.DEFAULT_RESPONSE_ID_KEY, "31415926-5358-9793-2384-626433832795");
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
index 69f4587..c8dc843 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
@@ -90,7 +90,7 @@ public class MAPCodec extends AbstractSoapInterceptor {
* is used in all chains.
*/
protected final Map<String, Exchange> uncorrelatedExchanges
- = new ConcurrentHashMap<String, Exchange>();
+ = new ConcurrentHashMap<>();
private VersionTransformer transformer;
private HeaderFactory headerFactory;
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
index 6073e33..3737b09 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
@@ -1029,7 +1029,7 @@ public class MAPAggregatorTest extends Assert {
Collection<FaultInfo> of = opInfo.getFaults();
if (of != null && !of.isEmpty()) {
- faults = new ConcurrentHashMap<QName, BindingFaultInfo>(of.size());
+ faults = new ConcurrentHashMap<>(of.size());
for (FaultInfo fault : of) {
faults.put(fault.getFaultName(), new BindingFaultInfo(fault, this));
}
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
index 9648669..c043fe6 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
@@ -214,7 +214,7 @@ public class EffectivePolicyImpl implements EffectivePolicy {
PolicyInterceptorProviderRegistry reg
= ((PolicyEngineImpl)engine).getBus().getExtension(PolicyInterceptorProviderRegistry.class);
Set<Interceptor<? extends org.apache.cxf.message.Message>> out
- = new LinkedHashSet<Interceptor<? extends org.apache.cxf.message.Message>>();
+ = new LinkedHashSet<>();
for (Assertion a : getChosenAlternative()) {
initialiseInterceptors(reg, engine, out, a, useIn, fault, m);
}
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
index 9700a2a..b8d9a96 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
@@ -295,7 +295,7 @@ public class EndpointPolicyImpl implements EndpointPolicy {
PolicyInterceptorProviderRegistry reg
= engine.getBus().getExtension(PolicyInterceptorProviderRegistry.class);
- Set<Interceptor<? extends Message>> out = new LinkedHashSet<Interceptor<? extends Message>>();
+ Set<Interceptor<? extends Message>> out = new LinkedHashSet<>();
if (getChosenAlternative() != null) {
for (Assertion a : getChosenAlternative()) {
initializeInterceptors(reg, out, a, false, m);
@@ -304,12 +304,12 @@ public class EndpointPolicyImpl implements EndpointPolicy {
List<Interceptor<? extends Message>> tmp = null;
if (requestor) {
- tmp = new ArrayList<Interceptor<? extends Message>>(out);
+ tmp = new ArrayList<>(out);
out.clear();
for (Assertion a : getChosenAlternative()) {
initializeInterceptors(reg, out, a, true, m);
}
- faultInterceptors = new ArrayList<Interceptor<? extends Message>>(out);
+ faultInterceptors = new ArrayList<>(out);
} else if (ei != null && ei.getBinding() != null) {
for (BindingOperationInfo boi : ei.getBinding().getOperations()) {
EffectivePolicy p = engine.getEffectiveServerRequestPolicy(ei, boi, m);
@@ -324,9 +324,9 @@ public class EndpointPolicyImpl implements EndpointPolicy {
}
}
}
- tmp = new ArrayList<Interceptor<? extends Message>>(out);
+ tmp = new ArrayList<>(out);
} else {
- tmp = new ArrayList<Interceptor<? extends Message>>(out);
+ tmp = new ArrayList<>(out);
}
interceptors = tmp;
}
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
index 9a0cb5d..6a59698 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
@@ -67,7 +67,7 @@ public class PolicyInInterceptor extends AbstractPolicyInterceptor {
return;
}
- List<Interceptor<? extends Message>> interceptors = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> interceptors = new ArrayList<>();
Collection<Assertion> assertions = new ArrayList<>();
// 1. Check overridden policy
@@ -132,4 +132,4 @@ public class PolicyInInterceptor extends AbstractPolicyInterceptor {
}
}
-}
\ No newline at end of file
+}
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
index 8988a09..451f774 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImpl.java
@@ -111,7 +111,7 @@ public class PolicyInterceptorProviderRegistryImpl
getInterceptorsForAlternative(Collection<? extends Assertion> alternative,
boolean out, boolean fault) {
- List<Interceptor<? extends Message>> interceptors = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> interceptors = new ArrayList<>();
for (Assertion a : alternative) {
if (a.isOptional()) {
continue;
@@ -141,7 +141,7 @@ public class PolicyInterceptorProviderRegistryImpl
protected List<Interceptor<? extends Message>> getInterceptorsForAssertion(QName qn, boolean out,
boolean fault) {
loadDynamic();
- List<Interceptor<? extends Message>> interceptors = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> interceptors = new ArrayList<>();
Set<PolicyInterceptorProvider> pps = get(qn);
for (PolicyInterceptorProvider pp : pps) {
interceptors.addAll(out
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java
index cbebef9..10f1334 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java
@@ -30,7 +30,7 @@ import org.apache.neethi.PolicyRegistry;
*/
public class PolicyRegistryImpl implements PolicyRegistry {
- private Map<String, Policy> reg = new ConcurrentHashMap<String, Policy>(16, 0.75f, 4);
+ private Map<String, Policy> reg = new ConcurrentHashMap<>(16, 0.75f, 4);
public Policy lookup(String key) {
return reg.get(key);
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
index 07965c0..769e1ea 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
@@ -64,7 +64,7 @@ public class EffectivePolicyImplTest extends Assert {
private List<Interceptor<? extends Message>> createMockInterceptorList() {
Interceptor<? extends Message> i = control.createMock(Interceptor.class);
Interceptor<? extends Message> m = i;
- List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> a = new ArrayList<>();
a.add(m);
return a;
}
@@ -314,7 +314,7 @@ public class EffectivePolicyImplTest extends Assert {
control.reset();
setupPolicyInterceptorProviderRegistry(engine, reg);
- List<Interceptor<? extends Message>> il = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> il = new ArrayList<>();
setupRegistryInterceptors(useIn, fault, reg, null, il);
PolicyAssertion a = control.createMock(PolicyAssertion.class);
alternative.add(a);
@@ -327,7 +327,7 @@ public class EffectivePolicyImplTest extends Assert {
setupPolicyInterceptorProviderRegistry(engine, reg);
QName qn = new QName("http://x.y.z", "a");
EasyMock.expect(a.getName()).andReturn(qn);
- il = new ArrayList<Interceptor<? extends Message>>();
+ il = new ArrayList<>();
setupRegistryInterceptors(useIn, fault, reg, qn, il);
control.replay();
epi.initialiseInterceptors(engine, useIn, fault, msg);
@@ -338,7 +338,7 @@ public class EffectivePolicyImplTest extends Assert {
setupPolicyInterceptorProviderRegistry(engine, reg);
EasyMock.expect(a.getName()).andReturn(qn);
Interceptor<Message> pi = control.createMock(Interceptor.class);
- il = new ArrayList<Interceptor<? extends Message>>();
+ il = new ArrayList<>();
il.add(pi);
setupRegistryInterceptors(useIn, fault, reg, qn, il);
control.replay();
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
index be330c7..d82bdfa 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
@@ -76,7 +76,7 @@ public class EndpointPolicyImplTest extends Assert {
private List<Interceptor<? extends Message>> createMockInterceptorList() {
Interceptor<? extends Message> i = control.createMock(Interceptor.class);
Interceptor<? extends Message> m = i;
- List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> a = new ArrayList<>();
a.add(m);
return a;
}
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
index 04aaeec..b711abd 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
@@ -383,10 +383,10 @@ public class PolicyEngineTest extends Assert {
engine = new PolicyEngineImpl(enabled);
Bus bus = control.createMock(Bus.class);
- List<Interceptor<? extends Message>> out = new ArrayList<Interceptor<? extends Message>>();
- List<Interceptor<? extends Message>> in = new ArrayList<Interceptor<? extends Message>>();
- List<Interceptor<? extends Message>> inFault = new ArrayList<Interceptor<? extends Message>>();
- List<Interceptor<? extends Message>> outFault = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> out = new ArrayList<>();
+ List<Interceptor<? extends Message>> in = new ArrayList<>();
+ List<Interceptor<? extends Message>> inFault = new ArrayList<>();
+ List<Interceptor<? extends Message>> outFault = new ArrayList<>();
if (enabled) {
EasyMock.expect(bus.getOutInterceptors()).andReturn(out).times(1);
EasyMock.expect(bus.getInInterceptors()).andReturn(in).times(1);
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
index bcf334c..618a709 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistryImplTest.java
@@ -66,14 +66,14 @@ public class PolicyInterceptorProviderRegistryImplTest extends Assert {
Interceptor<Message> pif = control.createMock(Interceptor.class);
Interceptor<Message> po = control.createMock(Interceptor.class);
Interceptor<Message> pof = control.createMock(Interceptor.class);
- List<Interceptor<? extends Message>> pil = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> pil = new ArrayList<>();
pil.add(pi1);
pil.add(pi2);
- List<Interceptor<? extends Message>> pifl = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> pifl = new ArrayList<>();
pifl.add(pif);
- List<Interceptor<? extends Message>> pol = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> pol = new ArrayList<>();
pol.add(po);
- List<Interceptor<? extends Message>> pofl = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> pofl = new ArrayList<>();
pofl.add(pof);
EasyMock.expect(pp.getInInterceptors()).andReturn(pil);
EasyMock.expect(pp.getInFaultInterceptors()).andReturn(pifl);
diff --git a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
index ad5c66d..a8bdabc 100644
--- a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
+++ b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
@@ -76,7 +76,7 @@ public class PolicyInterceptorsTest extends Assert {
private List<Interceptor<? extends Message>> createMockInterceptorList() {
Interceptor<? extends Message> i = control.createMock(Interceptor.class);
Interceptor<? extends Message> m = i;
- List<Interceptor<? extends Message>> a = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> a = new ArrayList<>();
a.add(m);
return a;
}
@@ -120,7 +120,7 @@ public class PolicyInterceptorsTest extends Assert {
EasyMock.expect(pe.getEffectiveClientResponsePolicy(ei, boi, message)).andReturn(effectivePolicy);
EasyMock.expect(effectivePolicy.getPolicy()).andReturn(new Policy()).times(2);
Interceptor<? extends Message> i = control.createMock(Interceptor.class);
- List<Interceptor<? extends Message>> lst = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> lst = new ArrayList<>();
lst.add(i);
EasyMock.expect(effectivePolicy.getInterceptors()).andReturn(lst);
InterceptorChain ic = control.createMock(InterceptorChain.class);
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
index d40c7e6..91f292d 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
@@ -49,7 +49,7 @@ public class Destination extends AbstractEndpoint {
Destination(RMEndpoint reliableEndpoint) {
super(reliableEndpoint);
- map = new ConcurrentHashMap<String, DestinationSequence>();
+ map = new ConcurrentHashMap<>();
}
public DestinationSequence getSequence(Identifier id) {
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index 886ad6e..cd3f224 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -69,7 +69,7 @@ public class DestinationSequence extends AbstractSequence {
private volatile long highNumberCompleted;
private long nextInOrder;
//be careful, must be used in sync block
- private Map<Long, Continuation> continuations = new TreeMap<Long, Continuation>();
+ private Map<Long, Continuation> continuations = new TreeMap<>();
// this map is used for robust and redelivery tracking. for redelivery it holds the beingDeliverd messages
private Set<Long> deliveringMessageNumbers = new HashSet<>();
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
index fef90e7..4ff1e1f 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java
@@ -117,7 +117,7 @@ public class RMManager {
private SequenceIdentifierGenerator idGenerator;
private RetransmissionQueue retransmissionQueue;
private RedeliveryQueue redeliveryQueue;
- private Map<Endpoint, RMEndpoint> reliableEndpoints = new ConcurrentHashMap<Endpoint, RMEndpoint>();
+ private Map<Endpoint, RMEndpoint> reliableEndpoints = new ConcurrentHashMap<>();
private AtomicReference<Timer> timer = new AtomicReference<>();
private RMConfiguration configuration;
private SourcePolicyType sourcePolicy;
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java
index 88cf9b0..b85eac9 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Source.java
@@ -44,7 +44,7 @@ public class Source extends AbstractEndpoint {
Source(RMEndpoint reliableEndpoint) {
super(reliableEndpoint);
- map = new ConcurrentHashMap<String, SourceSequence>();
+ map = new ConcurrentHashMap<>();
current = new HashMap<>();
sequenceCreationLock = new ReentrantLock();
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index 8dc9e0d..ca81e7e 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -77,7 +77,7 @@ public class WSS4JInOutTest 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/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
index 0366d5e..4500929 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
@@ -75,7 +75,7 @@ public final class SchemaUtil {
// added
getSchemaList(def);
- Map<Definition, Definition> done = new IdentityHashMap<Definition, Definition>();
+ Map<Definition, Definition> done = new IdentityHashMap<>();
done.put(def, def);
for (Definition def2 : defList) {
if (!done.containsKey(def2)) {
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
index 914ba4f..c111756 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
@@ -120,8 +120,8 @@ public class WSDLManagerImpl implements WSDLManager {
} catch (WSDLException e) {
throw new BusException(e);
}
- definitionsMap = new CacheMap<Object, Definition>();
- schemaCacheMap = new CacheMap<Object, ServiceSchemaInfo>();
+ definitionsMap = new CacheMap<>();
+ schemaCacheMap = new CacheMap<>();
setBus(b);
}
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
index 3085ce7..f200b55 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
@@ -284,7 +284,7 @@ public class WSDLServiceBuilder {
Service serv,
QName endpointName,
DescriptionInfo d) {
- Map<QName, ServiceInfo> services = new LinkedHashMap<QName, ServiceInfo>();
+ Map<QName, ServiceInfo> services = new LinkedHashMap<>();
DescriptionInfo description = d;
if (null == description) {
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index 50c21c7..31c3d61 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -163,13 +163,13 @@ public class SimpleBatchSTSClient implements Configurable, InterceptorProvider {
protected Map<String, Object> ctx = new HashMap<>();
protected List<Interceptor<? extends Message>> in
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
protected List<Interceptor<? extends Message>> out
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
protected List<Interceptor<? extends Message>> outFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
protected List<Interceptor<? extends Message>> inFault
- = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ = new ModCountCopyOnWriteArrayList<>();
protected List<AbstractFeature> features;
public SimpleBatchSTSClient(Bus b) {
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
index 330dea9..102af4e 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractCreatePullPoint.java
@@ -52,7 +52,7 @@ public abstract class AbstractCreatePullPoint extends AbstractEndpoint
public AbstractCreatePullPoint(String name) {
super(name);
idGenerator = new IdGenerator();
- pullPoints = new ConcurrentHashMap<String, AbstractPullPoint>();
+ pullPoints = new ConcurrentHashMap<>();
}
@Override
public ObjectName getMBeanName() {
diff --git a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
index 3dcd0c7..42e076d 100644
--- a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
+++ b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/AbstractNotificationBroker.java
@@ -101,8 +101,8 @@ public abstract class AbstractNotificationBroker extends AbstractEndpoint
public AbstractNotificationBroker(String name) {
super(name);
idGenerator = new IdGenerator();
- subscriptions = new ConcurrentHashMap<String, AbstractSubscription>();
- publishers = new ConcurrentHashMap<String, AbstractPublisher>();
+ subscriptions = new ConcurrentHashMap<>();
+ publishers = new ConcurrentHashMap<>();
nonContactPublishers = new CopyOnWriteArrayList<>();
}
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMBase64Test.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMBase64Test.java
index d5c10c0..128efb3 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMBase64Test.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMBase64Test.java
@@ -51,7 +51,7 @@ public class MTOMBase64Test extends AbstractBusClientServerTestBase {
public static class ObjectWithHashMapData {
private String name;
- private Map<String, byte[]> keyData = new LinkedHashMap<String, byte[]>();
+ private Map<String, byte[]> keyData = new LinkedHashMap<>();
public ObjectWithHashMapData() {
}
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
index ab99f7f..8f83b82 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
@@ -46,7 +46,7 @@ public class MTOMTest extends AbstractBusClientServerTestBase {
public static class ObjectWithHashMapData {
private String name;
- private Map<String, byte[]> keyData = new LinkedHashMap<String, byte[]>();
+ private Map<String, byte[]> keyData = new LinkedHashMap<>();
public ObjectWithHashMapData() {
}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
index 021d8b6..47ba4c3 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java
@@ -127,15 +127,15 @@ public class BookServer extends AbstractBusTestServerBase {
providers.add(new BlockedExceptionMapper());
providers.add(new ParamConverterImpl());
sf.setProviders(providers);
- List<Interceptor<? extends Message>> inInts = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> inInts = new ArrayList<>();
inInts.add(new CustomInFaultyInterceptor());
inInts.add(new LoggingInInterceptor());
sf.setInInterceptors(inInts);
- List<Interceptor<? extends Message>> outInts = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> outInts = new ArrayList<>();
outInts.add(new CustomOutInterceptor());
outInts.add(new LoggingOutInterceptor());
sf.setOutInterceptors(outInts);
- List<Interceptor<? extends Message>> outFaultInts = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> outFaultInts = new ArrayList<>();
outFaultInts.add(new CustomOutFaultInterceptor());
sf.setOutFaultInterceptors(outFaultInts);
sf.setResourceProvider(BookStore.class,
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index fd218c4..20ba1ee 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -1805,7 +1805,7 @@ public class BookStore {
throw new RuntimeException();
}
BookStore.this.messageContext.put(Message.RESPONSE_CODE, 503);
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.putSingle("Content-Type", "text/custom+plain");
headers.putSingle("CustomHeader", "CustomValue");
BookStore.this.messageContext.put(Message.PROTOCOL_HEADERS, headers);
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java
index bc1527d..bfcea0e 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutInterceptor.java
@@ -61,7 +61,7 @@ public class CustomOutInterceptor extends AbstractPhaseInterceptor<Message> {
message.put(Message.PROTOCOL_HEADERS, headers);
} else {
- MultivaluedMap<String, Object> headers = new MetadataMap<String, Object>();
+ MultivaluedMap<String, Object> headers = new MetadataMap<>();
headers.putSingle("BookId", "123");
headers.putSingle("MAP-NAME", MultivaluedMap.class.getName());
message.put(Message.PROTOCOL_HEADERS, headers);
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java
index 4c347f6..0536bc2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLocalTransportTest.java
@@ -59,11 +59,11 @@ public class JAXRSLocalTransportTest extends AbstractBusClientServerTestBase {
sf.setResourceProvider(BookStoreSpring.class,
new SingletonResourceProvider(new BookStoreSpring(), true));
sf.setProvider(new JacksonJsonProvider());
- List<Interceptor<? extends Message>> outInts = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> outInts = new ArrayList<>();
outInts.add(new CustomOutInterceptor());
sf.setOutInterceptors(outInts);
- List<Interceptor<? extends Message>> inInts = new ArrayList<Interceptor<? extends Message>>();
+ List<Interceptor<? extends Message>> inInts = new ArrayList<>();
inInts.add(new CustomInFaultyInterceptor());
sf.setInInterceptors(inInts);
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index ae99687..7d87461 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -576,21 +576,21 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
Book json = new Book("json", 2L);
InputStream is1 =
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg");
- Map<String, Object> objects = new LinkedHashMap<String, Object>();
+ Map<String, Object> objects = new LinkedHashMap<>();
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.putSingle("Content-Type", "application/xml");
headers.putSingle("Content-ID", "theroot");
headers.putSingle("Content-Transfer-Encoding", "customxml");
Attachment attJaxb = new Attachment(headers, jaxb);
- headers = new MetadataMap<String, String>();
+ headers = new MetadataMap<>();
headers.putSingle("Content-Type", "application/json");
headers.putSingle("Content-ID", "thejson");
headers.putSingle("Content-Transfer-Encoding", "customjson");
Attachment attJson = new Attachment(headers, json);
- headers = new MetadataMap<String, String>();
+ headers = new MetadataMap<>();
headers.putSingle("Content-Type", "application/octet-stream");
headers.putSingle("Content-ID", "theimage");
headers.putSingle("Content-Transfer-Encoding", "customstream");
@@ -626,17 +626,17 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
Book json = new Book("json", 1L);
InputStream is1 =
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg");
- Map<String, Object> objects = new LinkedHashMap<String, Object>();
+ Map<String, Object> objects = new LinkedHashMap<>();
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
- headers = new MetadataMap<String, String>();
+ headers = new MetadataMap<>();
headers.putSingle("Content-Type", "application/json");
headers.putSingle("Content-ID", "thejson");
headers.putSingle("Content-Transfer-Encoding", "customjson");
Attachment attJson = new Attachment(headers, json);
- headers = new MetadataMap<String, String>();
+ headers = new MetadataMap<>();
headers.putSingle("Content-Type", "application/octet-stream");
headers.putSingle("Content-ID", "theimage");
headers.putSingle("Content-Transfer-Encoding", "customstream");
@@ -668,7 +668,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
Book json = new Book("json", 2L);
InputStream is1 =
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/java.jpg");
- Map<String, Object> objects = new LinkedHashMap<String, Object>();
+ Map<String, Object> objects = new LinkedHashMap<>();
objects.put(MediaType.APPLICATION_XML, jaxb);
objects.put(MediaType.APPLICATION_JSON, json);
objects.put(MediaType.APPLICATION_OCTET_STREAM, is1);
@@ -824,7 +824,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
client.type("multipart/form-data").accept("multipart/form-data");
ContentDisposition cd = new ContentDisposition("attachment;filename=java.jpg");
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.putSingle("Content-ID", "image");
headers.putSingle("Content-Disposition", cd.toString());
headers.putSingle("Content-Location", "http://host/bar");
@@ -851,7 +851,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
client.type("multipart/form-data").accept("text/plain");
ContentDisposition cd = new ContentDisposition("attachment;name=\"a\";filename=\"a;txt\"");
- MultivaluedMap<String, String> headers = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.putSingle("Content-Disposition", cd.toString());
Attachment att = new Attachment(new ByteArrayInputStream("file name with semicolon".getBytes()),
headers);
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
index 9133091..5e75b7f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
@@ -676,7 +676,7 @@ public class JAXRSSoapBookTest extends AbstractBusClientServerTestBase {
String baseAddress = "http://localhost:" + PORT
+ "/test/services/rest/bookstore/books/679/subresource3";
WebClient wc = WebClient.create(baseAddress);
- MultivaluedMap<String, Object> map = new MetadataMap<String, Object>();
+ MultivaluedMap<String, Object> map = new MetadataMap<>();
map.putSingle("id", "679");
map.add("name", "CXF in Action - ");
map.add("name", "679");
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
index c843f7b..436d713 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/MultipartStore.java
@@ -215,7 +215,7 @@ public class MultipartStore {
public Map<String, Object> addBookJaxbJsonImage(@Multipart("root.message@cxf.apache.org") Book jaxb,
@Multipart("1") Book json,
@Multipart("2") byte[] image) throws Exception {
- Map<String, Object> objects = new LinkedHashMap<String, Object>();
+ Map<String, Object> objects = new LinkedHashMap<>();
objects.put("application/xml", jaxb);
objects.put("application/json", json);
objects.put("application/octet-stream", new ByteArrayInputStream(image));
@@ -230,7 +230,7 @@ public class MultipartStore {
public Map<String, Object> addBookJaxbJsonImage2(@Multipart("theroot") Book jaxb,
@Multipart("thejson") Book json,
@Multipart("theimage") byte[] image) throws Exception {
- Map<String, Object> objects = new LinkedHashMap<String, Object>();
+ Map<String, Object> objects = new LinkedHashMap<>();
objects.put("application/xml", jaxb);
objects.put("application/json", json);
objects.put("application/octet-stream", new ByteArrayInputStream(image));
@@ -245,7 +245,7 @@ public class MultipartStore {
public Map<String, Object> addBookJsonImageStream(
@Multipart(value = "thejson", type = "application/json") Book json,
@Multipart("theimage") InputStream image) throws Exception {
- Map<String, Object> objects = new LinkedHashMap<String, Object>();
+ Map<String, Object> objects = new LinkedHashMap<>();
objects.put("application/json", json);
objects.put("application/octet-stream", image);
return objects;
@@ -258,7 +258,7 @@ public class MultipartStore {
public Map<String, Book> getBookJaxbJson() throws Exception {
Book jaxb = new Book("jaxb", 1L);
Book json = new Book("json", 2L);
- Map<String, Book> objects = new LinkedHashMap<String, Book>();
+ Map<String, Book> objects = new LinkedHashMap<>();
objects.put(MediaType.APPLICATION_XML, jaxb);
objects.put(MediaType.APPLICATION_JSON, json);
return objects;
@@ -270,7 +270,7 @@ public class MultipartStore {
@Produces("multipart/mixed")
public Map<String, Book> getBookJson() throws Exception {
Book json = new Book("json", 1L);
- Map<String, Book> objects = new LinkedHashMap<String, Book>();
+ Map<String, Book> objects = new LinkedHashMap<>();
objects.put(MediaType.APPLICATION_JSON, json);
return objects;
@@ -282,7 +282,7 @@ public class MultipartStore {
public Map<String, Object> getBookJaxbJsonObject() throws Exception {
Book jaxb = new Book("jaxb", 1L);
Book json = new Book("json", 2L);
- Map<String, Object> objects = new LinkedHashMap<String, Object>();
+ Map<String, Object> objects = new LinkedHashMap<>();
objects.put(MediaType.APPLICATION_XML, jaxb);
objects.put(MediaType.APPLICATION_JSON, json);
return objects;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/HelloWorldImpl.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/HelloWorldImpl.java
index 6001dab..26788b3 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/HelloWorldImpl.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/HelloWorldImpl.java
@@ -27,7 +27,7 @@ import javax.jws.WebService;
@WebService(endpointInterface = "org.apache.cxf.systest.jaxrs.jaxws.HelloWorld",
serviceName = "HelloWorld")
public class HelloWorldImpl implements HelloWorld {
- Map<Integer, User> users = new LinkedHashMap<Integer, User>();
+ Map<Integer, User> users = new LinkedHashMap<>();
public int clearUsers() {
int i = users.size();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMapAdapter.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMapAdapter.java
index ae2b88c..6c39105 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMapAdapter.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/IntegerUserMapAdapter.java
@@ -38,7 +38,7 @@ public class IntegerUserMapAdapter extends XmlAdapter<IntegerUserMap, Map<Intege
}
public Map<Integer, User> unmarshal(IntegerUserMap v) throws Exception {
- Map<Integer, User> map = new LinkedHashMap<Integer, User>();
+ Map<Integer, User> map = new LinkedHashMap<>();
for (IntegerUserMap.IntegerUserEntry e : v.getEntries()) {
map.put(e.getId(), e.getUser());
}
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 2218392..06bcbc8 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
@@ -54,13 +54,13 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
Collections.singletonList("ROLE_ADMIN")));
}
- protected ConcurrentHashMap<String, Client> clientAuthInfo = new ConcurrentHashMap<String, Client>();
+ protected ConcurrentHashMap<String, Client> clientAuthInfo = new ConcurrentHashMap<>();
- protected MetadataMap<String, String> userRegisteredClients = new MetadataMap<String, String>();
+ protected MetadataMap<String, String> userRegisteredClients = new MetadataMap<>();
- protected MetadataMap<String, String> userAuthorizedClients = new MetadataMap<String, String>();
+ protected MetadataMap<String, String> userAuthorizedClients = new MetadataMap<>();
- protected ConcurrentHashMap<String, Token> oauthTokens = new ConcurrentHashMap<String, Token>();
+ protected ConcurrentHashMap<String, Token> oauthTokens = new ConcurrentHashMap<>();
protected MD5SequenceGenerator tokenGenerator =
new MD5SequenceGenerator();
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java
index 5d65368..db37eb2 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/JAXRSOAuth2Test.java
@@ -637,7 +637,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase {
@Override
public MultivaluedMap<String, String> toMap() {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
map.putSingle(OAuthConstants.GRANT_TYPE, "custom_grant");
return map;
}
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java
index cd0a302..ffe026b 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/tls/JAXRSOAuth2TlsTest.java
@@ -259,7 +259,7 @@ public class JAXRSOAuth2TlsTest extends AbstractBusClientServerTestBase {
@Override
public MultivaluedMap<String, String> toMap() {
- MultivaluedMap<String, String> map = new MetadataMap<String, String>();
+ MultivaluedMap<String, String> map = new MetadataMap<>();
map.putSingle(OAuthConstants.GRANT_TYPE, "custom_grant");
return map;
}
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/Book.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/Book.java
index 418fe91..c154fcb 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/Book.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/Book.java
@@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
public class Book {
private String name;
private long id;
- private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>();
+ private Map<Long, Chapter> chapters = new HashMap<>();
public Book() {
init();
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/BookStorePerRequest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/BookStorePerRequest.java
index a916426..c0dce7c 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/BookStorePerRequest.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/BookStorePerRequest.java
@@ -36,7 +36,7 @@ import javax.ws.rs.core.Response;
public class BookStorePerRequest {
private HttpHeaders httpHeaders;
- private Map<Long, Book> books = new HashMap<Long, Book>();
+ private Map<Long, Book> books = new HashMap<>();
private List<String> bookIds;
private List<String> setterBookIds;
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/BookStoreWebSocket.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/BookStoreWebSocket.java
index 8a5f442..a6e48df 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/BookStoreWebSocket.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/BookStoreWebSocket.java
@@ -47,7 +47,7 @@ import org.apache.cxf.transport.websocket.WebSocketConstants;
@Path("/web/bookstore")
public class BookStoreWebSocket {
private static ExecutorService executor = Executors.newSingleThreadExecutor();
- private Map<String, OutputStream> eventsStreams = new HashMap<String, OutputStream>();
+ private Map<String, OutputStream> eventsStreams = new HashMap<>();
@GET
@Path("/booknames")
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
index ca33c8f..824c6f4 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
@@ -65,7 +65,7 @@ public class HTTPConduitTest extends AbstractBusClientServerTestBase {
private static List<String> servers = new ArrayList<>();
- private static Map<String, String> addrMap = new TreeMap<String, String>();
+ private static Map<String, String> addrMap = new TreeMap<>();
private final QName serviceName =
new QName("http://apache.org/hello_world", "SOAPService");
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
index 68dd8e6..2e79bd7 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java
@@ -96,7 +96,7 @@ public class HTTPSConduitTest extends AbstractBusClientServerTestBase {
private static TLSClientParameters tlsClientParameters = new TLSClientParameters();
private static List<String> servers = new ArrayList<>();
- private static Map<String, String> addrMap = new TreeMap<String, String>();
+ private static Map<String, String> addrMap = new TreeMap<>();
static {
try (InputStream key = ClassLoaderUtils.getResourceAsStream("keys/Morpit.jks", HTTPSConduitTest.class);
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java
index b6417f2..44bbb61 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaModel.java
@@ -30,9 +30,9 @@ public class JavaModel {
private String location;
public JavaModel() {
- interfaces = new LinkedHashMap<String, JavaInterface>();
- exceptionClasses = new LinkedHashMap<String, JavaExceptionClass>();
- serviceClasses = new LinkedHashMap<String, JavaServiceClass>();
+ interfaces = new LinkedHashMap<>();
+ exceptionClasses = new LinkedHashMap<>();
+ serviceClasses = new LinkedHashMap<>();
}
public void addInterface(String name, JavaInterface i) {
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java b/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
index d4db0f8..31ed144 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
@@ -30,7 +30,7 @@ import java.util.TreeSet;
public class ClassCollector {
private Map<String, String> seiClassNames
- = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+ = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
private Map<String, String> typesClassNames = new HashMap<>();
private Map<String, String> exceptionClassNames = new HashMap<>();
private Map<String, String> serviceClassNames = new HashMap<>();
diff --git a/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java b/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
index c38b58d..7de2daa 100644
--- a/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
+++ b/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
@@ -46,7 +46,7 @@ public IDLLexer(LexerSharedInputState state) {
super(state);
caseSensitiveLiterals = true;
setCaseSensitive(true);
- literals = new Hashtable<ANTLRHashString, Integer>();
+ literals = new Hashtable<>();
literals.put(new ANTLRHashString("switch", this), Integer.valueOf(56));
literals.put(new ANTLRHashString("typeprefix", this), Integer.valueOf(78));
literals.put(new ANTLRHashString("case", this), Integer.valueOf(57));
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java
index 2dcf8d9..8bc1871 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLASTVisitor.java
@@ -85,7 +85,7 @@ public final class WSDLASTVisitor implements ASTVisitor {
definition = manager.createWSDLDefinition(tns);
- inheritScopeMap = new TreeMap<Scope, List<Scope>>();
+ inheritScopeMap = new TreeMap<>();
targetNamespace = tns;
schemas = new XmlSchemaCollection();
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java
index bc453f8..bb98af2 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/utils/TestWSDLCorbaWriterImpl.java
@@ -44,7 +44,7 @@ public class TestWSDLCorbaWriterImpl extends WSDLWriterImpl {
Definition def,
java.io.PrintWriter pw)
throws WSDLException {
- Map<Object, Object> bfaults = new TreeMap<Object, Object>(comparator);
+ Map<Object, Object> bfaults = new TreeMap<>(comparator);
bfaults.putAll(CastUtils.cast(bindingFaults));
super.printBindingFaults(bfaults, def, pw);
}
@@ -52,7 +52,7 @@ public class TestWSDLCorbaWriterImpl extends WSDLWriterImpl {
protected void printBindings(@SuppressWarnings("rawtypes")java.util.Map bindings,
Definition def, java.io.PrintWriter pw)
throws WSDLException {
- Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
+ Map<Object, Object> map = new TreeMap<>(comparator);
map.putAll(CastUtils.cast(bindings));
super.printBindings(map, def, pw);
}
@@ -60,7 +60,7 @@ public class TestWSDLCorbaWriterImpl extends WSDLWriterImpl {
protected void printFaults(@SuppressWarnings("rawtypes")java.util.Map faults,
Definition def, java.io.PrintWriter pw)
throws WSDLException {
- Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
+ Map<Object, Object> map = new TreeMap<>(comparator);
map.putAll(CastUtils.cast(faults));
super.printFaults(map, def, pw);
}
@@ -68,7 +68,7 @@ public class TestWSDLCorbaWriterImpl extends WSDLWriterImpl {
protected void printImports(@SuppressWarnings("rawtypes")java.util.Map imports,
Definition def, java.io.PrintWriter pw)
throws WSDLException {
- Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
+ Map<Object, Object> map = new TreeMap<>(comparator);
map.putAll(CastUtils.cast(imports));
super.printImports(map, def, pw);
}
@@ -76,7 +76,7 @@ public class TestWSDLCorbaWriterImpl extends WSDLWriterImpl {
protected void printMessages(@SuppressWarnings("rawtypes")java.util.Map messages,
Definition def, java.io.PrintWriter pw)
throws WSDLException {
- Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
+ Map<Object, Object> map = new TreeMap<>(comparator);
map.putAll(CastUtils.cast(messages));
super.printMessages(map, def, pw);
}
@@ -84,7 +84,7 @@ public class TestWSDLCorbaWriterImpl extends WSDLWriterImpl {
protected void printNamespaceDeclarations(@SuppressWarnings("rawtypes")java.util.Map namespaces,
java.io.PrintWriter pw)
throws WSDLException {
- Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
+ Map<Object, Object> map = new TreeMap<>(comparator);
map.putAll(CastUtils.cast(namespaces));
super.printNamespaceDeclarations(map, pw);
}
@@ -92,14 +92,14 @@ public class TestWSDLCorbaWriterImpl extends WSDLWriterImpl {
protected void printPorts(@SuppressWarnings("rawtypes")java.util.Map ports,
Definition def, java.io.PrintWriter pw)
throws WSDLException {
- Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
+ Map<Object, Object> map = new TreeMap<>(comparator);
map.putAll(CastUtils.cast(ports));
super.printPorts(map, def, pw);
}
protected void printPortTypes(@SuppressWarnings("rawtypes")java.util.Map portTypes,
Definition def, java.io.PrintWriter pw)
throws WSDLException {
- Map<QName, PortType> map = new TreeMap<QName, PortType>(comparator);
+ Map<QName, PortType> map = new TreeMap<>(comparator);
map.putAll(CastUtils.cast(portTypes, QName.class, PortType.class));
super.printPortTypes(map, def, pw);
}
@@ -107,7 +107,7 @@ public class TestWSDLCorbaWriterImpl extends WSDLWriterImpl {
protected void printServices(@SuppressWarnings("rawtypes")java.util.Map services,
Definition def, java.io.PrintWriter pw)
throws WSDLException {
- Map<Object, Object> map = new TreeMap<Object, Object>(comparator);
+ Map<Object, Object> map = new TreeMap<>(comparator);
map.putAll(CastUtils.cast(services));
super.printServices(map, def, pw);
}
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
index 220908d..8a3b6d5 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
@@ -106,7 +106,7 @@ public final class FaultBean {
}
private void buildBeanFields(final Class<?> exceptionClass, final JavaClass jClass) {
- Map<String, JavaField> fields = new TreeMap<String, JavaField>();
+ Map<String, JavaField> fields = new TreeMap<>();
for (Method method : exceptionClass.getMethods()) {
if (isIncludedGetter(method)) {
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
index 0eb6a0c..0d2bf87 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
@@ -236,7 +236,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer {
}
context.put(ToolConstants.SERVICE_LIST, serviceList);
- Map<String, InterfaceInfo> interfaces = new LinkedHashMap<String, InterfaceInfo>();
+ Map<String, InterfaceInfo> interfaces = new LinkedHashMap<>();
ServiceInfo service0 = serviceList.get(0);
SchemaCollection schemaCollection = service0.getXmlSchemaCollection();
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
index dc3f6a1..1ff3ead 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java
@@ -61,11 +61,11 @@ public final class PluginLoader {
private static PluginLoader pluginLoader;
private static final String PLUGIN_FILE_NAME = "META-INF/tools-plugin.xml";
- private Map<String, Plugin> plugins = new LinkedHashMap<String, Plugin>();
+ private Map<String, Plugin> plugins = new LinkedHashMap<>();
- private Map<String, FrontEnd> frontends = new LinkedHashMap<String, FrontEnd>();
+ private Map<String, FrontEnd> frontends = new LinkedHashMap<>();
- private Map<String, DataBinding> databindings = new TreeMap<String, DataBinding>();
+ private Map<String, DataBinding> databindings = new TreeMap<>();
private JAXBContext jaxbContext;
diff --git a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
index 67ce656..05d2155 100644
--- a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
+++ b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
@@ -132,7 +132,7 @@ public class JavaScriptContainer extends WSDLToJavaContainer {
if (serviceList.isEmpty()) {
throw new ToolException("Did not find any services in WSDL");
}
- Map<String, InterfaceInfo> interfaces = new LinkedHashMap<String, InterfaceInfo>();
+ Map<String, InterfaceInfo> interfaces = new LinkedHashMap<>();
ServiceInfo service0 = serviceList.get(0);
SchemaCollection schemaCollection = service0.getXmlSchemaCollection();
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
index 8474e86..4ea41bf 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
@@ -65,7 +65,7 @@ public class WSDLToJavaProcessor extends WSDLToProcessor implements ClassNamePro
JavaModel javaModel = null;
Map<QName, JavaModel> map = CastUtils.cast((Map<?, ?>)context.get(MODEL_MAP));
if (map == null) {
- map = new LinkedHashMap<QName, JavaModel>();
+ map = new LinkedHashMap<>();
context.put(MODEL_MAP, map);
}
if (map.containsKey(serviceInfo.getName())) {
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
index b2ea37c..a4960f6 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
@@ -675,7 +675,7 @@ public class ParameterProcessor extends AbstractProcessor {
outputPartsMap = outputMessage.getMessagePartsMap();
outputParts = outputPartsMap.values();
} else {
- outputPartsMap = new LinkedHashMap<QName, MessagePartInfo>();
+ outputPartsMap = new LinkedHashMap<>();
outputParts = new ArrayList<>();
}