You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/23 14:58:37 UTC
[cxf] 02/02: More removing of deprecated types
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 403b64df004caa563054d7b6a36c7e78b54bf53a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 23 15:58:15 2018 +0100
More removing of deprecated types
---
bin/DoMerges.java | 4 +-
.../cxf/bus/extension/ExtensionManagerBus.java | 6 +-
.../apache/cxf/common/jaxb/JAXBContextCache.java | 10 +--
.../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 4 +-
.../java/org/apache/cxf/common/util/ASMHelper.java | 4 +-
.../org/apache/cxf/common/util/CachedClass.java | 4 +-
.../apache/cxf/common/util/CglibProxyHelper.java | 2 +-
.../org/apache/cxf/common/util/PackageUtils.java | 2 +-
.../org/apache/cxf/common/util/SortedArraySet.java | 2 +-
.../blueprint/AbstractBPBeanDefinitionParser.java | 2 +-
.../jsse/TLSClientParametersConfig.java | 2 +-
.../spring/AbstractBeanDefinitionParser.java | 2 +-
.../main/java/org/apache/cxf/helpers/NSStack.java | 2 +-
.../java/org/apache/cxf/message/MessageImpl.java | 2 +-
.../service/model/AbstractPropertiesHolder.java | 2 +-
.../cxf/staxutils/transform/InTransformReader.java | 2 +-
.../staxutils/transform/OutTransformWriter.java | 4 +-
.../org/apache/cxf/ws/addressing/ContextUtils.java | 4 +-
.../cxf/ws/addressing/EndpointReferenceUtils.java | 2 +-
.../apache/cxf/demo/aegis/commands/WriteZoo.java | 2 +-
.../main/java/minimalosgi/SampleApplication.java | 2 +-
.../src/main/java/demo/mtom/client/Client.java | 2 +-
.../cxf/handlers/InvocationHandlerFactoryTest.java | 2 +-
.../cxf/maven_plugin/AbstractCodegenMoho.java | 2 +-
.../java2swagger/Java2SwaggerMojo.java | 2 +-
.../cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 2 +-
.../wadlto/AbstractCodeGeneratorMojo.java | 2 +-
.../java/org/apache/cxf/aegis/AegisContext.java | 6 +-
.../org/apache/cxf/aegis/type/XMLTypeCreator.java | 2 +-
.../cxf/aegis/standalone/StandaloneReadTest.java | 6 +-
.../cxf/aegis/standalone/StandaloneWriteTest.java | 2 +-
.../cxf/aegis/type/java5/CollectionService.java | 4 +-
.../cxf/aegis/xmlconfig/TestDateMapping.java | 4 +-
.../apache/cxf/jaxb/JAXBContextInitializer.java | 2 +-
.../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 4 +-
.../org/apache/cxf/jaxb/JAXBDataBindingTest.java | 6 +-
.../apache/cxf/jaxrs/impl/AsyncResponseImpl.java | 2 +-
.../apache/cxf/jaxrs/impl/ConfigurationImpl.java | 4 +-
.../cxf/jaxrs/model/AbstractResourceInfo.java | 4 +-
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 6 +-
.../cxf/jaxrs/provider/MultipartProvider.java | 2 +-
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 4 +-
.../cxf/jaxrs/provider/ServerProviderFactory.java | 2 +-
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 4 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 2 +-
.../org/apache/cxf/jaxrs/utils/ResourceUtils.java | 4 +-
.../cxf/jaxrs/model/ClassResourceInfoTest.java | 4 +-
.../jaxrs/provider/JAXBElementProviderTest.java | 32 ++++----
.../apache/cxf/jaxws/WrapperClassGenerator.java | 2 +-
.../cxf/jaxws/handler/HandlerChainInvoker.java | 8 +-
.../interceptors/WrapperClassInInterceptor.java | 2 +-
.../interceptors/WrapperClassOutInterceptor.java | 2 +-
.../cxf/jaxws/support/JaxWsServiceFactoryBean.java | 4 +-
.../handler/LogicalHandlerInterceptorTest.java | 2 +-
.../cxf/jaxrs/swagger/AbstractSwaggerFeature.java | 2 +-
.../cxf/jaxrs/swagger/ApplicationBeanConfig.java | 2 +-
.../provider/aegis/AbstractAegisProvider.java | 2 +-
.../aegis/NoNamespaceAegisElementProvider.java | 2 +-
.../cxf/jaxrs/provider/json/JSONProviderTest.java | 14 ++--
.../jaxrs/ext/search/hbase/HBaseQueryVisitor.java | 2 +-
.../search/jpa/AbstractJPATypedQueryVisitor.java | 2 +-
.../ext/search/jpa/JPACriteriaQueryVisitor.java | 2 +-
.../sci/JaxrsServletContainerInitializer.java | 2 +-
.../JettyHTTPServerEngineFactoryHolder.java | 2 +-
.../NettyHttpServerEngineFactoryHolder.java | 2 +-
.../UndertowHTTPServerEngineFactoryHolder.java | 2 +-
.../cxf/transport/https/CertConstraints.java | 2 +-
.../org/apache/cxf/ws/policy/AssertionInfoMap.java | 2 +-
.../cxf/ws/rm/persistence/jdbc/RMTxStore.java | 2 +-
.../sts/provider/SecurityTokenServiceProvider.java | 2 +-
.../apache/cxf/ws/security/sts/STSClientTest.java | 2 +-
.../ws/security/wss4j/DOMToStaxRoundTripTest.java | 2 +-
.../wss4j/StaxCryptoCoverageCheckerTest.java | 16 ++--
.../ws/security/wss4j/StaxRoundTripActionTest.java | 36 ++++-----
.../cxf/ws/security/wss4j/StaxRoundTripTest.java | 32 ++++----
.../wss4j/StaxToDOMEncryptionIdentifierTest.java | 10 +--
.../ws/security/wss4j/StaxToDOMRoundTripTest.java | 26 +++----
.../wss4j/StaxToDOMSignatureIdentifierTest.java | 10 +--
.../ws/security/wss4j/saml/StaxToDOMSamlTest.java | 12 +--
.../factory/ReflectionServiceFactoryBean.java | 2 +-
.../cxf/systest/jaxrs/BadgerFishProvider.java | 3 +-
.../apache/cxf/systest/jaxrs/BookApplication.java | 2 +-
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 2 +-
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 2 +-
.../apache/cxf/systest/jaxrs/failover/Server.java | 2 +-
.../apache/cxf/systest/jaxws/ClientServerTest.java | 2 +-
.../org/apache/cxf/systest/jaxws/ServerMisc.java | 2 +-
.../cxf/systest/swa/ClientServerSwaTest.java | 6 +-
.../mtom_bindingtype/MTOMBindingTypeTest.java | 4 +-
.../mtom_feature/MtomFeatureClientServerTest.java | 12 +--
.../systest/type_test/AbstractTypeTestClient.java | 88 +++++++++++-----------
.../systest/type_test/AbstractTypeTestClient3.java | 8 +-
.../systest/type_test/AbstractTypeTestClient4.java | 24 +++---
.../cxf/testutil/recorders/InMessageRecorder.java | 2 +-
.../cxf/testutil/recorders/OutMessageRecorder.java | 2 +-
.../generator/wsdl11/FaultBeanGenerator.java | 4 +-
.../java2wsdl/processor/JavaToWSDLProcessor.java | 2 +-
.../generator/wsdl11/FaultBeanGeneratorTest.java | 2 +-
.../cxf/tools/wadlto/jaxrs/WADLToJavaTest.java | 2 +-
99 files changed, 282 insertions(+), 285 deletions(-)
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index 5a47a41..80627fd 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -235,7 +235,7 @@ public class DoMerges {
reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
line = reader.readLine();
- List<String[]> map = new LinkedList<String[]>();
+ List<String[]> map = new LinkedList<>();
List<String> list = new ArrayList<>(10);
while (line != null) {
if (line.length() > 0 && line.startsWith("commit ")) {
@@ -546,7 +546,7 @@ public class DoMerges {
if (gitLogs == null) {
return false;
}
- List<List<String>> matchingLogs = new LinkedList<List<String>>();
+ List<List<String>> matchingLogs = new LinkedList<>();
for (String[] f : gitLogs) {
List<String> ll = compareLogs(f, logLines);
if (!ll.isEmpty()) {
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index a4f5bf9..50c1b0e 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -73,12 +73,12 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
public ExtensionManagerBus(Map<Class<?>, Object> extensions, Map<String, Object> props,
ClassLoader extensionClassLoader) {
if (extensions == null) {
- extensions = new ConcurrentHashMap<Class<?>, Object>(16, 0.75f, 4);
+ extensions = new ConcurrentHashMap<>(16, 0.75f, 4);
} else {
- extensions = new ConcurrentHashMap<Class<?>, Object>(extensions);
+ extensions = new ConcurrentHashMap<>(extensions);
}
this.extensions = extensions;
- this.missingExtensions = new CopyOnWriteArraySet<Class<?>>();
+ this.missingExtensions = new CopyOnWriteArraySet<>();
state = BusState.INITIAL;
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 d8ed8d1..11e128d 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
@@ -98,7 +98,7 @@ public final class JAXBContextCache {
CachedContextAndSchemasInternal(JAXBContext context, Set<Class<?>> classes) {
this.context = new WeakReference<>(context);
- this.classes = new WeakReference<Set<Class<?>>>(classes);
+ this.classes = new WeakReference<>(classes);
}
public JAXBContext getContext() {
@@ -118,10 +118,10 @@ public final class JAXBContextCache {
}
private static final Map<Set<Class<?>>, Map<String, CachedContextAndSchemasInternal>> JAXBCONTEXT_CACHE
- = new CacheMap<Set<Class<?>>, Map<String, CachedContextAndSchemasInternal>>();
+ = new CacheMap<>();
private static final Map<Package, CachedClass> OBJECT_FACTORY_CACHE
- = new CacheMap<Package, CachedClass>();
+ = new CacheMap<>();
private static final boolean HAS_MOXY;
@@ -157,7 +157,7 @@ public final class JAXBContextCache {
}
public static CachedContextAndSchemas getCachedContextAndSchemas(Class<?> ... cls) throws JAXBException {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
for (Class<?> c : cls) {
classes.add(c);
}
@@ -169,7 +169,7 @@ public final class JAXBContextCache {
Map<String, Object> props,
ClassLoader loader)
throws JAXBException {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
addPackage(classes, pkg, loader);
return getCachedContextAndSchemas(classes, null, props, null, true);
}
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 d0872a9..c152e5b 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
@@ -668,7 +668,7 @@ public final class JAXBUtils {
anns.getClass()).newInstance(qname, refcls, anns);
List<Object> typeRefs = new ArrayList<>();
typeRefs.add(ref);
- List<Class<?>> clses = new ArrayList<Class<?>>(ctxClasses);
+ List<Class<?>> clses = new ArrayList<>(ctxClasses);
clses.add(refClass.getField("type").get(ref).getClass());
if (!refcls.isInterface()) {
clses.add(refcls);
@@ -874,7 +874,7 @@ public final class JAXBUtils {
// that are in the same package. Also check for ObjectFactory classes
Map<String, InputStream> packages = new HashMap<>();
Map<String, ClassLoader> packageLoaders = new HashMap<>();
- Set<Class<?>> objectFactories = new HashSet<Class<?>>();
+ Set<Class<?>> objectFactories = new HashSet<>();
for (Class<?> jcls : classes) {
String pkgName = PackageUtils.getPackageName(jcls);
if (!packages.containsKey(pkgName)) {
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 6f481d0..9b31e27 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
@@ -42,9 +42,9 @@ public class ASMHelper {
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>>();
+ = new WeakIdentityHashMap<>();
protected static final Map<Class<?>, WeakReference<TypeHelperClassLoader>> CLASS_MAP
- = new WeakIdentityHashMap<Class<?>, WeakReference<TypeHelperClassLoader>>();
+ = new WeakIdentityHashMap<>();
protected static boolean badASM;
private static Class<?> cwClass;
diff --git a/core/src/main/java/org/apache/cxf/common/util/CachedClass.java b/core/src/main/java/org/apache/cxf/common/util/CachedClass.java
index 4df3e10..3457879 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CachedClass.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CachedClass.java
@@ -24,7 +24,7 @@ public class CachedClass {
private WeakReference<Class<?>> cachedClass;
public CachedClass(Class<?> cachedClass) {
- this.cachedClass = new WeakReference<Class<?>>(cachedClass);
+ this.cachedClass = new WeakReference<>(cachedClass);
}
public Class<?> getCachedClass() {
@@ -32,6 +32,6 @@ public class CachedClass {
}
public void setCachedClass(Class<?> cachedClass) {
- this.cachedClass = new WeakReference<Class<?>>(cachedClass);
+ this.cachedClass = new WeakReference<>(cachedClass);
}
}
diff --git a/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java b/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
index e7fc78c..2e00def 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
@@ -43,7 +43,7 @@ class CglibProxyHelper extends ProxyHelper {
final java.lang.reflect.InvocationHandler h) {
Class<?> superClass = null;
- List<Class<?>> theInterfaces = new ArrayList<Class<?>>();
+ List<Class<?>> theInterfaces = new ArrayList<>();
for (Class<?> c : interfaces) {
if (!c.isInterface()) {
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 e90fa63..f35cd11 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
@@ -53,7 +53,7 @@ public final class PackageUtils {
if (classes.isEmpty()) {
return "";
}
- List<List<String>> lParts = new ArrayList<List<String>>(classes.size());
+ List<List<String>> lParts = new ArrayList<>(classes.size());
List<String> currentParts = new ArrayList<>();
for (Class<?> cls : classes) {
if (!Proxy.isProxyClass(cls)) {
diff --git a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
index 2143e10..ef24f4c 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicReference;
* @param <T>
*/
public final class SortedArraySet<T> implements SortedSet<T> {
- final AtomicReference<T[]> data = new AtomicReference<T[]>();
+ final AtomicReference<T[]> data = new AtomicReference<>();
public void clear() {
data.set(null);
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
index 17bb768..38d173d 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
@@ -406,7 +406,7 @@ public abstract class AbstractBPBeanDefinitionParser {
protected synchronized JAXBContext getContext(Class<?> cls) {
if (jaxbContext == null || jaxbClasses == null || !jaxbClasses.contains(cls)) {
try {
- Set<Class<?>> tmp = new HashSet<Class<?>>();
+ Set<Class<?>> tmp = new HashSet<>();
if (jaxbClasses != null) {
tmp.addAll(jaxbClasses);
}
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
index 7ca29da..989850d 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
@@ -57,7 +57,7 @@ public final class TLSClientParametersConfig {
private static synchronized JAXBContext getContext() throws JAXBException {
if (context == null || classes == null) {
- Set<Class<?>> c2 = new HashSet<Class<?>>();
+ Set<Class<?>> c2 = new HashSet<>();
JAXBContextCache.addPackage(c2,
PackageUtils.getPackageName(TLSClientParametersType.class),
TLSClientParametersConfig.class.getClassLoader());
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
index 0423472..d1507a9 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
@@ -304,7 +304,7 @@ public abstract class AbstractBeanDefinitionParser
private synchronized JAXBContext getContext(Class<?> cls) {
if (context == null || classes == null || !classes.contains(cls)) {
try {
- Set<Class<?>> tmp = new HashSet<Class<?>>();
+ Set<Class<?>> tmp = new HashSet<>();
if (classes != null) {
tmp.addAll(classes);
}
diff --git a/core/src/main/java/org/apache/cxf/helpers/NSStack.java b/core/src/main/java/org/apache/cxf/helpers/NSStack.java
index d2189cf..4ce5230 100644
--- a/core/src/main/java/org/apache/cxf/helpers/NSStack.java
+++ b/core/src/main/java/org/apache/cxf/helpers/NSStack.java
@@ -27,7 +27,7 @@ public class NSStack {
private static final String NS_PREFIX_PREFIX = "ns";
- private final List<List<NSDecl>> stack = new ArrayList<List<NSDecl>>();
+ private final List<List<NSDecl>> stack = new ArrayList<>();
private List<NSDecl> top;
private int size;
private int nsPrefixCount = 1;
diff --git a/core/src/main/java/org/apache/cxf/message/MessageImpl.java b/core/src/main/java/org/apache/cxf/message/MessageImpl.java
index 0c2453d..2de20ed 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageImpl.java
@@ -141,7 +141,7 @@ public class MessageImpl extends StringMapImpl implements Message {
public Set<Class<?>> getContentFormats() {
- Set<Class<?>> c = new HashSet<Class<?>>();
+ Set<Class<?>> c = new HashSet<>();
for (int x = 0; x < index; x += 2) {
c.add((Class<?>)contents[x]);
}
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 08fd8f3..d994d1f 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
@@ -33,7 +33,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
private boolean delegateProperties;
private AtomicReference<Map<String, Object>> propertyMap = new AtomicReference<Map<String, Object>>();
- private AtomicReference<Object[]> extensors = new AtomicReference<Object[]>();
+ private AtomicReference<Object[]> extensors = new AtomicReference<>();
private Map<QName, Object> extensionAttributes;
private String documentation;
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 aaf22bc..402d2c2 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
@@ -50,7 +50,7 @@ public class InTransformReader extends DepthXMLStreamReader {
private Set<QName> inDropSet = new HashSet<>(5);
private Map<String, String> nsMap = new HashMap<>(5);
private List<ParsingEvent> pushedBackEvents = new LinkedList<>();
- private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<List<ParsingEvent>>();
+ private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<>();
private String replaceText;
private ParsingEvent currentEvent;
private List<Integer> attributesIndexes = new ArrayList<>();
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 cbdae71..f14ed10 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
@@ -43,10 +43,10 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
private QNamesMap attributesMap;
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 List<Set<String>> writtenUris = new LinkedList<>();
private Set<QName> dropElements;
- private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<List<ParsingEvent>>();
+ private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<>();
private List<QName> elementsStack = new LinkedList<>();
private String replaceNamespace;
private String replaceText;
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
index e1726ee..69362f7 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
@@ -524,7 +524,7 @@ public final class ContextUtils {
public static JAXBContext getJAXBContext() throws JAXBException {
synchronized (ContextUtils.class) {
if (jaxbContext == null || jaxbContextClasses == null) {
- Set<Class<?>> tmp = new HashSet<Class<?>>();
+ Set<Class<?>> tmp = new HashSet<>();
JAXBContextCache.addPackage(tmp, WSA_OBJECT_FACTORY.getClass().getPackage().getName(),
WSA_OBJECT_FACTORY.getClass().getClassLoader());
JAXBContextCache.scanPackages(tmp);
@@ -545,7 +545,7 @@ public final class ContextUtils {
public static void setJAXBContext(JAXBContext ctx) throws JAXBException {
synchronized (ContextUtils.class) {
jaxbContext = ctx;
- jaxbContextClasses = new HashSet<Class<?>>();
+ jaxbContextClasses = new HashSet<>();
}
}
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
index f67103d..866f081 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
@@ -252,7 +252,7 @@ public final class EndpointReferenceUtils {
new org.apache.cxf.ws.addressing.wsdl.ObjectFactory();
- private static final Set<Class<?>> ADDRESSING_CLASSES = new HashSet<Class<?>>();
+ private static final Set<Class<?>> ADDRESSING_CLASSES = new HashSet<>();
private static final AtomicReference<Reference<JAXBContext>> ADDRESSING_CONTEXT
= new AtomicReference<Reference<JAXBContext>>(new SoftReference<JAXBContext>(null));
static {
diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
index 8267f12..9258f74 100644
--- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
+++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
@@ -54,7 +54,7 @@ public final class WriteZoo {
context = new AegisContext();
context.setWriteXsiTypes(true);
- Set<java.lang.reflect.Type> rootClasses = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> rootClasses = new HashSet<>();
rootClasses.add(Zoo.class);
context.setRootClasses(rootClasses);
context.initialize();
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleApplication.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleApplication.java
index 8c6f7fd..97ba45e 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleApplication.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Application;
public class SampleApplication extends Application {
@Override
public Set<Class<?>> getClasses() {
- Set<Class<?>> s = new HashSet<Class<?>>();
+ Set<Class<?>> s = new HashSet<>();
s.add(SampleResource.class);
return s;
}
diff --git a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
index bcaebf5..39bbae6 100644
--- a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
+++ b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
@@ -76,7 +76,7 @@ public final class Client {
System.out.println("\nStarting MTOM Test using basic byte array:");
Holder<String> name = new Holder<>("Sam");
- Holder<byte[]> param = new Holder<byte[]>();
+ Holder<byte[]> param = new Holder<>();
param.value = new byte[(int) fileSize];
InputStream in = fileURL.openStream();
int len = in.read(param.value);
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
index 5a9550e..baba8e0 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
@@ -63,7 +63,7 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
assertNotNull("handler must not be null", handler);
int count = 0;
- Set<Class<?>> allHandlerTypes = new HashSet<Class<?>>();
+ Set<Class<?>> allHandlerTypes = new HashSet<>();
while (handler != null) {
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index dfbe5af..b83ad8e 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -516,7 +516,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
protected void forkOnce(Set<URI> classPath, List<GenericWsdlOption> effectiveWsdlOptions)
throws MojoExecutionException {
List<GenericWsdlOption> toDo = new LinkedList<>();
- List<List<String>> wargs = new LinkedList<List<String>>();
+ List<List<String>> wargs = new LinkedList<>();
for (GenericWsdlOption wsdlOption : effectiveWsdlOptions) {
File outputDirFile = wsdlOption.getOutputDir();
outputDirFile.mkdirs();
diff --git a/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java b/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java
index 6972907..d12887b 100644
--- a/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java
+++ b/maven-plugins/java2swagger-plugin/src/main/java/org/apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java
@@ -264,7 +264,7 @@ public class Java2SwaggerMojo extends AbstractMojo {
}
private Set<Class<?>> loadResourceClasses(Class<? extends Annotation> clazz) throws MojoExecutionException {
- resourceClasses = new LinkedHashSet<Class<?>>(this.resourcePackages.size());
+ resourceClasses = new LinkedHashSet<>(this.resourcePackages.size());
Thread.currentThread().setContextClassLoader(getClassLoader());
for (String resourcePackage : resourcePackages) {
Set<Class<?>> c = new Reflections(resourcePackage).getTypesAnnotatedWith(clazz, true);
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
index b1a425f..696110a 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
@@ -376,7 +376,7 @@ public class Java2WADLMojo extends AbstractMojo {
throw new MojoExecutionException(
"either classResourceNames or basePackages should be specified");
}
- List<Class<?>> resourceClasses = new ArrayList<Class<?>>(
+ List<Class<?>> resourceClasses = new ArrayList<>(
classResourceNames == null ? 0 : classResourceNames.size());
if (classResourceNames != null) {
for (String className : classResourceNames) {
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
index bdcc8fc..10e55be 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
@@ -263,7 +263,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
protected void forkOnce(Set<URI> classPath, List<WadlOption> effectiveOptions)
throws MojoExecutionException {
List<WadlOption> toDo = new LinkedList<>();
- List<List<String>> wargs = new LinkedList<List<String>>();
+ List<List<String>> wargs = new LinkedList<>();
for (WadlOption option : effectiveOptions) {
File outputDirFile = option.getOutputDir();
outputDirFile.mkdirs();
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
index d942881..a00219e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
@@ -100,7 +100,7 @@ public class AegisContext {
*/
public AegisContext() {
beanImplementationMap = new HashMap<>();
- rootClasses = new HashSet<java.lang.reflect.Type>();
+ rootClasses = new HashSet<>();
rootTypeQNames = new HashSet<>();
}
@@ -197,7 +197,7 @@ public class AegisContext {
}
private Set<Class<?>> rootMappableClasses() {
- Set<Class<?>> mappableClasses = new HashSet<Class<?>>();
+ Set<Class<?>> mappableClasses = new HashSet<>();
for (java.lang.reflect.Type jtype : rootClasses) {
addTypeToMappableClasses(mappableClasses, jtype);
}
@@ -234,7 +234,7 @@ public class AegisContext {
rootTypes = new HashSet<>();
// app may have already supplied classes.
if (rootClasses == null) {
- rootClasses = new HashSet<java.lang.reflect.Type>();
+ rootClasses = new HashSet<>();
}
rootTypeQNames = new HashSet<>();
if (this.rootClassNames != null) {
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
index a9de412..a79724a 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
@@ -101,7 +101,7 @@ import org.apache.cxf.helpers.XPathUtils;
*/
public class XMLTypeCreator extends AbstractTypeCreator {
private static final Logger LOG = LogUtils.getL7dLogger(XMLTypeCreator.class);
- private static List<Class<?>> stopClasses = new ArrayList<Class<?>>();
+ private static List<Class<?>> stopClasses = new ArrayList<>();
static {
stopClasses.add(Object.class);
stopClasses.add(Exception.class);
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
index e166103..1e8b9cd 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
@@ -68,7 +68,7 @@ public class StandaloneReadTest {
@Test
public void testCollectionReadNoXsiType() throws Exception {
context = new AegisContext();
- Set<java.lang.reflect.Type> roots = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> roots = new HashSet<>();
java.lang.reflect.Type listStringType
= ListStringInterface.class.getMethods()[0].getGenericReturnType();
roots.add(listStringType);
@@ -93,7 +93,7 @@ public class StandaloneReadTest {
@Test
public void testCollectionReadXsiType() throws Exception {
context = new AegisContext();
- Set<java.lang.reflect.Type> roots = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> roots = new HashSet<>();
java.lang.reflect.Type listStringType
= ListStringInterface.class.getMethods()[0].getGenericReturnType();
roots.add(listStringType);
@@ -116,7 +116,7 @@ public class StandaloneReadTest {
@Test
public void testSimpleBeanRead() throws Exception {
context = new AegisContext();
- Set<java.lang.reflect.Type> rootClasses = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> rootClasses = new HashSet<>();
rootClasses.add(SimpleBean.class);
context.setRootClasses(rootClasses);
context.initialize();
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
index 68a5c94..80cc038 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
@@ -141,7 +141,7 @@ public class StandaloneWriteTest {
@Test
public void testBean() throws Exception {
context = new AegisContext();
- Set<java.lang.reflect.Type> rootClasses = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> rootClasses = new HashSet<>();
rootClasses.add(SimpleBean.class);
context.setRootClasses(rootClasses);
context.initialize();
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
index 5cb0b6a..f2660d9 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
@@ -93,7 +93,7 @@ public class CollectionService implements CollectionServiceInterface {
}
public Collection<double[]> returnCollectionOfPrimitiveArrays() {
- List<double[]> data = new ArrayList<double[]>();
+ List<double[]> data = new ArrayList<>();
double[] dataArray = new double[] {3.14, 2.0, -666.6 };
data.add(dataArray);
dataArray = new double[] {-666.6, 3.14, 2.0, 0 };
@@ -113,7 +113,7 @@ public class CollectionService implements CollectionServiceInterface {
d2.appendChild(e);
e.setAttribute("not-an", "ungulate");
Document[] da = new Document[] {d1, d2};
- List<Document[]> l = new ArrayList<Document[]>();
+ List<Document[]> l = new ArrayList<>();
l.add(da);
da = new Document[] {d2, d1};
l.add(da);
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
index a275e2e..555992f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
@@ -50,7 +50,7 @@ public class TestDateMapping {
@Test
public void testWriteSqlDateAsDate() throws Exception {
context = new AegisContext();
- Set<java.lang.reflect.Type> rootClasses = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> rootClasses = new HashSet<>();
rootClasses.add(BeanWithDate.class);
context.setRootClasses(rootClasses);
context.initialize();
@@ -70,7 +70,7 @@ public class TestDateMapping {
@Test
public void testWriteCustomTypeSchemaType() throws Exception {
context = new AegisContext();
- Set<java.lang.reflect.Type> rootClasses = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> rootClasses = new HashSet<>();
rootClasses.add(BeanWithDate.class);
context.setRootClasses(rootClasses);
context.initialize();
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 3fb0041..57f9aab 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -71,7 +71,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
private static final Logger LOG = LogUtils.getL7dLogger(JAXBContextInitializer.class);
private Set<Class<?>> classes;
private Collection<Object> typeReferences;
- private Set<Class<?>> globalAdapters = new HashSet<Class<?>>();
+ private Set<Class<?>> globalAdapters = new HashSet<>();
private Map<String, Object> unmarshallerProperties;
JAXBContextInitializer(ServiceInfo serviceInfo,
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index c7e7a1a..243fe9d 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -221,7 +221,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
}
public JAXBDataBinding(Class<?>... classes) throws JAXBException {
- contextClasses = new LinkedHashSet<Class<?>>();
+ contextClasses = new LinkedHashSet<>();
contextClasses.addAll(Arrays.asList(classes));
setContext(createJAXBContext(contextClasses)); //NOPMD - specifically allow this
}
@@ -333,7 +333,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
return;
}
- contextClasses = new LinkedHashSet<Class<?>>();
+ contextClasses = new LinkedHashSet<>();
for (ServiceInfo serviceInfo : service.getServiceInfos()) {
JAXBContextInitializer initializer
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 4f8b5af..1f83fc7 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -193,7 +193,7 @@ public class JAXBDataBindingTest extends Assert {
Map<String, Object> contextProperties = new HashMap<>();
contextProperties.put("com.sun.xml.bind.defaultNamespaceRemap", "uri:ultima:thule");
db.setContextProperties(contextProperties);
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
classes.add(UnqualifiedBean.class);
db.setContext(db.createJAXBContext(classes));
DataWriter<XMLStreamWriter> writer = db.createWriter(XMLStreamWriter.class);
@@ -215,7 +215,7 @@ public class JAXBDataBindingTest extends Assert {
db.setNamespaceMap(nsMap);
Map<String, Object> contextProperties = new HashMap<>();
db.setContextProperties(contextProperties);
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
classes.add(QualifiedBean.class);
//have to fastboot to avoid conflicts of generated accessors
@@ -291,7 +291,7 @@ public class JAXBDataBindingTest extends Assert {
@Test
public void testResursiveType() throws Exception {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
Collection<Object> typeReferences = new ArrayList<>();
Map<String, Object> props = new HashMap<>();
JAXBContextInitializer init = new JAXBContextInitializer(null, classes, typeReferences, props);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index 762b62f..cb134eb 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -220,7 +220,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
Class<?> callbackCls = allCallbacks[i].getClass();
Collection<Class<?>> knownCallbacks = map.get(callbackCls);
if (knownCallbacks == null) {
- knownCallbacks = new HashSet<Class<?>>();
+ knownCallbacks = new HashSet<>();
map.put(callbackCls, knownCallbacks);
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
index f68faf8..f486854 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
@@ -52,7 +52,7 @@ public class ConfigurationImpl implements Configuration {
this.props.putAll(parent.getProperties());
this.runtimeType = parent.getRuntimeType();
- Set<Class<?>> providerClasses = new HashSet<Class<?>>(parent.getClasses());
+ Set<Class<?>> providerClasses = new HashSet<>(parent.getClasses());
for (Object o : parent.getInstances()) {
if (!(o instanceof Feature)) {
registerParentProvider(o, parent);
@@ -81,7 +81,7 @@ public class ConfigurationImpl implements Configuration {
@Override
public Set<Class<?>> getClasses() {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
for (Object o : getInstances()) {
classes.add(o.getClass());
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
index f692882..86e9888 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
@@ -181,7 +181,7 @@ public abstract class AbstractResourceInfo {
property = bus.getProperty(prop);
if (property == null && create) {
Map<Class<?>, Map<T, ThreadLocalProxy<?>>> map
- = new ConcurrentHashMap<Class<?>, Map<T, ThreadLocalProxy<?>>>(2);
+ = new ConcurrentHashMap<>(2);
bus.setProperty(prop, map);
property = map;
}
@@ -201,7 +201,7 @@ public abstract class AbstractResourceInfo {
Object property = bus.getProperty(CONSTRUCTOR_PROXY_MAP);
if (property == null) {
Map<Class<?>, Map<Class<?>, ThreadLocalProxy<?>>> map
- = new ConcurrentHashMap<Class<?>, Map<Class<?>, ThreadLocalProxy<?>>>(2);
+ = new ConcurrentHashMap<>(2);
bus.setProperty(CONSTRUCTOR_PROXY_MAP, map);
property = map;
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index 0882d4e..280ad13 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -96,7 +96,7 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
new HashSet<Class<?>>(Arrays.asList(InputStream.class,
OutputStream.class,
StreamingOutput.class));
- protected Set<Class<?>> collectionContextClasses = new HashSet<Class<?>>();
+ protected Set<Class<?>> collectionContextClasses = new HashSet<>();
protected Map<String, String> jaxbElementClassMap = Collections.emptyMap();
protected boolean unmarshalAsJaxbElement;
@@ -190,11 +190,11 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
JAXBContext context = null;
Set<Class<?>> allTypes = null;
if (cris != null) {
- allTypes = new HashSet<Class<?>>(ResourceUtils.getAllRequestResponseTypes(cris, true)
+ allTypes = new HashSet<>(ResourceUtils.getAllRequestResponseTypes(cris, true)
.getAllTypes().keySet());
context = ResourceUtils.createJaxbContext(allTypes, extraClass, cProperties);
} else if (extraClass != null) {
- allTypes = new HashSet<Class<?>>(Arrays.asList(extraClass));
+ allTypes = new HashSet<>(Arrays.asList(extraClass));
context = ResourceUtils.createJaxbContext(allTypes, null, cProperties);
}
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index 89b4970..691be86 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -85,7 +85,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
private static final Set<Class<?>> WELL_KNOWN_MULTIPART_CLASSES;
private static final Set<String> MULTIPART_SUBTYPES;
static {
- WELL_KNOWN_MULTIPART_CLASSES = new HashSet<Class<?>>();
+ WELL_KNOWN_MULTIPART_CLASSES = new HashSet<>();
WELL_KNOWN_MULTIPART_CLASSES.add(MultipartBody.class);
WELL_KNOWN_MULTIPART_CLASSES.add(Attachment.class);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index ca55251..e7466e0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -209,7 +209,7 @@ public abstract class ProviderFactory {
if (contextCls == null) {
return null;
}
- List<ContextResolver<T>> candidates = new LinkedList<ContextResolver<T>>();
+ List<ContextResolver<T>> candidates = new LinkedList<>();
for (ProviderInfo<ContextResolver<?>> cr : contextResolvers) {
Type[] types = cr.getProvider().getClass().getGenericInterfaces();
for (Type t : types) {
@@ -959,7 +959,7 @@ public abstract class ProviderFactory {
map.add(provider, entryName);
}
}
- List<ProviderInfo<T>> list = new LinkedList<ProviderInfo<T>>();
+ List<ProviderInfo<T>> list = new LinkedList<>();
for (Map.Entry<ProviderInfo<T>, List<String>> entry : map.entrySet()) {
List<String> values = entry.getValue();
if (names.containsAll(values)) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
index a9ccf78..d651b91 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
@@ -88,7 +88,7 @@ public final class ServerProviderFactory extends ProviderFactory {
private ApplicationInfo application;
private Set<DynamicFeature> dynamicFeatures = new LinkedHashSet<>();
- private Map<Class<?>, BeanParamInfo> beanParams = new ConcurrentHashMap<Class<?>, BeanParamInfo>();
+ private Map<Class<?>, BeanParamInfo> beanParams = new ConcurrentHashMap<>();
private ProviderInfo<ContainerRequestFilter> wadlGenerator;
private ServerProviderFactory(Bus bus) {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
index 45db499..7ad6030 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/AnnotationUtils.java
@@ -61,7 +61,7 @@ public final class AnnotationUtils {
private static Set<Class<?>> initParamAnnotationClasses() {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
classes.add(PathParam.class);
classes.add(QueryParam.class);
classes.add(MatrixParam.class);
@@ -73,7 +73,7 @@ public final class AnnotationUtils {
}
private static Set<Class<?>> initMethodAnnotationClasses() {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
classes.add(HttpMethod.class);
classes.add(Path.class);
classes.add(Produces.class);
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 8f766ba..1917c2b 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -164,7 +164,7 @@ public final class JAXRSUtils {
private static final String NO_CONTENT_EXCEPTION = "javax.ws.rs.core.NoContentException";
private static final String HTTP_CHARSET_PARAM = "charset";
private static final Annotation[] EMPTY_ANNOTATIONS = new Annotation[0];
- private static final Set<Class<?>> STREAMING_OUT_TYPES = new HashSet<Class<?>>(
+ private static final Set<Class<?>> STREAMING_OUT_TYPES = new HashSet<>(
Arrays.asList(InputStream.class, Reader.class, StreamingOutput.class));
private JAXRSUtils() {
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
index c43964f..89368f2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
@@ -410,7 +410,7 @@ public final class ResourceUtils {
}
public static Constructor<?> findResourceConstructor(Class<?> resourceClass, boolean perRequest) {
- List<Constructor<?>> cs = new LinkedList<Constructor<?>>();
+ List<Constructor<?>> cs = new LinkedList<>();
for (Constructor<?> c : resourceClass.getConstructors()) {
Class<?>[] params = c.getParameterTypes();
Annotation[][] anns = c.getParameterAnnotations();
@@ -870,7 +870,7 @@ public final class ResourceUtils {
Set<Object> singletons = app.getSingletons();
verifySingletons(singletons);
- List<Class<?>> resourceClasses = new ArrayList<Class<?>>();
+ List<Class<?>> resourceClasses = new ArrayList<>();
List<Object> providers = new ArrayList<>();
List<Feature> features = new ArrayList<>();
Map<Class<?>, ResourceProvider> map = new HashMap<>();
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
index a0b839f..cc73a20 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ClassResourceInfoTest.java
@@ -136,7 +136,7 @@ public class ClassResourceInfoTest extends Assert {
public void testGetHttpContexts() {
ClassResourceInfo c = new ClassResourceInfo(TestClass.class, true);
List<Field> fields = c.getContextFields();
- Set<Class<?>> clses = new HashSet<Class<?>>();
+ Set<Class<?>> clses = new HashSet<>();
for (Field f : fields) {
clses.add(f.getType());
}
@@ -266,7 +266,7 @@ public class ClassResourceInfoTest extends Assert {
public class TestApplication extends Application {
@Override
public Set<Class<?>> getClasses() {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
classes.add(TestClass.class);
return classes;
}
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index bd6d246..c365057 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -402,7 +402,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testWriteCollectionWithCustomPrefixes() throws Exception {
- JAXBElementProvider<List<TagVO2>> provider = new JAXBElementProvider<List<TagVO2>>();
+ JAXBElementProvider<List<TagVO2>> provider = new JAXBElementProvider<>();
provider.setNamespacePrefixes(
Collections.singletonMap("http://tags", "prefix"));
TagVO2 tag = new TagVO2("a", "b");
@@ -438,7 +438,7 @@ public class JAXBElementProviderTest extends Assert {
boolean marshalAsJaxbElement)
throws Exception {
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook> provider
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook>();
+ = new JAXBElementProvider<>();
if (!marshalAsJaxbElement) {
provider.setJaxbElementClassMap(Collections.singletonMap(
org.apache.cxf.jaxrs.fortest.jaxb.SuperBook.class.getName(),
@@ -461,7 +461,7 @@ public class JAXBElementProviderTest extends Assert {
public void testWriteCollectionWithoutXmlRootElement()
throws Exception {
JAXBElementProvider<List<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook>> provider
- = new JAXBElementProvider<List<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook>>();
+ = new JAXBElementProvider<>();
Map<String, String> prefixes = new HashMap<>();
prefixes.put("http://superbooks", "ns1");
@@ -493,7 +493,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testWriteWithoutXmlRootElementDerived() throws Exception {
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book> provider
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book>();
+ = new JAXBElementProvider<>();
provider.setJaxbElementClassMap(Collections.singletonMap(
org.apache.cxf.jaxrs.fortest.jaxb.Book.class.getName(), "Book"));
org.apache.cxf.jaxrs.fortest.jaxb.Book b =
@@ -551,7 +551,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testWriteWithoutXmlRootElementObjectFactory() throws Exception {
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook2> provider
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook2>();
+ = new JAXBElementProvider<>();
provider.setJaxbElementClassMap(Collections.singletonMap(
org.apache.cxf.jaxrs.fortest.jaxb.SuperBook2.class.getName(),
"{http://books}SuperBook2"));
@@ -564,7 +564,7 @@ public class JAXBElementProviderTest extends Assert {
new Annotation[0], MediaType.TEXT_XML_TYPE,
new MetadataMap<String, Object>(), bos);
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook2> provider2
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook2>();
+ = new JAXBElementProvider<>();
ByteArrayInputStream is = new ByteArrayInputStream(bos.toByteArray());
org.apache.cxf.jaxrs.fortest.jaxb.SuperBook2 book = provider2.readFrom(
org.apache.cxf.jaxrs.fortest.jaxb.SuperBook2.class,
@@ -576,7 +576,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testObjectFactoryExtraClass() throws Exception {
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book> provider
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book>();
+ = new JAXBElementProvider<>();
provider.setExtraClass(new Class[]{org.apache.cxf.jaxrs.fortest.jaxb.index.SuperBook3.class});
doTestObjectFactoryExtraClass(provider);
@@ -585,7 +585,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testObjectFactoryExtraClass2() throws Exception {
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book> provider
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book>();
+ = new JAXBElementProvider<>();
provider.setExtraClass(new Class[] {
org.apache.cxf.jaxrs.fortest.jaxb.Book.class,
org.apache.cxf.jaxrs.fortest.jaxb.index.SuperBook3.class});
@@ -608,7 +608,7 @@ public class JAXBElementProviderTest extends Assert {
new Annotation[0], MediaType.TEXT_XML_TYPE,
new MetadataMap<String, Object>(), bos);
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book> provider2
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book>();
+ = new JAXBElementProvider<>();
provider2.setExtraClass(new Class[]{org.apache.cxf.jaxrs.fortest.jaxb.index.SuperBook3.class});
ByteArrayInputStream is = new ByteArrayInputStream(bos.toByteArray());
@@ -668,7 +668,7 @@ public class JAXBElementProviderTest extends Assert {
private void readSuperBook2(String data, boolean unmarshalAsJaxbElement) throws Exception {
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook> provider
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook>();
+ = new JAXBElementProvider<>();
if (!unmarshalAsJaxbElement) {
provider.setJaxbElementClassMap(Collections.singletonMap(
org.apache.cxf.jaxrs.fortest.jaxb.SuperBook.class.getName(), "SuperBook"));
@@ -684,8 +684,8 @@ public class JAXBElementProviderTest extends Assert {
}
private void doTestWriteJAXBCollection(String mName) throws Exception {
- JAXBElementProvider<List<?>> provider = new JAXBElementProvider<List<?>>();
- List<JAXBElement<Book>> books = new ArrayList<JAXBElement<Book>>();
+ JAXBElementProvider<List<?>> provider = new JAXBElementProvider<>();
+ List<JAXBElement<Book>> books = new ArrayList<>();
books.add(new JAXBElement<Book>(new QName("Books"), Book.class, null,
new Book("CXF in Action", 123L)));
books.add(new JAXBElement<Book>(new QName("Books"), Book.class, null,
@@ -726,7 +726,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testWriteQualifiedCollection() throws Exception {
- JAXBElementProvider<List<TagVO2>> provider = new JAXBElementProvider<List<TagVO2>>();
+ JAXBElementProvider<List<TagVO2>> provider = new JAXBElementProvider<>();
provider.setCollectionWrapperName("{http://tags}tags");
List<TagVO2> tags = new ArrayList<>();
tags.add(new TagVO2("A", "B"));
@@ -916,7 +916,7 @@ public class JAXBElementProviderTest extends Assert {
public void testOutAttributesAsElementsForList() throws Exception {
//Provider
- JAXBElementProvider<List<?>> provider = new JAXBElementProvider<List<?>>();
+ JAXBElementProvider<List<?>> provider = new JAXBElementProvider<>();
provider.setMessageContext(new MessageContextImpl(createMessage()));
provider.setCollectionWrapperName("tagholders");
Map<String, String> map = new HashMap<>();
@@ -928,7 +928,7 @@ public class JAXBElementProviderTest extends Assert {
TagVO2 tag = new TagVO2("A", "B");
TagVO2Holder holder = new TagVO2Holder();
holder.setTag(tag);
- List<TagVO2Holder> list = new ArrayList<JAXBElementProviderTest.TagVO2Holder>();
+ List<TagVO2Holder> list = new ArrayList<>();
list.add(holder);
//ParameterizedType required for Lists of Objects
@@ -1395,7 +1395,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testPackageContextObjectFactory() {
JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book> p
- = new JAXBElementProvider<org.apache.cxf.jaxrs.fortest.jaxb.Book>();
+ = new JAXBElementProvider<>();
assertTrue(p.isReadable(org.apache.cxf.jaxrs.fortest.jaxb.Book.class,
org.apache.cxf.jaxrs.fortest.jaxb.Book.class,
new Annotation[]{}, MediaType.APPLICATION_XML_TYPE));
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
index 8531b4d..5b900f5 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
@@ -60,7 +60,7 @@ public final class WrapperClassGenerator extends ASMHelper {
public static final String DEFAULT_PACKAGE_NAME = "defaultnamespace";
private static final Logger LOG = LogUtils.getL7dLogger(WrapperClassGenerator.class);
- private Set<Class<?>> wrapperBeans = new LinkedHashSet<Class<?>>();
+ private Set<Class<?>> wrapperBeans = new LinkedHashSet<>();
private InterfaceInfo interfaceInfo;
private boolean qualified;
private JaxWsServiceFactoryBean factory;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
index 9b2d0a8..6fd7e88 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
@@ -59,11 +59,11 @@ public class HandlerChainInvoker {
private static final Logger LOG = LogUtils.getL7dLogger(HandlerChainInvoker.class);
- private final List<Handler<?>> protocolHandlers = new ArrayList<Handler<?>>();
- private List<LogicalHandler<?>> logicalHandlers = new ArrayList<LogicalHandler<?>>();
+ private final List<Handler<?>> protocolHandlers = new ArrayList<>();
+ private List<LogicalHandler<?>> logicalHandlers = new ArrayList<>();
- private final List<Handler<?>> invokedHandlers = new ArrayList<Handler<?>>();
- private final List<Handler<?>> closeHandlers = new ArrayList<Handler<?>>();
+ private final List<Handler<?>> invokedHandlers = new ArrayList<>();
+ private final List<Handler<?>> closeHandlers = new ArrayList<>();
private boolean outbound;
private boolean isRequestor;
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
index 702cc10..f0d4ff4 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
@@ -178,7 +178,7 @@ public class WrapperClassInInterceptor extends AbstractPhaseInterceptor<Message>
Class<?> wrapperClass) {
List<String> partNames = new ArrayList<>();
List<String> elTypeNames = new ArrayList<>();
- List<Class<?>> partClasses = new ArrayList<Class<?>>();
+ List<Class<?>> partClasses = new ArrayList<>();
QName wrapperName = null;
for (MessagePartInfo p : wrappedMessageInfo.getMessageParts()) {
if (wrapperClass == p.getTypeClass()) {
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
index fd98321..bd5e182 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
@@ -151,7 +151,7 @@ public class WrapperClassOutInterceptor extends AbstractPhaseInterceptor<Message
Class<?> wrapperClass) {
List<String> partNames = new ArrayList<>();
List<String> elTypeNames = new ArrayList<>();
- List<Class<?>> partClasses = new ArrayList<Class<?>>();
+ List<Class<?>> partClasses = new ArrayList<>();
QName wrapperName = null;
for (MessagePartInfo p : wrappedMessageInfo.getMessageParts()) {
if (p.getTypeClass() == wrapperClass) {
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
index 249b5ca..c7655a8 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
@@ -264,7 +264,7 @@ public class JaxWsServiceFactoryBean extends ReflectionServiceFactoryBean {
// Find the Async method whic has a Future & AsyncResultHandler
List<Class<?>> asyncHandlerParams = Arrays.asList(method.getParameterTypes());
//copy it to may it non-readonly
- asyncHandlerParams = new ArrayList<Class<?>>(asyncHandlerParams);
+ asyncHandlerParams = new ArrayList<>(asyncHandlerParams);
asyncHandlerParams.add(AsyncHandler.class);
Method futureMethod = ReflectionUtil
.getDeclaredMethod(method.getDeclaringClass(), method.getName() + "Async",
@@ -640,7 +640,7 @@ public class JaxWsServiceFactoryBean extends ReflectionServiceFactoryBean {
@Override
protected Set<Class<?>> getExtraClass() {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
wrapperClasses = generatedWrapperBeanClass();
if (wrapperClasses != null) {
classes.addAll(wrapperClasses);
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
index ce0c091..2bab7ae 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
@@ -74,7 +74,7 @@ public class LogicalHandlerInterceptorTest extends Assert {
@Test
public void testInterceptSuccess() {
- List<LogicalHandler<?>> list = new ArrayList<LogicalHandler<?>>();
+ List<LogicalHandler<?>> list = new ArrayList<>();
list.add(new LogicalHandler<LogicalMessageContext>() {
public void close(MessageContext arg0) {
}
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
index a2f9a4c..8294a56 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/AbstractSwaggerFeature.java
@@ -87,7 +87,7 @@ public abstract class AbstractSwaggerFeature extends AbstractFeature {
if (resourceInfos.size() == 1) {
setResourcePackage(resourceInfos.get(0).getServiceClass().getPackage().getName());
} else {
- List<Class<?>> serviceClasses = new ArrayList<Class<?>>(resourceInfos.size());
+ List<Class<?>> serviceClasses = new ArrayList<>(resourceInfos.size());
for (ClassResourceInfo cri : resourceInfos) {
serviceClasses.add(cri.getServiceClass());
}
diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/ApplicationBeanConfig.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/ApplicationBeanConfig.java
index b650975..77cf299 100644
--- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/ApplicationBeanConfig.java
+++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/ApplicationBeanConfig.java
@@ -32,7 +32,7 @@ public class ApplicationBeanConfig extends BeanConfig {
}
@Override
public Set<Class<?>> classes() {
- Set<Class<?>> allClasses = new HashSet<Class<?>>();
+ Set<Class<?>> allClasses = new HashSet<>();
allClasses.addAll(app.getClasses());
for (Object singleton : app.getSingletons()) {
allClasses.add(singleton.getClass());
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java
index 1b94428..0b70ac5 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/aegis/AbstractAegisProvider.java
@@ -92,7 +92,7 @@ public abstract class AbstractAegisProvider<T>
context = new AegisContext();
context.setWriteXsiTypes(writeXsiType);
context.setReadXsiTypes(readXsiType);
- Set<java.lang.reflect.Type> rootClasses = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> rootClasses = new HashSet<>();
rootClasses.add(reflectionType);
context.setRootClasses(rootClasses);
context.initialize();
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java
index fb77149..6030022 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/NoNamespaceAegisElementProvider.java
@@ -71,7 +71,7 @@ class NoNamespaceAegisElementProvider<T> extends AegisElementProvider<T> {
context.setReadXsiTypes(readXsiType);
TypeCreationOptions tco = new TypeCreationOptions();
tco.setQualifyElements(false);
- Set<java.lang.reflect.Type> rootClasses = new HashSet<java.lang.reflect.Type>();
+ Set<java.lang.reflect.Type> rootClasses = new HashSet<>();
rootClasses.add(genericType);
context.setTypeCreationOptions(tco);
context.setRootClasses(rootClasses);
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index e6e78fa..073caf2 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -191,8 +191,7 @@ public class JSONProviderTest extends Assert {
@Test
public void testWriteCollectionWithoutXmlRootElement()
throws Exception {
- JSONProvider<List<SuperBook>> provider
- = new JSONProvider<List<SuperBook>>();
+ JSONProvider<List<SuperBook>> provider = new JSONProvider<>();
provider.setCollectionWrapperName("{http://superbooks}SuperBooks");
provider.setJaxbElementClassMap(Collections.singletonMap(
SuperBook.class.getName(),
@@ -367,8 +366,7 @@ public class JSONProviderTest extends Assert {
private void doTestWriteCollectionParameterDef(boolean asJaxbElement)
throws Exception {
- JSONProvider<List<ReportDefinition>> provider
- = new JSONProvider<List<ReportDefinition>>();
+ JSONProvider<List<ReportDefinition>> provider = new JSONProvider<>();
provider.setMarshallAsJaxbElement(asJaxbElement);
provider.setUnmarshallAsJaxbElement(asJaxbElement);
ReportDefinition r = new ReportDefinition();
@@ -762,7 +760,7 @@ public class JSONProviderTest extends Assert {
public void doWriteQualifiedCollection(boolean drop, boolean serializeAsArray,
boolean ignoreNamespaces, String data)
throws Exception {
- JSONProvider<List<?>> p = new JSONProvider<List<?>>();
+ JSONProvider<List<?>> p = new JSONProvider<>();
p.setCollectionWrapperName("{http://tags}tag");
p.setDropCollectionWrapperElement(drop);
p.setSerializeAsArray(serializeAsArray);
@@ -800,7 +798,7 @@ public class JSONProviderTest extends Assert {
@Test
public void testWriteUnqualifiedCollection() throws Exception {
- JSONProvider<List<Book>> p = new JSONProvider<List<Book>>();
+ JSONProvider<List<Book>> p = new JSONProvider<>();
List<Book> books = new ArrayList<>();
books.add(new Book("CXF", 123L));
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -947,7 +945,7 @@ public class JSONProviderTest extends Assert {
Unmarshaller um = context.createUnmarshaller();
JAXBElement<?> jaxbEl = um.unmarshal(new StreamSource(is), Books.class);
- JSONProvider<JAXBElement<?>> p = new JSONProvider<JAXBElement<?>>();
+ JSONProvider<JAXBElement<?>> p = new JSONProvider<>();
p.setIgnoreMixedContent(ignore);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -1390,7 +1388,7 @@ public class JSONProviderTest extends Assert {
public void testOutAttributesAsElementsForList() throws Exception {
//Provider
- JSONProvider<List<?>> provider = new JSONProvider<List<?>>();
+ JSONProvider<List<?>> provider = new JSONProvider<>();
provider.setCollectionWrapperName("tagholders");
Map<String, String> map = new HashMap<>();
map.put("{http://tags}*", "*");
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java
index 0bc0d29..863994f 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/hbase/HBaseQueryVisitor.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
public class HBaseQueryVisitor<T> extends AbstractSearchConditionVisitor<T, Filter> {
- private Stack<List<Filter>> queryStack = new Stack<List<Filter>>();
+ private Stack<List<Filter>> queryStack = new Stack<>();
private String family;
private Map<String, String> familyMap;
public HBaseQueryVisitor(String family) {
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java
index eff9e76..96a6d30 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java
@@ -54,7 +54,7 @@ public abstract class AbstractJPATypedQueryVisitor<T, T1, E>
private Root<T> root;
private CriteriaBuilder builder;
private CriteriaQuery<T1> cq;
- private Stack<List<Predicate>> predStack = new Stack<List<Predicate>>();
+ private Stack<List<Predicate>> predStack = new Stack<>();
private boolean criteriaFinalized;
private Set<String> joinProperties;
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/JPACriteriaQueryVisitor.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/JPACriteriaQueryVisitor.java
index 9bc2153..3752c0f 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/JPACriteriaQueryVisitor.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/JPACriteriaQueryVisitor.java
@@ -141,7 +141,7 @@ public class JPACriteriaQueryVisitor<T, E> extends AbstractJPATypedQueryVisitor<
}
private List<Selection<?>> toSelectionsList(List<SingularAttribute<T, ?>> attributes, boolean setAlias) {
- List<Selection<?>> selections = new ArrayList<Selection<?>>(attributes.size());
+ List<Selection<?>> selections = new ArrayList<>(attributes.size());
for (SingularAttribute<T, ?> attr : attributes) {
Path<?> path = getRoot().get(attr);
path.alias(attr.getName());
diff --git a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
index a26bf53..569ac0d 100644
--- a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
+++ b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/sci/JaxrsServletContainerInitializer.java
@@ -108,7 +108,7 @@ public class JaxrsServletContainerInitializer implements ServletContainerInitial
app = new Application() {
@Override
public Set<Class<?>> getClasses() {
- Set<Class<?>> set = new HashSet<Class<?>>();
+ Set<Class<?>> set = new HashSet<>();
set.addAll(providersAndResources.get(Path.class));
set.addAll(providersAndResources.get(Provider.class));
return set;
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index 98fe722..347726a 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -231,7 +231,7 @@ public class JettyHTTPServerEngineFactoryHolder {
protected synchronized JAXBContext getContext(Class<?> cls) {
if (jaxbContext == null || jaxbClasses == null || !jaxbClasses.contains(cls)) {
try {
- Set<Class<?>> tmp = new HashSet<Class<?>>();
+ Set<Class<?>> tmp = new HashSet<>();
if (jaxbClasses != null) {
tmp.addAll(jaxbClasses);
}
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
index 48a1784..4fe1e9f 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
@@ -188,7 +188,7 @@ public class NettyHttpServerEngineFactoryHolder {
protected synchronized JAXBContext getContext(Class<?> cls) {
if (jaxbContext == null || jaxbClasses == null || !jaxbClasses.contains(cls)) {
try {
- Set<Class<?>> tmp = new HashSet<Class<?>>();
+ Set<Class<?>> tmp = new HashSet<>();
if (jaxbClasses != null) {
tmp.addAll(jaxbClasses);
}
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
index 0a2bfcf..cb225cb 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
@@ -206,7 +206,7 @@ public class UndertowHTTPServerEngineFactoryHolder {
protected synchronized JAXBContext getContext(Class<?> cls) {
if (jaxbContext == null || jaxbClasses == null || !jaxbClasses.contains(cls)) {
try {
- Set<Class<?>> tmp = new HashSet<Class<?>>();
+ Set<Class<?>> tmp = new HashSet<>();
if (jaxbClasses != null) {
tmp.addAll(jaxbClasses);
}
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
index 5d093a6..2ed44e2 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/CertConstraints.java
@@ -45,7 +45,7 @@ public class CertConstraints {
/**
* a collection of compiled regular expression patterns
*/
- private final Collection<Pattern> dnPatterns = new ArrayList<java.util.regex.Pattern>();
+ private final Collection<Pattern> dnPatterns = new ArrayList<>();
/**
* Creates a DNConstraints from a list of Strings
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
index 4fae87f..9c7799a 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
@@ -139,7 +139,7 @@ public class AssertionInfoMap extends HashMap<QName, Collection<AssertionInfo>>
}
public List<List<Assertion>> checkEffectivePolicy(Policy policy) {
- List<List<Assertion>> validated = new ArrayList<List<Assertion>>(4);
+ List<List<Assertion>> validated = new ArrayList<>(4);
List<QName> errors = new ArrayList<>();
Iterator<List<Assertion>> alternatives = policy.getAlternatives();
while (alternatives.hasNext()) {
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
index ece96b3..79b298c 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
@@ -897,7 +897,7 @@ public class RMTxStore implements RMStore {
DatabaseMetaData metadata = con.getMetaData();
ResultSet rs = metadata.getColumns(null, null, tableName, "%");
Set<String> dbCols = new HashSet<>();
- List<String[]> newCols = new ArrayList<String[]>();
+ List<String[]> newCols = new ArrayList<>();
while (rs.next()) {
dbCols.add(rs.getString(4));
}
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
index 10454dc..6bdfcf1 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/sts/provider/SecurityTokenServiceProvider.java
@@ -146,7 +146,7 @@ public class SecurityTokenServiceProvider implements Provider<Source> {
private WebServiceContext context;
public SecurityTokenServiceProvider() throws Exception {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
classes.add(ObjectFactory.class);
classes.add(org.apache.cxf.ws.security.sts.provider.model.wstrust14.ObjectFactory.class);
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
index b442d4c..3aea484 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/sts/STSClientTest.java
@@ -58,7 +58,7 @@ public class STSClientTest extends Assert {
@Test
public void testConfigureViaEPR() throws Exception {
- final Set<Class<?>> addressingClasses = new HashSet<Class<?>>();
+ final Set<Class<?>> addressingClasses = new HashSet<>();
addressingClasses.add(org.apache.cxf.ws.addressing.wsdl.ObjectFactory.class);
addressingClasses.add(org.apache.cxf.ws.addressing.ObjectFactory.class);
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
index ef5d5fe..b9cb8fd 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/DOMToStaxRoundTripTest.java
@@ -520,7 +520,7 @@ public class DOMToStaxRoundTripTest extends AbstractSecurityTest {
service.getInInterceptors().add(inhandler);
WSSSecurityProperties outProperties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
actions.add(WSSConstants.SIGNATURE_CONFIRMATION);
outProperties.setActions(actions);
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java
index ceb223b..52cb31c 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxCryptoCoverageCheckerTest.java
@@ -71,7 +71,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
@@ -121,7 +121,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
@@ -167,7 +167,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
@@ -222,7 +222,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -283,7 +283,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureUser("myalias");
@@ -327,7 +327,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
properties.setActions(actions);
@@ -369,7 +369,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -416,7 +416,7 @@ public class StaxCryptoCoverageCheckerTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java
index 8eb454d..69b98c1 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripActionTest.java
@@ -56,7 +56,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
Service service = createService();
WSSSecurityProperties inProperties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
inProperties.setActions(actions);
inProperties.setCallbackHandler(new TestPwdCallback());
@@ -75,7 +75,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
@@ -86,7 +86,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
assertEquals("test", echo.echo("test"));
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(XMLSecurityConstants.ENCRYPT);
inProperties.setActions(actions);
@@ -124,7 +124,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
@@ -159,7 +159,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
WSSSecurityProperties inProperties = new WSSSecurityProperties();
inProperties.setCallbackHandler(new TestPwdCallback());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
inProperties.setActions(actions);
Properties cryptoProperties =
@@ -177,7 +177,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
@@ -192,7 +192,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
assertEquals("test", echo.echo("test"));
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
actions.add(XMLSecurityConstants.SIGNATURE);
inProperties.setActions(actions);
@@ -261,7 +261,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
WSSSecurityProperties inProperties = new WSSSecurityProperties();
inProperties.setCallbackHandler(new TestPwdCallback());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
actions.add(WSSConstants.USERNAMETOKEN);
inProperties.setActions(actions);
@@ -280,7 +280,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
@@ -353,7 +353,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
inProperties.setCallbackHandler(new TestPwdCallback());
Properties cryptoProperties =
CryptoFactory.getProperties("insecurity.properties", this.getClass().getClassLoader());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
inProperties.setActions(actions);
inProperties.setSignatureVerificationCryptoProperties(cryptoProperties);
@@ -372,7 +372,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureUser("myalias");
@@ -386,7 +386,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
assertEquals("test", echo.echo("test"));
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
actions.add(XMLSecurityConstants.ENCRYPT);
inProperties.setActions(actions);
@@ -456,7 +456,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
Service service = createService();
WSSSecurityProperties inProperties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
inProperties.setActions(actions);
WSS4JStaxInInterceptor inhandler = new WSS4JStaxInInterceptor(inProperties);
@@ -471,7 +471,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
properties.setActions(actions);
@@ -515,7 +515,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
WSSSecurityProperties inProperties = new WSSSecurityProperties();
inProperties.setCallbackHandler(new TestPwdCallback());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(XMLSecurityConstants.SIGNATURE);
inProperties.setActions(actions);
@@ -534,7 +534,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -605,7 +605,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
WSSSecurityProperties inProperties = new WSSSecurityProperties();
inProperties.setCallbackHandler(new TestPwdCallback());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
actions.add(XMLSecurityConstants.SIGNATURE);
inProperties.setActions(actions);
@@ -625,7 +625,7 @@ public class StaxRoundTripActionTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
index e9a49b9..c6f7522 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxRoundTripTest.java
@@ -78,7 +78,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
@@ -176,7 +176,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
@@ -216,7 +216,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
@@ -259,7 +259,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
@@ -357,7 +357,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
@@ -397,7 +397,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
@@ -439,7 +439,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionSymAlgorithm(XMLSecurityConstants.NS_XENC_AES128);
@@ -507,7 +507,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
@@ -591,7 +591,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureUser("myalias");
@@ -664,7 +664,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -747,7 +747,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
properties.setActions(actions);
@@ -803,7 +803,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -887,7 +887,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureUser("alice");
@@ -964,7 +964,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -1034,7 +1034,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
service.getInInterceptors().add(inhandler);
WSSSecurityProperties outProperties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
actions.add(WSSConstants.SIGNATURE_CONFIRMATION);
outProperties.setActions(actions);
@@ -1055,7 +1055,7 @@ public class StaxRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- actions = new ArrayList<WSSConstants.Action>();
+ actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureUser("myalias");
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
index 0c592e9..640f983 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMEncryptionIdentifierTest.java
@@ -69,7 +69,7 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
@@ -108,7 +108,7 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
@@ -147,7 +147,7 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
@@ -187,7 +187,7 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
@@ -226,7 +226,7 @@ public class StaxToDOMEncryptionIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
index e9491d1..0536242 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
@@ -73,7 +73,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
@@ -171,7 +171,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
properties.setActions(actions);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
@@ -268,7 +268,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
@@ -336,7 +336,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
properties.setEncryptionUser("myalias");
@@ -432,7 +432,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(XMLSecurityConstants.ENCRYPT);
properties.setActions(actions);
@@ -516,7 +516,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureUser("myalias");
@@ -585,7 +585,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -670,7 +670,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
properties.setActions(actions);
@@ -763,7 +763,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -850,7 +850,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
actions.add(WSSConstants.TIMESTAMP);
properties.setActions(actions);
@@ -897,7 +897,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureUser("alice");
@@ -974,7 +974,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.ENCRYPT);
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
@@ -1064,7 +1064,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureUser("myalias");
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
index e0827d2..f4e60bb 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
@@ -69,7 +69,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureKeyIdentifier(
@@ -107,7 +107,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureKeyIdentifier(
@@ -145,7 +145,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureKeyIdentifier(
@@ -184,7 +184,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureKeyIdentifier(
@@ -223,7 +223,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(XMLSecurityConstants.SIGNATURE);
properties.setActions(actions);
properties.setSignatureKeyIdentifier(
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
index df1d7b0..f47c3de 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
@@ -84,7 +84,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SAML_TOKEN_UNSIGNED);
properties.setActions(actions);
properties.setSamlCallbackHandler(new SAML1CallbackHandler());
@@ -158,7 +158,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SAML_TOKEN_SIGNED);
properties.setActions(actions);
properties.setSamlCallbackHandler(new SAML1CallbackHandler());
@@ -240,7 +240,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SAML_TOKEN_UNSIGNED);
properties.setActions(actions);
properties.setSamlCallbackHandler(new SAML2CallbackHandler());
@@ -316,7 +316,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SAML_TOKEN_SIGNED);
properties.setActions(actions);
properties.setSamlCallbackHandler(new SAML2CallbackHandler());
@@ -400,7 +400,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SAML_TOKEN_SIGNED);
properties.setActions(actions);
SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
@@ -513,7 +513,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
client.getOutInterceptors().add(new LoggingOutInterceptor());
WSSSecurityProperties properties = new WSSSecurityProperties();
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SAML_TOKEN_SIGNED);
properties.setActions(actions);
SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index bcdc75a..6c4ea73 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -1459,7 +1459,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
}
private Map<Class<?>, Boolean> getJaxbAnnoMap(MessagePartInfo mpi) {
- Map<Class<?>, Boolean> map = new ConcurrentHashMap<Class<?>, Boolean>(4, 0.75f, 1);
+ Map<Class<?>, Boolean> map = new ConcurrentHashMap<>(4, 0.75f, 1);
Annotation[] anns = getMethodParameterAnnotations(mpi);
if (anns != null) {
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BadgerFishProvider.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BadgerFishProvider.java
index f42437f..d4906f2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BadgerFishProvider.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BadgerFishProvider.java
@@ -57,8 +57,7 @@ public final class BadgerFishProvider
implements MessageBodyReader<Object>, MessageBodyWriter<Object> {
- private static Map<Class<?>, JAXBContext> jaxbContexts
- = new WeakHashMap<Class<?>, JAXBContext>();
+ private static Map<Class<?>, JAXBContext> jaxbContexts = new WeakHashMap<>();
@Context
private HttpHeaders requestHeaders;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
index 2297900..605d5a6 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication.java
@@ -58,7 +58,7 @@ public class BookApplication extends Application {
@Override
public Set<Class<?>> getClasses() {
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
classes.add(org.apache.cxf.systest.jaxrs.BookStorePerRequest.class);
classes.add(org.apache.cxf.systest.jaxrs.jaxws.BookStoreJaxrsJaxws.class);
classes.add(org.apache.cxf.systest.jaxrs.RuntimeExceptionMapper.class);
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index aa29b97..5067ba4 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -457,7 +457,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
wc.accept(mt).type(mt);
GenericEntity<List<Book>> collectionEntity = createGenericEntity();
- final Holder<List<Book>> holder = new Holder<List<Book>>();
+ final Holder<List<Book>> holder = new Holder<>();
InvocationCallback<List<Book>> callback = new CustomInvocationCallback(holder);
Future<List<Book>> future = wc.async().post(Entity.entity(collectionEntity, mt),
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 76a1b5b..a57c9e8 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -342,7 +342,7 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
public void failed(Throwable error) {
}
};
- List<InvocationCallback<?>> callbacks = new ArrayList<InvocationCallback<?>>();
+ List<InvocationCallback<?>> callbacks = new ArrayList<>();
callbacks.add(bookCallback);
callbacks.add(booleanCallback);
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/Server.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/Server.java
index 23818da..c2c6073 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/Server.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/Server.java
@@ -38,7 +38,7 @@ public class Server extends AbstractBusTestServerBase {
public static final String ADDRESS3 = "http://localhost:" + PORT3 + "/work/rest";
- List<org.apache.cxf.endpoint.Server> servers = new ArrayList<org.apache.cxf.endpoint.Server>();
+ List<org.apache.cxf.endpoint.Server> servers = new ArrayList<>();
protected void run() {
createEndpoint(ADDRESS2);
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
index 18cef94..bae0237 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
@@ -578,7 +578,7 @@ public class ClientServerTest extends AbstractBusClientServerTestBase {
assertEquals(((TestExecutor)executor).getCount(), 0);
Greeter greeter = service.getPort(portName, Greeter.class);
updateAddressPort(greeter, PORT);
- List<Response<GreetMeResponse>> responses = new ArrayList<Response<GreetMeResponse>>();
+ List<Response<GreetMeResponse>> responses = new ArrayList<>();
for (int i = 0; i < 5; i++) {
responses.add(greeter.greetMeAsync("asyn call" + i));
}
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
index 6d24c0d..6fc423c 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
@@ -69,7 +69,7 @@ public class ServerMisc extends AbstractBusTestServerBase {
"http://localhost:" + PORT + "/XMLBindingCodeFirstService/";
- List<org.apache.cxf.endpoint.Server> servers = new LinkedList<org.apache.cxf.endpoint.Server>();
+ List<org.apache.cxf.endpoint.Server> servers = new LinkedList<>();
List<Endpoint> endpoints = new LinkedList<>();
public void tearDown() throws Exception {
for (org.apache.cxf.endpoint.Server s : servers) {
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
index 814f750..31f15f0 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
@@ -68,7 +68,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
setAddress(port, "http://localhost:" + serverPort + "/swa-nomime");
Holder<String> textHolder = new Holder<>("Hi");
- Holder<byte[]> data = new Holder<byte[]>("foobar".getBytes());
+ Holder<byte[]> data = new Holder<>("foobar".getBytes());
port.echoData(textHolder, data);
String string = IOUtils.newStringFromBytes(data.value);
@@ -84,8 +84,8 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
Holder<String> attach1 = new Holder<>(IOUtils.toString(url1.openStream()));
Holder<String> attach2 = new Holder<>(IOUtils.toString(url2.openStream()));
Holder<String> attach3 = new Holder<>(IOUtils.toString(url3.openStream()));
- Holder<byte[]> attach4 = new Holder<byte[]>(IOUtils.readBytesFromStream(url4.openStream()));
- Holder<byte[]> attach5 = new Holder<byte[]>(IOUtils.readBytesFromStream(url5.openStream()));
+ Holder<byte[]> attach4 = new Holder<>(IOUtils.readBytesFromStream(url4.openStream()));
+ Holder<byte[]> attach5 = new Holder<>(IOUtils.readBytesFromStream(url5.openStream()));
org.apache.cxf.swa_nomime.types.VoidRequest request
= new org.apache.cxf.swa_nomime.types.VoidRequest();
org.apache.cxf.swa_nomime.types.OutputResponseAll response
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
index 9c38aaa..4ddb42b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java
@@ -81,7 +81,7 @@ public class MTOMBindingTypeTest extends AbstractBusClientServerTestBase {
ByteArrayOutputStream input = setupInLogging();
ByteArrayOutputStream output = setupOutLogging();
- Holder<byte[]> photo = new Holder<byte[]>("CXF".getBytes());
+ Holder<byte[]> photo = new Holder<>("CXF".getBytes());
Holder<Image> image = new Holder<>(getImage("/java.jpg"));
Hello port = getPort();
@@ -104,7 +104,7 @@ public class MTOMBindingTypeTest extends AbstractBusClientServerTestBase {
@org.junit.Ignore
public void testEcho() throws Exception {
byte[] bytes = ImageHelper.getImageBytes(getImage("/java.jpg"), "image/jpeg");
- Holder<byte[]> image = new Holder<byte[]>(bytes);
+ Holder<byte[]> image = new Holder<>(bytes);
Hello port = getPort();
SOAPBinding binding = (SOAPBinding) ((BindingProvider)port).getBinding();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
index b43da4d..f8aee39 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java
@@ -59,7 +59,7 @@ public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase
@Test
public void testDetail() throws Exception {
- Holder<byte[]> photo = new Holder<byte[]>("CXF".getBytes());
+ Holder<byte[]> photo = new Holder<>("CXF".getBytes());
Holder<Image> image = new Holder<>(getImage("/java.jpg"));
port.detail(photo, image);
assertEquals("CXF", new String(photo.value));
@@ -69,7 +69,7 @@ public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase
@Test
public void testEcho() throws Exception {
byte[] bytes = ImageHelper.getImageBytes(getImage("/java.jpg"), "image/jpeg");
- Holder<byte[]> image = new Holder<byte[]>(bytes);
+ Holder<byte[]> image = new Holder<>(bytes);
port.echoData(image);
assertNotNull(image);
}
@@ -97,7 +97,7 @@ public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase
((BindingProvider)port).getRequestContext()
.put(LocalConduit.DIRECT_DISPATCH, Boolean.TRUE);
- Holder<byte[]> photo = new Holder<byte[]>("CXF".getBytes());
+ Holder<byte[]> photo = new Holder<>("CXF".getBytes());
Holder<Image> image = new Holder<>(getImage("/java.jpg"));
port.detail(photo, image);
assertEquals("CXF", new String(photo.value));
@@ -106,7 +106,7 @@ public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase
((BindingProvider)port).getRequestContext()
.put(LocalConduit.DIRECT_DISPATCH, Boolean.FALSE);
- photo = new Holder<byte[]>("CXF".getBytes());
+ photo = new Holder<>("CXF".getBytes());
image = new Holder<>(getImage("/java.jpg"));
port.detail(photo, image);
assertEquals("CXF", new String(photo.value));
@@ -117,7 +117,7 @@ public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase
public void testEchoWithLowThreshold() throws Exception {
ByteArrayOutputStream bout = this.setupOutLogging();
byte[] bytes = ImageHelper.getImageBytes(getImage("/java.jpg"), "image/jpeg");
- Holder<byte[]> image = new Holder<byte[]>(bytes);
+ Holder<byte[]> image = new Holder<>(bytes);
Hello hello = this.getPort(500);
hello.echoData(image);
assertTrue("MTOM should be enabled", bout.toString().indexOf("<xop:Include") > -1);
@@ -127,7 +127,7 @@ public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase
public void testEchoWithHighThreshold() throws Exception {
ByteArrayOutputStream bout = this.setupOutLogging();
byte[] bytes = ImageHelper.getImageBytes(getImage("/java.jpg"), "image/jpeg");
- Holder<byte[]> image = new Holder<byte[]>(bytes);
+ Holder<byte[]> image = new Holder<>(bytes);
Hello hello = this.getPort(2000);
hello.echoData(image);
assertTrue("MTOM should not be enabled", bout.toString().indexOf("<xop:Include") == -1);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
index 17e1926..c13a15d 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
@@ -1035,8 +1035,8 @@ public abstract class AbstractTypeTestClient
if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("123:abc");
List<String> yOrig = Arrays.asList("abc.-_:", "a");
- Holder<List<String>> y = new Holder<List<String>>(yOrig);
- Holder<List<String>> z = new Holder<List<String>>();
+ Holder<List<String>> y = new Holder<>(yOrig);
+ Holder<List<String>> z = new Holder<>();
List<String> ret = testXMLBinding ? xmlClient.testNMTOKENS(x, y, z) : docClient.testNMTOKENS(x, y, z);
assertTrue("testNMTOKENS(): Incorrect value for inout param", x.equals(y.value));
assertTrue("testNMTOKENS(): Incorrect value for out param", yOrig.equals(z.value));
@@ -1048,8 +1048,8 @@ public abstract class AbstractTypeTestClient
yOrig[0] = "abc.-_:";
yOrig[1] = "a";
- Holder<String[]> y = new Holder<String[]>(yOrig);
- Holder<String[]> z = new Holder<String[]>();
+ Holder<String[]> y = new Holder<>(yOrig);
+ Holder<String[]> z = new Holder<>();
String[] ret = rpcClient.testNMTOKENS(x, y, z);
assertTrue("testNMTOKENS(): Incorrect value for inout param", Arrays.equals(x, y.value));
@@ -1304,9 +1304,9 @@ public abstract class AbstractTypeTestClient
return;
}
byte[] x = "hello".getBytes();
- Holder<byte[]> y = new Holder<byte[]>("goodbye".getBytes());
- Holder<byte[]> yOriginal = new Holder<byte[]>("goodbye".getBytes());
- Holder<byte[]> z = new Holder<byte[]>();
+ Holder<byte[]> y = new Holder<>("goodbye".getBytes());
+ Holder<byte[]> yOriginal = new Holder<>("goodbye".getBytes());
+ Holder<byte[]> z = new Holder<>();
byte[] ret;
if (testDocLiteral) {
ret = docClient.testHexBinary(x, y, z);
@@ -1329,9 +1329,9 @@ public abstract class AbstractTypeTestClient
return;
}
byte[] x = "hello".getBytes();
- Holder<byte[]> y = new Holder<byte[]>("goodbye".getBytes());
- Holder<byte[]> yOriginal = new Holder<byte[]>("goodbye".getBytes());
- Holder<byte[]> z = new Holder<byte[]>();
+ Holder<byte[]> y = new Holder<>("goodbye".getBytes());
+ Holder<byte[]> yOriginal = new Holder<>("goodbye".getBytes());
+ Holder<byte[]> z = new Holder<>();
byte[] ret;
if (testDocLiteral) {
ret = docClient.testBase64Binary(x, y, z);
@@ -1349,8 +1349,8 @@ public abstract class AbstractTypeTestClient
// Test uninitialized holder value
try {
- y = new Holder<byte[]>();
- z = new Holder<byte[]>();
+ y = new Holder<>();
+ z = new Holder<>();
if (testDocLiteral) {
docClient.testBase64Binary(x, y, z);
} else if (testXMLBinding) {
@@ -1879,8 +1879,8 @@ public abstract class AbstractTypeTestClient
// normal case, maxLength=10 && minLength=1
byte[] x = "x".getBytes();
byte[] yOrig = "string_yyy".getBytes();
- Holder<byte[]> y = new Holder<byte[]>(yOrig);
- Holder<byte[]> z = new Holder<byte[]>();
+ Holder<byte[]> y = new Holder<>(yOrig);
+ Holder<byte[]> z = new Holder<>();
byte[] ret;
if (testDocLiteral) {
@@ -1900,8 +1900,8 @@ public abstract class AbstractTypeTestClient
if (testDocLiteral || testXMLBinding) {
// abnormal case
x = "".getBytes();
- y = new Holder<byte[]>(yOrig);
- z = new Holder<byte[]>();
+ y = new Holder<>(yOrig);
+ z = new Holder<>();
try {
ret = docClient.testHexBinaryRestriction(x, y, z);
fail("maxLength=10 && minLength=1 restriction is violated.");
@@ -1912,8 +1912,8 @@ public abstract class AbstractTypeTestClient
// abnormal case
x = "string_x".getBytes();
yOrig = "string_yyyyyy".getBytes();
- y = new Holder<byte[]>(yOrig);
- z = new Holder<byte[]>();
+ y = new Holder<>(yOrig);
+ z = new Holder<>();
try {
ret = testDocLiteral ? docClient.testHexBinaryRestriction(x, y, z) : xmlClient
.testHexBinaryRestriction(x, y, z);
@@ -1937,8 +1937,8 @@ public abstract class AbstractTypeTestClient
}
byte[] x = "string_xxx".getBytes();
byte[] yOrig = "string_yyy".getBytes();
- Holder<byte[]> y = new Holder<byte[]>(yOrig);
- Holder<byte[]> z = new Holder<byte[]>();
+ Holder<byte[]> y = new Holder<>(yOrig);
+ Holder<byte[]> z = new Holder<>();
byte[] ret;
if (testDocLiteral) {
@@ -1959,8 +1959,8 @@ public abstract class AbstractTypeTestClient
if (testDocLiteral) {
// abnormal case
x = "string_xxxxx".getBytes();
- y = new Holder<byte[]>(yOrig);
- z = new Holder<byte[]>();
+ y = new Holder<>(yOrig);
+ z = new Holder<>();
try {
ret = docClient.testBase64BinaryRestriction(x, y, z);
fail("length=10 restriction is violated.");
@@ -1978,8 +1978,8 @@ public abstract class AbstractTypeTestClient
if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("I", "am", "SimpleList");
List<String> yOrig = Arrays.asList("Does", "SimpleList", "Work");
- Holder<List<String>> y = new Holder<List<String>>(yOrig);
- Holder<List<String>> z = new Holder<List<String>>();
+ Holder<List<String>> y = new Holder<>(yOrig);
+ Holder<List<String>> z = new Holder<>();
List<String> ret = testDocLiteral ? docClient.testSimpleListRestriction2(x, y, z) : xmlClient
.testSimpleListRestriction2(x, y, z);
if (!perfTestOnly) {
@@ -1988,8 +1988,8 @@ public abstract class AbstractTypeTestClient
assertTrue("testStringList(): Incorrect return value", x.equals(ret));
}
x = new ArrayList<>();
- y = new Holder<List<String>>(yOrig);
- z = new Holder<List<String>>();
+ y = new Holder<>(yOrig);
+ z = new Holder<>();
try {
ret = testDocLiteral ? docClient.testSimpleListRestriction2(x, y, z) : xmlClient
.testSimpleListRestriction2(x, y, z);
@@ -2000,8 +2000,8 @@ public abstract class AbstractTypeTestClient
} else {
String[] x = {"I", "am", "SimpleList"};
String[] yOrig = {"Does", "SimpleList", "Work"};
- Holder<String[]> y = new Holder<String[]>(yOrig);
- Holder<String[]> z = new Holder<String[]>();
+ Holder<String[]> y = new Holder<>(yOrig);
+ Holder<String[]> z = new Holder<>();
// normal case, maxLength=10 && minLength=1
String[] ret = rpcClient.testSimpleListRestriction2(x, y, z);
@@ -2027,8 +2027,8 @@ public abstract class AbstractTypeTestClient
if (testDocLiteral || testXMLBinding) {
List<String> x = Arrays.asList("I", "am", "SimpleList");
List<String> yOrig = Arrays.asList("Does", "SimpleList", "Work");
- Holder<List<String>> y = new Holder<List<String>>(yOrig);
- Holder<List<String>> z = new Holder<List<String>>();
+ Holder<List<String>> y = new Holder<>(yOrig);
+ Holder<List<String>> z = new Holder<>();
List<String> ret = testDocLiteral ? docClient.testStringList(x, y, z) : xmlClient
.testStringList(x, y, z);
@@ -2047,8 +2047,8 @@ public abstract class AbstractTypeTestClient
} else {
String[] x = {"I", "am", "SimpleList"};
String[] yOrig = {"Does", "SimpleList", "Work"};
- Holder<String[]> y = new Holder<String[]>(yOrig);
- Holder<String[]> z = new Holder<String[]>();
+ Holder<String[]> y = new Holder<>(yOrig);
+ Holder<String[]> z = new Holder<>();
String[] ret = rpcClient.testStringList(x, y, z);
@@ -2073,8 +2073,8 @@ public abstract class AbstractTypeTestClient
if (testDocLiteral || testXMLBinding) {
List<Integer> x = Arrays.asList(1, 2, 3);
List<Integer> yOrig = Arrays.asList(10, 100, 1000);
- Holder<List<Integer>> y = new Holder<List<Integer>>(yOrig);
- Holder<List<Integer>> z = new Holder<List<Integer>>();
+ Holder<List<Integer>> y = new Holder<>(yOrig);
+ Holder<List<Integer>> z = new Holder<>();
List<Integer> ret = testDocLiteral ? docClient.testNumberList(x, y, z) : xmlClient
.testNumberList(x, y, z);
@@ -2086,8 +2086,8 @@ public abstract class AbstractTypeTestClient
} else {
Integer[] x = {1, 2, 3};
Integer[] yOrig = {10, 100, 1000};
- Holder<Integer[]> y = new Holder<Integer[]>(yOrig);
- Holder<Integer[]> z = new Holder<Integer[]>();
+ Holder<Integer[]> y = new Holder<>(yOrig);
+ Holder<Integer[]> z = new Holder<>();
Integer[] ret = rpcClient.testNumberList(x, y, z);
@@ -2116,8 +2116,8 @@ public abstract class AbstractTypeTestClient
List<QName> yOrig = Arrays.asList(new QName("http://schemas.iona.com/type_test", "testqname4"),
new QName("http://schemas.iona.com/type_test", "testqname5"),
new QName("http://schemas.iona.com/type_test", "testqname6"));
- Holder<List<QName>> y = new Holder<List<QName>>(yOrig);
- Holder<List<QName>> z = new Holder<List<QName>>();
+ Holder<List<QName>> y = new Holder<>(yOrig);
+ Holder<List<QName>> z = new Holder<>();
List<QName> ret = testDocLiteral ? docClient.testQNameList(x, y, z) : xmlClient.testQNameList(x,
y,
@@ -2134,8 +2134,8 @@ public abstract class AbstractTypeTestClient
QName[] yOrig = {new QName("http://schemas.iona.com/type_test", "testqname4"),
new QName("http://schemas.iona.com/type_test", "testqname5"),
new QName("http://schemas.iona.com/type_test", "testqname6")};
- Holder<QName[]> y = new Holder<QName[]>(yOrig);
- Holder<QName[]> z = new Holder<QName[]>();
+ Holder<QName[]> y = new Holder<>(yOrig);
+ Holder<QName[]> z = new Holder<>();
QName[] ret = rpcClient.testQNameList(x, y, z);
@@ -2161,8 +2161,8 @@ public abstract class AbstractTypeTestClient
List<String> x = Arrays.asList("5", "-7");
List<String> yOrig = Arrays.asList("-9", "7");
- Holder<List<String>> y = new Holder<List<String>>(yOrig);
- Holder<List<String>> z = new Holder<List<String>>();
+ Holder<List<String>> y = new Holder<>(yOrig);
+ Holder<List<String>> z = new Holder<>();
List<String> ret = testDocLiteral ? docClient.testSimpleUnionList(x, y, z) : xmlClient
.testSimpleUnionList(x, y, z);
@@ -2175,8 +2175,8 @@ public abstract class AbstractTypeTestClient
String[] x = {"5", "-7"};
String[] yOrig = {"-9", "7"};
- Holder<String[]> y = new Holder<String[]>(yOrig);
- Holder<String[]> z = new Holder<String[]>();
+ Holder<String[]> y = new Holder<>(yOrig);
+ Holder<String[]> z = new Holder<>();
String[] ret = rpcClient.testSimpleUnionList(x, y, z);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
index c241ed6..cfe7ba2 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
@@ -2226,8 +2226,8 @@ public abstract class AbstractTypeTestClient3 extends AbstractTypeTestClient2 {
List<Short> x = Arrays.asList((short)10, (short)100);
List<Short> yOrig = Arrays.asList((short)1000, (short)10);
- Holder<List<Short>> y = new Holder<List<Short>>(yOrig);
- Holder<List<Short>> z = new Holder<List<Short>>();
+ Holder<List<Short>> y = new Holder<>(yOrig);
+ Holder<List<Short>> z = new Holder<>();
List<Short> ret = testDocLiteral ? docClient.testAnonEnumList(x, y, z) : xmlClient
.testAnonEnumList(x, y, z);
@@ -2240,8 +2240,8 @@ public abstract class AbstractTypeTestClient3 extends AbstractTypeTestClient2 {
Short[] x = {(short)10, (short)100};
Short[] yOrig = {(short)1000, (short)10};
- Holder<Short[]> y = new Holder<Short[]>(yOrig);
- Holder<Short[]> z = new Holder<Short[]>();
+ Holder<Short[]> y = new Holder<>(yOrig);
+ Holder<Short[]> z = new Holder<>();
Short[] ret = rpcClient.testAnonEnumList(x, y, z);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
index 5105f3d..6c62762 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient4.java
@@ -1799,8 +1799,8 @@ public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
List<String> yOrig = Arrays.asList("I", "am", "SimpleList");
// Invoke testUnionWithStringList
- Holder<List<String>> y = new Holder<List<String>>(yOrig);
- Holder<List<String>> z = new Holder<List<String>>();
+ Holder<List<String>> y = new Holder<>(yOrig);
+ Holder<List<String>> z = new Holder<>();
List<String> ret = testDocLiteral ? docClient.testUnionWithStringList(x, y, z)
: xmlClient.testUnionWithStringList(x, y, z);
if (!perfTestOnly) {
@@ -1814,8 +1814,8 @@ public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
String[] x = {"5"};
String[] yOrig = {"I", "am", "SimpleList"};
- Holder<String[]> y = new Holder<String[]>(yOrig);
- Holder<String[]> z = new Holder<String[]>();
+ Holder<String[]> y = new Holder<>(yOrig);
+ Holder<String[]> z = new Holder<>();
String[] ret = rpcClient.testUnionWithStringList(x, y, z);
if (!perfTestOnly) {
@@ -1841,8 +1841,8 @@ public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
List<String> yOrig = Arrays.asList("I", "am", "SimpleList");
// Invoke testUnionWithStringListRestriction
- Holder<List<String>> y = new Holder<List<String>>(yOrig);
- Holder<List<String>> z = new Holder<List<String>>();
+ Holder<List<String>> y = new Holder<>(yOrig);
+ Holder<List<String>> z = new Holder<>();
List<String> ret = testDocLiteral ? docClient.testUnionWithStringListRestriction(x, y, z)
: xmlClient.testUnionWithStringListRestriction(x, y, z);
if (!perfTestOnly) {
@@ -1856,8 +1856,8 @@ public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
String[] x = {"5"};
String[] yOrig = {"I", "am", "SimpleList"};
- Holder<String[]> y = new Holder<String[]>(yOrig);
- Holder<String[]> z = new Holder<String[]>();
+ Holder<String[]> y = new Holder<>(yOrig);
+ Holder<String[]> z = new Holder<>();
String[] ret = rpcClient.testUnionWithStringListRestriction(x, y, z);
if (!perfTestOnly) {
@@ -1888,8 +1888,8 @@ public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
"12.78e-2", "12", "-0", "INF");
// Invoke testUnionWithAnonList
- Holder<List<String>> y = new Holder<List<String>>(yOrig);
- Holder<List<String>> z = new Holder<List<String>>();
+ Holder<List<String>> y = new Holder<>(yOrig);
+ Holder<List<String>> z = new Holder<>();
List<String> ret = testDocLiteral ? docClient.testUnionWithAnonList(x, y, z)
: xmlClient.testUnionWithAnonList(x, y, z);
if (!perfTestOnly) {
@@ -1903,8 +1903,8 @@ public abstract class AbstractTypeTestClient4 extends AbstractTypeTestClient3 {
//String[] yOrig = {"0.5f", "1.5f", "2.5f"};
String[] yOrig = {"-1E4", "1267.43233E12", "12.78e-2", "12", "-0", "INF"};
- Holder<String[]> y = new Holder<String[]>(yOrig);
- Holder<String[]> z = new Holder<String[]>();
+ Holder<String[]> y = new Holder<>(yOrig);
+ Holder<String[]> z = new Holder<>();
String[] ret = rpcClient.testUnionWithStringListRestriction(x, y, z);
if (!perfTestOnly) {
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/recorders/InMessageRecorder.java b/testutils/src/main/java/org/apache/cxf/testutil/recorders/InMessageRecorder.java
index bc875b8..5805136 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/recorders/InMessageRecorder.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/recorders/InMessageRecorder.java
@@ -40,7 +40,7 @@ public class InMessageRecorder extends AbstractPhaseInterceptor<Message> {
public InMessageRecorder() {
super(Phase.RECEIVE);
- inbound = new CopyOnWriteArrayList<byte[]>();
+ inbound = new CopyOnWriteArrayList<>();
}
public void handleMessage(Message message) throws Fault {
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java b/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
index b4b5bff..df797c7 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
@@ -45,7 +45,7 @@ public class OutMessageRecorder extends AbstractPhaseInterceptor<Message> {
public OutMessageRecorder() {
super(Phase.PREPARE_SEND);
- outbound = new CopyOnWriteArrayList<byte[]>();
+ outbound = new CopyOnWriteArrayList<>();
addAfter(MessageSenderInterceptor.class.getName());
}
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
index ad216ae..82d2ba5 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
@@ -46,7 +46,7 @@ public final class FaultBeanGenerator extends BeanGenerator {
}
protected Collection<JavaClass> generateBeanClasses(final ServiceInfo serviceInfo) {
- Set<Class<?>> exceptionClasses = new HashSet<Class<?>>();
+ Set<Class<?>> exceptionClasses = new HashSet<>();
String seiPackageName = null;
for (OperationInfo op : serviceInfo.getInterface().getOperations()) {
Method method = (Method) op.getProperty("operation.method");
@@ -67,7 +67,7 @@ public final class FaultBeanGenerator extends BeanGenerator {
}
protected Set<Class<?>> getExceptionClasses(final Method method) {
- Set<Class<?>> exps = new HashSet<Class<?>>();
+ Set<Class<?>> exps = new HashSet<>();
final Class<?>[] exceptionClasses = method.getExceptionTypes();
for (int i = 0; i < exceptionClasses.length; i++) {
boolean exclude = false;
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
index 21d15b2..10a23c0 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
@@ -55,7 +55,7 @@ public class JavaToWSDLProcessor implements Processor {
private static final String DEFAULT_ADDRESS = "http://localhost:9090/hello";
private static final String JAVA_CLASS_PATH = "java.class.path";
private ToolContext context;
- private final List<AbstractGenerator<?>> generators = new ArrayList<AbstractGenerator<?>>();
+ private final List<AbstractGenerator<?>> generators = new ArrayList<>();
private void customize(ServiceInfo service) {
if (context.containsKey(ToolConstants.CFG_TNS)) {
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
index 836d3e4..fd9493d 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
@@ -107,7 +107,7 @@ public class FaultBeanGeneratorTest extends ProcessorTestBase {
public void testGetExceptionClasses() throws Exception {
Class<?> seiClass = Class.forName("org.apache.hello_world.Greeter");
FaultBeanGenerator generator = new FaultBeanGenerator();
- Set<Class<?>> classes = new HashSet<Class<?>>();
+ Set<Class<?>> classes = new HashSet<>();
for (Method method : seiClass.getMethods()) {
classes.addAll(generator.getExceptionClasses(method));
}
diff --git a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java
index f3b89cf..fd9ee8b 100644
--- a/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java
+++ b/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/WADLToJavaTest.java
@@ -102,7 +102,7 @@ public class WADLToJavaTest extends ProcessorTestBase {
URLClassLoader cl = new URLClassLoader(new URL[] {output.toURI().toURL()},
Thread.currentThread().getContextClassLoader());
- List<Class<?>> files = new ArrayList<Class<?>>(4);
+ List<Class<?>> files = new ArrayList<>(4);
files.add(cl.loadClass("superbooks.EnumType"));
files.add(cl.loadClass("superbooks.Book"));
files.add(cl.loadClass("superbooks.TheBook2"));