You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/10 15:41:59 UTC
[11/14] cxf git commit: Removing unnecessary type information
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 aafa648..da73ba5 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
@@ -244,7 +244,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
List<String> bodyParts = null;
List<SoapHeaderInfo> headerInfos = b.getInput().getExtensors(SoapHeaderInfo.class);
if (headerInfos != null && headerInfos.size() > 0) {
- bodyParts = new ArrayList<String>();
+ bodyParts = new ArrayList<>();
for (MessagePartInfo part : b.getInput().getMessageParts()) {
bodyParts.add(part.getName().getLocalPart());
}
@@ -280,7 +280,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
List<String> bodyParts = null;
List<SoapHeaderInfo> headerInfos = b.getOutput().getExtensors(SoapHeaderInfo.class);
if (headerInfos != null && headerInfos.size() > 0) {
- bodyParts = new ArrayList<String>();
+ bodyParts = new ArrayList<>();
for (MessagePartInfo part : b.getOutput().getMessageParts()) {
bodyParts.add(part.getName().getLocalPart());
}
@@ -318,7 +318,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
BindingMessageInfo unwrappedBMsg,
MessageInfo msg,
SoapBindingConfiguration config) {
- List<MessagePartInfo> parts = new ArrayList<MessagePartInfo>();
+ List<MessagePartInfo> parts = new ArrayList<>();
for (MessagePartInfo part : msg.getMessageParts()) {
if (config.isHeader(op, part)) {
SoapHeaderInfo headerInfo = new SoapHeaderInfo();
@@ -524,7 +524,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
private javax.wsdl.Message findMessage(QName qn, Definition def) {
javax.wsdl.Message msg = def.getMessage(qn);
if (msg == null) {
- msg = findMessage(qn, def, new ArrayList<Definition>());
+ msg = findMessage(qn, def, new ArrayList<>());
}
return msg;
}
@@ -719,7 +719,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
private void initializeMessage(SoapBindingInfo bi, BindingOperationInfo boi, BindingMessageInfo bmsg) {
MessageInfo msg = bmsg.getMessageInfo();
- List<MessagePartInfo> messageParts = new ArrayList<MessagePartInfo>();
+ List<MessagePartInfo> messageParts = new ArrayList<>();
messageParts.addAll(msg.getMessageParts());
List<SoapHeader> headers =
@@ -775,7 +775,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
// Initialize the body parts.
List<MessagePartInfo> attParts = null;
if (parts != null) {
- List<MessagePartInfo> bodyParts = new ArrayList<MessagePartInfo>();
+ List<MessagePartInfo> bodyParts = new ArrayList<>();
for (Iterator<?> itr = parts.iterator(); itr.hasNext();) {
Object part = itr.next();
if (part instanceof MIMEPart) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
index 905213b..00f1c29 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
@@ -55,7 +55,7 @@ public class SoapMessage extends MessageImpl {
public List<Header> getHeaders() {
List<Header> heads = CastUtils.cast((List<?>)get(Header.HEADER_LIST));
if (heads == null) {
- heads = new ArrayList<Header>();
+ heads = new ArrayList<>();
put(Header.HEADER_LIST, heads);
}
return heads;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
index cb129ef..4c0a82a 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
@@ -74,7 +74,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
"http://www.w3.org/2010/soapjms/",
"http://www.w3.org/2003/05/soap/bindings/HTTP/");
public static final Set<String> DEFAULT_PREFIXES
- = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
+ = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"soap.udp"
)));
@@ -234,7 +234,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
}
public void setActivationNamespaces(Collection<String> ans) {
- super.setTransportIds(new ArrayList<String>(ans));
+ super.setTransportIds(new ArrayList<>(ans));
}
private static class SoapEndpointInfo extends EndpointInfo {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
index 64c3f75..20d54b3 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
@@ -70,11 +70,11 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
}
SoapVersion soapVersion = soapMessage.getVersion();
- Set<Header> mustUnderstandHeaders = new HashSet<Header>();
- Set<URI> serviceRoles = new HashSet<URI>();
- Set<QName> notUnderstandHeaders = new HashSet<QName>();
- Set<Header> ultimateReceiverHeaders = new HashSet<Header>();
- Set<QName> mustUnderstandQNames = new HashSet<QName>();
+ Set<Header> mustUnderstandHeaders = new HashSet<>();
+ Set<URI> serviceRoles = new HashSet<>();
+ Set<QName> notUnderstandHeaders = new HashSet<>();
+ Set<Header> ultimateReceiverHeaders = new HashSet<>();
+ Set<QName> mustUnderstandQNames = new HashSet<>();
initServiceSideInfo(mustUnderstandQNames, soapMessage, serviceRoles, paramHeaders);
buildMustUnderstandHeaders(mustUnderstandHeaders, soapMessage,
@@ -140,7 +140,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
}
}
if (!ultimateReceiverHeaders.isEmpty()) {
- Set<QName> notFound = new HashSet<QName>();
+ Set<QName> notFound = new HashSet<>();
for (Header h : ultimateReceiverHeaders) {
if (!mustUnderstandQNames.contains(h.getName())) {
notFound.add(h.getName());
@@ -230,7 +230,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
}
public void handleMessage(SoapMessage soapMessage) throws Fault {
SoapVersion soapVersion = soapMessage.getVersion();
- Set<QName> notFound = new HashSet<QName>();
+ Set<QName> notFound = new HashSet<>();
List<Header> heads = soapMessage.getHeaders();
for (Header header : heads) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index 16e3310..c0b72c9 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -323,7 +323,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
private final String header;
private final String body;
private final String envelope;
- private final List<XMLEvent> events = new ArrayList<XMLEvent>(8);
+ private final List<XMLEvent> events = new ArrayList<>(8);
private List<XMLEvent> envEvents;
private List<XMLEvent> bodyEvents;
private StreamToDOMContext context;
@@ -438,12 +438,12 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
final String lastEl = lastStartElementQName.getLocalPart();
if (body.equals(lastEl) && ns.equals(lastStartElementQName.getNamespaceURI())) {
if (bodyEvents == null) {
- bodyEvents = new ArrayList<XMLEvent>();
+ bodyEvents = new ArrayList<>();
}
bodyEvents.add(event);
} else if (envelope.equals(lastEl) && ns.equals(lastStartElementQName.getNamespaceURI())) {
if (envEvents == null) {
- envEvents = new ArrayList<XMLEvent>();
+ envEvents = new ArrayList<>();
}
envEvents.add(event);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 bc68c93..7b7c7be 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
@@ -77,7 +77,7 @@ public class JMSFaultType {
*/
public List<Object> getAny() {
if (any == null) {
- any = new ArrayList<Object>();
+ any = new ArrayList<>();
}
return this.any;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
index 77ffc39..8a54c0c 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
@@ -25,8 +25,8 @@ import java.util.List;
import org.apache.cxf.service.model.MessagePartInfo;
public class SoapBodyInfo {
- private List <MessagePartInfo> parts = new ArrayList<MessagePartInfo>();
- private List <MessagePartInfo> attachments = new ArrayList<MessagePartInfo>();
+ private List <MessagePartInfo> parts = new ArrayList<>();
+ private List <MessagePartInfo> attachments = new ArrayList<>();
private String use;
public List<MessagePartInfo> getParts() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
index 5cfa694..133c019 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
@@ -164,8 +164,8 @@ public class MustUnderstandInterceptorTest extends TestBase {
private boolean calledGetRoles;
private boolean calledGetUnderstood;
- private Set<URI> roles = new HashSet<URI>();
- private Set<QName> understood = new HashSet<QName>();
+ private Set<URI> roles = new HashSet<>();
+ private Set<QName> understood = new HashSet<>();
DummySoapInterceptor(String phase) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
index db03adf..b8bf11c 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
@@ -172,7 +172,7 @@ public class ReadHeaderInterceptorTest extends TestBase {
List<Header> eleHeaders = soapMessage.getHeaders();
- List<Element> headerChilds = new ArrayList<Element>();
+ List<Element> headerChilds = new ArrayList<>();
Iterator<Header> iter = eleHeaders.iterator();
while (iter.hasNext()) {
Header hdr = iter.next();
@@ -186,7 +186,7 @@ public class ReadHeaderInterceptorTest extends TestBase {
Element ele = headerChilds.get(i);
if (ele.getLocalName().equals("reservation")) {
Element reservation = ele;
- List<Element> reservationChilds = new ArrayList<Element>();
+ List<Element> reservationChilds = new ArrayList<>();
Element elem = DOMUtils.getFirstElement(reservation);
while (elem != null) {
reservationChilds.add(elem);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
index 739fe98..5fbff73 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
@@ -67,7 +67,7 @@ public final class TestUtil {
soapMessage.setContent(Attachment.class, new AttachmentImpl(cid, new DataHandler(bads)));
// setup the message attachments
- Collection<Attachment> attachments = new ArrayList<Attachment>();
+ Collection<Attachment> attachments = new ArrayList<>();
soapMessage.setAttachments(attachments);
// String cidAtt1 = "cid:http://cxf.apache.org/me.bmp";
// bads = new ByteArrayDataSource(clazz.getResourceAsStream("me.bmp"), "image/bmp");
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
index a5a0a0f..f6d5150 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
@@ -89,7 +89,7 @@ public class SAAJInInterceptorTest extends TestBase {
assertEquals("check the first entry of body", "itinerary", xmlReader.getLocalName());
List<Header> eleHeaders = soapMessage.getHeaders();
- List<Element> headerChilds = new ArrayList<Element>();
+ List<Element> headerChilds = new ArrayList<>();
Iterator<Header> iter = eleHeaders.iterator();
while (iter.hasNext()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 7dc3f47..8d640a7 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
@@ -101,7 +101,7 @@ public class AegisContext {
public AegisContext() {
beanImplementationMap = new HashMap<Class<?>, String>();
rootClasses = new HashSet<java.lang.reflect.Type>();
- rootTypeQNames = new HashSet<QName>();
+ rootTypeQNames = new HashSet<>();
}
public TypeCreator createTypeCreator() {
@@ -233,12 +233,12 @@ public class AegisContext {
* @param classes list of class names
*/
private void processRootTypes() {
- rootTypes = new HashSet<AegisType>();
+ rootTypes = new HashSet<>();
// app may have already supplied classes.
if (rootClasses == null) {
rootClasses = new HashSet<java.lang.reflect.Type>();
}
- rootTypeQNames = new HashSet<QName>();
+ rootTypeQNames = new HashSet<>();
if (this.rootClassNames != null) {
for (String typeName : rootClassNames) {
Class<?> c = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 9e772fd..582deb3 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
@@ -235,7 +235,7 @@ public class AegisDatabinding extends AbstractDataBinding {
s.getInInterceptors()
.add(new StaxSchemaValidationInInterceptor());
- Set<AegisType> deps = new HashSet<AegisType>();
+ Set<AegisType> deps = new HashSet<>();
for (ServiceInfo info : s.getServiceInfos()) {
for (OperationInfo opInfo : info.getInterface().getOperations()) {
@@ -410,7 +410,7 @@ public class AegisDatabinding extends AbstractDataBinding {
String ns = t.getSchemaType().getNamespaceURI();
Set<AegisType> types = tns2Type.get(ns);
if (types == null) {
- types = new HashSet<AegisType>();
+ types = new HashSet<>();
tns2Type.put(ns, types);
}
types.add(t);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 d7f69e6..3f8ff21 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
@@ -306,7 +306,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
protected List<Element> findMappings(Type type) {
Class<?> clazz = TypeUtil.getTypeClass(type, false);
- List<Element> mappings = new ArrayList<Element>();
+ List<Element> mappings = new ArrayList<>();
if (clazz == null) {
return mappings;
}
@@ -731,7 +731,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
private List<Element> getMatches(Node doc, String xpath) {
NodeList nl = (NodeList)getXPathUtils().getValue(xpath, doc, XPathConstants.NODESET);
- List<Element> r = new ArrayList<Element>();
+ List<Element> r = new ArrayList<>();
for (int x = 0; x < nl.getLength(); x++) {
r.add((Element)nl.item(x));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
index f6309ff..3b6b620 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ArrayType.java
@@ -78,7 +78,7 @@ public class ArrayType extends AegisType {
}
protected Collection<Object> createCollection() {
- return new ArrayList<Object>();
+ return new ArrayList<>();
}
/**
@@ -406,7 +406,7 @@ public class ArrayType extends AegisType {
*/
@Override
public Set<AegisType> getDependencies() {
- Set<AegisType> deps = new HashSet<AegisType>();
+ Set<AegisType> deps = new HashSet<>();
deps.add(getComponentType());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
index 894cc32..88b16bc 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
@@ -529,7 +529,7 @@ public class BeanType extends AegisType {
*/
@Override
public Set<AegisType> getDependencies() {
- Set<AegisType> deps = new HashSet<AegisType>();
+ Set<AegisType> deps = new HashSet<>();
BeanTypeInfo inf = getTypeInfo();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 a5f2a3b..d2dccbd 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
@@ -45,8 +45,8 @@ public class BeanTypeInfo {
private Map<QName, String> mappedName2pdName = new HashMap<QName, String>();
private Map<QName, AegisType> mappedName2type = new HashMap<QName, AegisType>();
private Class<?> beanClass;
- private List<QName> attributes = new ArrayList<QName>();
- private List<QName> elements = new ArrayList<QName>();
+ private List<QName> attributes = new ArrayList<>();
+ private List<QName> elements = new ArrayList<>();
private PropertyDescriptor[] descriptors;
private TypeMapping typeMapping;
private volatile boolean initialized;
@@ -306,7 +306,7 @@ public class BeanTypeInfo {
}
private PropertyDescriptor[] getInterfacePropertyDescriptors(Class<?> clazz) {
- List<PropertyDescriptor> pds = new ArrayList<PropertyDescriptor>();
+ List<PropertyDescriptor> pds = new ArrayList<>();
getInterfacePropertyDescriptors(clazz, pds, new HashSet<Class<?>>());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
index 7d878c8..9b8652e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
@@ -68,11 +68,11 @@ public class CollectionType extends ArrayType {
Class<?> userTypeClass = getTypeClass();
if (userTypeClass.isAssignableFrom(List.class)) {
- values = new ArrayList<Object>();
+ values = new ArrayList<>();
} else if (userTypeClass.isAssignableFrom(LinkedList.class)) {
values = new LinkedList<Object>();
} else if (userTypeClass.isAssignableFrom(Set.class)) {
- values = new HashSet<Object>();
+ values = new HashSet<>();
} else if (userTypeClass.isAssignableFrom(SortedSet.class)) {
values = new TreeSet<Object>();
} else if (userTypeClass.isAssignableFrom(Vector.class)) {
@@ -80,7 +80,7 @@ public class CollectionType extends ArrayType {
} else if (userTypeClass.isAssignableFrom(Stack.class)) {
values = new Stack<Object>();
} else if (userTypeClass.isInterface()) {
- values = new ArrayList<Object>();
+ values = new ArrayList<>();
} else {
try {
values = (Collection<Object>)userTypeClass.newInstance();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 b8cb474..25155bd 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
@@ -239,7 +239,7 @@ public class MapType extends AegisType {
@Override
public Set<AegisType> getDependencies() {
- Set<AegisType> deps = new HashSet<AegisType>();
+ Set<AegisType> deps = new HashSet<>();
deps.add(getKeyType());
deps.add(getValueType());
return deps;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
index ae2598c..940a12e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
@@ -48,7 +48,7 @@ public class ArrayTypeInfo {
private AegisType type;
private QName typeName;
private int ranks;
- private final List<Integer> dimensions = new ArrayList<Integer>();
+ private final List<Integer> dimensions = new ArrayList<>();
private int offset;
public ArrayTypeInfo(QName typeName, int ranks, Integer... dimensions) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
index 5e0ccd6..2f54840 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
@@ -89,7 +89,7 @@ public class SoapArrayType extends AegisType {
// if it is a partially transmitted array offset the array values
if (arrayTypeInfo.getOffset() > 0) {
- List<Object> list = new ArrayList<Object>(values.size() + arrayTypeInfo.getOffset());
+ List<Object> list = new ArrayList<>(values.size() + arrayTypeInfo.getOffset());
list.addAll(Collections.nCopies(arrayTypeInfo.getOffset(), null));
list.addAll(values);
values = list;
@@ -123,7 +123,7 @@ public class SoapArrayType extends AegisType {
ArrayTypeInfo arrayTypeInfo,
int maxSize) throws DatabindingException {
- List<Object> values = new ArrayList<Object>();
+ List<Object> values = new ArrayList<>();
Boolean sparse = null;
while (reader.hasMoreElementReaders()) {
@@ -372,7 +372,7 @@ public class SoapArrayType extends AegisType {
@Override
public Set<AegisType> getDependencies() {
- Set<AegisType> deps = new HashSet<AegisType>();
+ Set<AegisType> deps = new HashSet<>();
deps.add(getComponentType());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java
index cd844f4..84bfe16 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefRegistry.java
@@ -99,7 +99,7 @@ public class SoapRefRegistry {
} else {
List<SoapRef> list = unresolvedRefs.get(id);
if (list == null) {
- list = new ArrayList<SoapRef>();
+ list = new ArrayList<>();
unresolvedRefs.put(id, list);
}
list.add(soapRef);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
index b7cdee3..1a868c2 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
@@ -86,7 +86,7 @@ public class TrailingBlocks {
* @throws DatabindingException if a trailing block element does not contain a soap id attribute
*/
public List<Object> readBlocks(MessageReader reader, Context context) throws DatabindingException {
- List<Object> blocks = new ArrayList<Object>();
+ List<Object> blocks = new ArrayList<>();
// read extra serialization roots
while (reader.hasMoreElementReaders()) {
@@ -120,7 +120,7 @@ public class TrailingBlocks {
* @return a list containing the object instances written
*/
public List<Object> writeBlocks(MessageWriter writer, Context context) {
- List<Object> blocks = new ArrayList<Object>();
+ List<Object> blocks = new ArrayList<>();
for (Object instance : MarshalRegistry.get(context)) {
// determine instance type
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 ab6d3b7..eba0586 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
@@ -158,7 +158,7 @@ public abstract class AbstractXOPType extends AegisType {
Collection<Attachment> attachments = context.getAttachments();
if (attachments == null) {
- attachments = new ArrayList<Attachment>();
+ attachments = new ArrayList<>();
context.setAttachments(attachments);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
index 548af23..773133b 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
@@ -44,7 +44,7 @@ public class JDOMNamespaceContext implements NamespaceContext {
}
public Iterator<String> getPrefixes(String uri) {
- List<String> prefixes = new ArrayList<String>();
+ List<String> prefixes = new ArrayList<>();
rawGetPrefixes(element, uri, prefixes);
return prefixes.iterator();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 b276193..16e90fc 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
@@ -50,7 +50,7 @@ public class JDOMStreamReader extends AbstractDOMStreamReader<Element, Integer>
private FastStack<Map<String, Namespace>> namespaceStack
= new FastStack<Map<String, Namespace>>();
- private List<Namespace> namespaces = new ArrayList<Namespace>();
+ private List<Namespace> namespaces = new ArrayList<>();
private Map<String, Namespace> prefix2decNs;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
index 2116164..6d1ce56 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
@@ -91,7 +91,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/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
index 6066e9e..39e5127 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
@@ -233,7 +233,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
protected Collection<Document> getWSDLDocuments(String string) throws WSDLException {
WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
- Collection<Document> docs = new ArrayList<Document>();
+ Collection<Document> docs = new ArrayList<>();
Definition definition = getWSDLDefinition(string);
if (definition == null) {
return null;
@@ -247,7 +247,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
}
private Collection<Import> getImports(final Definition wsdlDef) {
- Collection<Import> importList = new ArrayList<Import>();
+ Collection<Import> importList = new ArrayList<>();
Map<?, ?> imports = wsdlDef.getImports();
for (Iterator<?> iter = imports.keySet().iterator(); iter.hasNext();) {
String uri = (String)iter.next();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookServiceImpl.java
index aaa56e8..5af69a6 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookServiceImpl.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
public class BookServiceImpl implements BookService {
- private List<Book> allBooks = new ArrayList<Book>();
+ private List<Book> allBooks = new ArrayList<>();
public BookServiceImpl() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 109bc26..ef6d2f3 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
@@ -43,7 +43,7 @@ public class ServiceImpl implements Service {
throw new IllegalArgumentException("key is null");
}
- Collection<NoDefaultConstructorBean> collection = new ArrayList<NoDefaultConstructorBean>();
+ Collection<NoDefaultConstructorBean> collection = new ArrayList<>();
collection.add(new NoDefaultConstructorBeanImpl("1", "name"));
@@ -60,7 +60,7 @@ public class ServiceImpl implements Service {
Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>> map =
new HashMap<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>>();
- Collection<NoDefaultConstructorBean> collection = new ArrayList<NoDefaultConstructorBean>();
+ Collection<NoDefaultConstructorBean> collection = new ArrayList<>();
collection.add(new NoDefaultConstructorBeanImpl("1", "name"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
index d0115b6..f05f426 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ExceptionInheritanceTest.java
@@ -48,7 +48,7 @@ public class ExceptionInheritanceTest extends AbstractAegisTest {
AegisContext globalContext = new AegisContext();
globalContext.setWriteXsiTypes(true);
- Set<String> l = new HashSet<String>();
+ Set<String> l = new HashSet<>();
l.add(SimpleBean.class.getName());
l.add(WS1ExtendedException.class.getName());
globalContext.setRootClassNames(l);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
index 3b3f4a6..33ea295 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritancePOJOTest.java
@@ -49,7 +49,7 @@ public class InheritancePOJOTest extends AbstractAegisTest {
AegisContext globalContext = new AegisContext();
globalContext.setWriteXsiTypes(true);
- Set<String> l = new HashSet<String>();
+ Set<String> l = new HashSet<>();
l.add(Employee.class.getName());
globalContext.setRootClassNames(l);
AegisDatabinding binding = new AegisDatabinding();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
index 024b06d..d577a01 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
@@ -32,6 +32,6 @@ import org.apache.cxf.aegis.namespaces.intf.NameService;
public class NameServiceImpl implements NameService {
public List<Name> listAvailableNames() {
- return new ArrayList<Name>();
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
index fb86f18..725f734 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
@@ -40,7 +40,7 @@ public class OverrideTypeTest extends AbstractAegisTest {
@Test
public void testOverrideBean() throws Exception {
AegisDatabinding aegisDatabinding = new AegisDatabinding();
- Set<String> types = new HashSet<String>();
+ Set<String> types = new HashSet<>();
types.add("org.apache.cxf.aegis.inheritance.Employee");
aegisDatabinding.setOverrideTypes(types);
DataReader<XMLStreamReader> dataReader =
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
index fbc5ee9..e382984 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
@@ -81,7 +81,7 @@ public class StandaloneReadTest {
AegisType aegisRegisteredType = context.getTypeMapping().getType(magicTypeQName);
Object something = reader.read(streamReader, aegisRegisteredType);
- List<String> correctAnswer = new ArrayList<String>();
+ List<String> correctAnswer = new ArrayList<>();
correctAnswer.add("cat");
correctAnswer.add("dog");
correctAnswer.add("hailstorm");
@@ -102,7 +102,7 @@ public class StandaloneReadTest {
AegisReader<XMLStreamReader> reader = context.createXMLStreamReader();
Object something = reader.read(streamReader);
- List<String> correctAnswer = new ArrayList<String>();
+ List<String> correctAnswer = new ArrayList<>();
correctAnswer.add("cat");
correctAnswer.add("dog");
correctAnswer.add("hailstorm");
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
index 82deda4..c9057e3 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
@@ -104,7 +104,7 @@ public class StandaloneWriteTest {
context = new AegisContext();
context.setWriteXsiTypes(true);
context.initialize();
- List<String> strings = new ArrayList<String>();
+ List<String> strings = new ArrayList<>();
strings.add("cat");
strings.add("dog");
strings.add("hailstorm");
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/BeanWithFlatCollection.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/BeanWithFlatCollection.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/BeanWithFlatCollection.java
index f664ff4..6906513 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/BeanWithFlatCollection.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/BeanWithFlatCollection.java
@@ -28,7 +28,7 @@ import org.apache.cxf.aegis.type.java5.XmlFlattenedArray;
* Test bean for flat='true'
*/
public class BeanWithFlatCollection {
- List<Integer> values = new ArrayList<Integer>();
+ List<Integer> values = new ArrayList<>();
@XmlFlattenedArray
public List<Integer> getValues() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 28fe7e1..05a9be8 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
@@ -92,7 +92,7 @@ public class CollectionTestsWithService extends AbstractAegisTest {
assertEquals("Able", first);
//CHECKSTYLE:OFF
- HashSet<String> hashedSet = new HashSet<String>();
+ HashSet<String> hashedSet = new HashSet<>();
hashedSet.addAll(strings);
String countString = csi.takeUnsortedSet(hashedSet);
assertEquals("2", countString);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java
index 869345c..a977edf 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutService.java
@@ -37,6 +37,6 @@ public class DualOutService {
@WebMethod
public Collection<String> getStrings() {
- return new ArrayList<String>();
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java
index 6706e20..848cd4b 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java
@@ -25,7 +25,7 @@ public class DTOService {
public CollectionDTO getDTO() {
CollectionDTO dto = new CollectionDTO();
- List<String> strings = new ArrayList<String>();
+ List<String> strings = new ArrayList<>();
strings.add("hi");
dto.setStrings(strings);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
index c4c4ba9..a670b7d 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
@@ -106,7 +106,7 @@ public abstract class JAXBDataBase {
if (ann instanceof XmlList || ann instanceof XmlAttachmentRef
|| ann instanceof XmlJavaTypeAdapter) {
if (annoList == null) {
- annoList = new ArrayList<Annotation>();
+ annoList = new ArrayList<>();
}
annoList.add(ann);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 7df1191..eb57c5e 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
@@ -191,7 +191,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
JAXBContext context;
Set<Class<?>> contextClasses;
- Collection<Object> typeRefs = new ArrayList<Object>();
+ Collection<Object> typeRefs = new ArrayList<>();
Class<?> cls;
@@ -372,7 +372,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
throw new ServiceConstructionException("SCHEMA_GEN_EXC", LOG, e);
}
}
- Set<String> ids = new HashSet<String>();
+ Set<String> ids = new HashSet<>();
for (DOMSource r : schemas) {
ids.add(r.getSystemId());
}
@@ -620,10 +620,10 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
public WrapperHelper createWrapperHelper(Class<?> wrapperType, QName wrapperName, List<String> partNames,
List<String> elTypeNames, List<Class<?>> partClasses) {
- List<Method> getMethods = new ArrayList<Method>(partNames.size());
- List<Method> setMethods = new ArrayList<Method>(partNames.size());
- List<Method> jaxbMethods = new ArrayList<Method>(partNames.size());
- List<Field> fields = new ArrayList<Field>(partNames.size());
+ List<Method> getMethods = new ArrayList<>(partNames.size());
+ List<Method> setMethods = new ArrayList<>(partNames.size());
+ List<Method> jaxbMethods = new ArrayList<>(partNames.size());
+ List<Field> fields = new ArrayList<>(partNames.size());
Method allMethods[] = wrapperType.getMethods();
String packageName = PackageUtils.getPackageName(wrapperType);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index f66baee..6abed2e 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -376,7 +376,7 @@ public final class JAXBEncoderDecoder {
attNs = null;
}
}
- List<Member> combinedMembers = new ArrayList<Member>();
+ List<Member> combinedMembers = new ArrayList<>();
for (Field f : Utils.getFields(cls, accessType)) {
XmlAttribute at = f.getAnnotation(XmlAttribute.class);
@@ -734,13 +734,13 @@ public final class JAXBEncoderDecoder {
Type genericType = (Type)part.getProperty("generic.type");
Class<?> tp2 = (Class<?>)((ParameterizedType)genericType).getRawType();
if (tp2.isInterface()) {
- return new HashSet<Object>(ret);
+ return new HashSet<>(ret);
}
Collection<Object> c;
try {
c = CastUtils.cast((Collection<?>)tp2.newInstance());
} catch (Exception e) {
- c = new HashSet<Object>();
+ c = new HashSet<>();
}
c.addAll(ret);
@@ -782,7 +782,7 @@ public final class JAXBEncoderDecoder {
}
}
}
- return new ArrayList<Object>();
+ return new ArrayList<>();
}
private static boolean isList(Type cls) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
index 40de666..2af2605 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
@@ -57,7 +57,7 @@ final class Utils {
}
private static Collection<Field> getFieldsInternal(Class<?> cls, XmlAccessType accessType) {
- Set<Field> fields = new HashSet<Field>();
+ Set<Field> fields = new HashSet<>();
Class<?> superClass = cls.getSuperclass();
if (superClass != null && !superClass.equals(Object.class) && !superClass.equals(Throwable.class)) {
// process super class until java.lang.Object or java.lang.Throwable is not reached
@@ -78,7 +78,7 @@ final class Utils {
private static Collection<Method> getMethodsInternal(Class<?> cls, XmlAccessType accessType,
boolean acceptSetters) {
- Set<Method> methods = new HashSet<Method>();
+ Set<Method> methods = new HashSet<>();
Class<?> superClass = cls.getSuperclass();
if (superClass != null && !superClass.equals(Object.class) && !superClass.equals(Throwable.class)) {
// process super class until java.lang.Object or java.lang.Throwable is not reached
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
index e189034..ae5b9ab 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
@@ -51,7 +51,7 @@ public final class JAXBAttachmentSchemaValidationHack extends AbstractPhaseInter
// This assumes that this interceptor is only use in IN / IN Fault chains.
if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message)
&& message.getAttachments() != null) {
- Collection<AttachmentDataSource> dss = new ArrayList<AttachmentDataSource>();
+ Collection<AttachmentDataSource> dss = new ArrayList<>();
for (Attachment at : message.getAttachments()) {
if (at.getDataHandler().getDataSource() instanceof AttachmentDataSource) {
AttachmentDataSource ds = (AttachmentDataSource)at.getDataHandler().getDataSource();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 0251d22..700a837 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
@@ -292,7 +292,7 @@ public class JAXBDataBindingTest extends Assert {
@Test
public void testResursiveType() throws Exception {
Set<Class<?>> classes = new HashSet<Class<?>>();
- Collection<Object> typeReferences = new ArrayList<Object>();
+ Collection<Object> typeReferences = new ArrayList<>();
Map<String, Object> props = new HashMap<String, Object>();
JAXBContextInitializer init = new JAXBContextInitializer(null, classes, typeReferences, props);
init.addClass(Type2.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index f556120..822a217 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -103,7 +103,7 @@ public class JAXBWrapperHelperTest extends Assert {
@XmlElement(name = "Parameter4")
protected String parameter4;
@XmlElement(name = "Parameter5")
- protected List<String> parameter5 = new ArrayList<String>();
+ protected List<String> parameter5 = new ArrayList<>();
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
index 6f120da..49a332c 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
@@ -64,7 +64,7 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
*/
public List<String> getAlternateAddresses(Exchange exchange) {
return alternateAddresses != null
- ? new ArrayList<String>(alternateAddresses)
+ ? new ArrayList<>(alternateAddresses)
: null;
}
@@ -134,7 +134,7 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
Endpoint endpoint = exchange.getEndpoint();
Collection<ServiceInfo> services = endpoint.getService().getServiceInfos();
QName currentBinding = endpoint.getBinding().getBindingInfo().getName();
- List<Endpoint> alternates = new ArrayList<Endpoint>();
+ List<Endpoint> alternates = new ArrayList<>();
for (ServiceInfo service : services) {
Collection<EndpointInfo> candidates = service.getEndpoints();
for (EndpointInfo candidate : candidates) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index abf3a06..7829b2e 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -47,7 +47,7 @@ import org.apache.cxf.ws.addressing.ContextUtils;
public class DefaultLogEventMapper implements LogEventMapper {
private static final Set<String> BINARY_CONTENT_MEDIA_TYPES;
static {
- BINARY_CONTENT_MEDIA_TYPES = new HashSet<String>();
+ BINARY_CONTENT_MEDIA_TYPES = new HashSet<>();
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/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
index db618d4..4515c1a 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
@@ -45,7 +45,7 @@ public class Slf4jEventSender implements LogEventSender {
String cat = logCategory != null ? logCategory
: "org.apache.cxf.services." + event.getPortTypeName().getLocalPart() + "." + event.getType();
Logger log = LoggerFactory.getLogger(cat);
- Set<String> keys = new HashSet<String>();
+ Set<String> keys = new HashSet<>();
try {
put(keys, "type", event.getType().toString());
put(keys, "address", event.getAddress());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestEventSender.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestEventSender.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestEventSender.java
index 44118c4..d268564 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestEventSender.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/TestEventSender.java
@@ -25,7 +25,7 @@ import org.apache.cxf.ext.logging.event.LogEvent;
import org.apache.cxf.ext.logging.event.LogEventSender;
final class TestEventSender implements LogEventSender {
- private final List<LogEvent> events = new ArrayList<LogEvent>();
+ private final List<LogEvent> events = new ArrayList<>();
@Override
public void send(LogEvent event) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
index e885163..ec10739 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
@@ -94,7 +94,7 @@ public abstract class AbstractMetricsInterceptor extends AbstractPhaseIntercepto
final Endpoint ep = m.getExchange().getEndpoint();
Object o = ep.get(MetricsContext.class.getName());
if (o == null) {
- List<MetricsContext> contexts = new ArrayList<MetricsContext>();
+ List<MetricsContext> contexts = new ArrayList<>();
for (MetricsProvider p : getMetricProviders(m.getExchange().getBus())) {
MetricsContext c = p.createEndpointContext(ep, MessageUtils.isRequestor(m),
(String)m.getContextualProperty(MetricsProvider.CLIENT_ID));
@@ -164,7 +164,7 @@ public abstract class AbstractMetricsInterceptor extends AbstractPhaseIntercepto
if (o != null) {
return o;
}
- List<MetricsContext> contexts = new ArrayList<MetricsContext>();
+ List<MetricsContext> contexts = new ArrayList<>();
for (MetricsProvider p : getMetricProviders(message.getExchange().getBus())) {
MetricsContext c = p.createResourceContext(message.getExchange().getEndpoint(),
resource, MessageUtils.isRequestor(message),
@@ -187,7 +187,7 @@ public abstract class AbstractMetricsInterceptor extends AbstractPhaseIntercepto
private Object createMetricsContextForOperation(Message message, BindingOperationInfo boi) {
Object o = boi.getProperty(MetricsContext.class.getName());
if (o == null) {
- List<MetricsContext> contexts = new ArrayList<MetricsContext>();
+ List<MetricsContext> contexts = new ArrayList<>();
for (MetricsProvider p : getMetricProviders(message.getExchange().getBus())) {
MetricsContext c = p.createOperationContext(message.getExchange().getEndpoint(),
boi, MessageUtils.isRequestor(message),
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
index 96a862b..d7afddf 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
@@ -58,7 +58,7 @@ public class ThrottlingResponseInterceptor extends AbstractPhaseInterceptor<Mess
for (Map.Entry<String, String> e : rsp.getResponseHeaders().entrySet()) {
List<String> r = headers.get(e.getKey());
if (r == null) {
- r = new ArrayList<String>();
+ r = new ArrayList<>();
headers.put(e.getKey(), r);
}
r.add(e.getValue());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
index 0fb8fae..ad74d07 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
@@ -285,7 +285,7 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
* @param entityProviders the entityProviders
*/
public void setProviders(List<? extends Object> providers) {
- List<Object> newBeans = new ArrayList<Object>();
+ List<Object> newBeans = new ArrayList<>();
addToBeans(newBeans, providers);
this.entityProviders.addAll(newBeans);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 0f481a3..47a45e7 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
@@ -346,7 +346,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
* @param beans the list of resource instances
*/
public void setServiceBeans(List<Object> beans) {
- List<Object> newBeans = new ArrayList<Object>();
+ List<Object> newBeans = new ArrayList<>();
addToBeans(newBeans, beans);
serviceFactory.setResourceClassesFromBeans(newBeans);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 b674185..576fc20 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
@@ -51,7 +51,7 @@ import org.apache.cxf.service.invoker.Invoker;
public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
protected List<ClassResourceInfo> classResourceInfos =
- new ArrayList<ClassResourceInfo>();
+ new ArrayList<>();
private Invoker invoker;
private Executor executor;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 2450822..ecd6cdb 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
@@ -121,7 +121,7 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
// like @XmlRootElement for ex to select a namespace
this.put("org.apache.cxf.databinding.namespace", "true");
- List<ServiceInfo> infos = new ArrayList<ServiceInfo>();
+ List<ServiceInfo> infos = new ArrayList<>();
for (ClassResourceInfo cri : classResourceInfos) {
ServiceInfo si = new ServiceInfo();
infos.add(si);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
index a6ede2b..41f0e39 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
@@ -160,7 +160,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
}
private static List<String> getResourceClassesFromElement(Element modelEl) {
- List<String> resources = new ArrayList<String>();
+ List<String> resources = new ArrayList<>();
List<Element> resourceEls =
DOMUtils.findAllElementsByTagName(modelEl, "class");
for (Element e : resourceEls) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
index 3bb2368..7fe7b71 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
@@ -47,7 +47,7 @@ public class MultipartBody {
}
public MultipartBody(Attachment att) {
- atts = new ArrayList<Attachment>();
+ atts = new ArrayList<>();
atts.add(att);
outbound = true;
this.mt = MULTIPART_RELATED_TYPE;
@@ -58,7 +58,7 @@ public class MultipartBody {
}
public MultipartBody(boolean outbound) {
- this(new ArrayList<Attachment>(), MULTIPART_RELATED_TYPE, outbound);
+ this(new ArrayList<>(), MULTIPART_RELATED_TYPE, outbound);
}
public MediaType getType() {
@@ -71,7 +71,7 @@ public class MultipartBody {
}
public List<Attachment> getChildAttachments() {
- List<Attachment> childAtts = new ArrayList<Attachment>();
+ List<Attachment> childAtts = new ArrayList<>();
for (int i = 1; i < atts.size(); i++) {
childAtts.add(atts.get(i));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 9ccc37d..7887101 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
@@ -58,9 +58,9 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
public CacheControl fromString(String c) {
boolean isPrivate = false;
- List<String> privateFields = new ArrayList<String>();
+ List<String> privateFields = new ArrayList<>();
boolean noCache = false;
- List<String> noCacheFields = new ArrayList<String>();
+ List<String> noCacheFields = new ArrayList<>();
boolean noStore = false;
boolean noTransform = false;
boolean mustRevalidate = false;
@@ -120,7 +120,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
throw new IllegalArgumentException();
}
if (c.contains("\"")) {
- List<String> values = new ArrayList<String>(4);
+ List<String> values = new ArrayList<>(4);
Matcher m = COMPLEX_HEADER_PATTERN.matcher(c);
while (m.find()) {
String val = m.group().trim();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 c412dde..9c0a8e6 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
@@ -99,7 +99,7 @@ public class ConfigurationImpl implements Configuration {
@Override
public Set<Object> getInstances() {
- Set<Object> allInstances = new HashSet<Object>();
+ Set<Object> allInstances = new HashSet<>();
allInstances.addAll(providers.keySet());
allInstances.addAll(features.keySet());
return Collections.unmodifiableSet(allInstances);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 79c4d4a..042ce89 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
@@ -69,7 +69,7 @@ public class HttpHeadersImpl implements HttpHeaders {
private static final String QUOTE = "\"";
private static final Set<String> HEADERS_WITH_POSSIBLE_QUOTES;
static {
- HEADERS_WITH_POSSIBLE_QUOTES = new HashSet<String>();
+ HEADERS_WITH_POSSIBLE_QUOTES = new HashSet<>();
HEADERS_WITH_POSSIBLE_QUOTES.add(HttpHeaders.CONTENT_TYPE);
HEADERS_WITH_POSSIBLE_QUOTES.add(HttpHeaders.CACHE_CONTROL);
HEADERS_WITH_POSSIBLE_QUOTES.add(HttpHeaders.ETAG);
@@ -188,7 +188,7 @@ public class HttpHeadersImpl implements HttpHeaders {
return Collections.singletonList(new Locale("*"));
}
- List<Locale> newLs = new ArrayList<Locale>();
+ List<Locale> newLs = new ArrayList<>();
Map<Locale, Float> prefs = new HashMap<Locale, Float>();
for (String l : ls) {
String[] pair = StringUtils.split(l, ";");
@@ -264,7 +264,7 @@ public class HttpHeadersImpl implements HttpHeaders {
if (ls.length == 1) {
return Collections.singletonList(ls[0].trim());
} else {
- List<String> newValues = new ArrayList<String>();
+ List<String> newValues = new ArrayList<>();
for (String v : ls) {
newValues.add(v.trim());
}
@@ -276,7 +276,7 @@ public class HttpHeadersImpl implements HttpHeaders {
: originalValue.substring(1, originalValue.length() - 1);
return Collections.singletonList(actualValue);
}
- List<String> values = new ArrayList<String>(4);
+ List<String> values = new ArrayList<>(4);
Matcher m = COMPLEX_HEADER_PATTERN.matcher(originalValue);
while (m.find()) {
String val = m.group().trim();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 115d213..2b99c98 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
@@ -166,7 +166,7 @@ public class LinkBuilderImpl implements Builder {
static class LinkImpl extends Link {
private static final Set<String> MAIN_PARAMETERS =
- new HashSet<String>(Arrays.asList(Link.REL, Link.TITLE, Link.TYPE));
+ new HashSet<>(Arrays.asList(Link.REL, Link.TITLE, Link.TYPE));
private URI uri;
private Map<String, String> params;
@@ -192,7 +192,7 @@ public class LinkBuilderImpl implements Builder {
return Collections.<String>emptyList();
} else {
String[] values = rel.split(" ");
- List<String> rels = new ArrayList<String>(values.length);
+ List<String> rels = new ArrayList<>(values.length);
for (String val : values) {
rels.add(val.trim());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
index 9a2af71..36c22dd 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
@@ -37,7 +37,7 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
private static final Set<String> KNOWN_PARAMETERS;
static {
- KNOWN_PARAMETERS = new HashSet<String>(Arrays.asList(REL, TYPE, TITLE));
+ KNOWN_PARAMETERS = new HashSet<>(Arrays.asList(REL, TYPE, TITLE));
}
public Link fromString(String value) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
index 74df78f..abd88dc 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
@@ -71,7 +71,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
this.m = new LinkedHashMap<K, List<V>>();
if (store != null) {
for (Map.Entry<K, List<V>> entry : store.entrySet()) {
- List<V> values = new ArrayList<V>(entry.getValue());
+ List<V> values = new ArrayList<>(entry.getValue());
m.put(entry.getKey(), values);
}
}
@@ -101,7 +101,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
} catch (UnsupportedOperationException ex) {
// this may happen if an unmodifiable List was set via put or putAll
if (!readOnly) {
- List<V> newList = new ArrayList<V>(data);
+ List<V> newList = new ArrayList<>(data);
put(key, newList);
addValue(key, value, last);
} else {
@@ -113,7 +113,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
private List<V> getList(K key) {
List<V> data = this.get(key);
if (data == null) {
- data = new ArrayList<V>();
+ data = new ArrayList<>();
m.put(key, data);
}
return readOnly ? Collections.unmodifiableList(data) : data;
@@ -125,7 +125,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
}
public void putSingle(K key, V value) {
- List<V> data = new ArrayList<V>();
+ List<V> data = new ArrayList<>();
data.add(value);
this.put(key, data);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 d01f956..b033924 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
@@ -53,7 +53,7 @@ public class RequestPreprocessor {
MEDIA_TYPE_SHORTCUTS.put("html", "text/html");
MEDIA_TYPE_SHORTCUTS.put("wadl", "application/vnd.sun.wadl+xml");
- PATHS_TO_SKIP = new HashSet<String>();
+ PATHS_TO_SKIP = new HashSet<>();
PATHS_TO_SKIP.add("swagger.json");
PATHS_TO_SKIP.add("swagger.yaml");
}
@@ -135,7 +135,7 @@ public class RequestPreprocessor {
List<String> acceptLanguage =
((Map<String, List<String>>)m.get(Message.PROTOCOL_HEADERS)).get(HttpHeaders.ACCEPT_LANGUAGE);
if (acceptLanguage == null) {
- acceptLanguage = new ArrayList<String>();
+ acceptLanguage = new ArrayList<>();
}
acceptLanguage.add(anotherValue);