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 2017/02/10 15:42:02 UTC

[14/14] cxf git commit: Removing unnecessary type information

Removing unnecessary type information


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/00503840
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/00503840
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/00503840

Branch: refs/heads/master
Commit: 00503840e6cbda974411968d094cc622f28829f5
Parents: ce6cdcf
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Feb 10 15:41:05 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 10 15:41:05 2017 +0000

----------------------------------------------------------------------
 .../cxf/performance/client/BenchClient.java     | 12 ++---
 .../cxf/performance/server/BenchmarkImpl.java   |  2 +-
 .../apache/cxf/pat/internal/TestCaseBase.java   |  4 +-
 .../performance/complex_type/client/Client.java |  2 +-
 bin/DoMerges.java                               | 10 ++--
 .../cxf/attachment/AttachmentDeserializer.java  |  6 +--
 .../apache/cxf/attachment/AttachmentUtil.java   |  4 +-
 .../attachment/LazyAttachmentCollection.java    |  2 +-
 .../apache/cxf/attachment/LazyDataSource.java   |  2 +-
 .../cxf/bus/blueprint/BlueprintBeanLocator.java |  8 +--
 .../blueprint/BundleDelegatingClassLoader.java  |  2 +-
 .../cxf/bus/blueprint/ConfigurerImpl.java       |  2 +-
 .../org/apache/cxf/bus/extension/Extension.java |  4 +-
 .../extension/TextExtensionFragmentParser.java  |  4 +-
 .../org/apache/cxf/bus/osgi/CXFActivator.java   |  2 +-
 .../bus/osgi/CXFExtensionBundleListener.java    |  2 +-
 .../apache/cxf/bus/osgi/OSGiBeanLocator.java    |  2 +-
 .../cxf/bus/spring/BusApplicationContext.java   |  2 +-
 .../BusWiringBeanFactoryPostProcessor.java      |  2 +-
 .../cxf/bus/spring/SpringBeanLocator.java       | 10 ++--
 .../common/classloader/ClassLoaderUtils.java    |  2 +-
 .../org/apache/cxf/common/jaxb/JAXBUtils.java   | 12 ++---
 .../apache/cxf/common/logging/Log4jLogger.java  |  2 +-
 .../apache/cxf/common/security/SimpleGroup.java |  2 +-
 .../cxf/common/util/ClasspathScanner.java       |  2 +-
 .../apache/cxf/common/util/CollectionUtils.java |  2 +-
 .../org/apache/cxf/common/util/Compiler.java    |  8 +--
 .../apache/cxf/common/util/PackageUtils.java    |  6 +--
 .../cxf/common/util/ProxyClassLoader.java       |  2 +-
 .../apache/cxf/common/util/ReflectionUtil.java  |  2 +-
 .../cxf/common/util/SpringClasspathScanner.java |  2 +-
 .../org/apache/cxf/common/util/StringUtils.java |  4 +-
 .../apache/cxf/common/util/URIParserUtil.java   |  4 +-
 .../cxf/common/util/WeakIdentityHashMap.java    |  2 +-
 .../cxf/common/xmlschema/SchemaCollection.java  |  2 +-
 .../cxf/common/xmlschema/XmlSchemaUtils.java    |  4 +-
 .../apache/cxf/configuration/jsse/SSLUtils.java |  6 +--
 .../configuration/jsse/TLSParameterBase.java    |  4 +-
 .../configuration/jsse/TLSServerParameters.java |  8 +--
 .../configuration/spring/ConfigurerImpl.java    |  4 +-
 .../cxf/databinding/AbstractDataBinding.java    |  2 +-
 .../cxf/databinding/AbstractWrapperHelper.java  |  2 +-
 .../cxf/endpoint/AbstractEndpointFactory.java   |  2 +-
 .../java/org/apache/cxf/helpers/DOMUtils.java   |  4 +-
 .../java/org/apache/cxf/helpers/FileUtils.java  |  8 +--
 .../java/org/apache/cxf/helpers/JavaUtils.java  |  2 +-
 .../java/org/apache/cxf/helpers/NSStack.java    |  2 +-
 .../interceptor/AbstractLoggingInterceptor.java |  2 +-
 .../AbstractOutDatabindingInterceptor.java      |  2 +-
 .../cxf/interceptor/AnnotationInterceptors.java |  2 +-
 .../cxf/interceptor/ClientFaultConverter.java   |  4 +-
 .../cxf/interceptor/FIStaxOutInterceptor.java   |  2 +-
 .../security/DefaultSecurityContext.java        |  2 +-
 .../security/JAASLoginInterceptor.java          |  2 +-
 .../security/RolePrefixSecurityContextImpl.java |  2 +-
 .../security/SecureAnnotationsInterceptor.java  |  2 +-
 .../org/apache/cxf/io/CachedOutputStream.java   |  4 +-
 .../java/org/apache/cxf/io/CachedWriter.java    |  4 +-
 .../org/apache/cxf/service/ServiceImpl.java     |  2 +-
 .../factory/AbstractServiceFactoryBean.java     |  2 +-
 .../factory/AnnotationsFactoryBeanListener.java |  4 +-
 .../service/model/AbstractMessageContainer.java |  6 +--
 .../service/model/AbstractPropertiesHolder.java |  2 +-
 .../cxf/service/model/DescriptionInfo.java      |  2 +-
 .../apache/cxf/service/model/MessageInfo.java   |  2 +-
 .../apache/cxf/service/model/ServiceInfo.java   |  2 +-
 .../cxf/service/model/ServiceModelUtil.java     |  2 +-
 .../cxf/service/model/ServiceSchemaInfo.java    |  2 +-
 .../cxf/staxutils/CachingXmlEventWriter.java    |  4 +-
 .../cxf/staxutils/W3CDOMStreamReader.java       |  6 +--
 .../cxf/staxutils/W3CNamespaceContext.java      |  2 +-
 .../staxutils/transform/InTransformReader.java  | 12 ++---
 .../staxutils/transform/OutTransformWriter.java | 10 ++--
 .../cxf/transport/TransportURIResolver.java     |  2 +-
 .../common/gzip/GZIPOutInterceptor.java         |  6 +--
 .../cxf/workqueue/AutomaticWorkQueueImpl.java   |  2 +-
 .../cxf/ws/addressing/AddressingProperties.java |  2 +-
 .../ws/addressing/EndpointReferenceUtils.java   |  2 +-
 .../org/apache/cxf/ws/addressing/Names.java     |  2 +-
 .../attachment/AttachmentDeserializerTest.java  |  2 +-
 .../attachment/AttachmentSerializerTest.java    |  4 +-
 .../cxf/bus/osgi/OSGiBusListenerTest.java       |  6 +--
 .../common/injection/ResourceInjectorTest.java  |  2 +-
 .../cxf/common/xmlschema/ImportRepairTest.java  |  2 +-
 .../OutgoingChainInterceptorTest.java           |  2 +-
 .../ServiceInvokerInterceptorTest.java          |  2 +-
 .../security/DefaultSecurityContextTest.java    |  2 +-
 .../RolePrefixSecurityContextImplTest.java      |  2 +-
 .../cxf/phase/PhaseInterceptorChainTest.java    |  8 +--
 .../DelegatingNamespaceContextTest.java         |  2 +-
 .../transform/InTransformReaderTest.java        |  4 +-
 .../transform/OutTransformWriterTest.java       |  4 +-
 .../apache/cxf/demo/aegis/commands/ReadZoo.java |  2 +-
 .../java/demo/hw/server/IntegerUserMap.java     |  2 +-
 .../tracing/server/CatalogApplication.java      |  2 +-
 .../tracing/server/CatalogApplication.java      |  2 +-
 .../demo/jaxrs/client/WebSocketTestClient.java  |  6 +--
 .../main/java/demo/handlers/client/Client.java  |  2 +-
 .../server/CustomerServiceImpl.java             |  2 +-
 .../demo/hw/server/JavascriptExampleImpl.java   |  8 +--
 .../demo/oauth/client/model/OAuthParams.java    |  2 +-
 .../controllers/MemoryOAuthDataProvider.java    |  2 +-
 .../controllers/SampleOAuthDataProvider.java    |  4 +-
 .../spring/SpringOAuthAuthenticationFilter.java |  2 +-
 .../java/demo/throttling/client/Client.java     |  2 +-
 .../demo/wseventing/ApplicationSingleton.java   |  2 +-
 .../eventapi/CatastrophicEventSinkImpl.java     |  2 +-
 .../server/CustomerServiceImpl.java             |  2 +-
 .../jca/core/classloader/PlugInClassLoader.java |  2 +-
 .../AbstractManagedConnectionImpl.java          |  4 +-
 .../org/apache/cxf/jca/cxf/JCABusFactory.java   |  2 +-
 .../apache/cxf/jca/cxf/ResourceAdapterImpl.java |  2 +-
 .../cxf/jca/outbound/ManagedConnectionImpl.java |  2 +-
 .../org/apache/cxf/jca/servant/EJBEndpoint.java |  2 +-
 .../ManagedConnectionFactoryImplTest.java       | 10 ++--
 .../cxf/ManagedConnectionFactoryImplTest.java   |  4 +-
 .../cxf/jca/cxf/ResourceAdapterImplTest.java    |  4 +-
 .../cxf/tracing/brave/BraveTraceTest.java       |  2 +-
 .../src/test/java/HelloWorldIT.java             |  2 +-
 .../cxf/maven_plugin/AbstractCodegenMoho.java   |  4 +-
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   |  2 +-
 .../apache/cxf/maven_plugin/WsdlUtilities.java  |  2 +-
 .../cxf/maven_plugin/wsdl2java/Option.java      | 12 ++---
 .../maven_plugin/wsdl2java/WSDL2JavaMojo.java   |  8 +--
 .../cxf/maven_plugin/wsdl2java/WsdlOption.java  |  2 +-
 .../wsdl2java/WsdlOptionLoader.java             |  4 +-
 .../wsdl2js/WSDL2JavaScriptMojo.java            |  6 +--
 .../cxf/maven_plugin/wsdl2js/WsdlOption.java    |  2 +-
 .../corba/maven/plugins/IDLToWSDLPlugin.java    |  2 +-
 .../corba/maven/plugins/WSDLToIDLPlugin.java    |  4 +-
 .../maven_plugin/javatowadl/Java2WADLMojo.java  |  2 +-
 .../cxf/maven_plugin/ClassLoaderSwitcher.java   |  2 +-
 .../apache/cxf/maven_plugin/Java2WSMojo.java    |  4 +-
 .../common/ClassLoaderSwitcher.java             |  2 +-
 .../apache/cxf/maven_plugin/wadlto/Option.java  |  4 +-
 .../cxf/maven_plugin/wadlto/OptionLoader.java   |  8 +--
 .../cxf/maven_plugin/wadlto/WADL2JavaMojo.java  |  2 +-
 .../cxf/maven_plugin/wadlto/WadlOption.java     |  2 +-
 .../cxf/maven_plugin/WSDLValidatorMojo.java     |  6 +--
 .../karaf/commands/internal/CXFController.java  |  2 +-
 .../binding/coloc/ColocOutInterceptorTest.java  | 14 ++---
 .../apache/cxf/binding/coloc/ColocUtilTest.java |  4 +-
 .../cxf/binding/corba/CorbaBindingFactory.java  |  2 +-
 .../cxf/binding/corba/CorbaDestination.java     |  4 +-
 .../apache/cxf/binding/corba/CorbaMessage.java  |  6 +--
 .../interceptors/CorbaStreamOutInterceptor.java |  4 +-
 .../binding/corba/runtime/CorbaDSIServant.java  |  2 +-
 .../corba/runtime/CorbaObjectReader.java        |  2 +-
 .../corba/runtime/CorbaStreamWriter.java        |  2 +-
 .../binding/corba/runtime/OrbConfigurer.java    |  2 +-
 .../corba/types/CorbaAnyEventProducer.java      |  6 +--
 .../binding/corba/types/CorbaArrayHandler.java  |  2 +-
 .../corba/types/CorbaExceptionHandler.java      |  2 +-
 .../CorbaObjectReferenceEventProducer.java      | 14 ++---
 .../corba/types/CorbaSequenceHandler.java       |  2 +-
 .../binding/corba/types/CorbaStructHandler.java |  2 +-
 .../corba/types/CorbaUnionEventProducer.java    |  4 +-
 .../binding/corba/types/CorbaUnionHandler.java  |  4 +-
 .../cxf/binding/corba/utils/OrbConfig.java      |  2 +-
 .../binding/corba/CorbaBindingFactoryTest.java  |  2 +-
 .../org/apache/cxf/binding/soap/HeaderUtil.java |  2 +-
 .../cxf/binding/soap/SOAPBindingUtil.java       |  8 +--
 .../cxf/binding/soap/SoapBindingFactory.java    | 12 ++---
 .../apache/cxf/binding/soap/SoapMessage.java    |  2 +-
 .../cxf/binding/soap/SoapTransportFactory.java  |  4 +-
 .../interceptor/MustUnderstandInterceptor.java  | 14 ++---
 .../interceptor/ReadHeadersInterceptor.java     |  6 +--
 .../soap/jms/interceptor/JMSFaultType.java      |  2 +-
 .../cxf/binding/soap/model/SoapBodyInfo.java    |  4 +-
 .../soap/MustUnderstandInterceptorTest.java     |  4 +-
 .../binding/soap/ReadHeaderInterceptorTest.java |  4 +-
 .../org/apache/cxf/binding/soap/TestUtil.java   |  2 +-
 .../soap/saaj/SAAJInInterceptorTest.java        |  2 +-
 .../java/org/apache/cxf/aegis/AegisContext.java |  6 +--
 .../cxf/aegis/databinding/AegisDatabinding.java |  4 +-
 .../apache/cxf/aegis/type/XMLTypeCreator.java   |  4 +-
 .../apache/cxf/aegis/type/basic/ArrayType.java  |  4 +-
 .../apache/cxf/aegis/type/basic/BeanType.java   |  2 +-
 .../cxf/aegis/type/basic/BeanTypeInfo.java      |  6 +--
 .../aegis/type/collection/CollectionType.java   |  6 +--
 .../cxf/aegis/type/collection/MapType.java      |  2 +-
 .../cxf/aegis/type/encoded/ArrayTypeInfo.java   |  2 +-
 .../cxf/aegis/type/encoded/SoapArrayType.java   |  6 +--
 .../cxf/aegis/type/encoded/SoapRefRegistry.java |  2 +-
 .../cxf/aegis/type/encoded/TrailingBlocks.java  |  4 +-
 .../cxf/aegis/type/mtom/AbstractXOPType.java    |  2 +-
 .../aegis/util/stax/JDOMNamespaceContext.java   |  2 +-
 .../cxf/aegis/util/stax/JDOMStreamReader.java   |  2 +-
 .../aegis/util/stax/W3CNamespaceContext.java    |  2 +-
 .../org/apache/cxf/aegis/AbstractAegisTest.java |  4 +-
 .../cxf/aegis/client/BookServiceImpl.java       |  2 +-
 .../cxf/aegis/custom/service/ServiceImpl.java   |  4 +-
 .../inheritance/ExceptionInheritanceTest.java   |  2 +-
 .../aegis/inheritance/InheritancePOJOTest.java  |  2 +-
 .../aegis/namespaces/impl/NameServiceImpl.java  |  2 +-
 .../cxf/aegis/override/OverrideTypeTest.java    |  2 +-
 .../aegis/standalone/StandaloneReadTest.java    |  4 +-
 .../aegis/standalone/StandaloneWriteTest.java   |  2 +-
 .../type/array/BeanWithFlatCollection.java      |  2 +-
 .../type/java5/CollectionTestsWithService.java  |  2 +-
 .../cxf/aegis/type/java5/DualOutService.java    |  2 +-
 .../cxf/aegis/type/java5/dto/DTOService.java    |  2 +-
 .../java/org/apache/cxf/jaxb/JAXBDataBase.java  |  2 +-
 .../org/apache/cxf/jaxb/JAXBDataBinding.java    | 12 ++---
 .../org/apache/cxf/jaxb/JAXBEncoderDecoder.java |  8 +--
 .../main/java/org/apache/cxf/jaxb/Utils.java    |  4 +-
 .../JAXBAttachmentSchemaValidationHack.java     |  2 +-
 .../apache/cxf/jaxb/JAXBDataBindingTest.java    |  2 +-
 .../apache/cxf/jaxb/JAXBWrapperHelperTest.java  |  2 +-
 .../AbstractStaticFailoverStrategy.java         |  4 +-
 .../logging/event/DefaultLogEventMapper.java    |  2 +-
 .../cxf/ext/logging/slf4j/Slf4jEventSender.java |  2 +-
 .../apache/cxf/ext/logging/TestEventSender.java |  2 +-
 .../AbstractMetricsInterceptor.java             |  6 +--
 .../ThrottlingResponseInterceptor.java          |  2 +-
 .../cxf/jaxrs/AbstractJAXRSFactoryBean.java     |  2 +-
 .../cxf/jaxrs/JAXRSServerFactoryBean.java       |  2 +-
 .../cxf/jaxrs/JAXRSServiceFactoryBean.java      |  2 +-
 .../org/apache/cxf/jaxrs/JAXRSServiceImpl.java  |  2 +-
 .../JAXRSServerFactoryBeanDefinitionParser.java |  2 +-
 .../cxf/jaxrs/ext/multipart/MultipartBody.java  |  6 +--
 .../jaxrs/impl/CacheControlHeaderProvider.java  |  6 +--
 .../cxf/jaxrs/impl/ConfigurationImpl.java       |  2 +-
 .../apache/cxf/jaxrs/impl/HttpHeadersImpl.java  |  8 +--
 .../apache/cxf/jaxrs/impl/LinkBuilderImpl.java  |  4 +-
 .../cxf/jaxrs/impl/LinkHeaderProvider.java      |  2 +-
 .../org/apache/cxf/jaxrs/impl/MetadataMap.java  |  8 +--
 .../cxf/jaxrs/impl/RequestPreprocessor.java     |  4 +-
 .../org/apache/cxf/jaxrs/impl/ResponseImpl.java |  6 +--
 .../apache/cxf/jaxrs/impl/UriBuilderImpl.java   | 14 ++---
 .../org/apache/cxf/jaxrs/impl/UriInfoImpl.java  |  4 +-
 .../cxf/jaxrs/impl/VariantListBuilderImpl.java  | 10 ++--
 .../cxf/jaxrs/model/AbstractResourceInfo.java   |  4 +-
 .../cxf/jaxrs/model/BeanResourceInfo.java       |  4 +-
 .../cxf/jaxrs/model/ClassResourceInfo.java      |  4 +-
 .../org/apache/cxf/jaxrs/model/URITemplate.java |  8 +--
 .../jaxrs/provider/AbstractJAXBProvider.java    | 12 ++---
 .../cxf/jaxrs/provider/MultipartProvider.java   |  8 +--
 .../cxf/jaxrs/provider/ProviderFactory.java     |  6 +--
 .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java |  4 +-
 .../AbstractSpringComponentScanServer.java      |  2 +-
 .../JAXRSServerFactoryBeanDefinitionParser.java |  4 +-
 .../org/apache/cxf/jaxrs/utils/HttpUtils.java   |  2 +-
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  |  4 +-
 .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java  | 14 ++---
 .../apache/cxf/jaxrs/utils/ResourceUtils.java   | 16 +++---
 .../cxf/jaxrs/utils/schemas/SchemaHandler.java  |  2 +-
 .../cxf/jaxrs/JAXRSServerFactoryBeanTest.java   |  2 +-
 .../jaxrs/ext/multipart/MultipartBodyTest.java  |  4 +-
 .../jaxrs/impl/EvaluatePreconditionsTest.java   |  2 +-
 .../cxf/jaxrs/impl/HttpHeadersImplTest.java     |  4 +-
 .../apache/cxf/jaxrs/impl/MetadataMapTest.java  | 12 ++---
 .../apache/cxf/jaxrs/impl/RequestImplTest.java  | 10 ++--
 .../cxf/jaxrs/impl/SecurityContextImplTest.java |  2 +-
 .../jaxrs/provider/JAXBElementProviderTest.java | 22 ++++----
 .../cxf/jaxrs/provider/ProviderFactoryTest.java |  6 +--
 .../jaxrs/provider/XSLTJaxbProviderTest.java    | 12 ++---
 .../org/apache/cxf/jaxrs/resources/Tags.java    |  2 +-
 .../cxf/jaxrs/utils/InjectionUtilsTest.java     |  8 +--
 .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java  |  6 +--
 .../java/org/apache/cxf/jaxws/DispatchImpl.java |  2 +-
 .../java/org/apache/cxf/jaxws/EndpointImpl.java |  2 +-
 .../apache/cxf/jaxws/JaxWsProxyFactoryBean.java |  4 +-
 .../cxf/jaxws/JaxWsServerFactoryBean.java       |  4 +-
 .../java/org/apache/cxf/jaxws/ServiceImpl.java  |  2 +-
 .../cxf/jaxws/binding/AbstractBindingImpl.java  |  4 +-
 .../cxf/jaxws/binding/soap/SOAPBindingImpl.java |  2 +-
 .../cxf/jaxws/context/WrappedAttachments.java   |  2 +-
 .../jaxws/context/WrappedMessageContext.java    |  4 +-
 .../handler/AnnotationHandlerChainBuilder.java  |  4 +-
 .../cxf/jaxws/handler/HandlerChainBuilder.java  |  8 +--
 .../cxf/jaxws/handler/HandlerChainInvoker.java  |  2 +-
 .../cxf/jaxws/handler/HandlerResolverImpl.java  |  2 +-
 .../soap/SOAPHandlerFaultInInterceptor.java     |  4 +-
 .../soap/SOAPHandlerFaultOutInterceptor.java    |  4 +-
 .../handler/soap/SOAPHandlerInterceptor.java    |  6 +--
 .../handler/soap/SOAPMessageContextImpl.java    |  4 +-
 .../cxf/jaxws/handler/types/ParamValueType.java |  2 +-
 .../handler/types/PortComponentHandlerType.java | 12 ++---
 .../interceptors/HolderOutInterceptor.java      |  2 +-
 .../jaxws/interceptors/SwAInInterceptor.java    |  2 +-
 .../jaxws/interceptors/SwAOutInterceptor.java   |  2 +-
 .../interceptors/WrapperClassInInterceptor.java |  6 +--
 .../WrapperClassOutInterceptor.java             |  4 +-
 .../cxf/jaxws/support/JaxWsEndpointImpl.java    |  6 +--
 .../cxf/jaxws/support/JaxWsImplementorInfo.java |  2 +-
 .../support/JaxWsServiceConfiguration.java      |  4 +-
 .../jaxws/support/JaxWsServiceFactoryBean.java  |  4 +-
 .../org/apache/cxf/jaxws/AbstractJaxWsTest.java |  2 +-
 .../org/apache/cxf/jaxws/CodeFirstTest.java     |  4 +-
 .../apache/cxf/jaxws/EndpointReferenceTest.java |  4 +-
 .../cxf/jaxws/JAXWSMethodInvokerTest.java       |  2 +-
 .../apache/cxf/jaxws/SEIWithJAXBAnnoTest.java   |  2 +-
 .../org/apache/cxf/jaxws/SOAPBindingTest.java   |  2 +-
 .../org/apache/cxf/jaxws/SchemaFirstTest.java   |  2 +-
 .../org/apache/cxf/jaxws/ServiceImplTest.java   |  2 +-
 .../cxf/jaxws/WrapperClassGeneratorTest.java    |  8 +--
 .../context/WebServiceContextImplTest.java      |  2 +-
 .../AbstractProtocolHandlerInterceptorTest.java |  2 +-
 .../jaxws/handler/HandlerChainBuilderTest.java  |  2 +-
 .../jaxws/handler/HandlerChainInvokerTest.java  |  4 +-
 .../handler/LogicalHandlerInterceptorTest.java  |  2 +-
 .../jaxws/handler/LogicalMessageImplTest.java   |  2 +-
 .../soap/SOAPHandlerInterceptorTest.java        | 12 ++---
 .../cxf/jaxws/service/AddNumbersImpl.java       |  2 +-
 .../service/AnnotationInterceptorTest.java      |  4 +-
 .../org/apache/cxf/jaxws/service/Hello.java     |  4 +-
 .../org/apache/cxf/jaxws/service/Hello2.java    |  2 +-
 .../org/apache/cxf/jaxws/service/Hello3.java    |  2 +-
 .../cxf/jaxws/service/HelloExcludeImpl.java     |  2 +-
 .../org/apache/cxf/jaxws/service/SayHiImpl.java |  2 +-
 .../apache/cxf/jaxws/spi/ProviderImplTest.java  |  4 +-
 .../endpoint/dynamic/DynamicClientFactory.java  |  4 +-
 .../cxf/frontend/ClientProxyFactoryBean.java    |  2 +-
 .../apache/cxf/javascript/BasicNameManager.java |  2 +-
 .../apache/cxf/javascript/JavascriptUtils.java  |  8 +--
 .../javascript/NamespacePrefixAccumulator.java  |  2 +-
 .../service/ServiceJavascriptBuilder.java       | 14 ++---
 .../apache/cxf/javascript/JsSimpleDomNode.java  |  4 +-
 .../apache/cxf/javascript/JsXMLHttpRequest.java |  2 +-
 .../fortest/SimpleDocLitWrappedImpl.java        |  2 +-
 .../interceptor/PersistOutInterceptor.java      |  2 +-
 .../jmx/InstrumentationManagerImpl.java         |  2 +-
 .../apache/cxf/jaxrs/client/AbstractClient.java |  4 +-
 .../cxf/jaxrs/client/ClientProxyImpl.java       |  2 +-
 .../jaxrs/client/UrlEncodingParamConverter.java |  2 +-
 .../client/JAXRSClientFactoryBeanTest.java      |  2 +-
 .../cxf/jaxrs/swagger/SwaggerFeature.java       |  4 +-
 .../apache/cxf/jaxrs/swagger/SwaggerUtils.java  |  2 +-
 .../model/wadl/ServerProviderFactoryTest.java   |  2 +-
 .../cxf/jaxrs/model/wadl/WadlGeneratorTest.java |  6 +--
 .../jaxrs/provider/atom/AtomPojoProvider.java   |  2 +-
 .../jaxrs/provider/json/utils/JSONUtils.java    |  2 +-
 .../provider/atom/AtomPojoProviderTest.java     |  8 +--
 .../jaxrs/provider/json/JSONProviderTest.java   | 18 +++----
 .../org/apache/cxf/jaxrs/resources/Tags.java    |  2 +-
 .../ext/search/AbstractComplexCondition.java    |  2 +-
 .../cxf/jaxrs/ext/search/Beanspector.java       |  2 +-
 .../ext/search/PrimitiveSearchCondition.java    |  2 +-
 .../cxf/jaxrs/ext/search/SearchContextImpl.java |  4 +-
 .../ext/search/hbase/HBaseQueryVisitor.java     |  6 +--
 .../jpa/AbstractJPATypedQueryVisitor.java       |  6 +--
 .../ext/search/jpa/JPACriteriaQueryVisitor.java |  2 +-
 .../ext/search/lucene/LuceneQueryVisitor.java   |  4 +-
 .../visitor/AbstractSearchConditionVisitor.java |  2 +-
 .../jaxrs/ext/search/SearchContextImplTest.java |  4 +-
 .../cors/CrossOriginResourceSharingFilter.java  |  2 +-
 .../jose/jaxrs/JweJsonWriterInterceptor.java    |  2 +-
 .../jose/jaxrs/JwsJsonWriterInterceptor.java    |  4 +-
 .../cxf/rs/security/jose/common/JoseUtils.java  |  2 +-
 .../jose/common/KeyManagementUtils.java         |  4 +-
 .../rs/security/jose/jwa/AlgorithmUtils.java    | 22 ++++----
 .../jwe/AesGcmWrapKeyEncryptionAlgorithm.java   |  2 +-
 .../jose/jwe/AesWrapKeyEncryptionAlgorithm.java |  2 +-
 .../rs/security/jose/jwe/JweJsonProducer.java   |  4 +-
 .../cxf/rs/security/jose/jwe/JweUtils.java      |  4 +-
 .../cxf/rs/security/jose/jwk/JsonWebKey.java    |  4 +-
 .../cxf/rs/security/jose/jwk/JwkUtils.java      |  2 +-
 .../cxf/rs/security/jose/jws/JwsUtils.java      |  4 +-
 .../security/jose/jws/JwsCompactHeaderTest.java |  4 +-
 .../oauth/filters/AbstractAuthFilter.java       |  4 +-
 .../rs/security/oauth/filters/OAuthInfo.java    |  2 +-
 .../services/AuthorizationRequestHandler.java   |  4 +-
 .../cxf/rs/security/oauth/utils/OAuthUtils.java |  2 +-
 .../grants/saml/Saml2BearerGrantHandler.java    |  2 +-
 .../oauth2/filters/OAuthRequestFilter.java      |  2 +-
 .../oauth2/filters/OAuthScopesFilter.java       |  4 +-
 .../code/DefaultEHCacheCodeDataProvider.java    |  2 +-
 .../code/DefaultEncryptingCodeDataProvider.java |  4 +-
 .../provider/AbstractOAuthDataProvider.java     |  2 +-
 .../DefaultEHCacheOAuthDataProvider.java        |  6 +--
 .../DefaultEncryptingOAuthDataProvider.java     | 10 ++--
 .../oauth2/provider/JPAOAuthDataProvider.java   |  4 +-
 .../services/AbstractAccessTokenValidator.java  |  2 +-
 .../rs/security/oauth2/utils/OAuthUtils.java    |  2 +-
 .../crypto/CodeGrantEncryptingDataProvider.java |  2 +-
 .../utils/crypto/EncryptingDataProvider.java    |  2 +-
 .../rs/security/oidc/idp/OidcHybridService.java |  4 +-
 .../security/oidc/idp/OidcImplicitService.java  |  2 +-
 .../rs/security/saml/sso/MetadataWriter.java    |  4 +-
 .../saml/sso/SAMLSSOResponseValidatorTest.java  |  4 +-
 .../saml/claims/SAMLSecurityContext.java        |  2 +-
 .../rt/security/saml/claims/SAMLClaimsTest.java |  2 +-
 .../xacml2/RequestComponentBuilderTest.java     |  4 +-
 .../xacml2/SamlRequestComponentBuilderTest.java |  2 +-
 .../xacml2/XACMLAuthorizingInterceptorTest.java |  2 +-
 .../http/asyncclient/AsyncHTTPConduit.java      |  4 +-
 .../asyncclient/AsyncHttpTransportFactory.java  |  4 +-
 .../http_jetty/JettyHTTPServerEngine.java       |  4 +-
 .../JettyHTTPServerEngineFactoryHolder.java     |  2 +-
 .../JettyServerEngineFactoryParser.java         |  4 +-
 .../spring/JettySpringTypesFactory.java         |  2 +-
 .../http_jetty/JettyHTTPDestinationTest.java    |  6 +--
 .../http_jetty/JettyHTTPServerEngineTest.java   |  8 +--
 .../netty/client/NettyHttpTransportFactory.java |  4 +-
 .../netty/server/NettyHttpServletHandler.java   |  2 +-
 .../netty/server/NettyHttpTransportFactory.java |  4 +-
 .../NettyHttpServerEngineFactoryHolder.java     |  2 +-
 .../server/servlet/NettyHttpServletRequest.java |  2 +-
 .../server/spring/NettySpringTypesFactory.java  |  2 +-
 .../transport/http/netty/server/util/Utils.java |  6 +--
 .../netty/server/NettyHttpDestinationTest.java  | 12 ++---
 .../http_undertow/UndertowHTTPServerEngine.java |  2 +-
 .../UndertowHTTPServerEngineFactoryHolder.java  |  2 +-
 .../UndertowServerEngineFactoryParser.java      |  2 +-
 .../spring/UndertowSpringTypesFactory.java      |  2 +-
 .../UndertowHTTPDestinationTest.java            |  6 +--
 .../UndertowHTTPServerEngineTest.java           |  2 +-
 .../apache/cxf/transport/http/HTTPConduit.java  |  4 +-
 .../transport/http/HTTPTransportFactory.java    |  4 +-
 .../org/apache/cxf/transport/http/Headers.java  | 10 ++--
 .../policy/NoOpPolicyInterceptorProvider.java   |  2 +-
 .../https/SSLSocketFactoryWrapper.java          |  2 +-
 .../httpclient/DefaultHostnameVerifier.java     |  2 +-
 .../ServiceListGeneratorServlet.java            |  6 +--
 .../http/CXFAuthenticatorCleanupTest.java       |  6 +--
 .../cxf/transport/http/HTTPConduitTest.java     |  2 +-
 .../http/HTTPConduitURLConnectionTest.java      |  2 +-
 .../http/HTTPConduitURLEasyMockTest.java        |  4 +-
 .../transport/http/policy/PolicyUtilsTest.java  |  6 +--
 .../transport/jms/JMSMessageHeadersType.java    |  2 +-
 .../cxf/transport/jms/JMSTransportFactory.java  |  2 +-
 .../cxf/transport/jms/uri/MyBeanLocator.java    |  2 +-
 .../transport/local/LocalTransportFactory.java  |  8 +--
 .../apache/cxf/transport/udp/UDPConduit.java    |  2 +-
 .../cxf/transport/udp/UDPDestination.java       |  2 +-
 .../cxf/transport/udp/UDPTransportFactory.java  |  4 +-
 .../websocket/WebSocketTransportFactory.java    |  2 +-
 .../AddressingPolicyInterceptorProvider.java    |  2 +-
 .../apache/cxf/ws/addressing/soap/MAPCodec.java |  2 +-
 .../ws/addressing/soap/VersionTransformer.java  |  2 +-
 .../ws/addressing/impl/MAPAggregatorTest.java   |  2 +-
 .../cxf/ws/addressing/soap/MAPCodecTest.java    |  2 +-
 .../ws/policy/AssertionBuilderRegistryImpl.java |  2 +-
 .../apache/cxf/ws/policy/AssertionInfoMap.java  |  8 +--
 .../policy/ClientPolicyInFaultInterceptor.java  |  2 +-
 .../cxf/ws/policy/EffectivePolicyImpl.java      |  2 +-
 .../cxf/ws/policy/EndpointPolicyImpl.java       |  8 +--
 .../cxf/ws/policy/PolicyAnnotationListener.java |  6 +--
 .../cxf/ws/policy/PolicyDataEngineImpl.java     |  6 +--
 .../apache/cxf/ws/policy/PolicyEngineImpl.java  |  6 +--
 .../cxf/ws/policy/PolicyInInterceptor.java      |  2 +-
 .../cxf/ws/policy/PolicyOutInterceptor.java     |  2 +-
 .../policy/ServerPolicyOutFaultInterceptor.java |  2 +-
 .../apache/cxf/ws/policy/WSPolicyFeature.java   | 10 ++--
 .../external/ExternalAttachmentProvider.java    |  4 +-
 .../wsdl11/Wsdl11AttachmentPolicyProvider.java  |  2 +-
 .../mtom/MTOMPolicyInterceptorProvider.java     |  2 +-
 .../selector/BaseAlternativeSelector.java       |  2 +-
 .../PolicyFeatureBeanDefinitionParser.java      |  4 +-
 .../cxf/ws/policy/AssertionInfoMapTest.java     | 12 ++---
 .../cxf/ws/policy/EffectivePolicyImplTest.java  |  6 +--
 .../cxf/ws/policy/EndpointPolicyImplTest.java   |  6 +--
 .../cxf/ws/policy/PolicyDataEngineImplTest.java |  2 +-
 .../apache/cxf/ws/policy/PolicyEngineTest.java  |  4 +-
 ...licyInterceptorProviderRegistryImplTest.java |  2 +-
 .../cxf/ws/policy/PolicyInterceptorsTest.java   |  2 +-
 .../ExternalAttachmentProviderTest.java         |  2 +-
 .../reference/ReferenceResolverTest.java        |  2 +-
 .../apache/cxf/ws/rm/DestinationSequence.java   |  4 +-
 .../org/apache/cxf/ws/rm/ManagedRMEndpoint.java | 12 ++---
 .../org/apache/cxf/ws/rm/ManagedRMManager.java  |  2 +-
 .../org/apache/cxf/ws/rm/RM10Constants.java     |  4 +-
 .../org/apache/cxf/ws/rm/RM11Constants.java     |  4 +-
 .../org/apache/cxf/ws/rm/RMOutInterceptor.java  |  2 +-
 .../java/org/apache/cxf/ws/rm/RMProperties.java |  2 +-
 .../org/apache/cxf/ws/rm/SequenceMonitor.java   |  2 +-
 .../main/java/org/apache/cxf/ws/rm/Source.java  |  2 +-
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java   |  8 +--
 .../rm/policy/RMPolicyInterceptorProvider.java  |  2 +-
 .../cxf/ws/rm/policy/RMPolicyUtilities.java     |  4 +-
 .../cxf/ws/rm/soap/RMSoapInInterceptor.java     |  6 +--
 .../cxf/ws/rm/soap/RMSoapOutInterceptor.java    |  2 +-
 .../cxf/ws/rm/soap/RedeliveryQueueImpl.java     |  6 +--
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java |  8 +--
 .../cxf/ws/rm/AbstractRMInterceptorTest.java    |  2 +-
 .../cxf/ws/rm/DestinationSequenceTest.java      |  4 +-
 .../apache/cxf/ws/rm/ManagedRMManagerTest.java  | 12 ++---
 .../org/apache/cxf/ws/rm/RMEndpointTest.java    |  6 +--
 .../apache/cxf/ws/rm/RMInInterceptorTest.java   |  2 +-
 .../org/apache/cxf/ws/rm/RMManagerTest.java     | 16 +++---
 .../ws/rm/persistence/PersistenceUtilsTest.java |  2 +-
 .../rm/persistence/jdbc/RMTxStoreTestBase.java  |  8 +--
 .../persistence/jdbc/RMTxStoreUpgradeTest.java  |  2 +-
 .../cxf/ws/rm/policy/PolicyUtilsTest.java       |  2 +-
 .../ws/rm/soap/RMSoapOutInterceptorTest.java    |  4 +-
 .../ws/rm/soap/RetransmissionQueueImplTest.java | 10 ++--
 .../cxf/ws/security/SecurityConstants.java      |  2 +-
 .../ws/security/trust/AbstractSTSClient.java    |  4 +-
 .../cxf/ws/security/trust/STSLoginModule.java   |  2 +-
 .../security/wss4j/WSS4JStaxInInterceptor.java  |  2 +-
 .../AsymmetricBindingHandler.java               |  2 +-
 .../policyhandlers/TransportBindingHandler.java |  2 +-
 .../cxf/ws/security/sts/STSClientTest.java      |  2 +-
 .../security/wss4j/SecurityActionTokenTest.java |  4 +-
 .../cxf/ws/security/wss4j/WSS4JInOutTest.java   | 14 ++---
 .../wss4j/saml/PolicyBasedSamlTest.java         | 12 ++---
 .../ws/security/wss4j/saml/SamlTokenTest.java   | 18 +++----
 .../dialect/fragment/FragmentDialect.java       |  4 +-
 .../java/org/apache/cxf/wsdl/WSDLHelper.java    |  6 +--
 .../wsdl/interceptors/BareInInterceptor.java    |  4 +-
 .../interceptors/DocLiteralInInterceptor.java   |  2 +-
 .../factory/ReflectionServiceFactoryBean.java   | 10 ++--
 .../factory/XercesSchemaValidationUtils.java    |  2 +-
 .../org/apache/cxf/wsdl11/SOAPBindingUtil.java  |  4 +-
 .../java/org/apache/cxf/wsdl11/SchemaUtil.java  |  4 +-
 .../apache/cxf/wsdl11/ServiceWSDLBuilder.java   |  2 +-
 .../org/apache/cxf/wsdl11/WSDLManagerImpl.java  |  2 +-
 .../apache/cxf/wsdl11/WSDLServiceBuilder.java   | 12 ++---
 .../DocLiteralInInterceptorTest.java            |  4 +-
 .../apache/cxf/sts/claims/ClaimsManager.java    |  2 +-
 .../cxf/sts/claims/LdapClaimsHandler.java       |  2 +-
 .../cxf/sts/claims/LdapGroupClaimsHandler.java  |  2 +-
 .../cxf/sts/claims/mapper/ClaimUtils.java       |  2 +-
 .../cxf/sts/operation/TokenCancelOperation.java |  2 +-
 .../cxf/sts/operation/TokenRenewOperation.java  |  2 +-
 .../provider/jwt/DefaultJWTClaimsProvider.java  |  2 +-
 .../claims/mapper/JexlIssueSamlClaimsTest.java  | 10 ++--
 .../cxf/sts/common/CustomAttributeProvider.java |  2 +-
 .../cxf/sts/common/CustomClaimsHandler.java     |  2 +-
 .../cxf/sts/common/CustomUserClaimsHandler.java |  2 +-
 .../cxf/sts/operation/CancelSCTUnitTest.java    |  2 +-
 .../sts/operation/IssueEncryptedUnitTest.java   | 14 ++---
 .../sts/operation/IssueJWTClaimsUnitTest.java   | 18 +++----
 .../operation/IssueJWTOnbehalfofUnitTest.java   | 12 ++---
 .../sts/operation/IssueJWTRealmUnitTest.java    |  8 +--
 .../cxf/sts/operation/IssueJWTUnitTest.java     |  2 +-
 .../sts/operation/IssueOnbehalfofUnitTest.java  | 54 ++++++++++----------
 .../cxf/sts/operation/IssueSCTUnitTest.java     |  6 +--
 .../sts/operation/IssueSamlClaimsUnitTest.java  | 22 ++++----
 .../sts/operation/IssueSamlRealmUnitTest.java   | 10 ++--
 .../cxf/sts/operation/IssueSamlUnitTest.java    | 34 ++++++------
 .../apache/cxf/sts/operation/IssueUnitTest.java | 16 +++---
 .../cxf/sts/operation/RenewSamlUnitTest.java    | 16 +++---
 .../ValidateJWTTransformationTest.java          | 14 ++---
 .../cxf/sts/operation/ValidateJWTUnitTest.java  |  2 +-
 .../cxf/sts/operation/ValidateSCTUnitTest.java  |  2 +-
 .../cxf/sts/operation/ValidateSamlUnitTest.java |  4 +-
 .../ValidateTokenTransformationUnitTest.java    | 32 ++++++------
 .../cxf/sts/operation/ValidateUnitTest.java     | 10 ++--
 .../ValidateUsernameTokenUnitTest.java          |  4 +-
 .../operation/ValidateX509TokenUnitTest.java    |  4 +-
 .../cxf/sts/token/provider/SAMLClaimsTest.java  |  4 +-
 .../token/provider/SAMLProviderActAsTest.java   |  2 +-
 .../token/provider/SAMLProviderCustomTest.java  | 14 ++---
 .../token/provider/SAMLProviderKeyTypeTest.java |  2 +-
 .../provider/SAMLProviderOnBehalfOfTest.java    |  2 +-
 .../cxf/sts/token/realm/RealmSupportTest.java   |  8 +--
 .../token/renewer/SAMLTokenRenewerPOPTest.java  |  4 +-
 .../token/validator/SAMLTokenValidatorTest.java |  2 +-
 .../systest/sts/batch/SAMLBatchUnitTest.java    |  2 +-
 .../systest/sts/batch/SimpleBatchSTSClient.java |  4 +-
 .../systest/sts/custom/CustomClaimsHandler.java |  2 +-
 .../CustomAttributeStatementProvider.java       |  2 +-
 .../sts/deployment/CustomClaimsHandler.java     |  2 +-
 .../sts/secure_conv/SCTSAMLTokenProvider.java   |  4 +-
 .../sts/deployment/CustomClaimsHandler.java     |  2 +-
 .../cxf/ws/discovery/WSDiscoveryClient.java     |  4 +-
 .../cxf/ws/discovery/WSDiscoveryClientTest.java |  2 +-
 .../org/apache/cxf/wsn/util/CXFWSNHelper.java   |  2 +-
 .../java/org/apache/cxf/wsn/util/WSNHelper.java |  2 +-
 .../apache/cxf/wsn/AbstractCreatePullPoint.java |  2 +-
 .../cxf/wsn/AbstractNotificationBroker.java     |  4 +-
 .../org/apache/cxf/wsn/jms/JmsPublisher.java    |  2 +-
 .../org/apache/cxf/wsn/jms/JmsPullPoint.java    |  2 +-
 .../cxf/wsn/services/JaxwsEndpointManager.java  |  2 +-
 .../java/org/apache/cxf/wsn/WsnBrokerTest.java  |  2 +-
 .../org/apache/cxf/xkms/service/CheckXKRSS.java |  2 +-
 .../systest/aegis/AegisClientServerTest.java    |  2 +-
 .../cxf/systest/aegis/AegisJaxWsTest.java       |  4 +-
 .../cxf/systest/aegis/SportsServiceImpl.java    |  2 +-
 .../apache/cxf/systest/jaxb/HashMapAdapter.java |  2 +-
 .../jaxrs/AbstractJAXRSContinuationsTest.java   |  2 +-
 .../cxf/systest/jaxrs/BookApplication.java      |  2 +-
 .../apache/cxf/systest/jaxrs/BookServer.java    |  2 +-
 .../apache/cxf/systest/jaxrs/BookServer20.java  |  2 +-
 .../cxf/systest/jaxrs/BookServerThrottled.java  |  2 +-
 .../org/apache/cxf/systest/jaxrs/BookStore.java |  8 +--
 .../org/apache/cxf/systest/jaxrs/Books.java     |  2 +-
 .../org/apache/cxf/systest/jaxrs/Chapter.java   |  2 +-
 .../jaxrs/JAXRS20ClientServerBookTest.java      |  8 +--
 .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java |  8 +--
 .../jaxrs/JAXRSClientServerBookTest.java        | 20 ++++----
 .../JAXRSClientServerNonSpringBookTest.java     |  2 +-
 .../jaxrs/JAXRSClientServerStreamingTest.java   |  2 +-
 ...AXRSClientServerUserResourceDefaultTest.java |  2 +-
 .../JAXRSClientServerUserResourceTest.java      |  2 +-
 .../cxf/systest/jaxrs/JAXRSMultipartTest.java   | 22 ++++----
 .../cxf/systest/jaxrs/JAXRSSoapBookTest.java    |  8 +--
 .../cxf/systest/jaxrs/MultipartStore.java       |  4 +-
 .../jaxrs/cors/CrossOriginSimpleTest.java       |  4 +-
 .../jaxrs/failover/AbstractFailoverTest.java    |  4 +-
 .../failover/CircuitBreakerFailoverTest.java    |  2 +-
 .../systest/jaxrs/failover/FailoverTest.java    |  2 +-
 .../jaxrs/failover/LoadDistributorTest.java     |  6 +--
 .../cxf/systest/jaxrs/jaxws/IntegerUserMap.java |  2 +-
 .../jaxrs/provider/JAXBProviderTest.java        |  2 +-
 .../jaxrs/websocket/WebSocketTestClient.java    |  6 +--
 .../systest/handlers/HandlerInvocationTest.java |  2 +-
 .../cxf/systest/handlers/HandlerTestImpl.java   |  4 +-
 .../cxf/systest/handlers/TestHandlerBase.java   |  2 +-
 .../cxf/systest/jaxws/AnyClientServerTest.java  |  2 +-
 .../cxf/systest/jaxws/ClientServerMiscTest.java | 10 ++--
 .../jaxws/DocLitWrappedCodeFirstService.java    |  2 +-
 .../systest/jaxws/JaxwsAsyncFailOverTest.java   |  2 +-
 .../cxf/systest/jaxws/LocatorServiceImpl.java   |  2 +-
 .../cxf/systest/jaxws/TestServiceImpl.java      |  2 +-
 .../JavaFirstSchemaValidationTest.java          |  2 +-
 .../AttachmentStreamSourceXMLProvider.java      |  2 +-
 .../kerberos/jaxrs/kerberos/Chapter.java        |  2 +-
 .../systest/kerberos/ldap/LDAPClaimsTest.java   | 10 ++--
 .../jaxrs/security/jcs/JAXRSJcsTest.java        |  2 +-
 .../security/jose/jwejws/JAXRSJwsJsonTest.java  |  4 +-
 .../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    | 22 ++++----
 .../security/oauth/MemoryOAuthDataProvider.java |  2 +-
 .../security/oauth2/common/OAuth2TestUtils.java |  2 +-
 .../oauth2/common/OAuthDataProviderImpl.java    |  2 +-
 .../oauth2/common/SamlCallbackHandler.java      |  6 +--
 .../security/oidc/MemoryClientDataProvider.java |  2 +-
 .../security/saml/SamlCallbackHandler.java      |  6 +--
 .../apache/cxf/systest/TestSpanReceiver.java    |  2 +-
 .../cxf/jms/testsuite/util/JMSTestUtil.java     |  2 +-
 .../cxf/systest/jms/AbstractVmJMSTest.java      |  2 +-
 .../cxf/systest/jms/JMSClientServerTest.java    |  2 +-
 .../systest/jms/security/JMSWSSecurityTest.java |  2 +-
 .../systest/jms/shared/JMSSharedQueueTest.java  |  6 +--
 .../cxf/systest/jms/tx/MyBeanLocator.java       |  2 +-
 .../cxf/systest/http/HTTPConduitTest.java       |  2 +-
 .../systest/https/conduit/HTTPSConduitTest.java |  2 +-
 .../cxf/systest/servlet/CXFFilterTest.java      |  2 +-
 .../cxf/systest/servlet/CXFServletTest.java     |  2 +-
 .../servlet/ExternalServicesServletTest.java    |  2 +-
 .../servlet/NoSpringServletClientTest.java      |  2 +-
 .../systest/bus/BusExtensionLoadingTest.java    |  2 +-
 .../clustering/FailoverAddressOverrideTest.java |  2 +-
 .../cxf/systest/clustering/FailoverTest.java    |  2 +-
 .../apache/cxf/systest/fault/GreeterImpl.java   |  2 +-
 .../interceptor/InterceptorFaultTest.java       |  2 +-
 .../apache/cxf/systest/mtom/MtomPolicyTest.java |  2 +-
 .../systest/outofband/header/OOBHeaderTest.java |  2 +-
 .../cxf/systest/schemaimport/SayHiImpl.java     |  2 +-
 .../cxf/systest/schemaimport/SayHiImpl2.java    |  2 +-
 .../systest/schemaimport/sayhi2/SayHiArray.java |  2 +-
 .../schemaimport/sayhi2/SayHiArrayResponse.java |  2 +-
 .../type_substitution/AppleFinderImpl.java      |  2 +-
 .../type_substitution/CarDealerImpl.java        |  2 +-
 .../type_test/AbstractTypeTestClient.java       |  2 +-
 .../corba/CORBADocLitClientTypeTest.java        |  4 +-
 .../ws/rm/DeliveryAssuranceOnewayTest.java      |  2 +-
 .../ws/rm/MessageCallbackOnewayTest.java        |  6 +--
 .../apache/cxf/systest/ws/rm/SequenceTest.java  |  2 +-
 .../apache/cxf/systest/ws/util/MessageFlow.java |  4 +-
 .../fault/AbstractModifyRequestInterceptor.java |  2 +-
 .../ws/policy/UriDomainFactoryBeanListener.java |  2 +-
 .../systest/ws/policy/handler/DummyHandler.java |  2 +-
 .../cxf/systest/ws/saml/SamlTokenTest.java      |  6 +--
 .../ws/security/WSSecurityClientTest.java       |  2 +-
 .../ws/ut/SecurityHeaderCacheInterceptor.java   |  2 +-
 .../cxf/systest/ws/wssc/WSSCUnitTest.java       |  2 +-
 .../cxf/systest/ws/x509/X509TokenTest.java      |  2 +-
 .../systest/ws/addressing/HeaderVerifier.java   |  2 +-
 .../cxf/systest/ws/addressing/MAPVerifier.java  |  2 +-
 .../apache/cxf/systest/ws/util/MessageFlow.java |  4 +-
 .../apache/cxf/authservice/AuthServiceImpl.java |  2 +-
 .../common/AbstractClientServerTestBase.java    |  2 +-
 .../cxf/testutil/common/ServerLauncher.java     |  2 +-
 .../tools/common/AbstractCXFToolContainer.java  |  2 +-
 .../org/apache/cxf/tools/common/ClassUtils.java |  4 +-
 .../cxf/tools/common/ProcessorTestBase.java     |  4 +-
 .../java/org/apache/cxf/tools/common/Tag.java   |  4 +-
 .../apache/cxf/tools/common/ToolContext.java    | 12 ++---
 .../apache/cxf/tools/common/ToolException.java  |  2 +-
 .../cxf/tools/common/model/JAnnotation.java     |  4 +-
 .../tools/common/model/JAnnotationElement.java  |  2 +-
 .../cxf/tools/common/model/JavaClass.java       |  2 +-
 .../cxf/tools/common/model/JavaCodeBlock.java   |  2 +-
 .../cxf/tools/common/model/JavaField.java       |  2 +-
 .../cxf/tools/common/model/JavaInterface.java   |  6 +--
 .../cxf/tools/common/model/JavaMethod.java      |  6 +--
 .../apache/cxf/tools/common/model/JavaPort.java |  2 +-
 .../tools/common/model/JavaServiceClass.java    |  2 +-
 .../cxf/tools/common/toolspec/ToolSpec.java     |  4 +-
 .../common/toolspec/parser/CommandDocument.java |  6 +--
 .../toolspec/parser/CommandLineParser.java      |  2 +-
 .../common/toolspec/parser/ErrorVisitor.java    |  2 +-
 .../cxf/tools/common/toolspec/parser/Form.java  |  6 +--
 .../common/toolspec/parser/OptionGroup.java     |  2 +-
 .../tools/util/BuiltInTypesJavaMappingUtil.java |  2 +-
 .../apache/cxf/tools/util/ClassCollector.java   |  2 +-
 .../org/apache/cxf/tools/util/NameUtil.java     |  2 +-
 .../apache/cxf/tools/util/ToolsStaxUtils.java   |  4 +-
 .../org/apache/cxf/tools/corba/IDLToWSDL.java   |  2 +-
 .../org/apache/cxf/tools/corba/WSDLToIDL.java   |  2 +-
 .../tools/corba/common/idltypes/IdlRoot.java    |  2 +-
 .../idl/DeferredActionCollection.java           |  2 +-
 .../processors/idl/IDLToWSDLProcessor.java      |  2 +-
 .../corba/processors/idl/PortTypeVisitor.java   |  2 +-
 .../processors/idl/PrimitiveTypesVisitor.java   |  2 +-
 .../cxf/tools/corba/processors/idl/Scope.java   | 10 ++--
 .../corba/processors/idl/ScopedNameVisitor.java |  6 +--
 .../corba/processors/idl/WSDLASTVisitor.java    |  2 +-
 .../corba/processors/idl/WSDLSchemaManager.java |  2 +-
 .../corba/processors/wsdl/WSDLParameter.java    |  6 +--
 .../processors/wsdl/WSDLToCorbaBinding.java     | 12 ++---
 .../processors/wsdl/WSDLToCorbaHelper.java      |  8 +--
 .../corba/processors/wsdl/WSDLToIDLAction.java  |  2 +-
 .../org/apache/cxf/tools/java2js/JavaToJS.java  |  2 +-
 .../java2js/processor/JavaToJSProcessor.java    |  2 +-
 .../cxf/tools/java2ws/JavaToWSContainer.java    |  2 +-
 .../generator/wsdl11/BeanGenerator.java         |  4 +-
 .../wsdl11/DateTypeCustomGenerator.java         |  4 +-
 .../generator/wsdl11/FaultBeanGenerator.java    |  2 +-
 .../generator/wsdl11/WrapperBeanGenerator.java  |  2 +-
 .../wsdl11/annotator/WrapperBeanAnnotator.java  |  2 +-
 .../java2wsdl/processor/FrontendFactory.java    |  2 +-
 .../processor/JavaToWSDLProcessor.java          |  4 +-
 .../internal/SpringServiceBuilderFactory.java   |  2 +-
 .../internal/jaxws/JAXWSFrontEndProcessor.java  |  4 +-
 .../internal/jaxws/RequestWrapper.java          |  2 +-
 .../internal/jaxws/ResponseWrapper.java         |  2 +-
 .../processor/internal/jaxws/Wrapper.java       |  2 +-
 .../processor/internal/jaxws/WrapperUtil.java   |  4 +-
 .../simple/SimpleFrontEndProcessor.java         |  2 +-
 .../internal/ServiceBuilderFactoryTest.java     |  2 +-
 .../jaxws/JaxwsServiceBuilderRPCTest.java       |  2 +-
 .../cxf/tools/validator/WSDLValidator.java      |  2 +-
 .../internal/MIMEBindingValidator.java          |  2 +-
 .../validator/internal/SchemaValidator.java     |  6 +--
 .../internal/UniqueBodyPartsValidator.java      |  2 +-
 .../tools/validator/internal/ValidatorUtil.java |  2 +-
 .../validator/internal/WSDL11Validator.java     |  4 +-
 .../validator/internal/WSDLRefValidator.java    | 14 ++---
 .../validator/internal/WSIBPValidator.java      |  4 +-
 .../internal/WSDLRefValidatorTest.java          |  6 +--
 .../tools/wadlto/jaxb/CustomizationParser.java  |  6 +--
 .../cxf/tools/wadlto/jaxrs/JAXRSContainer.java  |  4 +-
 .../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 16 +++---
 .../cxf/tools/wsdlto/WSDLToJavaContainer.java   |  8 +--
 .../cxf/tools/wsdlto/core/FrontEndProfile.java  |  2 +-
 .../cxf/tools/wsdlto/core/PluginLoader.java     |  2 +-
 .../wsdlto/core/WSDLDefinitionBuilder.java      |  4 +-
 .../databinding/jaxb/JAXBDataBinding.java       |  6 +--
 .../databinding/jaxb/TypesCodeWriter.java       |  4 +-
 .../wsdlto/javascript/JavaScriptContainer.java  |  6 +--
 .../wsdlto/frontend/jaxws/JAXWSContainer.java   |  2 +-
 .../customization/CustomizationParser.java      |  4 +-
 .../jaxws/customization/JAXWSBinding.java       |  4 +-
 .../jaxws/processor/WSDLToJavaProcessor.java    |  2 +-
 .../processor/internal/ParameterProcessor.java  | 12 ++---
 .../processor/internal/PortTypeProcessor.java   |  2 +-
 .../jaxws/processor/internal/ProcessorUtil.java |  6 +--
 .../processor/internal/ServiceProcessor.java    |  4 +-
 .../internal/annotator/WSActionAnnotator.java   |  2 +-
 .../internal/annotator/WrapperAnnotator.java    |  2 +-
 .../internal/annotator/XmlSeeAlsoAnnotator.java |  2 +-
 .../jaxws/validator/UniqueBodyValidator.java    |  2 +-
 .../apache/cxf/tools/misc/WSDLToService.java    |  2 +-
 .../org/apache/cxf/tools/misc/WSDLToSoap.java   |  2 +-
 .../org/apache/cxf/tools/misc/WSDLToXML.java    |  2 +-
 .../org/apache/cxf/tools/misc/XSDToWSDL.java    |  2 +-
 .../cxf/tools/wsdlto/jaxws/CodeGenTest.java     |  2 +-
 .../tools/wsdlto/jaxws/JAXWSContainerTest.java  |  2 +-
 766 files changed, 1615 insertions(+), 1615 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
----------------------------------------------------------------------
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java b/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
index dbdd2c2..ac8c17d 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
@@ -87,7 +87,7 @@ public class BenchClient {
         verbose("Starting " + ID + " at " + (new Date()));
 
         // allow multiple URLs (each must start with http"
-        List<String> locationList = new ArrayList<String>();        
+        List<String> locationList = new ArrayList<>();        
         int pos = 0;
         while (pos < args.length) {
             String s = args[pos];
@@ -320,7 +320,7 @@ public class BenchClient {
                     }
                 }
             } else if (method == 'd') {
-            	ArrayList<Double> da = new ArrayList<Double>();            	 
+            	ArrayList<Double> da = new ArrayList<>();            	 
             	new Util<Double>().copyList(darr, off, da, td.arrSizeToSend);            	
                 List<Double> uda = null;
                 int dlen = -1;
@@ -349,7 +349,7 @@ public class BenchClient {
                     }
                 }
             } else if (method == 'i') {
-            	ArrayList<Integer> ia = new ArrayList<Integer>();
+            	ArrayList<Integer> ia = new ArrayList<>();
             	new Util<Integer>().copyList(iarr, off, ia, td.arrSizeToSend);
                 List<Integer> uia = null;
                 int ulen = -1;
@@ -380,7 +380,7 @@ public class BenchClient {
                     }
                 }
             } else if (method == 's') {
-            	ArrayList<String> sa = new ArrayList<String>();
+            	ArrayList<String> sa = new ArrayList<>();
             	new Util<String>().copyList(sarr, off, sa, td.arrSizeToSend);
                 List<String> usa = null;
                 int slen = -1;
@@ -413,7 +413,7 @@ public class BenchClient {
                     }
                 }
             } else if (method == 'm') {
-            	ArrayList<MeshInterfaceObject> ma = new ArrayList<MeshInterfaceObject>();
+            	ArrayList<MeshInterfaceObject> ma = new ArrayList<>();
             	new Util<MeshInterfaceObject>().copyList(marr, off, ma, td.arrSizeToSend);
                 List<MeshInterfaceObject> uma = null;
                 int slen = -1;
@@ -446,7 +446,7 @@ public class BenchClient {
                     }
                 }
             } else if (method == 'e') {
-            	ArrayList<SimpleEvent> ea = new ArrayList<SimpleEvent>();
+            	ArrayList<SimpleEvent> ea = new ArrayList<>();
             	new Util<SimpleEvent>().copyList(earr, off, ea, td.arrSizeToSend);
                 List<SimpleEvent> uea = null;
                 int slen = -1;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
index 0526eca..d47a384 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
@@ -222,7 +222,7 @@ public class BenchmarkImpl implements Benchmark {
     )
     { 
        LOG.info("Executing operation sendStrings");       
-       List<String> ret = new ArrayList<String>(0);
+       List<String> ret = new ArrayList<>(0);
        for (int i = 0; i < size; i++) {
            String temp = "s" + i;
            ret.add(temp);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
index 2acd47b..2180469 100644
--- a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
+++ b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
@@ -48,7 +48,7 @@ public abstract class TestCaseBase<T> {
 
     protected String wsdlNameSpace;   
 
-    protected List<TestResult> results = new ArrayList<TestResult>();
+    protected List<TestResult> results = new ArrayList<>();
 
     protected int numberOfThreads;
     
@@ -278,7 +278,7 @@ public abstract class TestCaseBase<T> {
         if (numberOfThreads == 0) {
             numberOfThreads = 1; 
 	}
-        List<Thread> threadList = new ArrayList<Thread>();
+        List<Thread> threadList = new ArrayList<>();
         for (int i = 0; i < numberOfThreads; i++) {
             TestRunner<T> runner = new TestRunner<T>("No." + i + " TestRunner", this);
             Thread thread = new Thread(runner, "RunnerThread No." + i);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
index b1023af..acdef44 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
@@ -119,7 +119,7 @@ public final class Client extends TestCaseBase<DocPortType> {
             System.arraycopy(args, 0, tmp, 0, servIdx);
             args = tmp;
         }
-        List<String> threadList = new ArrayList<String>();
+        List<String> threadList = new ArrayList<>();
         if (threadIdx != -1) {
             String threads[] = args[threadIdx].split(",");
             for (String s : threads) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/bin/DoMerges.java
----------------------------------------------------------------------
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index 830f6d5..35f3c97 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -236,7 +236,7 @@ public class DoMerges {
         line = reader.readLine();
 
         List<String[]> map = new LinkedList<String[]>();
-        List<String> list = new ArrayList<String>(10);
+        List<String> list = new ArrayList<>(10);
         while (line != null) {
             if (line.length() > 0 && line.startsWith("commit ")) {
                 if (!list.isEmpty()) {
@@ -266,7 +266,7 @@ public class DoMerges {
 
         reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
         line = reader.readLine();
-        List<String> lines = new ArrayList<String>(10);
+        List<String> lines = new ArrayList<>(10);
         while (line != null) {
             if (!line.startsWith("commit ")) {
                 lines.add(line);
@@ -581,7 +581,7 @@ public class DoMerges {
         return false;
     }        
     private static List<String> compareLogs(String[] f, String[] logLines) throws IOException {
-        ArrayList<String> onBranch = new ArrayList<String>(f.length);
+        ArrayList<String> onBranch = new ArrayList<>(f.length);
         for (String s : f) {
             if (s.trim().startsWith("Conflicts:")) {
                 break;
@@ -593,7 +593,7 @@ public class DoMerges {
             }
         }
         
-        List<String> ll = new ArrayList<String>();
+        List<String> ll = new ArrayList<>();
         for (String s : logLines) {
             if (s.trim().length() > 0 
                 && onBranch.remove(s.trim())
@@ -608,7 +608,7 @@ public class DoMerges {
         
 
     private static String[] getCommandLine(String[] args) {
-        List<String> argLine = new ArrayList<String>();
+        List<String> argLine = new ArrayList<>();
         if (isWindows()) {
             argLine.add("cmd.exe");
             argLine.add("/c");

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
----------------------------------------------------------------------
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 e8dd326..c81ce9e 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -76,7 +76,7 @@ public class AttachmentDeserializer {
 
     private InputStream body;
     
-    private Set<DelegatingInputStream> loaded = new HashSet<DelegatingInputStream>();
+    private Set<DelegatingInputStream> loaded = new HashSet<>();
     private List<String> supportedTypes;
 
     public AttachmentDeserializer(Message message) {
@@ -187,7 +187,7 @@ public class AttachmentDeserializer {
             cache((DelegatingInputStream) body);
         }
 
-        List<Attachment> atts = new ArrayList<Attachment>(attachments.getLoadedAttachments());
+        List<Attachment> atts = new ArrayList<>(attachments.getLoadedAttachments());
         for (Attachment a : atts) {
             DataSource s = a.getDataHandler().getDataSource();
             if (s instanceof AttachmentDataSource) {
@@ -394,7 +394,7 @@ public class AttachmentDeserializer {
         }
         List<String> v = heads.get(name);
         if (v == null) {
-            v = new ArrayList<String>(1);
+            v = new ArrayList<>(1);
             heads.put(name, v);
         }
         v.add(value);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 79af3b1..037de30 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -95,7 +95,7 @@ public final class AttachmentUtil {
         public synchronized CommandInfo[] getAllCommands(String mimeType) {
             CommandInfo[] commands = super.getAllCommands(mimeType);
             CommandInfo[] defaultCommands = DEFAULT_COMMAND_MAP.getAllCommands(mimeType);
-            List<CommandInfo> cmdList = new ArrayList<CommandInfo>(Arrays.asList(commands));
+            List<CommandInfo> cmdList = new ArrayList<>(Arrays.asList(commands));
             
             // Add CommandInfo which does not exist in current command map.
             for (CommandInfo defCmdInfo : defaultCommands) {
@@ -132,7 +132,7 @@ public final class AttachmentUtil {
         public synchronized String[] getMimeTypes() {
             String[] mimeTypes = super.getMimeTypes();
             String[] defMimeTypes = DEFAULT_COMMAND_MAP.getMimeTypes();
-            Set<String> mimeTypeSet = new HashSet<String>();
+            Set<String> mimeTypeSet = new HashSet<>();
             mimeTypeSet.addAll(Arrays.asList(mimeTypes));
             mimeTypeSet.addAll(Arrays.asList(defMimeTypes));
             String[] mimeArray = new String[0];

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java b/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
index aaec8ed..85f0364 100644
--- a/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
+++ b/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
@@ -36,7 +36,7 @@ public class LazyAttachmentCollection
     implements Collection<Attachment> {
     
     private AttachmentDeserializer deserializer;
-    private final List<Attachment> attachments = new ArrayList<Attachment>();
+    private final List<Attachment> attachments = new ArrayList<>();
     
     public LazyAttachmentCollection(AttachmentDeserializer deserializer) {
         super();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java b/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
index 60274a0..bfae1e6 100644
--- a/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
@@ -57,7 +57,7 @@ public class LazyDataSource implements DataSource {
         }
         if (dataSource == null) {
             //couldn't find it, build up error message
-            List<String> ids = new ArrayList<String>(10);
+            List<String> ids = new ArrayList<>(10);
             for (Attachment a : attachments) {
                 ids.add(a.getId());
                 if (a.getId().equals(id)) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
index 4db349d..1a91eae 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
@@ -56,7 +56,7 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
         this.container = cont;
         this.context = context;
         if (orig instanceof ExtensionManagerImpl) {
-            List<String> names = new ArrayList<String>(container.getComponentIds());
+            List<String> names = new ArrayList<>(container.getComponentIds());
             ((ExtensionManagerImpl)orig).removeBeansOfNames(names);
         }
     }
@@ -109,12 +109,12 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
             }
         }
         names.addAll(orig.getBeanNamesOfType(type));
-        return new ArrayList<String>(names);
+        return new ArrayList<>(names);
     }
 
     /** {@inheritDoc}*/
     public <T> Collection<? extends T> getBeansOfType(Class<T> type) {
-        List<T> list = new ArrayList<T>();
+        List<T> list = new ArrayList<>();
         
         for (String s : container.getComponentIds()) {
             ComponentMetadata cmd = container.getComponentMetadata(s);
@@ -144,7 +144,7 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
 
     /** {@inheritDoc}*/
     public <T> boolean loadBeansOfType(Class<T> type, BeanLoaderListener<T> listener) {
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         boolean loaded = false;
         for (String s : container.getComponentIds()) {
             ComponentMetadata cmd = container.getComponentMetadata(s);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
index 8c00dc3..8314211 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
@@ -98,7 +98,7 @@ public class BundleDelegatingClassLoader extends ClassLoader {
         }
       
         if (urls == null) {
-            urls = Collections.enumeration(new ArrayList<URL>());
+            urls = Collections.enumeration(new ArrayList<>());
         }
       
         return urls;    

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
----------------------------------------------------------------------
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 bf0ce8c..03a8f17 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
@@ -88,7 +88,7 @@ public class ConfigurerImpl implements Configurer {
                     Matcher matcher = Pattern.compile(s).matcher("");
                     List<MatcherHolder> m = wildCardBeanDefinitions.get(cls.getName());
                     if (m == null) {
-                        m = new ArrayList<MatcherHolder>();
+                        m = new ArrayList<>();
                         wildCardBeanDefinitions.put(cls.getName(), m);
                     }
                     MatcherHolder holder = new MatcherHolder(orig, matcher);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
index 81cd8aa..376869b 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
@@ -41,7 +41,7 @@ public class Extension {
     protected volatile Class<?> intf;
     protected String interfaceName;
     protected boolean deferred;
-    protected Collection<String> namespaces = new ArrayList<String>();
+    protected Collection<String> namespaces = new ArrayList<>();
     protected Object args[];
     protected volatile Object obj;
     protected boolean optional;
@@ -264,7 +264,7 @@ public class Extension {
             }
         } catch (NoSuchMethodException ex) {
             notFound = true;
-            List<Object> a = new ArrayList<Object>();
+            List<Object> a = new ArrayList<>();
             if (b != null) {
                 a.add(b);
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java b/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
index f7804ee..0cd5e9d 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
@@ -49,7 +49,7 @@ public class TextExtensionFragmentParser {
             return getExtensions(is);
         } catch (Exception e) {
             LOG.log(Level.WARNING, e.getMessage(), e);
-            return new ArrayList<Extension>();
+            return new ArrayList<>();
         } finally {
             if (is != null) {
                 try {
@@ -71,7 +71,7 @@ public class TextExtensionFragmentParser {
      * @throws IOException
      */
     public List<Extension> getExtensions(InputStream is) throws IOException {
-        List<Extension> extensions = new ArrayList<Extension>();
+        List<Extension> extensions = new ArrayList<>();
         BufferedReader reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
         String line = reader.readLine();
         while (line != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
index c66d136..d929f55 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
@@ -68,7 +68,7 @@ public class CXFActivator implements BundleActivator {
                                                                      workQueues,
                                                                      ManagedWorkQueueList.FACTORY_PID);
                 
-        extensions = new ArrayList<Extension>();
+        extensions = new ArrayList<>();
         extensions.add(createOsgiBusListenerExtension(context));
         extensions.add(createManagedWorkQueueListExtension(workQueues));
         ExtensionRegistry.addExtensions(extensions);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
----------------------------------------------------------------------
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 7713c33..9385d46 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
@@ -85,7 +85,7 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener {
             return false;
         }
         
-        List<String> names = new ArrayList<String>(orig.size());
+        List<String> names = new ArrayList<>(orig.size());
         for (Extension ext : orig) {
             names.add(ext.getName());
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java b/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
index 7d621a2..fda6f80 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
@@ -59,7 +59,7 @@ public class OSGiBeanLocator implements ConfiguredBeanLocator {
     }
 
     private <T> List<T> getBeansFromOsgiService(Class<T> type) {
-        List<T> list = new ArrayList<T>();
+        List<T> list = new ArrayList<>();
         try {
             ServiceReference refs[] = context.getServiceReferences(type.getName(), null);
             if (refs != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
index 36d951b..c3de2a3 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
@@ -145,7 +145,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
     
     @Override
     protected Resource[] getConfigResources() {
-        List<Resource> resources = new ArrayList<Resource>();
+        List<Resource> resources = new ArrayList<>();
        
         if (includeDefaults) {
             try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 e24da64..f4f826e 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
@@ -143,7 +143,7 @@ public class BusWiringBeanFactoryPostProcessor implements BeanFactoryPostProcess
      * @param valueToInsert the value to insert as the first argument.
      */
     private void insertConstructorArg(ConstructorArgumentValues constructorArgs, Object valueToInsert) {
-        List<ValueHolder> genericArgs = new ArrayList<ValueHolder>(CastUtils
+        List<ValueHolder> genericArgs = new ArrayList<>(CastUtils
             .<ValueHolder> cast(constructorArgs.getGenericArgumentValues()));
         Map<Integer, ValueHolder> indexedArgs = new HashMap<Integer, ValueHolder>(CastUtils
             .<Integer, ValueHolder> cast(constructorArgs.getIndexedArgumentValues()));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
index 6686cd1..6a42c11 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
@@ -55,7 +55,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
     
     ApplicationContext context;
     ConfiguredBeanLocator orig;
-    Set<String> passThroughs = new HashSet<String>();
+    Set<String> passThroughs = new HashSet<>();
     Object bundleContext;
     boolean osgi = true;
     
@@ -67,7 +67,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
         if (bus != null) {
             orig = bus.getExtension(ConfiguredBeanLocator.class);
             if (orig instanceof ExtensionManagerImpl) {
-                List<String> names = new ArrayList<String>();
+                List<String> names = new ArrayList<>();
                 for (String s : ctx.getBeanDefinitionNames()) {
                     names.add(s);
                     for (String s2 : ctx.getAliases(s)) {
@@ -137,7 +137,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
                                                                                          false)));
         s.removeAll(passThroughs);
         s.addAll(orig.getBeanNamesOfType(type));
-        return new ArrayList<String>(s);
+        return new ArrayList<>(s);
     }
 
     /** {@inheritDoc}*/
@@ -205,7 +205,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
 
     public <T> boolean loadBeansOfType(Class<T> type,
                                        BeanLoaderListener<T> listener) {
-        List<String> list = new ArrayList<String>(Arrays.asList(context.getBeanNamesForType(type,
+        List<String> list = new ArrayList<>(Arrays.asList(context.getBeanNamesForType(type,
                                                                                             false,
                                                                                             false)));
         list.removeAll(passThroughs);
@@ -269,7 +269,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
     }
 
     public <T> List<T> getOSGiServices(Class<T> type) {
-        List<T> lst = new ArrayList<T>();
+        List<T> lst = new ArrayList<>();
         if (!osgi) {
             return lst;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
index cbd3f43..421d1d2 100644
--- a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
@@ -140,7 +140,7 @@ public final class ClassLoaderUtils {
      * @param callingClass The Class object of the calling object
      */
     public static List<URL> getResources(String resourceName, Class<?> callingClass) {
-        List<URL> ret = new ArrayList<URL>();
+        List<URL> ret = new ArrayList<>();
         Enumeration<URL> urls = new Enumeration<URL>() {
             public boolean hasMoreElements() {
                 return false;

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 9ff8800..fdbe147 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
@@ -417,7 +417,7 @@ public final class JAXBUtils {
         
         // split into words 
 
-        List<String> words = new ArrayList<String>();
+        List<String> words = new ArrayList<>();
 
         StringTokenizer st = new StringTokenizer(name, XML_NAME_PUNCTUATION_STRING);
         while (st.hasMoreTokens()) {
@@ -659,7 +659,7 @@ public final class JAXBUtils {
             Object ref = refClass.getConstructor(QName.class, 
                                                  Type.class, 
                                                  anns.getClass()).newInstance(qname, refcls, anns);
-            List<Object> typeRefs = new ArrayList<Object>();
+            List<Object> typeRefs = new ArrayList<>();
             typeRefs.add(ref);
             List<Class<?>> clses = new ArrayList<Class<?>>(ctxClasses);
             clses.add(refClass.getField("type").get(ref).getClass());
@@ -763,7 +763,7 @@ public final class JAXBUtils {
     }
     
     public static List<String> getGeneratedClassNames(JCodeModel codeModel) {
-        List<String> classes = new ArrayList<String>();
+        List<String> classes = new ArrayList<>();
         for (Iterator<JPackage> itr = codeModel.packages(); itr.hasNext();) {
             JPackage package1 = itr.next();
             
@@ -813,7 +813,7 @@ public final class JAXBUtils {
     
     public static List<DOMResult> generateJaxbSchemas(
         JAXBContext context, final Map<String, DOMResult> builtIns) throws IOException {
-        final List<DOMResult> results = new ArrayList<DOMResult>();
+        final List<DOMResult> results = new ArrayList<>();
 
         context.generateSchema(new SchemaOutputResolver() {
             @Override
@@ -962,7 +962,7 @@ public final class JAXBUtils {
         private final Set<String> typesClassNames;
 
         public DefaultClassNameAllocator() {
-            this(new HashSet<String>());
+            this(new HashSet<>());
         }
         
         public DefaultClassNameAllocator(Set<String> set) {
@@ -1140,7 +1140,7 @@ public final class JAXBUtils {
             if (nsctxt == null) {
                 return sup;
             }
-            List<String> s = new ArrayList<String>(Arrays.asList(sup));
+            List<String> s = new ArrayList<>(Arrays.asList(sup));
             for (int x = 1; x < nsctxt.length; x = x + 2) {
                 s.remove(nsctxt[x]);
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
index 416d68a..ae3aa0f 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
@@ -95,7 +95,7 @@ public class Log4jLogger extends AbstractDelegatingLogger {
         log.removeAppender("HandlerWrapper-" + handler.hashCode());
     }
     public synchronized Handler[] getHandlers() {
-        List<Handler> ret = new ArrayList<Handler>();
+        List<Handler> ret = new ArrayList<>();
         Enumeration<?> en = log.getAllAppenders();
         while (en.hasMoreElements()) {
             Appender ap = (Appender)en.nextElement();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java b/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
index 73b0d5c..f1ecd34 100644
--- a/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
+++ b/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
@@ -32,7 +32,7 @@ import java.util.Set;
 public class SimpleGroup extends SimplePrincipal implements Group {
     
     private static final long serialVersionUID = 1L;
-    private Set<Principal> members = new HashSet<Principal>();
+    private Set<Principal> members = new HashSet<>();
     
     public SimpleGroup(String groupName) {
         super(groupName);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java
index 7b4c34a..86b7827 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java
@@ -168,7 +168,7 @@ public class ClasspathScanner {
     
     public static Set<String> parsePackages(final String packagesAsCsv) {        
         final String[] values = StringUtils.split(packagesAsCsv, ",");
-        final Set<String> basePackages = new HashSet<String>(values.length);
+        final Set<String> basePackages = new HashSet<>(values.length);
         for (final String value : values) {
             final String trimmed = value.trim();
             if (trimmed.equals(WILDCARD)) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java b/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
index 605159b..c6b2acd 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
@@ -32,7 +32,7 @@ public final class CollectionUtils {
         if (c1 == null || c1.size() == 0 || c2 == null || c2.size() == 0) {
             return c1;
         }
-        Collection<T> difference = new ArrayList<T>();
+        Collection<T> difference = new ArrayList<>();
         for (T item : c1) {
             if (!c2.contains(item)) {
                 difference.add(item);

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/util/Compiler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
index 11e3122..855eaad 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -122,14 +122,14 @@ public class Compiler {
 
     }
     public boolean compileFiles(File[] files) {
-        List<String> f = new ArrayList<String>(files.length);
+        List<String> f = new ArrayList<>(files.length);
         for (File file : files) {
             f.add(file.getAbsolutePath());
         }
         return compileFiles(f.toArray(new String[files.length]));
     }
     public boolean compileFiles(List<File> files) {
-        List<String> f = new ArrayList<String>(files.size());
+        List<String> f = new ArrayList<>(files.size());
         for (File file : files) {
             f.add(file.getAbsolutePath());
         }
@@ -141,7 +141,7 @@ public class Compiler {
             return useJava6Compiler(files);
         }
         
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
 
         // Start of honoring java.home for used javac
         String fsep = File.separator;
@@ -237,7 +237,7 @@ public class Compiler {
     protected boolean internalJava6Compile(JavaCompiler compiler, JavaFileManager fileManager,
                                            DiagnosticListener<JavaFileObject> listener,
                                            Iterable<? extends JavaFileObject> fileList) {
-        List<String> args = new ArrayList<String>();
+        List<String> args = new ArrayList<>();
         addArgs(args);
         CompilationTask task = compiler.getTask(null, fileManager, listener, args, null, fileList);
         Boolean ret = task.call();

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
index cd5b306..1d8d6ed 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
@@ -54,7 +54,7 @@ public final class PackageUtils {
             return "";
         }
         List<List<String>> lParts = new  ArrayList<List<String>>(classes.size());
-        List<String> currentParts = new ArrayList<String>();
+        List<String> currentParts = new ArrayList<>();
         for (Class<?> cls : classes) {
             lParts.add(StringUtils.getParts(getPackageName(cls), "\\."));
         }
@@ -151,7 +151,7 @@ public final class PackageUtils {
 
     private static List<String> tokenize(String str, String sep) {
         StringTokenizer tokens = new StringTokenizer(str, sep);
-        List<String> r = new ArrayList<String>();
+        List<String> r = new ArrayList<>();
 
         while (tokens.hasMoreTokens()) {
             r.add(tokens.nextToken());
@@ -160,7 +160,7 @@ public final class PackageUtils {
     }
 
     private static <T> List<T> reverse(List<T> a) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
 
         for (int i = a.size() - 1; i >= 0; i--) {
             r.add(a.get(i));

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
index f14e61f..5075653 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
@@ -29,7 +29,7 @@ import java.util.Set;
  */
 public class ProxyClassLoader extends ClassLoader {
     private final Class<?> classes[];
-    private final Set<ClassLoader> loaders = new HashSet<ClassLoader>();
+    private final Set<ClassLoader> loaders = new HashSet<>();
     private boolean checkSystem;
 
     public ProxyClassLoader(ClassLoader parent) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
index 6b41895..39f9b71 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
@@ -222,7 +222,7 @@ public final class ReflectionUtil {
         
         if (springBeanUtilsDescriptorFetcher != null) {
             if (propertyDescriptors != null) {
-                List<PropertyDescriptor> descriptors = new ArrayList<PropertyDescriptor>(propertyDescriptors.length);
+                List<PropertyDescriptor> descriptors = new ArrayList<>(propertyDescriptors.length);
                 for (int i = 0; i < propertyDescriptors.length; i++) {
                     PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
                     try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 650e793..a18a8db 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
@@ -141,7 +141,7 @@ class SpringClasspathScanner extends ClasspathScanner {
                                               String extension,
                                               ClassLoader loader) 
         throws IOException {
-        final List<URL> resourceURLs = new ArrayList<URL>();
+        final List<URL> resourceURLs = new ArrayList<>();
         if (basePackages == null || basePackages.isEmpty()) {
             return resourceURLs;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 aa0edba..7b895e2 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
@@ -92,7 +92,7 @@ public final class StringUtils {
     
     public static List<String> getParts(String str, String separator) {
         String[] parts = split(str, separator);
-        List<String> ret = new ArrayList<String>(parts.length);
+        List<String> ret = new ArrayList<>(parts.length);
         for (String part : parts) {
             if (!isEmpty(part)) {
                 ret.add(part);
@@ -127,7 +127,7 @@ public final class StringUtils {
         if (isEmpty(regex) || isEmpty(contents)) {
             return null;
         }
-        List<String> results = new ArrayList<String>();
+        List<String> results = new ArrayList<>();
         Pattern pattern = Pattern.compile(regex, Pattern.UNICODE_CASE);
         Matcher matcher = pattern.matcher(contents);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
index 9850ee5..214e71a 100644
--- a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
@@ -165,7 +165,7 @@ public final class URIParserUtil {
 
     private static List<String> tokenize(String str, String sep) {
         StringTokenizer tokens = new StringTokenizer(str, sep);
-        List<String> r = new ArrayList<String>();
+        List<String> r = new ArrayList<>();
 
         while (tokens.hasMoreTokens()) {
             r.add(tokens.nextToken());
@@ -204,7 +204,7 @@ public final class URIParserUtil {
     }
 
     private static <T> List<T> reverse(List<T> a) {
-        List<T> r = new ArrayList<T>();
+        List<T> r = new ArrayList<>();
 
         for (int i = a.size() - 1; i >= 0; i--) {
             r.add(a.get(i));