Removing HashMap parameters
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/885b65d3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/885b65d3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/885b65d3 Branch: refs/heads/master Commit: 885b65d32198083961e380c8c55c7d7a6d00ed33 Parents: a6a9e69 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Mar 9 11:40:21 2017 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Mar 9 11:40:21 2017 +0000 ---------------------------------------------------------------------- .../apache/cxf/attachment/AttachmentImpl.java | 2 +- .../cxf/bus/extension/ExtensionRegistry.java | 2 +- .../BusWiringBeanFactoryPostProcessor.java | 2 +- .../catalog/CatalogXmlSchemaURIResolver.java | 2 +- .../cxf/common/jaxb/JAXBContextCache.java | 2 +- .../org/apache/cxf/common/jaxb/JAXBUtils.java | 8 +- .../jaxb/SchemaCollectionContextProxy.java | 2 +- .../org/apache/cxf/common/util/ASMHelper.java | 6 +- .../apache/cxf/common/util/PrimitiveUtils.java | 2 +- .../cxf/common/util/SpringClasspathScanner.java | 2 +- .../org/apache/cxf/common/util/StringUtils.java | 2 +- .../org/apache/cxf/common/util/UrlUtils.java | 2 +- .../cxf/common/util/WeakIdentityHashMap.java | 2 +- .../common/util/XmlSchemaPrimitiveUtils.java | 2 +- .../cxf/common/xmlschema/SchemaCollection.java | 2 +- .../cxf/databinding/AbstractDataBinding.java | 2 +- .../cxf/endpoint/AbstractEndpointFactory.java | 2 +- .../org/apache/cxf/endpoint/ClientImpl.java | 12 +-- .../apache/cxf/helpers/HttpHeaderHelper.java | 2 +- .../apache/cxf/helpers/MapNamespaceContext.java | 2 +- .../cxf/interceptor/ClientFaultConverter.java | 2 +- .../cxf/interceptor/StaxInInterceptor.java | 2 +- .../cxf/interceptor/StaxOutInterceptor.java | 2 +- .../security/SecureAnnotationsInterceptor.java | 2 +- .../security/SimpleAuthorizingInterceptor.java | 4 +- .../apache/cxf/phase/PhaseInterceptorChain.java | 2 +- .../org/apache/cxf/resource/URIResolver.java | 2 +- .../org/apache/cxf/service/ServiceImpl.java | 2 +- .../factory/AbstractServiceFactoryBean.java | 2 +- .../service/model/AbstractPropertiesHolder.java | 2 +- .../apache/cxf/service/model/MessageInfo.java | 2 +- .../cxf/service/model/ServiceModelUtil.java | 2 +- .../cxf/staxutils/CachingXmlEventWriter.java | 2 +- .../staxutils/transform/InTransformReader.java | 4 +- .../staxutils/transform/OutTransformWriter.java | 4 +- .../java/org/apache/cxf/bus/CXFBusImplTest.java | 2 +- .../cxf/bus/extension/ExtensionManagerTest.java | 2 +- .../common/annotation/AnnotatedGreeterImpl.java | 2 +- .../cxf/common/util/PropertyUtilsTest.java | 4 +- .../cxf/common/xmlschema/ImportRepairTest.java | 2 +- .../databinding/AbstractDataBindingTest.java | 4 +- .../security/JAASLoginInterceptorTest.java | 2 +- .../PropertiesExpandingStreamReaderTest.java | 2 +- .../transform/InTransformReaderTest.java | 56 +++++++------- .../transform/OutTransformWriterTest.java | 62 +++++++-------- .../staxutils/transform/TransformTestUtils.java | 2 +- .../cxf/demo/aegis/commands/WriteZoo.java | 2 +- .../bank/src/main/java/cxf/server/BankImpl.java | 2 +- .../src/main/java/corba/server/BankImpl.java | 2 +- .../src/main/java/cxf/server/BankImpl.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 4 +- .../src/main/java/demo/jaxrs/server/Order.java | 2 +- .../httpsdemo/server/CustomerServiceImpl.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 2 +- .../java/demo/jaxrs/search/server/Catalog.java | 2 +- .../jaxrs/server/simple/StreamingService.java | 2 +- .../jaxrs/server/socket/StreamingService.java | 2 +- .../service/AbstractCustomerServiceSecured.java | 4 +- .../demo/jaxrs/service/CustomerServiceImpl.java | 4 +- .../src/main/java/demo/jaxrs/service/Order.java | 2 +- .../java/demo/jaxrs/tracing/client/Client.java | 2 +- .../tracing/server/CatalogApplication.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 8 +- .../src/main/java/demo/jaxrs/server/Order.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 8 +- .../src/main/java/demo/jaxrs/server/Order.java | 2 +- .../java/demo/jaxrs/server/CustomerService.java | 8 +- .../src/main/java/demo/jaxrs/server/Order.java | 2 +- .../GetProtectedResourceController.java | 2 +- .../TemporaryCredentialsController.java | 2 +- .../controllers/TokenRequestController.java | 2 +- .../src/main/java/demo/wssec/client/Client.java | 4 +- .../src/main/java/demo/wssec/server/Server.java | 4 +- .../src/main/java/demo/wssec/client/Client.java | 4 +- .../src/main/java/demo/wssec/server/Server.java | 4 +- .../classloader/PlugInClassLoaderHelper.java | 2 +- .../org/apache/cxf/jca/jarloader/JarLoader.java | 4 +- .../boot/autoconfigure/CxfProperties.java | 2 +- .../tracing/brave/AbstractBraveInterceptor.java | 2 +- .../cxf/tracing/brave/BraveStopInterceptor.java | 2 +- .../tracing/htrace/HTraceStopInterceptor.java | 2 +- .../cxf/maven_plugin/ClassLoaderSwitcher.java | 4 +- .../corba/maven/plugins/WSDLToIDLPlugin.java | 4 +- .../cxf/maven_plugin/ClassLoaderSwitcher.java | 4 +- .../common/ClassLoaderSwitcher.java | 4 +- .../apache/cxf/osgi/itests/jaxrs/BookStore.java | 2 +- .../apache/cxf/binding/corba/CorbaConduit.java | 2 +- .../apache/cxf/binding/corba/CorbaTypeMap.java | 4 +- .../binding/corba/runtime/CorbaDSIServant.java | 2 +- .../corba/runtime/CorbaStreamWriter.java | 4 +- .../binding/corba/types/CorbaHandlerUtils.java | 2 +- .../cxf/binding/corba/utils/CorbaAnyHelper.java | 4 +- .../binding/corba/utils/CorbaBindingHelper.java | 4 +- .../cxf/binding/corba/utils/CorbaUtils.java | 2 +- .../corba/runtime/CorbaDSIServantTest.java | 2 +- .../cxf/binding/soap/SOAPBindingUtil.java | 2 +- .../cxf/binding/soap/SoapBindingFactory.java | 4 +- .../org/apache/cxf/binding/soap/SoapFault.java | 2 +- .../cxf/binding/soap/SoapVersionFactory.java | 2 +- .../interceptor/Soap12FaultInInterceptor.java | 2 +- .../soap/jms/interceptor/JMSFaultType.java | 2 +- .../interceptor/SoapFaultSerializerTest.java | 2 +- .../apache/cxf/aegis/util/jdom/StaxBuilder.java | 2 +- .../apache/cxf/aegis/AbstractAegisIoImpl.java | 4 +- .../java/org/apache/cxf/aegis/AegisContext.java | 2 +- .../main/java/org/apache/cxf/aegis/Context.java | 4 +- .../cxf/aegis/databinding/AegisDatabinding.java | 6 +- .../aegis/databinding/ElementDataWriter.java | 2 +- .../aegis/databinding/XMLStreamDataWriter.java | 2 +- .../apache/cxf/aegis/type/XMLTypeCreator.java | 2 +- .../cxf/aegis/type/basic/BeanTypeInfo.java | 6 +- .../type/basic/InterfaceInvocationHandler.java | 2 +- .../cxf/aegis/type/basic/XMLBeanTypeInfo.java | 2 +- .../cxf/aegis/type/collection/MapType.java | 4 +- .../cxf/aegis/type/java5/Java5TypeCreator.java | 8 +- .../cxf/aegis/type/mtom/AbstractXOPType.java | 2 +- .../cxf/aegis/util/stax/JDOMStreamReader.java | 2 +- .../cxf/aegis/util/stax/JDOMStreamWriter.java | 2 +- .../cxf/aegis/custom/service/ServiceImpl.java | 2 +- .../cxf/aegis/inheritance/ws2/impl/WS2Impl.java | 2 +- .../aegis/namespaces/ExplicitPrefixTest.java | 4 +- .../type/java5/CollectionTestsWithService.java | 4 +- .../cxf/aegis/type/java5/dto/MapDTOService.java | 2 +- .../java5/map/StudentServiceDocLiteralImpl.java | 2 +- .../type/java5/map/StudentServiceImpl.java | 4 +- .../cxf/aegis/type/java5/map/StudentTest.java | 4 +- .../cxf/aegis/type/map/fortest/MapTestImpl.java | 4 +- .../aegis/type/map/fortest/ObjectWithAMap.java | 2 +- .../aegis/type/map/ns2/ObjectWithAMapNs2.java | 2 +- .../org/apache/cxf/jaxb/JAXBDataBinding.java | 8 +- .../DataBindingMarshallerPropertiesTest.java | 2 +- .../apache/cxf/jaxb/JAXBDataBindingTest.java | 12 +-- .../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 4 +- .../java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 2 +- .../cxf/jaxb/io/XMLStreamDataWriterTest.java | 4 +- .../cxf/jaxrs/JAXRSServerFactoryBean.java | 2 +- .../cxf/jaxrs/JAXRSServiceFactoryBean.java | 2 +- .../org/apache/cxf/jaxrs/JAXRSServiceImpl.java | 2 +- .../jaxrs/impl/CacheControlHeaderProvider.java | 2 +- .../cxf/jaxrs/impl/ConfigurationImpl.java | 6 +- .../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 4 +- .../apache/cxf/jaxrs/impl/LinkBuilderImpl.java | 2 +- .../cxf/jaxrs/impl/PropertyHolderFactory.java | 2 +- .../cxf/jaxrs/impl/RequestPreprocessor.java | 2 +- .../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 2 +- .../cxf/jaxrs/impl/RuntimeDelegateImpl.java | 2 +- .../apache/cxf/jaxrs/impl/UriBuilderImpl.java | 4 +- .../cxf/jaxrs/model/AbstractResourceInfo.java | 4 +- .../apache/cxf/jaxrs/model/ApplicationInfo.java | 2 +- .../apache/cxf/jaxrs/model/ResourceTypes.java | 8 +- .../apache/cxf/jaxrs/model/UserApplication.java | 2 +- .../apache/cxf/jaxrs/model/UserResource.java | 2 +- .../jaxrs/provider/AbstractJAXBProvider.java | 4 +- .../cxf/jaxrs/provider/JAXBElementProvider.java | 2 +- .../provider/RequestDispatcherProvider.java | 2 +- .../jaxrs/provider/ServerProviderFactory.java | 2 +- .../cxf/jaxrs/provider/XSLTJaxbProvider.java | 8 +- .../security/KerberosAuthOutInterceptor.java | 2 +- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 22 +++--- .../apache/cxf/jaxrs/utils/InjectionUtils.java | 2 +- .../apache/cxf/jaxrs/utils/ResourceUtils.java | 4 +- .../apache/cxf/jaxrs/utils/SpecExceptions.java | 2 +- .../jaxrs/impl/EvaluatePreconditionsTest.java | 2 +- .../apache/cxf/jaxrs/impl/MetadataMapTest.java | 6 +- .../cxf/jaxrs/impl/UriBuilderImplTest.java | 42 +++++----- .../apache/cxf/jaxrs/model/URITemplateTest.java | 14 ++-- .../jaxrs/provider/JAXBElementProviderTest.java | 46 +++++------ .../cxf/jaxrs/provider/XPathProviderTest.java | 2 +- .../org/apache/cxf/jaxrs/resources/Book.java | 2 +- .../cxf/jaxrs/resources/BookNoSubResource.java | 2 +- .../jaxrs/resources/BookStoreNoAnnotations.java | 2 +- .../cxf/jaxrs/utils/ResourceUtilsTest.java | 2 +- .../cxf/jaxws/AbstractJAXWSMethodInvoker.java | 2 +- .../java/org/apache/cxf/jaxws/EndpointImpl.java | 2 +- .../java/org/apache/cxf/jaxws/ServiceImpl.java | 2 +- .../cxf/jaxws/context/WrappedAttachments.java | 2 +- .../jaxws/context/WrappedMessageContext.java | 6 +- .../cxf/jaxws/handler/HandlerChainBuilder.java | 2 +- .../cxf/jaxws/handler/HandlerResolverImpl.java | 2 +- .../support/JaxWsServiceConfiguration.java | 6 +- .../cxf/jaxws/ConfiguredEndpointTest.java | 4 +- .../cxf/jaxws/JaxWsServerFactoryBeanTest.java | 6 +- .../context/WebServiceContextImplTest.java | 2 +- .../jaxws/context/WrappedAttachmentsTest.java | 2 +- .../context/WrappedMessageContextTest.java | 2 +- .../handler/InitParamResourceResolverTest.java | 2 +- .../support/ContextPropertiesMappingTest.java | 6 +- .../cxf/jaxws/ws/PolicyAnnotationTest.java | 8 +- .../JAXWSHttpSpiDestinationTest.java | 2 +- .../endpoint/dynamic/DynamicClientFactory.java | 4 +- .../cxf/frontend/ClientProxyFactoryBean.java | 2 +- .../org/apache/cxf/frontend/WSDLGetUtils.java | 6 +- .../service/factory/ClientFactoryBeanTest.java | 2 +- .../factory/ReflectionServiceFactoryTest.java | 4 +- .../cxf/service/factory/ServerFactoryTest.java | 2 +- .../apache/cxf/javascript/BasicNameManager.java | 2 +- .../apache/cxf/javascript/JavascriptUtils.java | 2 +- .../javascript/NamespacePrefixAccumulator.java | 2 +- .../service/ServiceJavascriptBuilder.java | 6 +- .../apache/cxf/javascript/JsXMLHttpRequest.java | 2 +- .../jmx/InstrumentationManagerImpl.java | 2 +- .../export/runtime/ModelMBeanInfoSupporter.java | 8 +- .../apache/cxf/jaxrs/client/AbstractClient.java | 6 +- .../cxf/jaxrs/client/ClientConfiguration.java | 4 +- .../cxf/jaxrs/client/ClientProxyImpl.java | 4 +- .../CacheControlClientReaderInterceptor.java | 2 +- .../client/spec/InvocationBuilderImpl.java | 2 +- .../AbstractJaxRsClientConfiguration.java | 2 +- .../org/apache/cxf/jaxrs/resources/Book.java | 2 +- .../jaxrs/resources/BookStoreNoAnnotations.java | 2 +- .../apache/cxf/jaxrs/swagger/SwaggerUtils.java | 2 +- .../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 2 +- .../jsonp/JsonpPreStreamInterceptor.java | 2 +- .../jaxrs/provider/json/JSONProviderTest.java | 68 ++++++++--------- .../cxf/jaxrs/ext/search/Beanspector.java | 2 +- .../cxf/jaxrs/ext/search/InterfaceProxy.java | 2 +- .../apache/cxf/jaxrs/ext/search/SearchBean.java | 2 +- .../ext/search/SimpleSearchConditionTest.java | 4 +- .../client/FiqlSearchConditionBuilderTest.java | 2 +- .../jaxrs/ext/search/fiql/FiqlParserTest.java | 2 +- .../jpa/JPATypedQueryVisitorFiqlTest.java | 6 +- .../jpa/JPATypedQueryVisitorODataTest.java | 6 +- .../rs/security/jose/jwa/AlgorithmUtils.java | 4 +- .../jose/jwe/AesCbcHmacJweEncryption.java | 4 +- .../jwe/EcdhAesWrapKeyEncryptionAlgorithm.java | 2 +- .../PbesHmacAesWrapKeyEncryptionAlgorithm.java | 6 +- .../cxf/rs/security/jose/jwk/JwkUtils.java | 2 +- .../jose/jws/EcDsaJwsSignatureVerifier.java | 2 +- .../security/oauth/client/OAuthClientUtils.java | 8 +- .../oauth/filters/AbstractAuthFilter.java | 2 +- .../oauth/services/AccessTokenHandler.java | 2 +- .../services/AuthorizationRequestHandler.java | 2 +- .../oauth/services/RequestTokenHandler.java | 2 +- .../cxf/rs/security/oauth/utils/OAuthUtils.java | 2 +- .../oauth2/common/AccessTokenValidation.java | 2 +- .../cxf/rs/security/oauth2/common/Client.java | 2 +- .../oauth2/common/OAuthAuthorizationData.java | 2 +- .../oauth2/common/TokenIntrospection.java | 2 +- .../rs/security/oauth2/common/UserSubject.java | 2 +- .../oauth2/filters/OAuthScopesFilter.java | 4 +- .../provider/AbstractOAuthDataProvider.java | 2 +- .../hawk/AbstractHawkAccessTokenValidator.java | 2 +- .../utils/crypto/ModelEncryptionSupport.java | 2 +- .../utils/crypto/EncryptingDataProvider.java | 2 +- .../cxf/rs/security/oidc/utils/OidcUtils.java | 2 +- .../transport/http/asyncclient/Activator.java | 2 +- .../http_jetty/JettyHTTPDestinationTest.java | 4 +- .../server/servlet/NettyServletContext.java | 4 +- .../netty/server/NettyHttpDestinationTest.java | 4 +- .../UndertowHTTPDestinationTest.java | 4 +- .../apache/cxf/transport/http/HTTPConduit.java | 2 +- .../transport/http/auth/DigestAuthSupplier.java | 2 +- .../cxf/transport/http/auth/HttpAuthHeader.java | 2 +- .../transport/servlet/AbstractHTTPServlet.java | 4 +- .../apache/cxf/transport/http/HeadersTest.java | 6 +- .../http/auth/DigestAuthSupplierTest.java | 2 +- .../transport/http/auth/HttpAuthHeaderTest.java | 2 +- .../cxf/transport/jms/uri/JMSEndpoint.java | 6 +- .../cxf/transport/jms/uri/JMSURIParser.java | 2 +- .../cxf/transport/jms/uri/MyBeanLocator.java | 2 +- .../apache/cxf/transport/udp/UDPConduit.java | 2 +- .../websocket/ahc/AhcWebSocketConduit.java | 4 +- .../atmosphere/DefaultProtocolInterceptor.java | 4 +- .../ws/addressing/impl/ContextUtilsTest.java | 2 +- .../cxf/ws/addressing/soap/MAPCodecTest.java | 2 +- .../EventSinkInterfaceNotificationTask.java | 2 +- .../java/org/apache/cxf/ws/mex/MEXUtils.java | 2 +- .../DomainExpressionBuilderRegistryTest.java | 2 +- .../apache/cxf/ws/rm/CapturingXMLWriter.java | 2 +- .../main/java/org/apache/cxf/ws/rm/Proxy.java | 2 +- .../cxf/ws/rm/RMCaptureInInterceptor.java | 4 +- .../java/org/apache/cxf/ws/rm/RMEndpoint.java | 4 +- .../java/org/apache/cxf/ws/rm/RMManager.java | 2 +- .../main/java/org/apache/cxf/ws/rm/Source.java | 2 +- .../cxf/ws/rm/persistence/jdbc/RMTxStore.java | 4 +- .../cxf/ws/rm/soap/RedeliveryQueueImpl.java | 2 +- .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 2 +- .../apache/cxf/ws/rm/ManagedRMManagerTest.java | 2 +- .../java/org/apache/cxf/ws/rm/ProxyTest.java | 4 +- .../security/policy/WSSecurityPolicyLoader.java | 2 +- .../custom/DefaultAlgorithmSuiteLoader.java | 2 +- .../provider/SecurityTokenServiceProvider.java | 4 +- .../apache/cxf/ws/security/trust/STSUtils.java | 2 +- ...tUsernameTokenAuthenticatingInterceptor.java | 2 +- .../cxf/ws/security/wss4j/StaxSerializer.java | 4 +- .../ws/security/wss4j/WSS4JInInterceptor.java | 2 +- .../AbstractStaxBindingHandler.java | 2 +- .../wss4j/CryptoCoverageCheckerTest.java | 2 +- .../DOMToStaxEncryptionIdentifierTest.java | 10 +-- .../security/wss4j/DOMToStaxRoundTripTest.java | 28 +++---- .../wss4j/DOMToStaxSignatureIdentifierTest.java | 10 +-- .../wss4j/DefaultCryptoCoverageCheckerTest.java | 2 +- .../security/wss4j/SecurityActionTokenTest.java | 4 +- .../security/wss4j/StaxRoundTripActionTest.java | 26 +++---- .../ws/security/wss4j/StaxRoundTripTest.java | 50 ++++++------ .../StaxToDOMEncryptionIdentifierTest.java | 10 +-- .../security/wss4j/StaxToDOMRoundTripTest.java | 80 ++++++++++---------- .../wss4j/StaxToDOMSignatureIdentifierTest.java | 10 +-- .../cxf/ws/security/wss4j/TestPwdCallback.java | 2 +- .../cxf/ws/security/wss4j/WSS4JInOutTest.java | 36 ++++----- .../security/wss4j/WSS4JOutInterceptorTest.java | 4 +- .../security/wss4j/saml/DOMToStaxSamlTest.java | 12 +-- .../ws/security/wss4j/saml/SamlTokenTest.java | 68 ++++++++--------- .../security/wss4j/saml/StaxToDOMSamlTest.java | 60 +++++++-------- .../dialect/fragment/FragmentDialect.java | 2 +- .../transfer/manager/MemoryResourceManager.java | 2 +- .../cxf/ws/transfer/resource/ResourceLocal.java | 2 +- .../resourcefactory/ResourceFactoryImpl.java | 2 +- .../integration/IntegrationBaseTest.java | 2 +- .../apache/cxf/wsdl/JAXBExtensionHelper.java | 6 +- .../cxf/wsdl/service/factory/ClassReader.java | 2 +- .../cxf/wsdl/service/factory/ParamReader.java | 2 +- .../factory/ReflectionServiceFactoryBean.java | 14 ++-- .../factory/XercesSchemaValidationUtils.java | 2 +- .../java/org/apache/cxf/wsdl11/NSManager.java | 2 +- .../org/apache/cxf/wsdl11/SOAPBindingUtil.java | 2 +- .../java/org/apache/cxf/wsdl11/SchemaUtil.java | 2 +- .../apache/cxf/wsdl11/ServiceWSDLBuilder.java | 6 +- .../apache/cxf/wsdl11/WSDLServiceBuilder.java | 2 +- .../DocLiteralInInterceptorTest.java | 2 +- .../apache/cxf/wsdl11/WSDLManagerImplTest.java | 2 +- .../sts/rest/RESTSecurityTokenServiceImpl.java | 6 +- .../cxf/sts/cache/CacheIdentityMapper.java | 2 +- .../claims/mapper/JexlIssueSamlClaimsTest.java | 2 +- .../sts/operation/IssueJWTClaimsUnitTest.java | 2 +- .../operation/IssueJWTOnbehalfofUnitTest.java | 2 +- .../sts/operation/IssueJWTRealmUnitTest.java | 2 +- .../sts/operation/IssueOnbehalfofUnitTest.java | 2 +- .../sts/operation/IssueSamlClaimsUnitTest.java | 2 +- .../sts/operation/IssueSamlRealmUnitTest.java | 2 +- .../ValidateJWTTransformationTest.java | 2 +- .../ValidateTokenTransformationUnitTest.java | 2 +- .../cxf/sts/token/provider/JWTClaimsTest.java | 2 +- .../provider/JWTTokenProviderRealmTest.java | 2 +- .../cxf/sts/token/provider/SAMLClaimsTest.java | 10 +-- .../token/provider/SAMLProviderRealmTest.java | 2 +- .../renewer/SAMLTokenRenewerRealmTest.java | 2 +- .../validator/JWTTokenValidatorRealmTest.java | 2 +- .../SAMLTokenValidatorCachedRealmTest.java | 2 +- .../validator/SAMLTokenValidatorRealmTest.java | 2 +- .../AsymmetricEncryptionTest.java | 2 +- .../systest/sts/batch/SAMLBatchUnitTest.java | 4 +- .../systest/sts/batch/SimpleBatchSTSClient.java | 2 +- .../systest/sts/caching/ServerCachingTest.java | 2 +- .../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 4 +- .../cxf/systest/sts/jwt/JaxrsJWTTest.java | 2 +- .../systest/sts/renew/SAMLRenewUnitTest.java | 6 +- .../SecurityContextTokenCancelTest.java | 4 +- .../SecurityContextTokenUnitTest.java | 2 +- .../cxf/systest/sts/soap12/Soap12Test.java | 2 +- .../sts/delegation/SAMLDelegationTest.java | 2 +- .../systest/sts/issueunit/IssueUnitTest.java | 6 +- .../stsclient/STSTokenOutInterceptorTest.java | 4 +- .../sts/stsclient/STSTokenRetrieverTest.java | 4 +- .../sts/symmetric/SymmetricBindingTest.java | 2 +- .../cxf/systest/sts/template/TemplateTest.java | 2 +- .../sts/transport/TransportBindingTest.java | 2 +- .../systest/sts/itests/unit/STSUnitTest.java | 2 +- .../org/apache/cxf/ws/discovery/WSDVersion.java | 8 +- .../internal/WSDiscoveryServiceImpl.java | 6 +- .../org/apache/cxf/wsn/util/CXFWSNHelper.java | 4 +- .../org/apache/cxf/wsn/jms/JmsPublisher.java | 2 +- .../x509/repo/ldap/LdapCertificateRepo.java | 2 +- .../cxf/systest/aegis/AegisJaxWsImpl.java | 2 +- .../cxf/systest/aegis/SportsServiceImpl.java | 2 +- .../apache/cxf/systest/aegis/mtom/MtomTest.java | 2 +- .../apache/cxf/systest/jaxb/HashMapAdapter.java | 2 +- .../apache/cxf/systest/jaxrs/AtomBookStore.java | 4 +- .../java/org/apache/cxf/systest/jaxrs/Book.java | 2 +- .../org/apache/cxf/systest/jaxrs/BookBean.java | 4 +- .../systest/jaxrs/BookContinuationStore.java | 2 +- .../systest/jaxrs/BookCxfContinuationStore.java | 2 +- .../cxf/systest/jaxrs/BookNoXmlRootElement.java | 2 +- .../apache/cxf/systest/jaxrs/BookServer.java | 2 +- .../apache/cxf/systest/jaxrs/BookServer20.java | 2 +- .../org/apache/cxf/systest/jaxrs/BookStore.java | 4 +- .../cxf/systest/jaxrs/BookStoreDispatch.java | 2 +- .../systest/jaxrs/BookStoreNoAnnotations.java | 2 +- .../jaxrs/BookStoreNoAnnotationsImpl.java | 2 +- .../cxf/systest/jaxrs/BookStorePerRequest.java | 2 +- .../cxf/systest/jaxrs/BookStoreSpring.java | 2 +- .../cxf/systest/jaxrs/BookStoreStorage.java | 2 +- .../org/apache/cxf/systest/jaxrs/BookType.java | 2 +- .../cxf/systest/jaxrs/CustomOutInterceptor.java | 2 +- .../jaxrs/JAXRSClientServerBookTest.java | 4 +- .../jaxrs/JAXRSClientServerODataSearchTest.java | 2 +- ...ServerResourceCreatedSpringProviderTest.java | 2 +- .../jaxrs/JAXRSClientServerSpringBookTest.java | 2 +- .../jaxrs/JAXRSClientServerStreamingTest.java | 2 +- .../jaxrs/JAXRSRequestDispatcherTest.java | 6 +- .../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 12 +-- .../apache/cxf/systest/jaxrs/JMSBookStore.java | 2 +- .../cxf/systest/jaxrs/MultipartServer.java | 2 +- .../systest/jaxrs/extraction/BookCatalog.java | 2 +- .../extraction/JAXRSClientServerTikaTest.java | 2 +- .../jaxrs/failover/AbstractFailoverTest.java | 2 +- .../jaxrs/jaxws/BookStoreSoapRestImpl.java | 2 +- .../cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 2 +- .../apache/cxf/systest/jaxrs/provider/Book.java | 2 +- .../systest/jaxrs/provider/BookJsonStore.java | 2 +- .../systest/jaxrs/security/BookLoginModule.java | 2 +- .../systest/jaxrs/security/SecureBookStore.java | 2 +- .../jaxrs/security/SecureBookStoreGenerics.java | 2 +- .../security/SecureBookStoreNoAnnotations.java | 2 +- .../security/SecureBookStoreNoInterface.java | 2 +- .../validation/BookStoreWithValidation.java | 2 +- .../BookStoreWithValidationPerRequest.java | 2 +- .../jaxrs/websocket/BookStoreWebSocket.java | 2 +- .../dispatch/DispatchClientServerTest.java | 4 +- .../cxf/systest/handlers/TestHandler.java | 2 +- .../cxf/systest/handlers/TestHandlerBase.java | 2 +- .../jaxws/ClientServerGreeterNoWsdlTest.java | 2 +- .../cxf/systest/jaxws/ClientServerMiscTest.java | 4 +- .../systest/jaxws/ClientServerRPCLitTest.java | 2 +- .../cxf/systest/jaxws/ClientServerTest.java | 2 +- .../jaxws/SchemaValidationClientServerTest.java | 2 +- .../cxf/systest/jaxws/ServerGreeterNoWsdl.java | 2 +- .../JavaFirstSchemaValidationTest.java | 4 +- .../AttachmentStreamSourceXMLProvider.java | 2 +- .../provider/ProviderClientServerTest.java | 2 +- .../org/apache/cxf/systest/provider/Server.java | 2 +- .../apache/cxf/systest/provider/XMLServer.java | 2 +- .../systest/kerberos/jaxrs/kerberos/Book.java | 2 +- .../kerberos/jaxrs/kerberos/BookStoreImpl.java | 2 +- .../security/jose/jwejws/JAXRSJwsJsonTest.java | 6 +- .../jose/jwejws/JweJwsAlgorithmTest.java | 30 ++++---- .../jose/jwejws/JweJwsReferenceTest.java | 18 ++--- .../security/jose/jwt/JWTAlgorithmTest.java | 34 ++++----- .../security/jose/jwt/JWTAuthnAuthzTest.java | 10 +-- .../security/jose/jwt/JWTPropertiesTest.java | 20 ++--- .../oauth/TemporaryCredentialServiceTest.java | 2 +- .../security/oauth2/grants/JAXRSOAuth2Test.java | 26 +++---- .../security/oidc/MemoryClientDataProvider.java | 2 +- .../saml/JAXRSSamlAuthorizationTest.java | 10 +-- .../jaxrs/security/saml/JAXRSSamlTest.java | 2 +- .../jaxrs/security/xml/JAXRSXmlSecTest.java | 24 +++--- .../htrace/HTraceTracingCustomHeadersTest.java | 6 +- .../jaxrs/tracing/htrace/HTraceTracingTest.java | 4 +- .../jaxws/tracing/brave/BraveTracingTest.java | 2 +- .../jaxws/tracing/htrace/HTraceTracingTest.java | 4 +- .../systest/jms/security/JMSWSSecurityTest.java | 10 +-- .../apache/cxf/systest/jms/security/Server.java | 2 +- .../cxf/systest/jms/tx/MyBeanLocator.java | 2 +- .../http_undertow/ClientServerSessionTest.java | 2 +- .../org/apache/cxf/systest/http/BusServer.java | 2 +- .../systest/http/ClientServerSessionTest.java | 2 +- .../org/apache/cxf/systest/https/BusServer.java | 2 +- .../apache/cxf/systest/basicDOCBare/Server.java | 2 +- .../cxf/systest/clustering/ControlImpl.java | 4 +- .../LoadDistributorAddressOverrideTest.java | 6 +- .../systest/clustering/LoadDistributorTest.java | 6 +- .../systest/exception/GenericExceptionTest.java | 2 +- .../MultiplexClientServerTest.java | 2 +- .../cxf/systest/lifecycle/LifeCycleTest.java | 4 +- .../apache/cxf/systest/mtom/MtomServerTest.java | 4 +- .../cxf/systest/outofband/header/Server.java | 8 +- .../systest/soap12/Soap12ClientServerTest.java | 2 +- .../cxf/systest/soapfault/details/Server11.java | 2 +- .../cxf/systest/soapfault/details/Server12.java | 2 +- .../StaxTransformFeatureTest.java | 8 +- .../ws/rm/AbstractClientPersistenceTest.java | 2 +- .../apache/cxf/systest/ws/rm/ControlImpl.java | 2 +- .../cxf/systest/ws/rm/DecoupledBareTest.java | 2 +- .../ws/rm/DecoupledClientServerOnewayTest.java | 2 +- .../ws/rm/DecoupledClientServerTest.java | 2 +- .../ws/rm/DeliveryAssuranceOnewayTest.java | 2 +- .../ws/rm/MessageCallbackOnewayTest.java | 2 +- .../systest/ws/rm/ProtocolVariationsTest.java | 8 +- .../apache/cxf/systest/ws/rm/SequenceTest.java | 10 +-- .../ws/rm/sec/WSRMWithWSSecurityPolicyTest.java | 6 +- .../CryptoCoverageCheckerTest.java | 24 +++--- .../ws/gcm/MGF256AlgorithmSuiteLoader.java | 2 +- .../cxf/systest/ws/httpget/HTTPGetTest.java | 2 +- .../ws/policy/JavaFirstPolicyServiceTest.java | 4 +- .../policy/handler/CommonPasswordCallback.java | 2 +- .../systest/ws/security/SecurityPolicyTest.java | 4 +- .../ws/security/WSSecurityClientTest.java | 4 +- .../handler/UsernamePasswordCallback.java | 2 +- .../cxf/systest/ws/wssc/WSSCUnitTest.java | 4 +- .../cxf/systest/ws/x509/SHA512PolicyLoader.java | 2 +- .../cxf/systest/ws/AbstractWSATestBase.java | 4 +- .../apache/cxf/systest/ws/addr_wsdl/Server.java | 4 +- .../systest/ws/addressing/DecoupledJMSTest.java | 2 +- .../cxf/systest/ws/addressing/MAPTestBase.java | 2 +- .../cxf/systest/ws/addressing/MAPVerifier.java | 2 +- .../ws/addressing/NonDecoupledJMSTest.java | 2 +- .../cxf/customer/bare/CustomerService.java | 2 +- .../cxf/customer/book/BookServiceImpl.java | 2 +- .../customer/book/BookServiceWrappedImpl.java | 2 +- .../cxf/customer/wraped/CustomerService.java | 2 +- .../java/org/apache/cxf/test/TestUtilities.java | 2 +- .../java/org/apache/cxf/test/XPathAssert.java | 4 +- .../cxf/testutil/common/ServerLauncher.java | 2 +- .../AnnotatedGreeterImpl.java | 2 +- .../AnnotatedGreeterNoOverloadImpl.java | 2 +- .../AnotherDerivedGreeterImpl.java | 2 +- .../DerivedGreeterImpl.java | 2 +- .../org/apache/cxf/test/XPathAssertTest.java | 2 +- .../tools/common/AbstractCXFToolContainer.java | 2 +- .../cxf/tools/common/ProcessorTestBase.java | 2 +- .../java/org/apache/cxf/tools/common/Tag.java | 2 +- .../apache/cxf/tools/common/ToolContext.java | 12 +-- .../cxf/tools/common/VelocityGenerator.java | 2 +- .../cxf/tools/common/model/JavaMethod.java | 4 +- .../cxf/tools/common/model/JavaParameter.java | 2 +- .../apache/cxf/tools/common/model/JavaType.java | 2 +- .../tools/util/BuiltInTypesJavaMappingUtil.java | 2 +- .../apache/cxf/tools/util/ClassCollector.java | 14 ++-- .../org/apache/cxf/tools/util/PropertyUtil.java | 2 +- .../tools/common/ProcessorEnvironmentTest.java | 14 ++-- .../tools/corba/common/CorbaPrimitiveMap.java | 2 +- .../corba/common/ProcessorEnvironment.java | 8 +- .../corba/common/XmlSchemaPrimitiveMap.java | 2 +- .../tools/corba/common/idltypes/IdlRoot.java | 2 +- .../corba/idlpreprocessor/DefineState.java | 2 +- .../corba/processors/idl/AttributeVisitor.java | 4 +- .../idl/DeferredActionCollection.java | 2 +- .../processors/idl/IDLToWSDLProcessor.java | 8 +- .../corba/processors/idl/ModuleToNSMapper.java | 4 +- .../processors/idl/ScopeNameCollection.java | 2 +- .../corba/processors/idl/WSDLSchemaManager.java | 10 +-- .../processors/wsdl/WSDLToCorbaBinding.java | 2 +- .../processors/wsdl/WSDLToCorbaHelper.java | 2 +- .../corba/common/CorbaPrimitiveMapTest.java | 2 +- .../processors/IDLToWSDLGenerationTest.java | 6 +- .../processors/WSDLToCorbaBindingTest.java | 2 +- .../processors/WSDLToCorbaBindingTypeTest.java | 2 +- .../generator/wsdl11/WSDL11Generator.java | 2 +- .../processor/internal/AntGenerator.java | 4 +- .../org/apache/cxf/tools/java2ws/AegisTest.java | 2 +- .../apache/cxf/tools/java2ws/JavaToWSTest.java | 4 +- .../processor/JavaToProcessorTest.java | 16 ++-- .../validator/internal/SchemaValidator.java | 2 +- .../internal/UniqueBodyPartsValidator.java | 2 +- .../tools/validator/internal/ValidatorUtil.java | 2 +- .../validator/internal/WSDLRefValidator.java | 10 +-- .../tools/validator/internal/model/XNode.java | 2 +- .../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 2 +- .../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 18 ++--- .../cxf/tools/wsdlto/WSDLToJavaContainer.java | 4 +- .../wsdlto/core/WSDLDefinitionBuilder.java | 2 +- .../databinding/jaxb/JAXBDataBinding.java | 2 +- .../wsdlto/javascript/JavaScriptContainer.java | 2 +- .../jaxws/customization/CustomNodeSelector.java | 2 +- .../customization/CustomizationParser.java | 4 +- .../frontend/jaxws/generators/AntGenerator.java | 4 +- .../jaxws/generators/ImplGenerator.java | 2 +- .../jaxws/generators/ServerGenerator.java | 2 +- .../processor/internal/ServiceProcessor.java | 2 +- .../jaxws/validator/UniqueBodyValidator.java | 4 +- .../WrapperStyleNameCollisionValidator.java | 2 +- .../jaxws/wsdl11/CustomizedWSDLLocator.java | 2 +- .../misc/processor/AbstractWSDLToProcessor.java | 2 +- .../misc/processor/WSDLToXMLProcessor.java | 2 +- .../misc/processor/address/AddressFactory.java | 2 +- .../misc/processor/address/JmsAddress.java | 4 +- .../misc/processor/address/SoapAddress.java | 4 +- .../misc/processor/address/XmlAddress.java | 4 +- 558 files changed, 1265 insertions(+), 1265 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java index 29c161f..84cdaba 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java @@ -31,7 +31,7 @@ public class AttachmentImpl implements Attachment { private DataHandler dataHandler; private String id; - private Map<String, String> headers = new HashMap<String, String>(); + private Map<String, String> headers = new HashMap<>(); private boolean xop; public AttachmentImpl(String idParam) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java ---------------------------------------------------------------------- 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 7b0f800..dcd583f 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 @@ -40,7 +40,7 @@ public final class ExtensionRegistry { } public static Map<String, Extension> getRegisteredExtensions() { - Map<String, Extension> exts = new HashMap<String, Extension>(extensions.size()); + Map<String, Extension> exts = new HashMap<>(extensions.size()); for (Map.Entry<String, Extension> ext : extensions.entrySet()) { exts.put(ext.getKey(), ext.getValue().cloneNoObject()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java index 4119214..aab8ed4 100644 --- a/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java +++ b/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java @@ -145,7 +145,7 @@ public class BusWiringBeanFactoryPostProcessor implements BeanFactoryPostProcess private void insertConstructorArg(ConstructorArgumentValues constructorArgs, Object valueToInsert) { List<ValueHolder> genericArgs = new ArrayList<>(CastUtils .<ValueHolder> cast(constructorArgs.getGenericArgumentValues())); - Map<Integer, ValueHolder> indexedArgs = new HashMap<Integer, ValueHolder>(CastUtils + Map<Integer, ValueHolder> indexedArgs = new HashMap<>(CastUtils .<Integer, ValueHolder> cast(constructorArgs.getIndexedArgumentValues())); constructorArgs.clear(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java b/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java index 07d330a..f0241ae 100644 --- a/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java +++ b/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java @@ -40,7 +40,7 @@ public class CatalogXmlSchemaURIResolver implements URIResolver { private ExtendedURIResolver resolver; private Bus bus; - private Map<String, String> resolved = new HashMap<String, String>(); + private Map<String, String> resolved = new HashMap<>(); public CatalogXmlSchemaURIResolver(Bus bus) { this.resolver = new TransportURIResolver(bus); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java ---------------------------------------------------------------------- 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 542e7ce..924f3ef 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 @@ -189,7 +189,7 @@ public final class JAXBContextCache { } } - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); if (defaultNs != null) { if (HAS_MOXY) { map.put("eclipselink.default-target-namespace", defaultNs); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java index 83364b8..8527851 100644 --- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java +++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java @@ -123,7 +123,7 @@ public final class JAXBUtils { private static ClassLoader jaxbXjcLoader; static { - BUILTIN_DATATYPES_MAP = new HashMap<String, String>(); + BUILTIN_DATATYPES_MAP = new HashMap<>(); BUILTIN_DATATYPES_MAP.put("string", "java.lang.String"); BUILTIN_DATATYPES_MAP.put("integer", "java.math.BigInteger"); BUILTIN_DATATYPES_MAP.put("int", "int"); @@ -152,7 +152,7 @@ public final class JAXBUtils { BUILTIN_DATATYPES_MAP.put("NOTATION", "javax.xml.namespace.QName"); BUILTIN_DATATYPES_MAP.put("string", "java.lang.String"); - HOLDER_TYPES_MAP = new HashMap<String, Class<?>>(); + HOLDER_TYPES_MAP = new HashMap<>(); HOLDER_TYPES_MAP.put("int", java.lang.Integer.class); HOLDER_TYPES_MAP.put("long", java.lang.Long.class); HOLDER_TYPES_MAP.put("short", java.lang.Short.class); @@ -865,8 +865,8 @@ public final class JAXBUtils { // allow loading of extra classes (such as subclasses for inheritance // reasons) // that are in the same package. Also check for ObjectFactory classes - Map<String, InputStream> packages = new HashMap<String, InputStream>(); - Map<String, ClassLoader> packageLoaders = new HashMap<String, ClassLoader>(); + Map<String, InputStream> packages = new HashMap<>(); + Map<String, ClassLoader> packageLoaders = new HashMap<>(); Set<Class<?>> objectFactories = new HashSet<Class<?>>(); for (Class<?> jcls : classes) { String pkgName = PackageUtils.getPackageName(jcls); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java b/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java index 9d91286..4841cda 100644 --- a/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java +++ b/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java @@ -53,7 +53,7 @@ import org.apache.ws.commons.schema.constants.Constants; * */ public class SchemaCollectionContextProxy implements JAXBContextProxy { - private static final Map<Class<?>, QName> TYPE_MAP = new HashMap<Class<?>, QName>(); + private static final Map<Class<?>, QName> TYPE_MAP = new HashMap<>(); final JAXBContext context; final SchemaCollection schemas; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java ---------------------------------------------------------------------- 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 b83742d..4352693 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 @@ -37,9 +37,9 @@ import org.apache.cxf.common.util.ReflectionInvokationHandler.UnwrapParam; import org.apache.cxf.common.util.ReflectionInvokationHandler.WrapReturn; public class ASMHelper { - protected static final Map<Class<?>, String> PRIMITIVE_MAP = new HashMap<Class<?>, String>(); - protected static final Map<Class<?>, String> NONPRIMITIVE_MAP = new HashMap<Class<?>, String>(); - protected static final Map<Class<?>, Integer> PRIMITIVE_ZERO_MAP = new HashMap<Class<?>, Integer>(); + protected static final Map<Class<?>, String> PRIMITIVE_MAP = new HashMap<>(); + protected static final Map<Class<?>, String> NONPRIMITIVE_MAP = new HashMap<>(); + protected static final Map<Class<?>, Integer> PRIMITIVE_ZERO_MAP = new HashMap<>(); protected static final Map<ClassLoader, WeakReference<TypeHelperClassLoader>> LOADER_MAP = new WeakIdentityHashMap<ClassLoader, WeakReference<TypeHelperClassLoader>>(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java index 3889443..1c1b9ff 100644 --- a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java @@ -25,7 +25,7 @@ import java.util.Map; public final class PrimitiveUtils { private static final Map<Class<?>, Class<?>> AUTOBOXED_PRIMITIVES_MAP; static { - AUTOBOXED_PRIMITIVES_MAP = new HashMap<Class<?>, Class<?>>(); + AUTOBOXED_PRIMITIVES_MAP = new HashMap<>(); AUTOBOXED_PRIMITIVES_MAP.put(byte.class, Byte.class); AUTOBOXED_PRIMITIVES_MAP.put(short.class, Short.class); AUTOBOXED_PRIMITIVES_MAP.put(int.class, Integer.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java index b4308ea..023f7a6 100644 --- a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java +++ b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java @@ -71,7 +71,7 @@ class SpringClasspathScanner extends ClasspathScanner { new HashMap< Class< ? extends Annotation >, Collection< Class< ? > > >(); final Map< Class< ? extends Annotation >, Collection< String > > matchingInterfaces = new HashMap< Class< ? extends Annotation >, Collection< String > >(); - final Map<String, String[]> nonMatchingClasses = new HashMap<String, String[]>(); + final Map<String, String[]> nonMatchingClasses = new HashMap<>(); for (Class< ? extends Annotation > annotation: annotations) { classes.put(annotation, new HashSet< Class < ? > >()); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/util/StringUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java index 8fd86a1..94b953a 100644 --- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java @@ -33,7 +33,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public final class StringUtils { - public static final Map<String, Pattern> PATTERN_MAP = new HashMap<String, Pattern>(); + public static final Map<String, Pattern> PATTERN_MAP = new HashMap<>(); static { String patterns[] = {"/", " ", ":", ",", ";", "=", "\\.", "\\+"}; for (String p : patterns) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java index 3220ad2..bd78305 100644 --- a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java @@ -142,7 +142,7 @@ public final class UrlUtils { * @return the map. */ public static Map<String, String> parseQueryString(String s) { - Map<String, String> ht = new HashMap<String, String>(); + Map<String, String> ht = new HashMap<>(); StringTokenizer st = new StringTokenizer(s, "&"); while (st.hasMoreTokens()) { String pair = st.nextToken(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java ---------------------------------------------------------------------- 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 ba3c4ad..143440c 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 @@ -46,7 +46,7 @@ import java.util.Set; */ public class WeakIdentityHashMap<K, V> implements Map<K, V> { private final ReferenceQueue<K> queue = new ReferenceQueue<K>(); - private Map<IdentityWeakReference, V> backingStore = new HashMap<IdentityWeakReference, V>(); + private Map<IdentityWeakReference, V> backingStore = new HashMap<>(); public WeakIdentityHashMap() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java b/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java index c18d2e1..7af3d6c 100644 --- a/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java @@ -25,7 +25,7 @@ import java.util.Map; public final class XmlSchemaPrimitiveUtils { private static final String SCHEMA_NS_PREFIX = "xs"; - private static final Map<Class<?>, String> XML_SCHEMA_PRIMITIVE_MAP = new HashMap<Class<?>, String>(); + private static final Map<Class<?>, String> XML_SCHEMA_PRIMITIVE_MAP = new HashMap<>(); static { initializeMap(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java index c6d8509..e5a71e0 100644 --- a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java +++ b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java @@ -62,7 +62,7 @@ public class SchemaCollection { private XmlSchemaCollection schemaCollection; private Map<XmlSchema, Set<XmlSchemaType>> xmlTypesCheckedForCrossImportsPerSchema - = new HashMap<XmlSchema, Set<XmlSchemaType>>(); + = new HashMap<>(); public SchemaCollection() { this(new XmlSchemaCollection()); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java index c2ba64e..34517a3 100644 --- a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java +++ b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java @@ -50,7 +50,7 @@ import org.apache.ws.commons.schema.XmlSchema; * Supply default implementations, as appropriate, for DataBinding. */ public abstract class AbstractDataBinding implements DataBinding { - private static final Map<String, String> BUILTIN_SCHEMA_LOCS = new HashMap<String, String>(); + private static final Map<String, String> BUILTIN_SCHEMA_LOCS = new HashMap<>(); { BUILTIN_SCHEMA_LOCS.put("http://www.w3.org/2005/08/addressing";, "http://www.w3.org/2006/03/addressing/ws-addr.xsd";); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java b/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java index 4f6fb6a..6f50eb3 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java +++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java @@ -157,7 +157,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr } public Map<String, Object> getProperties(boolean create) { if (create && properties == null) { - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); } return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java ---------------------------------------------------------------------- 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 3641d82..09f8373 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java +++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java @@ -315,9 +315,9 @@ public class ClientImpl public Object[] invoke(BindingOperationInfo oi, Object[] params, Exchange exchange) throws Exception { - Map<String, Object> context = new HashMap<String, Object>(); - Map<String, Object> resp = new HashMap<String, Object>(); - Map<String, Object> req = new HashMap<String, Object>(getRequestContext()); + Map<String, Object> context = new HashMap<>(); + Map<String, Object> resp = new HashMap<>(); + Map<String, Object> req = new HashMap<>(getRequestContext()); context.put(RESPONSE_CONTEXT, resp); context.put(REQUEST_CONTEXT, req); try { @@ -450,16 +450,16 @@ public class ClientImpl Map<String, Object> reqContext = null; Map<String, Object> resContext = null; if (context == null) { - context = new HashMap<String, Object>(); + context = new HashMap<>(); } reqContext = CastUtils.cast((Map<?, ?>)context.get(REQUEST_CONTEXT)); resContext = CastUtils.cast((Map<?, ?>)context.get(RESPONSE_CONTEXT)); if (reqContext == null) { - reqContext = new HashMap<String, Object>(getRequestContext()); + reqContext = new HashMap<>(getRequestContext()); context.put(REQUEST_CONTEXT, reqContext); } if (resContext == null) { - resContext = new HashMap<String, Object>(); + resContext = new HashMap<>(); context.put(RESPONSE_CONTEXT, resContext); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java ---------------------------------------------------------------------- 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 94a96ec..ef1030a 100644 --- a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java +++ b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java @@ -43,7 +43,7 @@ public final class HttpHeaderHelper { public static final String AUTHORIZATION = "Authorization"; private static final String ISO88591 = Charset.forName("ISO-8859-1").name(); - private static Map<String, String> internalHeaders = new HashMap<String, String>(); + private static Map<String, String> internalHeaders = new HashMap<>(); private static ConcurrentHashMap<String, String> encodings = new ConcurrentHashMap<String, String>(); private static Pattern charsetPattern = Pattern.compile("\"|'"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java b/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java index 2773e6a..02f18b7 100644 --- a/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java +++ b/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java @@ -27,7 +27,7 @@ import javax.xml.namespace.NamespaceContext; import org.w3c.dom.Node; public final class MapNamespaceContext implements NamespaceContext { - private Map<String, String> namespaces = new HashMap<String, String>(); + private Map<String, String> namespaces = new HashMap<>(); private Node targetNode; public MapNamespaceContext() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java index 5d2e7db..61a7a51 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java +++ b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java @@ -239,7 +239,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor { private void setStackTrace(Fault fault, Message msg) { Throwable cause = null; - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); XPathUtils xu = new XPathUtils(ns); ns.put("s", Fault.STACKTRACE_NAMESPACE); String ss = (String) xu.getValue("//s:" + Fault.STACKTRACE + "/text()", fault.getDetail(), http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java index 8c1e035..4e0a091 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java @@ -50,7 +50,7 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> { private static final Logger LOG = LogUtils.getL7dLogger(StaxInInterceptor.class); - private static Map<Object, XMLInputFactory> factories = new HashMap<Object, XMLInputFactory>(); + private static Map<Object, XMLInputFactory> factories = new HashMap<>(); public StaxInInterceptor() { super(Phase.POST_STREAM); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java index a4505bc..af41e12 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java @@ -52,7 +52,7 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> { = new StaxOutEndingInterceptor(OUTPUT_STREAM_HOLDER, WRITER_HOLDER); private static final ResourceBundle BUNDLE = BundleUtils.getBundle(StaxOutInterceptor.class); - private static Map<Object, XMLOutputFactory> factories = new HashMap<Object, XMLOutputFactory>(); + private static Map<Object, XMLOutputFactory> factories = new HashMap<>(); public StaxOutInterceptor() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java index 41b1bd5..5aca185 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java @@ -67,7 +67,7 @@ public class SecureAnnotationsInterceptor extends SimpleAuthorizingInterceptor { public void setSecuredObject(Object object) { Class<?> cls = ClassHelper.getRealClass(object); - Map<String, String> rolesMap = new HashMap<String, String>(); + Map<String, String> rolesMap = new HashMap<>(); findRoles(cls, rolesMap); if (rolesMap.isEmpty()) { LOG.warning("The roles map is empty, the service object is not protected"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java index 45c0a94..df2a907 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java @@ -31,7 +31,7 @@ import org.apache.cxf.security.SecurityContext; public class SimpleAuthorizingInterceptor extends AbstractAuthorizingInInterceptor { - protected Map<String, List<String>> methodRolesMap = new HashMap<String, List<String>>(); + protected Map<String, List<String>> methodRolesMap = new HashMap<>(); protected Map<String, List<String>> userRolesMap = Collections.emptyMap(); protected List<String> globalRoles = Collections.emptyList(); private boolean checkConfiguredRolesOnly; @@ -110,7 +110,7 @@ public class SimpleAuthorizingInterceptor extends AbstractAuthorizingInIntercept } private static Map<String, List<String>> parseRolesMap(Map<String, String> rolesMap) { - Map<String, List<String>> map = new HashMap<String, List<String>>(); + Map<String, List<String>> map = new HashMap<>(); for (Map.Entry<String, String> entry : rolesMap.entrySet()) { map.put(entry.getKey(), Arrays.asList(StringUtils.split(entry.getValue(), " "))); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java index 85a4d6c..32da08b 100644 --- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java +++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java @@ -142,7 +142,7 @@ public class PhaseInterceptorChain implements InterceptorChain { int numPhases = ps.size(); phases = new Phase[numPhases]; - nameMap = new HashMap<String, Integer>(); + nameMap = new HashMap<>(); heads = new InterceptorHolder[numPhases]; tails = new InterceptorHolder[numPhases]; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/resource/URIResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/resource/URIResolver.java b/core/src/main/java/org/apache/cxf/resource/URIResolver.java index 560169d..a3a65e5 100644 --- a/core/src/main/java/org/apache/cxf/resource/URIResolver.java +++ b/core/src/main/java/org/apache/cxf/resource/URIResolver.java @@ -56,7 +56,7 @@ public class URIResolver { private static final Logger LOG = LogUtils.getLogger(URIResolver.class); private Map<String, LoadingByteArrayOutputStream> cache - = new HashMap<String, LoadingByteArrayOutputStream>(); + = new HashMap<>(); private File file; private URI uri; private URL url; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/service/ServiceImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/ServiceImpl.java b/core/src/main/java/org/apache/cxf/service/ServiceImpl.java index 2e31da5..5106843 100644 --- a/core/src/main/java/org/apache/cxf/service/ServiceImpl.java +++ b/core/src/main/java/org/apache/cxf/service/ServiceImpl.java @@ -44,7 +44,7 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement private DataBinding dataBinding; private Executor executor; private Invoker invoker; - private Map<QName, Endpoint> endpoints = new HashMap<QName, Endpoint>(); + private Map<QName, Endpoint> endpoints = new HashMap<>(); public ServiceImpl() { this((ServiceInfo)null); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java b/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java index 31e7050..a796b3b 100644 --- a/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java +++ b/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java @@ -55,7 +55,7 @@ public abstract class AbstractServiceFactoryBean { private DataBinding dataBinding; private Service service; private List<FactoryBeanListener> listeners = new ModCountCopyOnWriteArrayList<FactoryBeanListener>(); - private Map<String, Object> sessionState = new HashMap<String, Object>(); + private Map<String, Object> sessionState = new HashMap<>(); public abstract Service create(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java ---------------------------------------------------------------------- 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 ac12b68..08fd8f3 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 @@ -231,7 +231,7 @@ public abstract class AbstractPropertiesHolder implements Extensible { return; } if (null == extensionAttributes) { - extensionAttributes = new HashMap<QName, Object>(); + extensionAttributes = new HashMap<>(); } extensionAttributes.put(name, attr); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java b/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java index d8e4d97..faf4503 100644 --- a/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java @@ -51,7 +51,7 @@ public class MessageInfo extends AbstractMessageContainer { } public Map<QName, MessagePartInfo> getMessagePartsMap() { - Map<QName, MessagePartInfo> partsMap = new HashMap<QName, MessagePartInfo>(); + Map<QName, MessagePartInfo> partsMap = new HashMap<>(); for (MessagePartInfo part : getMessageParts()) { partsMap.put(part.getName(), part); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java index 1b32beb..fcdc604 100644 --- a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java +++ b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java @@ -86,7 +86,7 @@ public final class ServiceModelUtil { ? "ServiceModel.WRAPPER.MAP_OUT" : "ServiceModel.WRAPPER.MAP", Map.class)); if (wrapperMap == null) { - wrapperMap = new HashMap<QName, BindingOperationInfo>(); + wrapperMap = new HashMap<>(); for (BindingOperationInfo b : service.getOperations()) { if (b.isUnwrappedCapable()) { MessagePartInfo part = null; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java b/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java index 2554e39..50a9104 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java +++ b/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java @@ -236,7 +236,7 @@ public class CachingXmlEventWriter implements XMLStreamWriter { public static class NSContext implements NamespaceContext { NamespaceContext parent; - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); public NSContext(NamespaceContext p) { parent = p; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java index 3a115ff..3ce1a15 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java +++ b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java @@ -46,9 +46,9 @@ public class InTransformReader extends DepthXMLStreamReader { private QNamesMap inElementsMap; private QNamesMap inAttributesMap; - private Map<QName, ElementProperty> inAppendMap = new HashMap<QName, ElementProperty>(5); + private Map<QName, ElementProperty> inAppendMap = new HashMap<>(5); private Set<QName> inDropSet = new HashSet<>(5); - private Map<String, String> nsMap = new HashMap<String, String>(5); + private Map<String, String> nsMap = new HashMap<>(5); private List<ParsingEvent> pushedBackEvents = new LinkedList<ParsingEvent>(); private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<List<ParsingEvent>>(); private String replaceText; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java index a7ade15..a29a59d 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java +++ b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java @@ -41,8 +41,8 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter { private String defaultNamespace; private QNamesMap elementsMap; private QNamesMap attributesMap; - private Map<QName, ElementProperty> appendMap = new HashMap<QName, ElementProperty>(5); - private Map<String, String> nsMap = new HashMap<String, String>(5); + private Map<QName, ElementProperty> appendMap = new HashMap<>(5); + private Map<String, String> nsMap = new HashMap<>(5); private List<Set<String>> writtenUris = new LinkedList<Set<String>>(); private Set<QName> dropElements; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java index 10c8ad6..a473a0d 100644 --- a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java +++ b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java @@ -71,7 +71,7 @@ public class CXFBusImplTest extends Assert { control = EasyMock.createNiceControl(); - Map<Class<?>, Object> extensions = new HashMap<Class<?>, Object>(); + Map<Class<?>, Object> extensions = new HashMap<>(); bindingFactoryManager = control.createMock(BindingFactoryManager.class); instrumentationManager = control.createMock(InstrumentationManager.class); phaseManager = control.createMock(PhaseManager.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java index 81bebfc..e9a4330 100644 --- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java +++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java @@ -41,7 +41,7 @@ public class ExtensionManagerTest extends Assert { ResourceResolver resolver = new SinglePropertyResolver(EXTENSIONMANAGER_TEST_RESOURECE_NAME, this); ResourceManager rm = new DefaultResourceManager(resolver); - extensions = new HashMap<Class<?>, Object>(); + extensions = new HashMap<>(); extensions.put(Integer.class, Integer.valueOf(0)); manager = new ExtensionManagerImpl("test-extension.xml", http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java index 8390e51..15ee62b 100644 --- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java +++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java @@ -46,7 +46,7 @@ public class AnnotatedGreeterImpl { private WebServiceContext context; - private final Map<String, Integer> invocationCount = new HashMap<String, Integer>(); + private final Map<String, Integer> invocationCount = new HashMap<>(); public AnnotatedGreeterImpl() { invocationCount.put("sayHi", 0); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java index ea4e30b..c080ec9 100644 --- a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java +++ b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java @@ -30,7 +30,7 @@ public class PropertyUtilsTest extends Assert { @Test public void testIsTrueWithMap() { - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); assertFalse(PropertyUtils.isTrue(props, TEST_KEY)); props.put(TEST_KEY, "false"); @@ -48,7 +48,7 @@ public class PropertyUtilsTest extends Assert { @Test public void testIsFalseWithMap() { - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); assertFalse(PropertyUtils.isFalse(props, TEST_KEY)); props.put(TEST_KEY, "true"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java index 028208f..7f03285 100644 --- a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java +++ b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java @@ -148,7 +148,7 @@ public class ImportRepairTest extends Assert { private void tryToParseSchemas() throws Exception { // Get DOM Implementation using DOM Registry final List<DOMLSInput> inputs = new ArrayList<>(); - final Map<String, LSInput> resolverMap = new HashMap<String, LSInput>(); + final Map<String, LSInput> resolverMap = new HashMap<>(); for (XmlSchema schema : collection.getXmlSchemas()) { if (XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(schema.getTargetNamespace())) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java index 61f797f..1a651b7 100644 --- a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java +++ b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java @@ -31,7 +31,7 @@ import org.junit.Test; public class AbstractDataBindingTest extends Assert { @Test(expected = IllegalArgumentException.class) public void testNamespaceMapCheckDuplicates() { - Map<String, String> testMap = new HashMap<String, String>(); + Map<String, String> testMap = new HashMap<>(); testMap.put("urn:hello.there", "ht"); testMap.put("urn:high.temperature", "ht"); AbstractDataBinding.checkNamespaceMap(testMap); @@ -39,7 +39,7 @@ public class AbstractDataBindingTest extends Assert { @Test public void testNamespaceMapOK() { - Map<String, String> testMap = new HashMap<String, String>(); + Map<String, String> testMap = new HashMap<>(); testMap.put("urn:hello.there", "ht"); testMap.put("urn:high.temperature", "warm"); AbstractDataBinding.checkNamespaceMap(testMap); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java index 462efc1..ac1eb0a 100644 --- a/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java +++ b/core/src/test/java/org/apache/cxf/interceptor/security/JAASLoginInterceptorTest.java @@ -142,7 +142,7 @@ public class JAASLoginInterceptorTest { @Override public AppConfigurationEntry[] getAppConfigurationEntry(String name) { - Map<String, String> options = new HashMap<String, String>(); + Map<String, String> options = new HashMap<>(); AppConfigurationEntry configEntry = new AppConfigurationEntry( TestUserPasswordLoginModule.class .getName(), http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java index 93eb19a..fc16421 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java @@ -36,7 +36,7 @@ public class PropertiesExpandingStreamReaderTest extends Assert { @Test public void testSystemPropertyExpansion() throws Exception { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("bar", "BAR-VALUE"); map.put("blah", "BLAH-VALUE"); XMLStreamReader reader = new PropertiesExpandingStreamReader(
