http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java b/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java index 5ebc1c3..bebea75 100644 --- a/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java +++ b/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java @@ -91,7 +91,7 @@ public class WeakIdentityHashMap<K, V> implements Map<K, V> { } public Set<K> keySet() { reap(); - Set<K> ret = new HashSet<K>(); + Set<K> ret = new HashSet<>(); for (IdentityWeakReference ref : backingStore.keySet()) { ret.add(ref.get()); }
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java index a9b6a1c..a66aceb 100644 --- a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java +++ b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java @@ -276,7 +276,7 @@ public class SchemaCollection { if (schemaType != null) { Set<XmlSchemaType> xmlTypesCheckedForCrossImports; if (!xmlTypesCheckedForCrossImportsPerSchema.containsKey(schema)) { - xmlTypesCheckedForCrossImports = new HashSet<XmlSchemaType>(); + xmlTypesCheckedForCrossImports = new HashSet<>(); xmlTypesCheckedForCrossImportsPerSchema.put(schema, xmlTypesCheckedForCrossImports); } else { xmlTypesCheckedForCrossImports = xmlTypesCheckedForCrossImportsPerSchema.get(schema); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java index dbff0c0..7db5aba 100644 --- a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java +++ b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java @@ -106,7 +106,7 @@ public final class XmlSchemaUtils { XmlSchemaSimpleTypeContent content = type.getContent(); XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction) content; List<XmlSchemaFacet> facets = restriction.getFacets(); - List<String> values = new ArrayList<String>(); + List<String> values = new ArrayList<>(); for (XmlSchemaFacet facet : facets) { XmlSchemaEnumerationFacet enumFacet = (XmlSchemaEnumerationFacet) facet; values.add(enumFacet.getValue().toString()); @@ -240,7 +240,7 @@ public final class XmlSchemaUtils { public static List<XmlSchemaAnnotated> getContentAttributes(XmlSchemaComplexType type, SchemaCollection collection) { - List<XmlSchemaAnnotated> results = new ArrayList<XmlSchemaAnnotated>(); + List<XmlSchemaAnnotated> results = new ArrayList<>(); QName baseTypeName = getBaseType(type); if (baseTypeName != null) { XmlSchemaComplexType baseType = (XmlSchemaComplexType)collection.getTypeByQName(baseTypeName); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java index 4132b35..4e52018 100644 --- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java +++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java @@ -439,8 +439,8 @@ public final class SSLUtils { String[] supportedCipherSuites, Logger log, boolean exclude) { // We have explicit filters, so use the "include/exclude" cipherSuiteFilter configuration - List<String> filteredCipherSuites = new ArrayList<String>(); - List<String> excludedCipherSuites = new ArrayList<String>(); + List<String> filteredCipherSuites = new ArrayList<>(); + List<String> excludedCipherSuites = new ArrayList<>(); List<Pattern> includes = filters != null ? compileRegexPatterns(filters.getInclude(), true, log) @@ -494,7 +494,7 @@ public final class SSLUtils { private static List<Pattern> compileRegexPatterns(List<String> regexes, boolean include, Logger log) { - List<Pattern> patterns = new ArrayList<Pattern>(); + List<Pattern> patterns = new ArrayList<>(); if (regexes != null) { String msg = include ? "CIPHERSUITE_INCLUDE_FILTER" http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java index 4c1bb4e..b3d7e99 100644 --- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java +++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java @@ -36,7 +36,7 @@ public class TLSParameterBase { protected KeyManager[] keyManagers; protected TrustManager[] trustManagers; protected String provider; - protected List<String> ciphersuites = new ArrayList<String>(); + protected List<String> ciphersuites = new ArrayList<>(); protected FiltersType cipherSuiteFilters; protected CertificateConstraintsType certConstraints; protected SecureRandom secureRandom; @@ -100,7 +100,7 @@ public class TLSParameterBase { */ public List<String> getCipherSuites() { if (ciphersuites == null) { - ciphersuites = new ArrayList<String>(); + ciphersuites = new ArrayList<>(); } return ciphersuites; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java index fe7806e..0a2f3ac 100644 --- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java +++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java @@ -31,8 +31,8 @@ import org.apache.cxf.configuration.security.ClientAuthentication; public class TLSServerParameters extends TLSParameterBase { ClientAuthentication clientAuthentication; - List<String> excludeProtocols = new ArrayList<String>(); - List<String> includeProtocols = new ArrayList<String>(); + List<String> excludeProtocols = new ArrayList<>(); + List<String> includeProtocols = new ArrayList<>(); /** * This parameter configures the server side to request and/or @@ -61,7 +61,7 @@ public class TLSServerParameters extends TLSParameterBase { */ public List<String> getExcludeProtocols() { if (excludeProtocols == null) { - excludeProtocols = new ArrayList<String>(); + excludeProtocols = new ArrayList<>(); } return excludeProtocols; } @@ -78,7 +78,7 @@ public class TLSServerParameters extends TLSParameterBase { */ public List<String> getIncludeProtocols() { if (includeProtocols == null) { - includeProtocols = new ArrayList<String>(); + includeProtocols = new ArrayList<>(); } return includeProtocols; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java index 2e0de2a..c993624 100644 --- a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java +++ b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java @@ -110,7 +110,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport Matcher matcher = Pattern.compile(n).matcher(""); List<MatcherHolder> m = wildCardBeanDefinitions.get(className); if (m == null) { - m = new ArrayList<MatcherHolder>(); + m = new ArrayList<>(); wildCardBeanDefinitions.put(className, m); } MatcherHolder holder = new MatcherHolder(orig, matcher); @@ -256,7 +256,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport public final void addApplicationContext(ApplicationContext ac) { if (!appContexts.contains(ac)) { appContexts.add(ac); - List<ApplicationContext> inactiveApplicationContexts = new ArrayList<ApplicationContext>(); + List<ApplicationContext> inactiveApplicationContexts = new ArrayList<>(); Iterator<ApplicationContext> it = appContexts.iterator(); while (it.hasNext()) { ApplicationContext c = it.next(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java index 96eafbe..ab375fd 100644 --- a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java +++ b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java @@ -286,7 +286,7 @@ public abstract class AbstractDataBinding implements DataBinding { protected static void checkNamespaceMap(Map<String, String> namespaceMap) { // make some checks. This is a map from namespace to prefix, but we want unique prefixes. if (namespaceMap != null) { - Set<String> prefixesSoFar = new HashSet<String>(); + Set<String> prefixesSoFar = new HashSet<>(); for (Map.Entry<String, String> mapping : namespaceMap.entrySet()) { if (prefixesSoFar.contains(mapping.getValue())) { throw new IllegalArgumentException("Duplicate prefix " + mapping.getValue()); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java b/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java index 2e62add..30dcd7d 100644 --- a/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java +++ b/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java @@ -126,7 +126,7 @@ public abstract class AbstractWrapperHelper implements WrapperHelper { public List<Object> getWrapperParts(Object o) throws Fault { try { Object wrapperObject = getWrapperObject(o); - List<Object> ret = new ArrayList<Object>(getMethods.length); + List<Object> ret = new ArrayList<>(getMethods.length); for (int x = 0; x < getMethods.length; x++) { if (getMethods[x] != null) { ret.add(getValue(getMethods[x], wrapperObject)); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java b/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java index 27f89c7..17745e3 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java +++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java @@ -168,7 +168,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr public List<Feature> getFeatures() { if (features == null) { - features = new ArrayList<Feature>(); + features = new ArrayList<>(); } return features; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java index 66c70a2..0853716 100644 --- a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java +++ b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java @@ -430,7 +430,7 @@ public final class DOMUtils { * @param localName */ public static List<Element> getChildrenWithName(Element parent, String ns, String localName) { - List<Element> r = new ArrayList<Element>(); + List<Element> r = new ArrayList<>(); for (Node n = parent.getFirstChild(); n != null; n = n.getNextSibling()) { if (n instanceof Element) { Element e = (Element)n; @@ -451,7 +451,7 @@ public final class DOMUtils { * @return all child elements with specified namespace */ public static List<Element> getChildrenWithNamespace(Element parent, String ns) { - List<Element> r = new ArrayList<Element>(); + List<Element> r = new ArrayList<>(); for (Node n = parent.getFirstChild(); n != null; n = n.getNextSibling()) { if (n instanceof Element) { Element e = (Element)n; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/helpers/FileUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java index cdab0ab..6d9f388 100644 --- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java +++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java @@ -368,10 +368,10 @@ public final class FileUtils { } public static List<File> getFiles(File dir, final String pattern, File exclude) { - return getFilesRecurse(dir, Pattern.compile(pattern), exclude, false, new ArrayList<File>()); + return getFilesRecurse(dir, Pattern.compile(pattern), exclude, false, new ArrayList<>()); } public static List<File> getFilesRecurse(File dir, final String pattern, File exclude) { - return getFilesRecurse(dir, Pattern.compile(pattern), exclude, true, new ArrayList<File>()); + return getFilesRecurse(dir, Pattern.compile(pattern), exclude, true, new ArrayList<>()); } private static List<File> getFilesRecurse(File dir, Pattern pattern, @@ -398,9 +398,9 @@ public final class FileUtils { public static List<String> readLines(File file) throws Exception { if (!file.exists()) { - return new ArrayList<String>(); + return new ArrayList<>(); } - List<String> results = new ArrayList<String>(); + List<String> results = new ArrayList<>(); try (BufferedReader reader = new BufferedReader(new FileReader(file))) { String line = reader.readLine(); while (line != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java b/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java index e29e388..b489039 100644 --- a/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java +++ b/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java @@ -35,7 +35,7 @@ public final class JavaUtils { * literal values, but for the purposes of this array, they can be treated * as literals. */ - private static final Set<String> KEYWORDS = new HashSet<String>(Arrays.asList( + private static final Set<String> KEYWORDS = new HashSet<>(Arrays.asList( "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "default", "do", "double", "else", "enum", "extends", "false", "final", "finally", "float", "for", "goto", http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/helpers/NSStack.java ---------------------------------------------------------------------- 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 a3d41a4..e9267d9 100644 --- a/core/src/main/java/org/apache/cxf/helpers/NSStack.java +++ b/core/src/main/java/org/apache/cxf/helpers/NSStack.java @@ -33,7 +33,7 @@ public class NSStack { private int nsPrefixCount = 1; public synchronized void push() { - top = new ArrayList<NSDecl>(); + top = new ArrayList<>(); stack.add(top); size++; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java index 889f4f6..c9fcf02 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java @@ -60,7 +60,7 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto private static final String LIVE_LOGGING_PROP = "org.apache.cxf.logging.enable"; private static final List<String> BINARY_CONTENT_MEDIA_TYPES; static { - BINARY_CONTENT_MEDIA_TYPES = new ArrayList<String>(); + BINARY_CONTENT_MEDIA_TYPES = new ArrayList<>(); BINARY_CONTENT_MEDIA_TYPES.add("application/octet-stream"); BINARY_CONTENT_MEDIA_TYPES.add("image/png"); BINARY_CONTENT_MEDIA_TYPES.add("image/jpeg"); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java index 9d3bd45..9dcb29f 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java @@ -188,7 +188,7 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt Collection<Attachment> atts = message.getAttachments(); if (MessageUtils.isTrue(message.getContextualProperty(Message.MTOM_ENABLED)) && atts == null) { - atts = new ArrayList<Attachment>(); + atts = new ArrayList<>(); message.setAttachments(atts); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java index a8c5a85..bdc9d9f 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java +++ b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java @@ -53,7 +53,7 @@ public class AnnotationInterceptors { private <T> List<T> initializeAnnotationObjects(Annotation annotation, Class<T> type) { - List<T> list = new ArrayList<T>(); + List<T> list = new ArrayList<>(); for (String cn : getAnnotationObjectNames(annotation)) { list.add(initializeAnnotationObject(cn, type)); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java index a5edceb..cd9fc2e 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java +++ b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java @@ -244,7 +244,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor { ns.put("s", Fault.STACKTRACE_NAMESPACE); String ss = (String) xu.getValue("//s:" + Fault.STACKTRACE + "/text()", fault.getDetail(), XPathConstants.STRING); - List<StackTraceElement> stackTraceList = new ArrayList<StackTraceElement>(); + List<StackTraceElement> stackTraceList = new ArrayList<>(); if (!StringUtils.isEmpty(ss)) { Iterator<String> linesIterator = Arrays.asList(CAUSE_SUFFIX_SPLITTER.split(ss)).iterator(); while (linesIterator.hasNext()) { @@ -295,7 +295,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor { if (res == null) { res = new Throwable(firstLine); } - List<StackTraceElement> stackTraceList = new ArrayList<StackTraceElement>(); + List<StackTraceElement> stackTraceList = new ArrayList<>(); while (linesIterator.hasNext()) { String oneLine = linesIterator.next(); if (oneLine.startsWith("Caused by:")) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java index c5d0b6e..4aaee1f 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java @@ -99,7 +99,7 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> { = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS)); List<String> accepts = headers.get("Accept"); if (accepts == null) { - accepts = new ArrayList<String>(); + accepts = new ArrayList<>(); headers.put("Accept", accepts); } String a = "application/fastinfoset"; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java b/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java index 12e4935..1a3b3ad 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java @@ -122,7 +122,7 @@ public class DefaultSecurityContext implements LoginSecurityContext { } public Set<Principal> getUserRoles() { - Set<Principal> roles = new HashSet<Principal>(); + Set<Principal> roles = new HashSet<>(); if (subject != null) { for (Principal principal : subject.getPrincipals()) { if (principal != p) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java index fa40793..b3fa291 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java @@ -65,7 +65,7 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> { public JAASLoginInterceptor(String phase) { super(phase); - this.callbackHandlerProviders = new ArrayList<CallbackHandlerProvider>(); + this.callbackHandlerProviders = new ArrayList<>(); this.callbackHandlerProviders.add(new CallbackHandlerProviderAuthPol()); this.callbackHandlerProviders.add(new CallbackHandlerProviderUsernameToken()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java b/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java index bcd202b..7b6baa3 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java @@ -71,7 +71,7 @@ public class RolePrefixSecurityContextImpl implements LoginSecurityContext { private static Set<Principal> findRoles(Subject subject, String roleClassifier, String roleClassifierType) { - Set<Principal> set = new HashSet<Principal>(); + Set<Principal> set = new HashSet<>(); for (Principal p : subject.getPrincipals()) { if (isRole(p, roleClassifier, roleClassifierType)) { set.add(p); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java index 00e3277..0ff02dd 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java @@ -40,7 +40,7 @@ public class SecureAnnotationsInterceptor extends SimpleAuthorizingInterceptor { private static final Set<String> SKIP_METHODS; static { - SKIP_METHODS = new HashSet<String>(); + SKIP_METHODS = new HashSet<>(); SKIP_METHODS.addAll(Arrays.asList( new String[] {"wait", "notify", "notifyAll", "equals", "toString", "hashCode"})); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java index 9c8175f..d261984 100644 --- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java +++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java @@ -90,7 +90,7 @@ public class CachedOutputStream extends OutputStream { private List<CachedOutputStreamCallback> callbacks; - private List<Object> streamList = new ArrayList<Object>(); + private List<Object> streamList = new ArrayList<>(); public CachedOutputStream() { this(defaultThreshold); @@ -135,7 +135,7 @@ public class CachedOutputStream extends OutputStream { public void registerCallback(CachedOutputStreamCallback cb) { if (null == callbacks) { - callbacks = new ArrayList<CachedOutputStreamCallback>(); + callbacks = new ArrayList<>(); } callbacks.add(cb); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/io/CachedWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/io/CachedWriter.java b/core/src/main/java/org/apache/cxf/io/CachedWriter.java index 8fb3fdf..66c9df8 100644 --- a/core/src/main/java/org/apache/cxf/io/CachedWriter.java +++ b/core/src/main/java/org/apache/cxf/io/CachedWriter.java @@ -97,7 +97,7 @@ public class CachedWriter extends Writer { private List<CachedWriterCallback> callbacks; - private List<Object> streamList = new ArrayList<Object>(); + private List<Object> streamList = new ArrayList<>(); static class LoadingCharArrayWriter extends CharArrayWriter { @@ -155,7 +155,7 @@ public class CachedWriter extends Writer { public void registerCallback(CachedWriterCallback cb) { if (null == callbacks) { - callbacks = new ArrayList<CachedWriterCallback>(); + callbacks = new ArrayList<>(); } callbacks.add(cb); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/ServiceImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/ServiceImpl.java b/core/src/main/java/org/apache/cxf/service/ServiceImpl.java index b906d65..d05d2d6 100644 --- a/core/src/main/java/org/apache/cxf/service/ServiceImpl.java +++ b/core/src/main/java/org/apache/cxf/service/ServiceImpl.java @@ -51,7 +51,7 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement } public ServiceImpl(ServiceInfo si) { - serviceInfos = new ArrayList<ServiceInfo>(); + serviceInfos = new ArrayList<>(); if (si != null) { serviceInfos.add(si); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java b/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java index 9f5e051..379a724 100644 --- a/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java +++ b/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java @@ -129,7 +129,7 @@ public abstract class AbstractServiceFactoryBean { private void fillDataBindingSchemas() { ResourceManager rr = getBus().getExtension(ResourceManager.class); - List<DOMSource> schemas = new ArrayList<DOMSource>(); + List<DOMSource> schemas = new ArrayList<>(); for (String l : schemaLocations) { URL url = rr.resolveResource(l, URL.class); if (url == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java index 8eb7d0e..d2e0ea1 100644 --- a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java +++ b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java @@ -367,7 +367,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener { } private void addDocumentation(OperationInfo inf, Placement defPlace, WSDLDocumentation ... values) { - List<WSDLDocumentation> later = new ArrayList<WSDLDocumentation>(); + List<WSDLDocumentation> later = new ArrayList<>(); for (WSDLDocumentation doc : values) { WSDLDocumentation.Placement p = doc.placement(); if (p == WSDLDocumentation.Placement.DEFAULT) { @@ -420,7 +420,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener { private void addDocumentation(InterfaceInfo interfaceInfo, WSDLDocumentation.Placement defPlace, WSDLDocumentation ... values) { - List<WSDLDocumentation> later = new ArrayList<WSDLDocumentation>(); + List<WSDLDocumentation> later = new ArrayList<>(); for (WSDLDocumentation doc : values) { WSDLDocumentation.Placement p = doc.placement(); if (p == WSDLDocumentation.Placement.DEFAULT) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java b/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java index ba36e1b..baabede 100644 --- a/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java +++ b/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java @@ -199,7 +199,7 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder MessagePartInfo part = new MessagePartInfo(name, this); if (outOfBandParts == null) { - outOfBandParts = new ArrayList<MessagePartInfo>(1); + outOfBandParts = new ArrayList<>(1); } part.setIndex(messageParts.size() + outOfBandParts.size()); outOfBandParts.add(part); @@ -215,9 +215,9 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder */ public List<MessagePartInfo> getMessageParts() { if (outOfBandParts == null) { - return new ArrayList<MessagePartInfo>(messageParts.values()); + return new ArrayList<>(messageParts.values()); } - List<MessagePartInfo> parts = new ArrayList<MessagePartInfo>(messageParts.values()); + List<MessagePartInfo> parts = new ArrayList<>(messageParts.values()); parts.addAll(outOfBandParts); return parts; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java index a263b21..8321fb3 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 @@ -194,7 +194,7 @@ public abstract class AbstractPropertiesHolder implements Extensible { if (exts == null) { return null; } - List<T> list = new ArrayList<T>(exts.length); + List<T> list = new ArrayList<>(exts.length); for (int x = 0; x < exts.length; x++) { if (cls.isInstance(exts[x])) { list.add(cls.cast(exts[x])); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java b/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java index 7eb1d2c..7fdc170 100644 --- a/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java @@ -28,7 +28,7 @@ public class DescriptionInfo extends AbstractPropertiesHolder implements NamedIt QName name; String uri; - List<AbstractDescriptionElement> described = new ArrayList<AbstractDescriptionElement>(); + List<AbstractDescriptionElement> described = new ArrayList<>(); public DescriptionInfo() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java b/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java index 23226ee..27f1ed9 100644 --- a/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java @@ -63,7 +63,7 @@ public class MessageInfo extends AbstractMessageContainer { return getMessageParts(); } - List<MessagePartInfo> orderedParts = new ArrayList<MessagePartInfo>(); + List<MessagePartInfo> orderedParts = new ArrayList<>(); Map<QName, MessagePartInfo> partsMap = getMessagePartsMap(); for (String part : order) { QName qname = getMessagePartQName(part); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java b/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java index e39295c..99697f7 100644 --- a/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java @@ -38,7 +38,7 @@ public class ServiceInfo extends AbstractDescriptionElement implements NamedItem List<BindingInfo> bindings = new CopyOnWriteArrayList<BindingInfo>(); List<EndpointInfo> endpoints = new CopyOnWriteArrayList<EndpointInfo>(); Map<QName, MessageInfo> messages; - List<SchemaInfo> schemas = new ArrayList<SchemaInfo>(4); + List<SchemaInfo> schemas = new ArrayList<>(4); private SchemaCollection xmlSchemaCollection; private String topLevelDoc; private DescriptionInfo description; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java index a189a8c..52c4283 100644 --- a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java +++ b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java @@ -130,7 +130,7 @@ public final class ServiceModelUtil { } public static List<String> getOperationInputPartNames(OperationInfo operation) { - List<String> names = new ArrayList<String>(); + List<String> names = new ArrayList<>(); List<MessagePartInfo> parts = operation.getInput().getMessageParts(); if (parts == null || parts.size() == 0) { return names; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java b/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java index 124161a..39891bb 100644 --- a/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java +++ b/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java @@ -46,7 +46,7 @@ public class ServiceSchemaInfo { return schemaInfoList; } public void setSchemaInfoList(List<SchemaInfo> schemaInfoList) { - this.schemaInfoList = new ArrayList<SchemaInfo>(schemaInfoList); + this.schemaInfoList = new ArrayList<>(schemaInfoList); } public Map<String, Element> getSchemaElementList() { return schemaElementList; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java b/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java index 495cd31..6dda7f9 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java +++ b/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java @@ -44,7 +44,7 @@ import org.apache.cxf.common.util.StringUtils; public class CachingXmlEventWriter implements XMLStreamWriter { protected XMLEventFactory factory; - List<XMLEvent> events = new ArrayList<XMLEvent>(1000); + List<XMLEvent> events = new ArrayList<>(1000); Stack<NSContext> contexts = new Stack<NSContext>(); Stack<QName> elNames = new Stack<QName>(); QName lastStart; @@ -266,7 +266,7 @@ public class CachingXmlEventWriter implements XMLStreamWriter { } public Iterator<String> getPrefixes(String namespaceURI) { - List<String> l = new ArrayList<String>(); + List<String> l = new ArrayList<>(); for (Map.Entry<String, String> e : map.entrySet()) { if (e.getValue().equals(namespaceURI)) { l.add(e.getKey()); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java index eb8442b..f3eb87c 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java +++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java @@ -99,9 +99,9 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> { @Override protected final void newFrame(ElementFrame<Node, Node> frame) { Node element = getCurrentNode(); - frame.uris = new ArrayList<String>(); - frame.prefixes = new ArrayList<String>(); - frame.attributes = new ArrayList<Object>(); + frame.uris = new ArrayList<>(); + frame.prefixes = new ArrayList<>(); + frame.attributes = new ArrayList<>(); if (context == null) { context = new W3CNamespaceContext(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java b/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java index 88f56ad..fe52c8f 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java +++ b/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java @@ -122,7 +122,7 @@ public class W3CNamespaceContext implements NamespaceContext { } public Iterator<String> getPrefixes(String uri) { - List<String> prefixes = new ArrayList<String>(); + List<String> prefixes = new ArrayList<>(); String prefix = getPrefix(uri); if (prefix != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java index aba6166..765713d 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 @@ -47,13 +47,13 @@ public class InTransformReader extends DepthXMLStreamReader { private QNamesMap inElementsMap; private QNamesMap inAttributesMap; private Map<QName, ElementProperty> inAppendMap = new HashMap<QName, ElementProperty>(5); - private Set<QName> inDropSet = new HashSet<QName>(5); + private Set<QName> inDropSet = new HashSet<>(5); private Map<String, String> nsMap = new HashMap<String, String>(5); private List<ParsingEvent> pushedBackEvents = new LinkedList<ParsingEvent>(); private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<List<ParsingEvent>>(); private String replaceText; private ParsingEvent currentEvent; - private List<Integer> attributesIndexes = new ArrayList<Integer>(); + private List<Integer> attributesIndexes = new ArrayList<>(); private boolean blockOriginalReader = true; private boolean attributesIndexed; private DelegatingNamespaceContext namespaceContext; @@ -210,7 +210,7 @@ public class InTransformReader extends DepthXMLStreamReader { pushedBackEvents.add(0, TransformUtils.createStartElementEvent(appendProp.getName())); currentEvent = TransformUtils.createStartElementEvent(expected); - List<ParsingEvent> pe = new ArrayList<ParsingEvent>(2); + List<ParsingEvent> pe = new ArrayList<>(2); pe.add(TransformUtils.createEndElementEvent(appendProp.getName())); pe.add(TransformUtils.createEndElementEvent(expected)); pushedAheadEvents.add(0, pe); @@ -218,7 +218,7 @@ public class InTransformReader extends DepthXMLStreamReader { // ap-post-incl currentEvent = TransformUtils.createStartElementEvent(expected); - List<ParsingEvent> pe = new ArrayList<ParsingEvent>(4); + List<ParsingEvent> pe = new ArrayList<>(4); pe.add(TransformUtils.createStartElementEvent(appendProp.getName())); pe.add(TransformUtils.createCharactersEvent(appendProp.getText())); pe.add(TransformUtils.createEndElementEvent(appendProp.getName())); @@ -232,7 +232,7 @@ public class InTransformReader extends DepthXMLStreamReader { pushedBackEvents.add(0, TransformUtils.createStartElementEvent(expected)); currentEvent = TransformUtils.createStartElementEvent(appendProp.getName()); - List<ParsingEvent> pe = new ArrayList<ParsingEvent>(2); + List<ParsingEvent> pe = new ArrayList<>(2); pe.add(TransformUtils.createEndElementEvent(expected)); pe.add(TransformUtils.createEndElementEvent(appendProp.getName())); pushedAheadEvents.add(0, pe); @@ -253,7 +253,7 @@ public class InTransformReader extends DepthXMLStreamReader { private void handleDefaultMode(QName name, QName expected) { currentEvent = TransformUtils.createStartElementEvent(expected); if (!name.equals(expected)) { - List<ParsingEvent> pe = new ArrayList<ParsingEvent>(1); + List<ParsingEvent> pe = new ArrayList<>(1); pe.add(TransformUtils.createEndElementEvent(expected)); pushedAheadEvents.add(0, pe); } else { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java index c4541bf..f3d5b0b 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 @@ -173,9 +173,9 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter { } Set<String> s; if (writtenUris.isEmpty()) { - s = new HashSet<String>(); + s = new HashSet<>(); } else { - s = new HashSet<String>(writtenUris.get(0)); + s = new HashSet<>(writtenUris.get(0)); } writtenUris.add(0, s); @@ -231,7 +231,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter { if (appendProp.getText() == null) { // ap-pre-wrap currentDepth++; - pe = new ArrayList<ParsingEvent>(); + pe = new ArrayList<>(); pe.add(TransformUtils.createEndElementEvent(expected)); pe.add(TransformUtils.createEndElementEvent(appendProp.getName())); pushedAheadEvents.add(0, null); @@ -277,7 +277,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter { this.writeNamespace(theprefix, uri); } currentDepth++; - pe = new ArrayList<ParsingEvent>(); + pe = new ArrayList<>(); pe.add(TransformUtils.createEndElementEvent(appendProp.getName())); pe.add(TransformUtils.createEndElementEvent(expected)); pushedAheadEvents.add(0, pe); @@ -285,7 +285,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter { } else { // ap-post-incl pushedAheadEvents.remove(0); - pe = new ArrayList<ParsingEvent>(); + pe = new ArrayList<>(); pe.add(TransformUtils.createStartElementEvent(appendProp.getName())); pe.add(TransformUtils.createCharactersEvent(appendProp.getText())); pe.add(TransformUtils.createEndElementEvent(appendProp.getName())); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java index 5809121..f5fe03f 100644 --- a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java +++ b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java @@ -44,7 +44,7 @@ import org.apache.cxf.service.model.EndpointInfo; * */ public class TransportURIResolver extends ExtendedURIResolver { - private static final Set<String> DEFAULT_URI_RESOLVER_HANDLES = new HashSet<String>(); + private static final Set<String> DEFAULT_URI_RESOLVER_HANDLES = new HashSet<>(); static { //bunch we really don't want to have the conduits checked for //as we know the conduits don't handle. No point http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java index 7693308..abac612 100644 --- a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java @@ -203,8 +203,8 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> { // we split it into its component parts and build two // lists, one with all the "q=0" encodings and the other // with the rest (no q, or q=<non-zero>). - List<String> zeros = new ArrayList<String>(3); - List<String> nonZeros = new ArrayList<String>(3); + List<String> zeros = new ArrayList<>(3); + List<String> nonZeros = new ArrayList<>(3); for (String headerLine : acceptEncodingHeader) { String[] encodings = ENCODINGS.split(headerLine.trim()); @@ -325,7 +325,7 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> { } List<String> header = CastUtils.cast((List<?>)protocolHeaders.get(name)); if (header == null) { - header = new ArrayList<String>(); + header = new ArrayList<>(); protocolHeaders.put(name, header); } if (header.size() == 0) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java index b6ecd69..d3b409e 100644 --- a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java +++ b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java @@ -117,7 +117,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue { this.lowWaterMark = -1 == lowWaterMark ? Integer.MAX_VALUE : lowWaterMark; this.dequeueTimeout = dequeueTimeout; this.name = name; - this.changeListenerList = new ArrayList<PropertyChangeListener>(); + this.changeListenerList = new ArrayList<>(); } public void addChangeListener(PropertyChangeListener listener) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java b/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java index b44ea3d..ffadebe 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java @@ -209,7 +209,7 @@ public class AddressingProperties { public List<QName> getMustUnderstand() { if (mustUnderstand == null) { - mustUnderstand = new ArrayList<QName>(); + mustUnderstand = new ArrayList<>(); } return mustUnderstand; } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java ---------------------------------------------------------------------- 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 57a65af..05f19a9 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 @@ -99,7 +99,7 @@ public final class EndpointReferenceUtils { */ private static final class SchemaLSResourceResolver implements LSResourceResolver { private final Map<String, byte[]> schemas; - private final Set<String> done = new HashSet<String>(); + private final Set<String> done = new HashSet<>(); private final ExtendedURIResolver resolver = new ExtendedURIResolver(); private final Bus bus; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/main/java/org/apache/cxf/ws/addressing/Names.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java index b80758e..c0761a1 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java @@ -176,7 +176,7 @@ public final class Names { */ public static final Set<QName> HEADERS; static { - Set<QName> headers = new HashSet<QName>(); + Set<QName> headers = new HashSet<>(); headers.add(WSA_FROM_QNAME); headers.add(WSA_TO_QNAME); headers.add(WSA_REPLYTO_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java index 9a9b567..9d890dd 100644 --- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java +++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java @@ -111,7 +111,7 @@ public class AttachmentDeserializerTest extends Assert { assertTrue(attBody instanceof DelegatingInputStream); attBody.close(); assertEquals(2, msg.getAttachments().size()); - List<String> cidlist = new ArrayList<String>(); + List<String> cidlist = new ArrayList<>(); cidlist.add("xfire_logo.jpg"); cidlist.add("xfire_logo2.jpg"); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java index 661b69f..b68e012 100644 --- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java +++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java @@ -66,7 +66,7 @@ public class AttachmentSerializerTest extends Assert { private void doTestMessageWrite(boolean xop, String soapContentType) throws Exception { MessageImpl msg = new MessageImpl(); - Collection<Attachment> atts = new ArrayList<Attachment>(); + Collection<Attachment> atts = new ArrayList<>(); AttachmentImpl a = new AttachmentImpl("test.xml"); InputStream is = getClass().getResourceAsStream("my.wav"); @@ -174,7 +174,7 @@ public class AttachmentSerializerTest extends Assert { public void testMessageMTOM() throws Exception { MessageImpl msg = new MessageImpl(); - Collection<Attachment> atts = new ArrayList<Attachment>(); + Collection<Attachment> atts = new ArrayList<>(); AttachmentImpl a = new AttachmentImpl("test.xml"); InputStream is = getClass().getResourceAsStream("my.wav"); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java index 9f901d6..21c3e99 100644 --- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java +++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java @@ -85,7 +85,7 @@ public class OSGiBusListenerTest extends Assert { public void testRegistratioWithServices() throws Exception { setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null); setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null); - Collection<Feature> lst = new ArrayList<Feature>(); + Collection<Feature> lst = new ArrayList<>(); setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst); control.replay(); @@ -100,7 +100,7 @@ public class OSGiBusListenerTest extends Assert { public void testRegistratioWithServicesExcludes() throws Exception { setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES); setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES); - Collection<Feature> lst = new ArrayList<Feature>(); + Collection<Feature> lst = new ArrayList<>(); setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst); EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES); control.replay(); @@ -115,7 +115,7 @@ public class OSGiBusListenerTest extends Assert { public void testRegistratioWithServicesExcludesAndRestricted() throws Exception { setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES); setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES); - Collection<Feature> lst = new ArrayList<Feature>(); + Collection<Feature> lst = new ArrayList<>(); setFeatures(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, lst); EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES); control.replay(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java index 4736663..1a3c1b8 100644 --- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java +++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java @@ -54,7 +54,7 @@ public class ResourceInjectorTest extends Assert { public void setUpResourceManager(String pfx) { ResourceManager resMgr = EasyMock.createMock(ResourceManager.class); - List<ResourceResolver> resolvers = new ArrayList<ResourceResolver>(); + List<ResourceResolver> resolvers = new ArrayList<>(); resMgr.getResourceResolvers(); EasyMock.expectLastCall().andReturn(resolvers); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java index 14e5e25..d00abfe 100644 --- a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java +++ b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java @@ -147,7 +147,7 @@ public class ImportRepairTest extends Assert { private void tryToParseSchemas() throws Exception { // Get DOM Implementation using DOM Registry - final List<DOMLSInput> inputs = new ArrayList<DOMLSInput>(); + final List<DOMLSInput> inputs = new ArrayList<>(); final Map<String, LSInput> resolverMap = new HashMap<String, LSInput>(); for (XmlSchema schema : collection.getXmlSchemas()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java index 270b16b..ca29607 100644 --- a/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java +++ b/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java @@ -63,7 +63,7 @@ public class OutgoingChainInterceptorTest extends Assert { control = EasyMock.createNiceControl(); - phases = new ArrayList<Phase>(); + phases = new ArrayList<>(); phases.add(new Phase(Phase.SEND, 1000)); empty = new ArrayList<Interceptor<? extends Message>>(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java index cb6c604..3cb4aad 100644 --- a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java +++ b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java @@ -53,7 +53,7 @@ public class ServiceInvokerInterceptorTest extends Assert { Endpoint endpoint = createEndpoint(i); exchange.put(Endpoint.class, endpoint); Object input = new Object(); - List<Object> lst = new ArrayList<Object>(); + List<Object> lst = new ArrayList<>(); lst.add(input); m.setContent(List.class, lst); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java index 43dbdfe..191772c 100644 --- a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java +++ b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java @@ -57,7 +57,7 @@ public class DefaultSecurityContextTest extends Assert { Principal p = new SimplePrincipal("Barry"); s.getPrincipals().add(p); - Set<Principal> roles = new HashSet<Principal>(); + Set<Principal> roles = new HashSet<>(); roles.add(new SimpleGroup("friend", p)); roles.add(new SimpleGroup("admin", p)); s.getPrincipals().addAll(roles); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java index 5a205d6..428f5c4 100644 --- a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java +++ b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java @@ -67,7 +67,7 @@ public class RolePrefixSecurityContextImplTest extends Assert { Principal p = new SimplePrincipal("Barry"); s.getPrincipals().add(p); - Set<Principal> roles = new HashSet<Principal>(); + Set<Principal> roles = new HashSet<>(); roles.add(new SimplePrincipal("role_friend")); roles.add(new SimplePrincipal("role_admin")); s.getPrincipals().addAll(roles); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java index 1c8f808..1a24849 100644 --- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java +++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java @@ -167,7 +167,7 @@ public class PhaseInterceptorChainTest extends Assert { @Test public void testAddTwoInterceptorsSamePhase() throws Exception { AbstractPhaseInterceptor<? extends Message> p1 = setUpPhaseInterceptor("phase1", "p1"); - Set<String> after = new HashSet<String>(); + Set<String> after = new HashSet<>(); after.add("p1"); AbstractPhaseInterceptor<? extends Message> p2 = setUpPhaseInterceptor("phase1", "p2", null, after); control.replay(); @@ -183,10 +183,10 @@ public class PhaseInterceptorChainTest extends Assert { @Test public void testThreeInterceptorSamePhaseWithOrder() throws Exception { AbstractPhaseInterceptor<? extends Message> p1 = setUpPhaseInterceptor("phase1", "p1"); - Set<String> before = new HashSet<String>(); + Set<String> before = new HashSet<>(); before.add("p1"); AbstractPhaseInterceptor<? extends Message> p2 = setUpPhaseInterceptor("phase1", "p2", before, null); - Set<String> before1 = new HashSet<String>(); + Set<String> before1 = new HashSet<>(); before1.add("p2"); AbstractPhaseInterceptor<? extends Message> p3 = setUpPhaseInterceptor("phase1", "p3", before1, null); control.replay(); @@ -333,7 +333,7 @@ public class PhaseInterceptorChainTest extends Assert { AbstractPhaseInterceptor<Message> p2 = setUpPhaseInterceptor("phase1", "p2"); setUpPhaseInterceptorInvocations(p2, false, false); - Set<String> after3 = new HashSet<String>(); + Set<String> after3 = new HashSet<>(); after3.add("p2"); AbstractPhaseInterceptor<Message> p3 = setUpPhaseInterceptor("phase1", "p3", null, after3); setUpPhaseInterceptorInvocations(p3, false, false); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java index e0ae7c9..52b3ebe 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java @@ -130,7 +130,7 @@ public class DelegatingNamespaceContextTest extends Assert { } private void verifyPrefixes(Iterator<String> prefixes, String[] values) { - Set<String> tmp = new HashSet<String>(); + Set<String> tmp = new HashSet<>(); while (prefixes.hasNext()) { tmp.add(prefixes.next()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java index e566682..f1022d5 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java @@ -272,7 +272,7 @@ public class InTransformReaderTest extends Assert { appendElements.put("requestValue", "{http://cxf.apache.org/hello_world_soap_http/types}greetMe";); - List<String> dropElements = new ArrayList<String>(); + List<String> dropElements = new ArrayList<>(); dropElements.add("value"); Map<String, String> transformAttributes = new HashMap<String, String>(); @@ -415,7 +415,7 @@ public class InTransformReaderTest extends Assert { Map<String, String> appendElements = new HashMap<String, String>(); appendElements.put("payload/", "{http://www.w3.org/2003/05/soap-envelope}Body";); - List<String> dropElements = new ArrayList<String>(); + List<String> dropElements = new ArrayList<>(); dropElements.add("param"); TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn3.xml", http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java index 181f9c4..545f41a 100644 --- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java +++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java @@ -340,7 +340,7 @@ public class OutTransformWriterTest extends Assert { appendElements.put("requestValue", "{http://cxf.apache.org/hello_world_soap_http/types}greetMe";); - List<String> dropElements = new ArrayList<String>(); + List<String> dropElements = new ArrayList<>(); dropElements.add("value"); Map<String, String> transformAttributes = new HashMap<String, String>(); @@ -483,7 +483,7 @@ public class OutTransformWriterTest extends Assert { Map<String, String> appendElements = new HashMap<String, String>(); appendElements.put("payload/", "{http://www.w3.org/2003/05/soap-envelope}Body";); - List<String> dropElements = new ArrayList<String>(); + List<String> dropElements = new ArrayList<>(); dropElements.add("param"); TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn3.xml", http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java index 6592d79..50e4e36 100644 --- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java +++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java @@ -49,7 +49,7 @@ public final class ReadZoo { AegisContext context; context = new AegisContext(); - Set<Type> rootClasses = new HashSet<Type>(); + Set<Type> rootClasses = new HashSet<>(); rootClasses.add(Zoo.class); context.setRootClasses(rootClasses); context.initialize(); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java index 7beb9b9..ec282f3 100644 --- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java +++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMap.java @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) public class IntegerUserMap { @XmlElement(nillable = false, name = "entry") - List<IntegerUserEntry> entries = new ArrayList<IntegerUserEntry>(); + List<IntegerUserEntry> entries = new ArrayList<>(); public List<IntegerUserEntry> getEntries() { return entries; http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java index b522a41..f0c5032 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java +++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java @@ -34,7 +34,7 @@ import org.apache.cxf.tracing.brave.jaxrs.BraveFeature; public class CatalogApplication extends Application { @Override public Set<Object> getSingletons() { - return new HashSet<Object>( + return new HashSet<>( Arrays.asList( new Catalog(), new BraveFeature(), http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java index 1445dc8..175e9d5 100644 --- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java +++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java @@ -42,7 +42,7 @@ public class CatalogApplication extends Application { @Override public Set<Object> getSingletons() { try { - return new HashSet<Object>( + return new HashSet<>( Arrays.asList( new Catalog(), new HTraceFeature(HTraceConfiguration.fromMap(getTracingProperties()), "catalog-server"), http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java index 26fe7ee..8e958a9 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java +++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java @@ -57,8 +57,8 @@ class WebSocketTestClient { private String url; WebSocketTestClient(String url) { - this.received = new ArrayList<Object>(); - this.fragments = new ArrayList<Object>(); + this.received = new ArrayList<>(); + this.fragments = new ArrayList<>(); this.latch = new CountDownLatch(1); this.client = new AsyncHttpClient(); this.url = url; @@ -92,7 +92,7 @@ class WebSocketTestClient { public List<Response> getReceivedResponses() { Object[] objs = received.toArray(); - List<Response> responses = new ArrayList<Response>(objs.length); + List<Response> responses = new ArrayList<>(objs.length); for (Object o : objs) { responses.add(new Response(o)); } http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java index 18063cb..bc71bb9 100644 --- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java +++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/client/Client.java @@ -58,7 +58,7 @@ public final class Client { //Add client side handlers programmatically SmallNumberHandler sh = new SmallNumberHandler(); - List<Handler> newHandlerChain = new ArrayList<Handler>(); + List<Handler> newHandlerChain = new ArrayList<>(); newHandlerChain.add(sh); ((BindingProvider)port).getBinding().setHandlerChain(newHandlerChain); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java index 3fdce4a..f2e91c0 100644 --- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java +++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java @@ -50,7 +50,7 @@ public class CustomerServiceImpl implements CustomerService { noSuchCustomer); } - List<Customer> customers = new ArrayList<Customer>(); + List<Customer> customers = new ArrayList<>(); for (int c = 0; c < 2; c++) { Customer cust = new Customer(); cust.setName(name); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java index e81b0e1..1acd14e 100644 --- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java +++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java @@ -34,7 +34,7 @@ public class JavascriptExampleImpl implements JavascriptExample { private List<Beverage> beverages; public JavascriptExampleImpl() { - beverages = new ArrayList<Beverage>(); + beverages = new ArrayList<>(); Ingredient calcium = new Ingredient(); calcium.setName("calcium"); calcium.setCategory(Category.Mineral); @@ -80,7 +80,7 @@ public class JavascriptExampleImpl implements JavascriptExample { } public Beverage[] getBeverageWithIngredientCategories(List<Category> c) { - List<Beverage> matches = new ArrayList<Beverage>(); + List<Beverage> matches = new ArrayList<>(); for (Beverage b : beverages) { for (Ingredient i : b.getIngredients()) { if (c.contains(i.getCategory())) { @@ -93,7 +93,7 @@ public class JavascriptExampleImpl implements JavascriptExample { } public Beverage[] getBeverageWithIngredientCategory(Category c) { - List<Beverage> matches = new ArrayList<Beverage>(); + List<Beverage> matches = new ArrayList<>(); for (Beverage b : beverages) { for (Ingredient i : b.getIngredients()) { if (c == i.getCategory()) { @@ -106,7 +106,7 @@ public class JavascriptExampleImpl implements JavascriptExample { } public Beverage[] getBeveragesWithIngredient(Ingredient i) { - List<Beverage> matches = new ArrayList<Beverage>(); + List<Beverage> matches = new ArrayList<>(); for (Beverage b : beverages) { for (Ingredient bi : b.getIngredients()) { if (bi == i) { http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/model/OAuthParams.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/model/OAuthParams.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/model/OAuthParams.java index 9420041..45918d2 100644 --- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/model/OAuthParams.java +++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/model/OAuthParams.java @@ -44,7 +44,7 @@ public class OAuthParams implements Serializable { private String header; private Integer responseCode; - private List<SignatureMethod> methods = new ArrayList<SignatureMethod>(); + private List<SignatureMethod> methods = new ArrayList<>(); public OAuthParams() { methods.add(new SignatureMethod("HMAC-SHA1")); http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java index 53179f1..6927aad 100644 --- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java +++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java @@ -78,7 +78,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider { } private List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions) { - List<OAuthPermission> permissions = new ArrayList<OAuthPermission>(); + List<OAuthPermission> permissions = new ArrayList<>(); for (String requestScope : requestPermissions) { OAuthPermission oAuthPermission = AVAILABLE_PERMISSIONS.get(requestScope); permissions.add(oAuthPermission);
