http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java ---------------------------------------------------------------------- diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java index a672de3..7b1e229 100644 --- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java +++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java @@ -71,7 +71,7 @@ import org.omg.CORBA.UnionMember; public final class CorbaUtils { static final QName EMPTY_QNAME = new QName("", ""); - static final Map<QName, TCKind> PRIMITIVE_TYPECODES = new HashMap<QName, TCKind>(); + static final Map<QName, TCKind> PRIMITIVE_TYPECODES = new HashMap<>(); private static final Logger LOG = LogUtils.getL7dLogger(CorbaUtils.class); private static final class LastExport {
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java ---------------------------------------------------------------------- diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java index e906e84..2a7897d 100644 --- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java +++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java @@ -118,7 +118,7 @@ public class CorbaDSIServantTest extends Assert { MessageObserver incomingObserver = new TestObserver(); dsiServant.setObserver(incomingObserver); - Map<String, QName> map = new HashMap<String, QName>(2); + Map<String, QName> map = new HashMap<>(2); map.put("greetMe", new QName("greetMe")); dsiServant.setOperationMapping(map); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java index b112b26..779bfd4 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java @@ -62,7 +62,7 @@ import org.apache.cxf.wsdl.WSDLConstants; public final class SOAPBindingUtil { - private static Map<String, String> bindingMap = new HashMap<String, String>(); + private static Map<String, String> bindingMap = new HashMap<>(); static { bindingMap.put("RPC", "SOAPBinding.Style.RPC"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java index 9fec946..904175d 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java @@ -474,9 +474,9 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory { String ns = p.getNamespaceURI(); Map<String, String> nsMap = message.getEnvelopeNs(); if (nsMap == null) { - nsMap = new HashMap<String, String>(); + nsMap = new HashMap<>(); } else { - nsMap = new HashMap<String, String>(nsMap); + nsMap = new HashMap<>(nsMap); } message.put("soap.env.ns.map", nsMap); if (!nsMap.containsValue(ns) http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java index 41470e2..d8ba78f 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java @@ -53,7 +53,7 @@ public class SoapFault extends Fault { private List<QName> subCodes; private String role; private String node; - private Map<String, String> namespaces = new HashMap<String, String>(); + private Map<String, String> namespaces = new HashMap<>(); public SoapFault(Message message, Throwable throwable, QName faultCode) { super(message, throwable, faultCode); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java index 9113204..1da5d41 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java @@ -31,7 +31,7 @@ public class SoapVersionFactory { getInstance().register(Soap12.getInstance()); } - private Map<String, SoapVersion> versions = new HashMap<String, SoapVersion>(); + private Map<String, SoapVersion> versions = new HashMap<>(); public static SoapVersionFactory getInstance() { return factory; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java index fdecf8b..4efe590 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java @@ -76,7 +76,7 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor { Element detail = null; String lang = null; - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("s", Soap12.SOAP_NAMESPACE); XPathUtils xu = new XPathUtils(ns); try { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java index 0dc92cd..624a5ad 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java @@ -36,7 +36,7 @@ public class JMSFaultType { @XmlAnyElement(lax = true) protected List<Object> any; @XmlAnyAttribute - private Map<QName, String> otherAttributes = new HashMap<QName, String>(); + private Map<QName, String> otherAttributes = new HashMap<>(); /** * Gets the value of the faultCode property. http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java index 98cbc2b..2e08a56 100644 --- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java +++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java @@ -58,7 +58,7 @@ import org.junit.Test; public class SoapFaultSerializerTest extends Assert { private void assertValid(String xpathExpression, Document doc) { - Map<String, String> namespaces = new HashMap<String, String>(); + Map<String, String> namespaces = new HashMap<>(); namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/";); namespaces.put("xsd", "http://www.w3.org/2001/XMLSchema";); namespaces.put("wsdl", "http://schemas.xmlsoap.org/wsdl/";); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java b/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java index b883175..648dc88 100644 --- a/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java +++ b/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java @@ -87,7 +87,7 @@ public class StaxBuilder { * Map that contains conversion from textual attribute types StAX uses, to * int values JDOM uses. */ - private static final Map<String, Integer> ATTR_TYPES = new HashMap<String, Integer>(32); + private static final Map<String, Integer> ATTR_TYPES = new HashMap<>(32); static { ATTR_TYPES.put("CDATA", new Integer(Attribute.CDATA_TYPE)); ATTR_TYPES.put("cdata", new Integer(Attribute.CDATA_TYPE)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java index be01567..bb975f7 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java @@ -39,7 +39,7 @@ public abstract class AbstractAegisIoImpl { protected AbstractAegisIoImpl(AegisContext globalContext) { aegisContext = globalContext; context = new Context(globalContext); - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); } /** @@ -51,7 +51,7 @@ public abstract class AbstractAegisIoImpl { protected AbstractAegisIoImpl(AegisContext globalContext, Context context) { aegisContext = globalContext; this.context = context; - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); } /** {@inheritDoc}*/ http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java ---------------------------------------------------------------------- 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 fb4406b..4f9711f 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 @@ -99,7 +99,7 @@ public class AegisContext { * Construct a context. */ public AegisContext() { - beanImplementationMap = new HashMap<Class<?>, String>(); + beanImplementationMap = new HashMap<>(); rootClasses = new HashSet<java.lang.reflect.Type>(); rootTypeQNames = new HashSet<>(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java index dcd37c2..d8889ba 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java @@ -39,8 +39,8 @@ public class Context { public Context(AegisContext aegisContext) { this.globalContext = aegisContext; - this.properties = new HashMap<Class<?>, Object>(); - this.namedProperties = new HashMap<String, Object>(); + this.properties = new HashMap<>(); + this.namedProperties = new HashMap<>(); } public TypeMapping getTypeMapping() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java index f27daf2..ba6b3d0 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java @@ -97,7 +97,7 @@ public class AegisDatabinding extends AbstractDataBinding { public AegisDatabinding() { super(); - part2Type = new HashMap<MessagePartInfo, AegisType>(); + part2Type = new HashMap<>(); } public AegisDatabinding(AegisContext ctx) { this(); @@ -197,7 +197,7 @@ public class AegisDatabinding extends AbstractDataBinding { aegisContext.setMtomUseXmime(true); } - Map<Class<?>, String> implMap = new HashMap<Class<?>, String>(); + Map<Class<?>, String> implMap = new HashMap<>(); // now for a really annoying case, the .implementation objects. for (String key : s.keySet()) { if (key.endsWith(".implementation")) { @@ -405,7 +405,7 @@ public class AegisDatabinding extends AbstractDataBinding { private void createSchemas(Service s, Set<AegisType> deps) { - Map<String, Set<AegisType>> tns2Type = new HashMap<String, Set<AegisType>>(); + Map<String, Set<AegisType>> tns2Type = new HashMap<>(); for (AegisType t : deps) { String ns = t.getSchemaType().getNamespaceURI(); Set<AegisType> types = tns2Type.get(ns); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataWriter.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataWriter.java index 8b0c4ef..1f058fe 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataWriter.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataWriter.java @@ -99,7 +99,7 @@ public class ElementDataWriter implements DataWriter<Element> { public void setProperty(String prop, Object value) { if (properties == null) { - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); } properties.put(prop, value); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java index 348dd81..1382ede 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java @@ -122,7 +122,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> { public void setProperty(String prop, Object value) { if (properties == null) { - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); } properties.put(prop, value); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java ---------------------------------------------------------------------- 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 db435ac..5b6812f 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 @@ -111,7 +111,7 @@ public class XMLTypeCreator extends AbstractTypeCreator { private static final DocumentBuilderFactory AEGIS_DOCUMENT_BUILDER_FACTORY; // cache of classes to documents - private Map<String, Document> documents = new HashMap<String, Document>(); + private Map<String, Document> documents = new HashMap<>(); static { AEGIS_DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance(); AEGIS_DOCUMENT_BUILDER_FACTORY.setNamespaceAware(true); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java index 1bad34c..f1ccc63 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java @@ -41,9 +41,9 @@ import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.common.util.ReflectionUtil; public class BeanTypeInfo { - private Map<QName, QName> mappedName2typeName = new HashMap<QName, QName>(); - private Map<QName, String> mappedName2pdName = new HashMap<QName, String>(); - private Map<QName, AegisType> mappedName2type = new HashMap<QName, AegisType>(); + private Map<QName, QName> mappedName2typeName = new HashMap<>(); + private Map<QName, String> mappedName2pdName = new HashMap<>(); + private Map<QName, AegisType> mappedName2type = new HashMap<>(); private Class<?> beanClass; private List<QName> attributes = new ArrayList<>(); private List<QName> elements = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java index 2c2439d..0874942 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Map; class InterfaceInvocationHandler implements InvocationHandler { - private Map<Object, Object> attributes = new HashMap<Object, Object>(); + private Map<Object, Object> attributes = new HashMap<>(); InterfaceInvocationHandler() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java index e387d92..1b8fa84 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java @@ -42,7 +42,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo { /** * Map used for storing meta data about each property */ - private Map<QName, BeanTypePropertyInfo> name2PropertyInfo = new HashMap<QName, BeanTypePropertyInfo>(); + private Map<QName, BeanTypePropertyInfo> name2PropertyInfo = new HashMap<>(); public XMLBeanTypeInfo(Class<?> typeClass, List<Element> mappings, String defaultNS) { super(typeClass, defaultNS); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java index 25155bd..5fcf2c0 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java @@ -127,7 +127,7 @@ public class MapType extends AegisType { Class<?> cls = getTypeClass(); if (cls.equals(Map.class)) { - map = new HashMap<Object, Object>(); + map = new HashMap<>(); } else if (cls.equals(Hashtable.class)) { map = new Hashtable<Object, Object>(); } else if (cls.equals(ConcurrentMap.class)) { @@ -137,7 +137,7 @@ public class MapType extends AegisType { } else if (cls.equals(SortedMap.class) || cls.equals(NavigableMap.class)) { map = new TreeMap<Object, Object>(); } else if (cls.isInterface()) { - map = new HashMap<Object, Object>(); + map = new HashMap<>(); } else { try { map = (Map<Object, Object>)cls.newInstance(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java index 2e611d3..e49431f 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java @@ -163,9 +163,9 @@ public class Java5TypeCreator extends AbstractTypeCreator { Map<String, Type> pm = generic.getTypeVars(); if (map) { if (pm == null) { - pm = new HashMap<String, Type>(); + pm = new HashMap<>(); } else { - pm = new HashMap<String, Type>(pm); + pm = new HashMap<>(pm); } paramType = getComponentTypeForMap(generic.getType(), pm, index == 0); } else { @@ -228,7 +228,7 @@ public class Java5TypeCreator extends AbstractTypeCreator { protected Type getComponentTypeForMap(Type genericType, Map<String, Type> pm, boolean key) { if (pm == null) { - pm = new HashMap<String, Type>(); + pm = new HashMap<>(); } return findMapGenericTypes(genericType, pm, key); } @@ -262,7 +262,7 @@ public class Java5TypeCreator extends AbstractTypeCreator { if (Map.class.isAssignableFrom(c)) { for (Type tp : c.getGenericInterfaces()) { - Map<String, Type> cp = new HashMap<String, Type>(pm); + Map<String, Type> cp = new HashMap<>(pm); Type types = findMapGenericTypes(tp, cp, key); if (types != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java index bde1b9f..4a373ad 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java @@ -197,7 +197,7 @@ public abstract class AbstractXOPType extends AegisType { @Override public void addToSchemaElement(XmlSchemaElement schemaElement) { if (expectedContentTypes != null) { - Map<String, Node> extAttrMap = new HashMap<String, Node>(); + Map<String, Node> extAttrMap = new HashMap<>(); Attr theAttr = DOMUtils.createDocument().createAttributeNS(XML_MIME_NS, "xmime"); theAttr.setNodeValue(expectedContentTypes); extAttrMap.put("xmime", theAttr); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java index 99dd0de..166ab36 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamReader.java @@ -119,7 +119,7 @@ public class JDOMStreamReader extends AbstractDOMStreamReader<Element, Integer> namespaceStack.push(prefix2decNs); } - prefix2decNs = new HashMap<String, Namespace>(); + prefix2decNs = new HashMap<>(); namespaces.clear(); for (Iterator<?> itr = element.getAdditionalNamespaces().iterator(); itr.hasNext();) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java index 94e2f11..e061e4d 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java @@ -43,7 +43,7 @@ public class JDOMStreamWriter implements XMLStreamWriter { private NamespaceContext context; - private Map<String, Object> properties = new HashMap<String, Object>(); + private Map<String, Object> properties = new HashMap<>(); public JDOMStreamWriter() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java index 883f111..8ddbef1 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java @@ -30,7 +30,7 @@ public class ServiceImpl implements Service { throw new IllegalArgumentException("beanIds is null"); } - Map<String, NoDefaultConstructorBean> map = new HashMap<String, NoDefaultConstructorBean>(); + Map<String, NoDefaultConstructorBean> map = new HashMap<>(); map.put("1", new NoDefaultConstructorBeanImpl("1", "name")); map.put("2", new NoDefaultConstructorBeanImpl("2", "name")); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws2/impl/WS2Impl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws2/impl/WS2Impl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws2/impl/WS2Impl.java index 4e6a8df..49ede62 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws2/impl/WS2Impl.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws2/impl/WS2Impl.java @@ -29,7 +29,7 @@ import org.apache.cxf.aegis.inheritance.ws2.common.pack1.ContentBean1; import org.apache.cxf.aegis.inheritance.ws2.common.pack2.ContentBean2; public class WS2Impl implements WS2 { - private Map<String, ParentBean> map = new HashMap<String, ParentBean>(); + private Map<String, ParentBean> map = new HashMap<>(); public WS2Impl() { ParentBean x = new ParentBean("X", new ContentBean1("data1-X")); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java index d5e3e81..8aa3ce3 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java @@ -118,7 +118,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest { * @return */ private Map<String, String> getNodeNamespaceDeclarations(Node node) { - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); NamedNodeMap attributes = node.getAttributes(); for (int x = 0; x < attributes.getLength(); x++) { Attr attr = (Attr)attributes.item(x); @@ -147,7 +147,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest { @Test public void testOnePrefix() throws Exception { - Map<String, String> mappings = new HashMap<String, String>(); + Map<String, String> mappings = new HashMap<>(); mappings.put(URN_AEGIS_NAMESPACE_TEST, AEGIS_TEST_NAMESPACE_PREFIX_XYZZY); ServiceAndMapping serviceAndMapping = setupService(NameServiceImpl.class, mappings); Definition def = getWSDLDefinition("NameServiceImpl"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java index 05a9be8..0a2d1cd 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTestsWithService.java @@ -66,8 +66,8 @@ public class CollectionTestsWithService extends AbstractAegisTest { @Test public void testNestedMap() throws Exception { Map<String, Map<String, BeanWithGregorianDate>> complexMap; - complexMap = new HashMap<String, Map<String, BeanWithGregorianDate>>(); - Map<String, BeanWithGregorianDate> innerMap = new HashMap<String, BeanWithGregorianDate>(); + complexMap = new HashMap<>(); + Map<String, BeanWithGregorianDate> innerMap = new HashMap<>(); BeanWithGregorianDate bean = new BeanWithGregorianDate(); bean.setName("shem bean"); bean.setId(42); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java index b748010..d42baa3 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java @@ -25,7 +25,7 @@ public class MapDTOService { public MapDTO getDTO() { MapDTO dto = new MapDTO(); - Map<String, Integer> strings = new HashMap<String, Integer>(); + Map<String, Integer> strings = new HashMap<>(); strings.put("hi", 4); dto.setStrings(strings); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java index c108fcf..7a1908d 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java @@ -28,7 +28,7 @@ public class StudentServiceDocLiteralImpl implements StudentServiceDocLiteral { private Map<Long, Student> studentMap; public StudentServiceDocLiteralImpl() { - studentMap = new HashMap<Long, Student>(); + studentMap = new HashMap<>(); studentMap.put(Long.valueOf(1), new Student("Student1", 1)); studentMap.put(Long.valueOf(100), new Student("Student100", 100)); studentMap.put(Long.valueOf(-1), new Student("StudentNegative", -1)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java index 93ed075..483285d 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java @@ -28,7 +28,7 @@ public class StudentServiceImpl implements StudentService { private Map<Long, Student> studentMap; public StudentServiceImpl() { - studentMap = new HashMap<Long, Student>(); + studentMap = new HashMap<>(); studentMap.put(Long.valueOf(1), new Student("Student1", 1)); studentMap.put(Long.valueOf(100), new Student("Student100", 100)); studentMap.put(Long.valueOf(-1), new Student("StudentNegative", -1)); @@ -64,7 +64,7 @@ public class StudentServiceImpl implements StudentService { } public Map<String, ?> getWildcardMap() { - Map<String, String> m = new HashMap<String, String>(); + Map<String, String> m = new HashMap<>(); m.put("keystring", "valuestring"); return m; } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java index 2ab8c43..0758c74 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentTest.java @@ -89,9 +89,9 @@ public class StudentTest extends AbstractAegisTest { proxyFac.setBus(getBus()); setupAegis(proxyFac.getClientFactoryBean()); //CHECKSTYLE:OFF - HashMap<String, Student> mss = new HashMap<String, Student>(); + HashMap<String, Student> mss = new HashMap<>(); mss.put("Alice", new Student()); - HashMap<String, HashMap<String, Student>> mmss = new HashMap<String, HashMap<String, Student>>(); + HashMap<String, HashMap<String, Student>> mmss = new HashMap<>(); mmss.put("Bob", mss); StudentServiceDocLiteral clientInterface = proxyFac.create(StudentServiceDocLiteral.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java index e62d42d..4f3cf86 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTestImpl.java @@ -27,7 +27,7 @@ import org.apache.cxf.aegis.type.map.ns2.ObjectWithAMapNs2; public class MapTestImpl implements MapTest { public Map<String, Long> getMapStringToLong() { - Map<String, Long> map = new HashMap<String, Long>(); + Map<String, Long> map = new HashMap<>(); map.put("one", Long.valueOf(1)); map.put("twenty-seven", Long.valueOf(27)); return map; @@ -45,7 +45,7 @@ public class MapTestImpl implements MapTest { } public Map<Long, String> getMapLongToString() { - Map<Long, String> map = new HashMap<Long, String>(); + Map<Long, String> map = new HashMap<>(); map.put(Long.valueOf(1), "one"); map.put(Long.valueOf(2), null); map.put(Long.valueOf(27), "twenty-seven"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java index 4af428d..be258b5 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java @@ -29,7 +29,7 @@ public class ObjectWithAMap { private Map<String, Boolean> theMap; public ObjectWithAMap() { - theMap = new HashMap<String, Boolean>(); + theMap = new HashMap<>(); } public Map<String, Boolean> getTheMap() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java index 422b1d3..34c003f 100644 --- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java +++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java @@ -29,7 +29,7 @@ public class ObjectWithAMapNs2 { private Map<String, Boolean> theMap; public ObjectWithAMapNs2() { - theMap = new HashMap<String, Boolean>(); + theMap = new HashMap<>(); theMap.put("rainy", Boolean.TRUE); theMap.put("sunny", Boolean.FALSE); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java ---------------------------------------------------------------------- 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 76d099b..9a1a11d 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 @@ -143,7 +143,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding return nd; } } - private static final Map<String, DOMResult> BUILT_IN_SCHEMAS = new HashMap<String, DOMResult>(); + private static final Map<String, DOMResult> BUILT_IN_SCHEMAS = new HashMap<>(); static { URIResolver resolver = new URIResolver(); try { @@ -195,10 +195,10 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding Class<?> cls; - private Map<String, Object> contextProperties = new HashMap<String, Object>(); + private Map<String, Object> contextProperties = new HashMap<>(); private List<XmlAdapter<?, ?>> adapters = new ArrayList<XmlAdapter<?, ?>>(); - private Map<String, Object> marshallerProperties = new HashMap<String, Object>(); - private Map<String, Object> unmarshallerProperties = new HashMap<String, Object>(); + private Map<String, Object> marshallerProperties = new HashMap<>(); + private Map<String, Object> unmarshallerProperties = new HashMap<>(); private Unmarshaller.Listener unmarshallerListener; private Marshaller.Listener marshallerListener; private ValidationEventHandler validationEventHandler; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java index a583648..d49d074 100644 --- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java +++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java @@ -28,7 +28,7 @@ public class DataBindingMarshallerPropertiesTest extends TestBase { @Test public void testInitializeUnmarshallerProperties() throws Exception { JAXBDataBinding db = new JAXBDataBinding(); - Map<String, Object> unmarshallerProperties = new HashMap<String, Object>(); + Map<String, Object> unmarshallerProperties = new HashMap<>(); unmarshallerProperties.put("someproperty", "somevalue"); db.setUnmarshallerProperties(unmarshallerProperties); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java ---------------------------------------------------------------------- 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 2f8ea71..f069cdb 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 @@ -187,10 +187,10 @@ public class JAXBDataBindingTest extends Assert { @Test public void testContextProperties() throws Exception { JAXBDataBinding db = new JAXBDataBinding(); - Map<String, String> nsMap = new HashMap<String, String>(); + Map<String, String> nsMap = new HashMap<>(); nsMap.put("uri:ultima:thule", ""); db.setNamespaceMap(nsMap); - Map<String, Object> contextProperties = new HashMap<String, Object>(); + 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<?>>(); @@ -210,10 +210,10 @@ public class JAXBDataBindingTest extends Assert { JAXBDataBinding createJaxbContext(boolean internal) throws Exception { JAXBDataBinding db = new JAXBDataBinding(); - Map<String, String> nsMap = new HashMap<String, String>(); + Map<String, String> nsMap = new HashMap<>(); nsMap.put("uri:ultima:thule", "greenland"); db.setNamespaceMap(nsMap); - Map<String, Object> contextProperties = new HashMap<String, Object>(); + Map<String, Object> contextProperties = new HashMap<>(); db.setContextProperties(contextProperties); Set<Class<?>> classes = new HashSet<Class<?>>(); classes.add(QualifiedBean.class); @@ -293,7 +293,7 @@ public class JAXBDataBindingTest extends Assert { public void testResursiveType() throws Exception { Set<Class<?>> classes = new HashSet<Class<?>>(); Collection<Object> typeReferences = new ArrayList<>(); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); JAXBContextInitializer init = new JAXBContextInitializer(null, classes, typeReferences, props); init.addClass(Type2.class); assertEquals(2, classes.size()); @@ -368,7 +368,7 @@ public class JAXBDataBindingTest extends Assert { public static class LanguageAdapter extends XmlAdapter<String, Language> { - private Map<String, Language> knownLanguages = new HashMap<String, Language>(); + private Map<String, Language> knownLanguages = new HashMap<>(); public LanguageAdapter(Language... languages) { for (Language language : languages) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java index c1af75b..5616fb8 100644 --- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java +++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java @@ -135,7 +135,7 @@ public class JAXBEncoderDecoderTest extends Assert { @Test public void testCXF3611() throws Exception { - Map<String, String> foo = new HashMap<String, String>(); + Map<String, String> foo = new HashMap<>(); assertTrue(JAXBSchemaInitializer.isArray(getFieldType("arrayField"))); assertTrue(JAXBSchemaInitializer.isArray(getFieldType("listField"))); @@ -226,7 +226,7 @@ public class JAXBEncoderDecoderTest extends Assert { @Test public void testCustomNamespaces() throws Exception { - Map<String, String> mapper = new HashMap<String, String>(); + Map<String, String> mapper = new HashMap<>(); mapper.put("http://apache.org/hello_world_soap_http/types";, "Omnia"); mapper.put("http://cxf.apache.org/jaxb_form";, "Gallia"); ObjectWithQualifiedElementElement testObject = new ObjectWithQualifiedElementElement(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java index 4759237..3263825 100644 --- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java +++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java @@ -163,7 +163,7 @@ public class JAXBUtilsTest extends Assert { public void testSetNamespaceMapper() throws Exception { JAXBContext ctx = JAXBContext.newInstance(GreetMe.class); Marshaller marshaller = ctx.createMarshaller(); - Map<String, String> nspref = new HashMap<String, String>(); + Map<String, String> nspref = new HashMap<>(); nspref.put("http://cxf.apache.org/hello_world_soap_http/types";, "x"); JAXBUtils.setNamespaceMapper(nspref, marshaller); String mapperkey = null; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java ---------------------------------------------------------------------- diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java index 4df525f..4fbd2bc 100644 --- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java +++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java @@ -298,7 +298,7 @@ public class XMLStreamDataWriterTest extends Assert { @Test public void testWriteWithNamespacePrefixMapping() throws Exception { JAXBDataBinding db = getTestWriterFactory(GreetMe.class); - Map<String, String> nspref = new HashMap<String, String>(); + Map<String, String> nspref = new HashMap<>(); nspref.put("http://apache.org/hello_world_soap_http/types";, "x"); db.setNamespaceMap(nspref); @@ -336,7 +336,7 @@ public class XMLStreamDataWriterTest extends Assert { @Test public void testWriteWithContextualNamespaceDecls() throws Exception { JAXBDataBinding db = getTestWriterFactory(GreetMe.class); - Map<String, String> nspref = new HashMap<String, String>(); + Map<String, String> nspref = new HashMap<>(); nspref.put("http://apache.org/hello_world_soap_http/types";, "x"); db.setNamespaceMap(nspref); db.setContextualNamespaceMap(nspref); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java index 3aff010..b643a28 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java @@ -75,7 +75,7 @@ import org.apache.cxf.service.invoker.Invoker; */ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean { - protected Map<Class<?>, ResourceProvider> resourceProviders = new HashMap<Class<?>, ResourceProvider>(); + protected Map<Class<?>, ResourceProvider> resourceProviders = new HashMap<>(); private Server server; private boolean start = true; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java index 70a3871..b96bfef 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java @@ -197,7 +197,7 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean { } private Map<String, UserResource> userResourcesAsMap(List<UserResource> resources) { - Map<String, UserResource> map = new HashMap<String, UserResource>(); + Map<String, UserResource> map = new HashMap<>(); for (UserResource ur : resources) { map.put(ur.getName(), ur); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java index e4c22cb..dc8e7ca 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java @@ -61,7 +61,7 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl private DataBinding dataBinding; private Executor executor; private Invoker invoker; - private Map<QName, Endpoint> endpoints = new HashMap<QName, Endpoint>(); + private Map<QName, Endpoint> endpoints = new HashMap<>(); private String address; private boolean createServiceModel; private QName serviceName; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java index 5e2e56e..7b3b42e 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java @@ -67,7 +67,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl> boolean proxyRevalidate = false; int maxAge = -1; int sMaxAge = -1; - Map<String, String> extensions = new HashMap<String, String>(); + Map<String, String> extensions = new HashMap<>(); String[] tokens = getTokens(c); for (String rawToken : tokens) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java ---------------------------------------------------------------------- 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 0fc667d..d27e136 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 @@ -37,7 +37,7 @@ import org.apache.cxf.jaxrs.utils.AnnotationUtils; public class ConfigurationImpl implements Configuration { private static final Logger LOG = LogUtils.getL7dLogger(ConfigurationImpl.class); - private Map<String, Object> props = new HashMap<String, Object>(); + private Map<String, Object> props = new HashMap<>(); private RuntimeType runtimeType; private Map<Object, Map<Class<?>, Integer>> providers = new LinkedHashMap<Object, Map<Class<?>, Integer>>(); @@ -192,7 +192,7 @@ public class ConfigurationImpl implements Configuration { Map<Class<?>, Integer> metadata = providers.get(provider); if (metadata == null) { - metadata = new HashMap<Class<?>, Integer>(); + metadata = new HashMap<>(); providers.put(provider, metadata); } for (Entry<Class<?>, Integer> entry : contracts.entrySet()) { @@ -204,7 +204,7 @@ public class ConfigurationImpl implements Configuration { } public static Map<Class<?>, Integer> initContractsMap(int bindingPriority, Class<?>... contracts) { - Map<Class<?>, Integer> metadata = new HashMap<Class<?>, Integer>(); + Map<Class<?>, Integer> metadata = new HashMap<>(); for (Class<?> contract : contracts) { metadata.put(contract, bindingPriority); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java index f4b9a28..bf144b7 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java @@ -109,7 +109,7 @@ public class HttpHeadersImpl implements HttpHeaders { return Collections.emptyMap(); } - Map<String, Cookie> cl = new HashMap<String, Cookie>(); + Map<String, Cookie> cl = new HashMap<>(); for (String value : values) { if (value == null) { continue; @@ -189,7 +189,7 @@ public class HttpHeadersImpl implements HttpHeaders { } List<Locale> newLs = new ArrayList<>(); - Map<Locale, Float> prefs = new HashMap<Locale, Float>(); + Map<Locale, Float> prefs = new HashMap<>(); for (String l : ls) { String[] pair = StringUtils.split(l, ";"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java index 0e23048..caed5cd 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java @@ -39,7 +39,7 @@ public class LinkBuilderImpl implements Builder { private static final String DOUBLE_QUOTE = "\""; private UriBuilder ub; private URI baseUri; - private Map<String, String> params = new HashMap<String, String>(6); + private Map<String, String> params = new HashMap<>(6); @Override public Link build(Object... values) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java index f52a673..23be014 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java @@ -64,7 +64,7 @@ public final class PropertyHolderFactory { public void setProperty(String name, Object value) { if (props == null) { - props = new HashMap<String, Object>(); + props = new HashMap<>(); m.getExchange().put(PROPERTY_KEY, props); } if (value == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java index 874d9bf..5e26dc9 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java @@ -45,7 +45,7 @@ public class RequestPreprocessor { private static final Map<String, String> MEDIA_TYPE_SHORTCUTS; static { - MEDIA_TYPE_SHORTCUTS = new HashMap<String, String>(); + MEDIA_TYPE_SHORTCUTS = new HashMap<>(); MEDIA_TYPE_SHORTCUTS.put("json", "application/json"); MEDIA_TYPE_SHORTCUTS.put("text", "text/*"); MEDIA_TYPE_SHORTCUTS.put("xml", "application/xml"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java index 0363650..13953e6 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java @@ -204,7 +204,7 @@ public final class ResponseImpl extends Response { if (cookieValues == null) { return Collections.emptyMap(); } else { - Map<String, NewCookie> cookies = new HashMap<String, NewCookie>(); + Map<String, NewCookie> cookies = new HashMap<>(); for (Object o : cookieValues) { NewCookie newCookie = NewCookie.valueOf(o.toString()); cookies.put(newCookie.getName(), newCookie); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java index 3dcc399..9555774 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java @@ -43,7 +43,7 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils; public class RuntimeDelegateImpl extends RuntimeDelegate { protected Map<Class<?>, HeaderDelegate<?>> headerProviders - = new HashMap<Class<?>, HeaderDelegate<?>>(); + = new HashMap<>(); public RuntimeDelegateImpl() { headerProviders.put(MediaType.class, new MediaTypeHeaderProvider()); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java index 820d6b0..24209e9 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java @@ -276,7 +276,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable { boolean encodePathSlash) { //CHECKSTYLE:ON - Map<String, String> varValueMap = new HashMap<String, String>(); + Map<String, String> varValueMap = new HashMap<>(); // vars in set are properly ordered due to linking in hash set Set<String> uniqueVars = new LinkedHashSet<String>(templ.getVariables()); @@ -382,7 +382,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable { public URI buildFromEncodedMap(Map<String, ?> map) throws IllegalArgumentException, UriBuilderException { - Map<String, String> decodedMap = new HashMap<String, String>(map.size()); + Map<String, String> decodedMap = new HashMap<>(map.size()); for (Map.Entry<String, ? extends Object> entry : map.entrySet()) { if (entry.getValue() == null) { throw new IllegalArgumentException("Value is null"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java ---------------------------------------------------------------------- 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 764580c..9284122 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 @@ -265,7 +265,7 @@ public abstract class AbstractResourceInfo { private void addContextMethod(Class<?> contextClass, Method m, Object provider) { if (contextMethods == null) { - contextMethods = new HashMap<Class<?>, Map<Class<?>, Method>>(); + contextMethods = new HashMap<>(); } addToMap(contextMethods, contextClass, m); if (!InjectionUtils.VALUE_CONTEXTS.contains(m.getParameterTypes()[0].getName())) { @@ -334,7 +334,7 @@ public abstract class AbstractResourceInfo { private Map<Class<?>, List<Field>> addContextField(Map<Class<?>, List<Field>> theFields, Field f) { if (theFields == null) { - theFields = new HashMap<Class<?>, List<Field>>(); + theFields = new HashMap<>(); } List<Field> fields = theFields.get(serviceClass); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java index 9870736..0aa4f7b 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ApplicationInfo.java @@ -43,7 +43,7 @@ public class ApplicationInfo extends ProviderInfo<Application> { if (overridingProps.isEmpty()) { return appProps; } else { - Map<String, Object> props = new HashMap<String, Object>(appProps); + Map<String, Object> props = new HashMap<>(appProps); props.putAll(overridingProps); return props; } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ResourceTypes.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ResourceTypes.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ResourceTypes.java index c120c84..69be0b7 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ResourceTypes.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ResourceTypes.java @@ -25,10 +25,10 @@ import java.util.Map; import javax.xml.namespace.QName; public class ResourceTypes { - private Map<Class<?>, Type> allTypes = new HashMap<Class<?>, Type>(); - private Map<Class<?>, QName> collectionMap = new HashMap<Class<?>, QName>(); - private Map<Class<?>, QName> xmlNameMap = new HashMap<Class<?>, QName>(); - private Map<Class<?>, Class<?>> substitutions = new HashMap<Class<?>, Class<?>>(); + private Map<Class<?>, Type> allTypes = new HashMap<>(); + private Map<Class<?>, QName> collectionMap = new HashMap<>(); + private Map<Class<?>, QName> xmlNameMap = new HashMap<>(); + private Map<Class<?>, Class<?>> substitutions = new HashMap<>(); public Map<Class<?>, Type> getAllTypes() { return allTypes; } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java index 0274299..54effe7 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserApplication.java @@ -55,7 +55,7 @@ public class UserApplication { } public Map<String, UserResource> getResourcesAsMap() { - Map<String, UserResource> map = new HashMap<String, UserResource>(); + Map<String, UserResource> map = new HashMap<>(); if (resources != null) { for (UserResource r : resources) { map.put(r.getName(), r); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserResource.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserResource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserResource.java index 9d278a8..8ae9fb8 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserResource.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/UserResource.java @@ -101,7 +101,7 @@ public class UserResource { } public Map<String, UserOperation> getOperationsAsMap() { - Map<String, UserOperation> map = new HashMap<String, UserOperation>(); + Map<String, UserOperation> map = new HashMap<>(); for (UserOperation op : opers) { map.put(op.getName(), op); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java ---------------------------------------------------------------------- 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 01aa8c9..5871cd2 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 @@ -104,8 +104,8 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid protected List<String> inDropElements; protected Map<String, String> inElementsMap; protected Map<String, String> inAppendMap; - protected Map<String, JAXBContext> packageContexts = new HashMap<String, JAXBContext>(); - protected Map<Class<?>, JAXBContext> classContexts = new HashMap<Class<?>, JAXBContext>(); + protected Map<String, JAXBContext> packageContexts = new HashMap<>(); + protected Map<Class<?>, JAXBContext> classContexts = new HashMap<>(); private boolean attributesToElements; private MessageContext mc; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java index 22f819d..328f63a 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java @@ -414,7 +414,7 @@ public class JAXBElementProvider<T> extends AbstractJAXBProvider<T> { Marshaller ms = createMarshaller(obj, cls, genericType, enc); ms.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE); if (ns.length() > 0) { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); // set the default just in case if (!nsPrefixes.containsKey(ns)) { map.put(ns, "ns1"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java index c3ca9fd..9e1ac3f 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java @@ -459,7 +459,7 @@ public class RequestDispatcherProvider extends AbstractConfigurableProvider this.path = path; this.servletPath = servletPath; this.saveParamsAsAttributes = saveParamsAsAttributes; - params = new HashMap<String, String[]>(request.getParameterMap()); + params = new HashMap<>(request.getParameterMap()); } @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java ---------------------------------------------------------------------- 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 d65e451..86a417e 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 @@ -507,7 +507,7 @@ public final class ServerProviderFactory extends ProviderFactory { @Override public Map<Class<?>, Integer> getContracts(Class<?> cls) { - Map<Class<?>, Integer> map = new HashMap<Class<?>, Integer>(); + Map<Class<?>, Integer> map = new HashMap<>(); if (isRegistered(cls)) { if (ContainerRequestFilter.class.isAssignableFrom(cls)) { boolean isPreMatch = cls.getAnnotation(PreMatching.class) != null; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java index 90c6a1b..a533e36 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java @@ -381,14 +381,14 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> { } public void setInMediaTemplates(Map<String, String> map) { - inMediaTemplates = new HashMap<String, Templates>(); + inMediaTemplates = new HashMap<>(); for (Map.Entry<String, String> entry : map.entrySet()) { inMediaTemplates.put(entry.getKey(), createTemplates(entry.getValue())); } } public void setOutMediaTemplates(Map<String, String> map) { - outMediaTemplates = new HashMap<String, Templates>(); + outMediaTemplates = new HashMap<>(); for (Map.Entry<String, String> entry : map.entrySet()) { outMediaTemplates.put(entry.getKey(), createTemplates(entry.getValue())); } @@ -547,8 +547,8 @@ public class XSLTJaxbProvider<T> extends JAXBElementProvider<T> { private Templates templates; private URIResolver resolver; - private Map<String, Object> transformParameters = new HashMap<String, Object>(); - private Map<String, String> outProps = new HashMap<String, String>(); + private Map<String, Object> transformParameters = new HashMap<>(); + private Map<String, String> outProps = new HashMap<>(); TemplatesImpl(Templates templates, URIResolver resolver) { this.templates = templates; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthOutInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthOutInterceptor.java index dd9bfc8..2089de4 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthOutInterceptor.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthOutInterceptor.java @@ -56,7 +56,7 @@ public class KerberosAuthOutInterceptor extends AbstractSpnegoAuthSupplier Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS)); if (headers == null) { - headers = new HashMap<String, List<String>>(); + headers = new HashMap<>(); message.put(Message.PROTOCOL_HEADERS, headers); } headers.put("Authorization", Collections.singletonList(value)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java index 8fb9040..e961dd3 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java @@ -234,7 +234,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { String[] values = StringUtils.split(value, splitChar); List<Interceptor<? extends Message>> list = new ArrayList<Interceptor<? extends Message>>(); for (String interceptorVal : values) { - Map<String, List<String>> props = new HashMap<String, List<String>>(); + Map<String, List<String>> props = new HashMap<>(); String theValue = getClassNameAndProperties(interceptorVal, props); if (theValue.length() != 0) { try { @@ -267,7 +267,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { if (value == null) { return; } - Map<String, List<String>> props = new HashMap<String, List<String>>(); + Map<String, List<String>> props = new HashMap<>(); String theValue = getClassNameAndProperties(value, props); if (theValue.length() != 0) { try { @@ -300,7 +300,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { Map<Class<?>, Map<String, List<String>>> map = new HashMap<Class<?>, Map<String, List<String>>>(); for (String cName : classNames) { - Map<String, List<String>> props = new HashMap<String, List<String>>(); + Map<String, List<String>> props = new HashMap<>(); String theName = getClassNameAndProperties(cName, props); if (theName.length() != 0) { Class<?> cls = loadClass(theName); @@ -323,7 +323,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { String[] classNames = StringUtils.split(featuresList, splitChar); List< Feature > features = new ArrayList< Feature >(); for (String cName : classNames) { - Map<String, List<String>> props = new HashMap<String, List<String>>(); + Map<String, List<String>> props = new HashMap<>(); String theName = getClassNameAndProperties(cName, props); if (theName.length() != 0) { Class<?> cls = loadClass(theName); @@ -343,7 +343,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { String[] classNames = StringUtils.split(providersList, splitChar); List<Object> providers = new ArrayList<>(); for (String cName : classNames) { - Map<String, List<String>> props = new HashMap<String, List<String>>(); + Map<String, List<String>> props = new HashMap<>(); String theName = getClassNameAndProperties(cName, props); if (theName.length() != 0) { Class<?> cls = loadClass(theName); @@ -366,7 +366,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { protected static Map<String, List<String>> parseMapListSequence(String sequence) { if (sequence != null) { sequence = sequence.trim(); - Map<String, List<String>> map = new HashMap<String, List<String>>(); + Map<String, List<String>> map = new HashMap<>(); String[] pairs = StringUtils.split(sequence, " "); for (String pair : pairs) { String thePair = pair.trim(); @@ -404,7 +404,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { throw new ServletException("Only singleton and prototype scopes are supported"); } boolean isPrototype = SERVICE_SCOPE_REQUEST.equals(scope); - Map<Class<?>, ResourceProvider> map = new HashMap<Class<?>, ResourceProvider>(); + Map<Class<?>, ResourceProvider> map = new HashMap<>(); for (Map.Entry<Class<?>, Map<String, List<String>>> entry : resourceClasses.entrySet()) { Class<?> c = entry.getKey(); map.put(c, isPrototype ? new PerRequestResourceProvider(c) @@ -436,7 +436,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { provider = new ProviderInfo<Object>(c.newInstance(), getBus(), false, true); } } else { - Map<Class<?>, Object> values = new HashMap<Class<?>, Object>(); + Map<Class<?>, Object> values = new HashMap<>(); values.put(ServletContext.class, sc.getServletContext()); values.put(ServletConfig.class, sc); provider = ProviderFactory.createProviderFromConstructor(c, values, getBus(), isApplication, true); @@ -465,7 +465,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { return; } Method[] methods = instance.getClass().getMethods(); - Map<String, Method> methodsMap = new HashMap<String, Method>(); + Map<String, Method> methodsMap = new HashMap<>(); for (Method m : methods) { methodsMap.put(m.getName(), m); } @@ -552,11 +552,11 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { if (customApp != null) { return new ApplicationInfo(customApp, getBus()); } - Map<String, List<String>> props = new HashMap<String, List<String>>(); + Map<String, List<String>> props = new HashMap<>(); appClassName = getClassNameAndProperties(appClassName, props); Class<?> appClass = loadApplicationClass(appClassName); ApplicationInfo appInfo = (ApplicationInfo)createSingletonInstance(appClass, props, servletConfig); - Map<String, Object> servletProps = new HashMap<String, Object>(); + Map<String, Object> servletProps = new HashMap<>(); ServletContext servletContext = servletConfig.getServletContext(); for (Enumeration<String> names = servletContext.getInitParameterNames(); names.hasMoreElements();) { String name = names.nextElement(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java index a3d918b..042b378 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java @@ -763,7 +763,7 @@ public final class InjectionUtils { } return theValues; } else { - Map<Object, Object> theValues = new HashMap<Object, Object>(); + Map<Object, Object> theValues = new HashMap<>(); Class<?> valueType = (Class<?>) InjectionUtils.getType(paramType.getActualTypeArguments(), 1); for (Map.Entry<String, List<String>> processedValuesEntry : processedValues.entrySet()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java ---------------------------------------------------------------------- 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 999a492..21c6052 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 @@ -217,7 +217,7 @@ public final class ResourceUtils { Map<String, UserOperation> ops = model.getOperationsAsMap(); Method defaultMethod = null; - Map<String, Method> methodNames = new HashMap<String, Method>(); + Map<String, Method> methodNames = new HashMap<>(); for (Method m : cri.getServiceClass().getMethods()) { if (m.getAnnotation(DefaultMethod.class) != null) { // if needed we can also support multiple default methods @@ -826,7 +826,7 @@ public final class ResourceUtils { List<Class<?>> resourceClasses = new ArrayList<Class<?>>(); List<Object> providers = new ArrayList<>(); List<Feature> features = new ArrayList<>(); - Map<Class<?>, ResourceProvider> map = new HashMap<Class<?>, ResourceProvider>(); + Map<Class<?>, ResourceProvider> map = new HashMap<>(); // Note, app.getClasses() returns a list of per-request classes // or singleton provider classes http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java index 83cd38e..5b22e99 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/SpecExceptions.java @@ -42,7 +42,7 @@ final class SpecExceptions { private static final Map<Integer, Class<?>> EXCEPTIONS_MAP; static { - EXCEPTIONS_MAP = new HashMap<Integer, Class<?>>(); + EXCEPTIONS_MAP = new HashMap<>(); EXCEPTIONS_MAP.put(400, BadRequestException.class); EXCEPTIONS_MAP.put(401, NotAuthorizedException.class); EXCEPTIONS_MAP.put(403, ForbiddenException.class);
