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:58 UTC
[10/14] cxf git commit: Removing unnecessary type information
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 fa56e9f..0039923 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
@@ -174,7 +174,7 @@ public final class ResponseImpl extends Response {
if (values == null) {
return null;
} else {
- List<String> stringValues = new ArrayList<String>(values.size());
+ List<String> stringValues = new ArrayList<>(values.size());
HeaderDelegate<Object> hd = HttpUtils.getHeaderDelegate(values.get(0));
for (Object value : values) {
String actualValue = hd == null ? value.toString() : hd.toString(value);
@@ -189,7 +189,7 @@ public final class ResponseImpl extends Response {
if (methodValues == null) {
return Collections.emptySet();
} else {
- Set<String> methods = new HashSet<String>();
+ Set<String> methods = new HashSet<>();
for (Object o : methodValues) {
methods.add(o.toString());
}
@@ -285,7 +285,7 @@ public final class ResponseImpl extends Response {
}
public Set<Link> getLinks() {
- return new HashSet<Link>(getAllLinks());
+ return new HashSet<>(getAllLinks());
}
private Set<Link> getAllLinks() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 624a1e7..476c629 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
@@ -50,7 +50,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
private String userInfo;
private int port = -1;
private String host;
- private List<PathSegment> paths = new ArrayList<PathSegment>();
+ private List<PathSegment> paths = new ArrayList<>();
private boolean originalPathEmpty;
private boolean leadingSlash;
private String fragment;
@@ -288,7 +288,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
int idx = ind;
Set<String> pathEncodeVars = alreadyResolvedTsPathEnc.isEmpty() && !encodePathSlash
- ? Collections.<String>emptySet() : new HashSet<String>();
+ ? Collections.<String>emptySet() : new HashSet<>();
for (String var : uniqueVars) {
boolean resolvedPathVarHasToBeEncoded = alreadyResolvedTsPathEnc.containsKey(var);
@@ -340,7 +340,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
//CHECKSTYLE:ON
URITemplate templ = new URITemplate(path);
- Set<String> uniqueVars = new HashSet<String>(templ.getVariables());
+ Set<String> uniqueVars = new HashSet<>(templ.getVariables());
if (varValueMap.size() + alreadyResolvedTs.size() + alreadyResolvedTsEnc.size()
+ alreadyResolvedTsPathEnc.size() < uniqueVars.size()) {
throw new IllegalArgumentException("Unresolved variables; only " + varValueMap.size()
@@ -349,7 +349,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
Set<String> pathEncodeVars = alreadyResolvedTsPathEnc.isEmpty() && !encodePathSlash
- ? Collections.<String>emptySet() : new HashSet<String>();
+ ? Collections.<String>emptySet() : new HashSet<>();
Map<String, Object> theMap = new LinkedHashMap<String, Object>();
for (String var : uniqueVars) {
@@ -418,7 +418,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
builder.userInfo = userInfo;
builder.port = port;
builder.host = host;
- builder.paths = new ArrayList<PathSegment>(paths);
+ builder.paths = new ArrayList<>(paths);
builder.fragment = fragment;
builder.query = new MetadataMap<String, String>(query);
builder.matrix = new MetadataMap<String, String>(matrix);
@@ -555,7 +555,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
if (checkSegments) {
segments = JAXRSUtils.getPathSegments(path, false, false);
} else {
- segments = new ArrayList<PathSegment>();
+ segments = new ArrayList<>();
path = path.replaceAll("/", "%2F");
segments.add(new PathSegmentImpl(path, false));
}
@@ -806,7 +806,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
* @throws IllegalArgumentException when one of values is null
*/
private List<String> toStringList(boolean encodeSlash, Object... values) throws IllegalArgumentException {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
if (values != null) {
for (int i = 0; i < values.length; i++) {
Object value = values[i];
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
index b090927..7adce74 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
@@ -172,7 +172,7 @@ public class UriInfoImpl implements UriInfo {
public List<String> getMatchedURIs(boolean decode) {
if (stack != null) {
- List<String> objects = new ArrayList<String>();
+ List<String> objects = new ArrayList<>();
List<String> uris = new LinkedList<String>();
StringBuilder sumPath = new StringBuilder("");
for (MethodInvocationInfo invocation : stack) {
@@ -184,7 +184,7 @@ public class UriInfoImpl implements UriInfo {
};
if (paths[0] != null) {
int count = paths[0].getVariables().size();
- List<String> rootObjects = new ArrayList<String>(count);
+ List<String> rootObjects = new ArrayList<>(count);
for (int i = 0; i < count && i < templateObjects.size(); i++) {
rootObjects.add(templateObjects.get(i));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
index 2e07d60..0ab5070 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/VariantListBuilderImpl.java
@@ -31,10 +31,10 @@ import javax.ws.rs.core.Variant.VariantListBuilder;
public class VariantListBuilderImpl extends VariantListBuilder {
- private List<String> encodings = new ArrayList<String>();
- private List<Locale> languages = new ArrayList<Locale>();
- private List<MediaType> mediaTypes = new ArrayList<MediaType>();
- private List<Variant> variants = new ArrayList<Variant>();
+ private List<String> encodings = new ArrayList<>();
+ private List<Locale> languages = new ArrayList<>();
+ private List<MediaType> mediaTypes = new ArrayList<>();
+ private List<Variant> variants = new ArrayList<>();
public VariantListBuilderImpl() {
@@ -49,7 +49,7 @@ public class VariantListBuilderImpl extends VariantListBuilder {
@Override
public List<Variant> build() {
- List<Variant> vs = new ArrayList<Variant>(variants);
+ List<Variant> vs = new ArrayList<>(variants);
reset();
return vs;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 1e6dd7e..311cc8f 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
@@ -53,7 +53,7 @@ public abstract class AbstractResourceInfo {
private static final String FIELD_PROXY_MAP = "jaxrs-field-proxy-map";
private static final String SETTER_PROXY_MAP = "jaxrs-setter-proxy-map";
- private static final Set<String> STANDARD_CONTEXT_CLASSES = new HashSet<String>();
+ private static final Set<String> STANDARD_CONTEXT_CLASSES = new HashSet<>();
static {
// JAX-RS 1.0-1.1
STANDARD_CONTEXT_CLASSES.add(Application.class.getName());
@@ -366,7 +366,7 @@ public abstract class AbstractResourceInfo {
List<Field> fields = theFields.get(serviceClass);
if (fields == null) {
- fields = new ArrayList<Field>();
+ fields = new ArrayList<>();
theFields.put(serviceClass, fields);
}
if (!fields.contains(f)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java
index bf0bb03..84879ca 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java
@@ -63,7 +63,7 @@ public abstract class BeanResourceInfo extends AbstractResourceInfo {
for (Annotation a : f.getAnnotations()) {
if (AnnotationUtils.isParamAnnotationClass(a.annotationType())) {
if (paramFields == null) {
- paramFields = new ArrayList<Field>();
+ paramFields = new ArrayList<>();
}
paramsAvailable = true;
paramFields.add(f);
@@ -95,7 +95,7 @@ public abstract class BeanResourceInfo extends AbstractResourceInfo {
private void addParamMethod(Method m) {
if (paramMethods == null) {
- paramMethods = new ArrayList<Method>();
+ paramMethods = new ArrayList<>();
}
paramsAvailable = true;
paramMethods.add(m);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
index 61e240b..ba0f36d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
@@ -60,7 +60,7 @@ public class ClassResourceInfo extends BeanResourceInfo {
private String producesTypes;
private Set<String> nameBindings = Collections.emptySet();
private ClassResourceInfo parent;
- private Set<String> injectedSubInstances = new HashSet<String>();
+ private Set<String> injectedSubInstances = new HashSet<>();
public ClassResourceInfo(ClassResourceInfo cri) {
super(cri.getBus());
if (cri.isCreatedFromModel() && !InjectionUtils.isConcreteClass(cri.getServiceClass())) {
@@ -208,7 +208,7 @@ public class ClassResourceInfo extends BeanResourceInfo {
}
public Set<String> getAllowedMethods() {
- Set<String> methods = new HashSet<String>();
+ Set<String> methods = new HashSet<>();
for (OperationResourceInfo o : methodDispatcher.getOperationResourceInfos()) {
String method = o.getHttpMethod();
if (method != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
index 3c6afd3..892d960 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
@@ -46,8 +46,8 @@ public final class URITemplate {
private static final String SLASH_QUOTE = "/;";
private final String template;
- private final List<String> variables = new ArrayList<String>();
- private final List<String> customVariables = new ArrayList<String>();
+ private final List<String> variables = new ArrayList<>();
+ private final List<String> customVariables = new ArrayList<>();
private final Pattern templateRegexPattern;
private final String literals;
private final List<UriChunk> uriChunks;
@@ -57,7 +57,7 @@ public final class URITemplate {
StringBuilder literalChars = new StringBuilder();
StringBuilder patternBuilder = new StringBuilder();
CurlyBraceTokenizer tok = new CurlyBraceTokenizer(template);
- uriChunks = new ArrayList<UriChunk>();
+ uriChunks = new ArrayList<>();
while (tok.hasNext()) {
String templatePart = tok.next();
UriChunk chunk = UriChunk.createUriChunk(templatePart);
@@ -508,7 +508,7 @@ public final class URITemplate {
*/
static class CurlyBraceTokenizer {
- private List<String> tokens = new ArrayList<String>();
+ private List<String> tokens = new ArrayList<>();
private int tokenIdx;
CurlyBraceTokenizer(String string) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 9fe46dd..b40d89e 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
@@ -859,7 +859,7 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
public List<?> getList() {
if (l == null) {
- l = new ArrayList<Object>();
+ l = new ArrayList<>();
}
return l;
}
@@ -876,7 +876,7 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
Object first = theList.get(0);
if (first instanceof Element) {
- List<Object> newList = new ArrayList<Object>(theList.size());
+ List<Object> newList = new ArrayList<>(theList.size());
for (Object o : theList) {
newList.add(unm.unmarshal((Element)o, type));
}
@@ -890,14 +890,14 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
if (first instanceof JAXBElement && !isJaxbElement && !JAXBElement.class.isAssignableFrom(type)) {
adapterChecked = true;
- List<Object> newList = new ArrayList<Object>(theList.size());
+ List<Object> newList = new ArrayList<>(theList.size());
for (Object o : theList) {
newList.add(org.apache.cxf.jaxrs.utils.JAXBUtils.useAdapter(
((JAXBElement<?>)o).getValue(), adapter, false));
}
theList = newList;
} else if (!(first instanceof JAXBElement) && isJaxbElement) {
- List<Object> newList = new ArrayList<Object>(theList.size());
+ List<Object> newList = new ArrayList<>(theList.size());
XmlRootElement root = type.getAnnotation(XmlRootElement.class);
QName qname = getQNameFromNamespaceAndName(root.namespace(), root.name(), type, false);
@SuppressWarnings("rawtypes")
@@ -917,14 +917,14 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
return values;
} else {
if (!adapterChecked && adapter != null) {
- List<Object> newList = new ArrayList<Object>(theList.size());
+ List<Object> newList = new ArrayList<>(theList.size());
for (Object o : theList) {
newList.add(org.apache.cxf.jaxrs.utils.JAXBUtils.useAdapter(o, adapter, false));
}
theList = newList;
}
if (collectionType == Set.class) {
- return new HashSet<Object>(theList);
+ return new HashSet<>(theList);
} else {
return theList;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index c70521a..840a4dc 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -88,7 +88,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
WELL_KNOWN_MULTIPART_CLASSES.add(MultipartBody.class);
WELL_KNOWN_MULTIPART_CLASSES.add(Attachment.class);
- MULTIPART_SUBTYPES = new HashSet<String>();
+ MULTIPART_SUBTYPES = new HashSet<>();
MULTIPART_SUBTYPES.add("form-data");
MULTIPART_SUBTYPES.add("mixed");
MULTIPART_SUBTYPES.add("related");
@@ -198,7 +198,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
if (Attachment.class.isAssignableFrom(actual)) {
return infos;
}
- Collection<Object> objects = new ArrayList<Object>();
+ Collection<Object> objects = new ArrayList<>();
for (Attachment a : infos) {
objects.add(fromAttachment(a, actual, actual, anns));
}
@@ -271,7 +271,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
Annotation[] anns, MediaType mt) throws IOException {
if (Map.class.isAssignableFrom(obj.getClass())) {
Map<Object, Object> objects = CastUtils.cast((Map<?, ?>)obj);
- List<Attachment> handlers = new ArrayList<Attachment>(objects.size());
+ List<Attachment> handlers = new ArrayList<>(objects.size());
int i = 0;
for (Iterator<Map.Entry<Object, Object>> iter = objects.entrySet().iterator();
iter.hasNext();) {
@@ -304,7 +304,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
}
private List<Attachment> getAttachments(List<?> objects, String rootMediaType) throws IOException {
- List<Attachment> handlers = new ArrayList<Attachment>(objects.size());
+ List<Attachment> handlers = new ArrayList<>(objects.size());
for (int i = 0; i < objects.size(); i++) {
Object value = objects.get(i);
Attachment handler = createDataHandler(value,
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index a038f84..dfb9953 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -367,7 +367,7 @@ public abstract class ProviderFactory {
List<ReaderInterceptor> interceptors = null;
if (size > 0) {
- interceptors = new ArrayList<ReaderInterceptor>(size + 1);
+ interceptors = new ArrayList<>(size + 1);
List<ProviderInfo<ReaderInterceptor>> readers =
getBoundFilters(readerInterceptors, names);
for (ProviderInfo<ReaderInterceptor> p : readers) {
@@ -406,7 +406,7 @@ public abstract class ProviderFactory {
List<WriterInterceptor> interceptors = null;
if (size > 0) {
- interceptors = new ArrayList<WriterInterceptor>(size + 1);
+ interceptors = new ArrayList<>(size + 1);
List<ProviderInfo<WriterInterceptor>> writers =
getBoundFilters(writerInterceptors, names);
for (ProviderInfo<WriterInterceptor> p : writers) {
@@ -968,7 +968,7 @@ public abstract class ProviderFactory {
}
Set<Object> getReadersWriters() {
- Set<Object> set = new HashSet<Object>();
+ Set<Object> set = new HashSet<>();
set.addAll(messageReaders);
set.addAll(messageWriters);
return set;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 8332ab8..e7654ca 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
@@ -204,7 +204,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
return;
}
String[] locations = StringUtils.split(schemas, " ");
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (String loc : locations) {
String theLoc = loc.trim();
if (theLoc.length() != 0) {
@@ -341,7 +341,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet {
return Collections.EMPTY_LIST;
}
String[] classNames = StringUtils.split(providersList, splitChar);
- List<Object> providers = new ArrayList<Object>();
+ List<Object> providers = new ArrayList<>();
for (String cName : classNames) {
Map<String, List<String>> props = new HashMap<String, List<String>>();
String theName = getClassNameAndProperties(cName, props);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
index fb8ee4b..b3e05d8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
@@ -120,7 +120,7 @@ public abstract class AbstractSpringComponentScanServer extends AbstractSpringCo
}
private static void warnIfDuplicatesAvailable(List<? extends Object> providers) {
- Set<String> classNames = new HashSet<String>();
+ Set<String> classNames = new HashSet<>();
for (Object o : providers) {
if (!classNames.add(o.getClass().getName())) {
LOG.warning("Duplicate Provider " + o.getClass().getName() + " has been detected");
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index d10bd66..181071c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -66,7 +66,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends AbstractBeanDefiniti
protected void mapAttribute(BeanDefinitionBuilder bean, Element e, String name, String val) {
if ("beanNames".equals(name)) {
String[] values = StringUtils.split(val, " ");
- List<SpringResourceFactory> tempFactories = new ArrayList<SpringResourceFactory>(values.length);
+ List<SpringResourceFactory> tempFactories = new ArrayList<>(values.length);
for (String v : values) {
String theValue = v.trim();
if (theValue.length() > 0) {
@@ -206,7 +206,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends AbstractBeanDefiniti
this.context = ctx;
if (tempFactories != null) {
- List<ResourceProvider> factories = new ArrayList<ResourceProvider>(
+ List<ResourceProvider> factories = new ArrayList<>(
tempFactories.size());
for (int i = 0; i < tempFactories.size(); i++) {
SpringResourceFactory factory = tempFactories.get(i);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index 321d5c5..c1ce4dd 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -250,7 +250,7 @@ public final class HttpUtils {
values.set(i, value);
} catch (UnsupportedOperationException ex) {
// this may happen if an unmodifiable List was set via Map put
- List<Object> newList = new ArrayList<Object>(values);
+ List<Object> newList = new ArrayList<>(values);
newList.set(i, value);
// Won't help if the map is unmodifiable in which case it is a bug anyway
headers.put(entry.getKey(), newList);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 8688a18..bb9714b 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
@@ -949,7 +949,7 @@ public final class InjectionUtils {
if (pathParam != ParameterType.PATH || !PathSegment.class.isAssignableFrom(type)) {
return values;
}
- List<String> newValues = new ArrayList<String>();
+ List<String> newValues = new ArrayList<>();
for (String v : values) {
String[] segments = StringUtils.split(v, "/");
for (String s : segments) {
@@ -1253,7 +1253,7 @@ public final class InjectionUtils {
if (value.getClass().isArray()) {
theValues = Arrays.asList((Object[])value);
} else if (value instanceof Set) {
- theValues = new ArrayList<Object>((Set<?>)value);
+ theValues = new ArrayList<>((Set<?>)value);
} else {
theValues = CastUtils.cast((List<?>)value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 442b50f..ba755f8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -185,7 +185,7 @@ public final class JAXRSUtils {
public static List<PathSegment> getPathSegments(String thePath, boolean decode,
boolean ignoreLastSlash) {
String[] segments = StringUtils.split(thePath, "/");
- List<PathSegment> theList = new ArrayList<PathSegment>();
+ List<PathSegment> theList = new ArrayList<>();
for (String path : segments) {
if (!StringUtils.isEmpty(path)) {
theList.add(new PathSegmentImpl(path, decode));
@@ -236,7 +236,7 @@ public final class JAXRSUtils {
}
public static List<MediaType> getMediaTypes(String[] values) {
- List<MediaType> supportedMimeTypes = new ArrayList<MediaType>(values.length);
+ List<MediaType> supportedMimeTypes = new ArrayList<>(values.length);
for (int i = 0; i < values.length; i++) {
supportedMimeTypes.addAll(parseMediaTypes(values[i]));
}
@@ -607,7 +607,7 @@ public final class JAXRSUtils {
String responseMessage, int status, boolean addAllow) {
ResponseBuilder rb = toResponseBuilder(status);
if (addAllow) {
- Set<String> allowedMethods = new HashSet<String>();
+ Set<String> allowedMethods = new HashSet<>();
for (ClassResourceInfo cri : cris) {
allowedMethods.addAll(cri.getAllowedMethods());
}
@@ -775,7 +775,7 @@ public final class JAXRSUtils {
Type[] genericParameterTypes = ori.getInGenericParameterTypes();
Annotation[][] anns = ori.getInParameterAnnotations();
- List<Object> params = new ArrayList<Object>(parameterTypesLengh);
+ List<Object> params = new ArrayList<>(parameterTypesLengh);
for (int i = 0; i < parameterTypesLengh; i++) {
Class<?> param = null;
@@ -1438,7 +1438,7 @@ public final class JAXRSUtils {
}
public static List<MediaType> parseMediaTypes(String types) {
- List<MediaType> acceptValues = new ArrayList<MediaType>();
+ List<MediaType> acceptValues = new ArrayList<>();
if (types != null) {
int x = 0;
@@ -1526,7 +1526,7 @@ public final class JAXRSUtils {
}
}
- return new ArrayList<MediaType>(supportedMimeTypeList);
+ return new ArrayList<>(supportedMimeTypeList);
}
@@ -1797,7 +1797,7 @@ public final class JAXRSUtils {
if (params.size() <= 1) {
values = Collections.emptyList();
} else {
- values = new ArrayList<String>(params.size() - 1);
+ values = new ArrayList<>(params.size() - 1);
for (Parameter pm : ori.getParameters()) {
if (pm.getType() == ParameterType.PATH) {
List<String> paramValues = params.get(pm.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/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 ced9fc1..79a149e 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
@@ -113,7 +113,7 @@ public final class ResourceUtils {
private static final String NO_VOID_RETURN_ASYNC_MESSAGE_ID = "NO_VOID_RETURN_ASYNC_METHOD";
private static final Set<String> SERVER_PROVIDER_CLASS_NAMES;
static {
- SERVER_PROVIDER_CLASS_NAMES = new HashSet<String>();
+ SERVER_PROVIDER_CLASS_NAMES = new HashSet<>();
SERVER_PROVIDER_CLASS_NAMES.add("javax.ws.rs.ext.MessageBodyWriter");
SERVER_PROVIDER_CLASS_NAMES.add("javax.ws.rs.ext.MessageBodyReader");
SERVER_PROVIDER_CLASS_NAMES.add("javax.ws.rs.ext.ExceptionMapper");
@@ -412,7 +412,7 @@ public final class ResourceUtils {
return CastUtils.cast(Collections.emptyList(), Parameter.class);
}
Class<?>[] types = resourceMethod.getParameterTypes();
- List<Parameter> params = new ArrayList<Parameter>(paramAnns.length);
+ List<Parameter> params = new ArrayList<>(paramAnns.length);
for (int i = 0; i < paramAnns.length; i++) {
Parameter p = getParameter(i, paramAnns[i], types[i]);
params.add(p);
@@ -581,7 +581,7 @@ public final class ResourceUtils {
}
public static List<UserResource> getResourcesFromElement(Element modelEl) {
- List<UserResource> resources = new ArrayList<UserResource>();
+ List<UserResource> resources = new ArrayList<>();
List<Element> resourceEls =
DOMUtils.findAllElementsByTagNameNS(modelEl,
"http://cxf.apache.org/jaxrs", "resource");
@@ -730,7 +730,7 @@ public final class ResourceUtils {
List<Element> operEls =
DOMUtils.findAllElementsByTagNameNS(e,
"http://cxf.apache.org/jaxrs", "operation");
- List<UserOperation> opers = new ArrayList<UserOperation>(operEls.size());
+ List<UserOperation> opers = new ArrayList<>(operEls.size());
for (Element operEl : operEls) {
opers.add(getOperationFromElement(operEl));
}
@@ -749,7 +749,7 @@ public final class ResourceUtils {
List<Element> paramEls =
DOMUtils.findAllElementsByTagNameNS(e,
"http://cxf.apache.org/jaxrs", "param");
- List<Parameter> params = new ArrayList<Parameter>(paramEls.size());
+ List<Parameter> params = new ArrayList<>(paramEls.size());
for (int i = 0; i < paramEls.size(); i++) {
Element paramEl = paramEls.get(i);
Parameter p = new Parameter(paramEl.getAttribute("type"), i, paramEl.getAttribute("name"));
@@ -825,8 +825,8 @@ public final class ResourceUtils {
verifySingletons(singletons);
List<Class<?>> resourceClasses = new ArrayList<Class<?>>();
- List<Object> providers = new ArrayList<Object>();
- List<Feature> features = new ArrayList<Feature>();
+ List<Object> providers = new ArrayList<>();
+ List<Feature> features = new ArrayList<>();
Map<Class<?>, ResourceProvider> map = new HashMap<Class<?>, ResourceProvider>();
// Note, app.getClasses() returns a list of per-request classes
@@ -933,7 +933,7 @@ public final class ResourceUtils {
if (singletons.isEmpty()) {
return;
}
- Set<String> map = new HashSet<String>();
+ Set<String> map = new HashSet<>();
for (Object s : singletons) {
if (map.contains(s.getClass().getName())) {
throw new RuntimeException("More than one instance of the same singleton class "
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
index da70a19..e011eaa 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java
@@ -85,7 +85,7 @@ public class SchemaHandler {
SchemaFactory factory = SchemaFactory.newInstance(Constants.URI_2001_SCHEMA_XSD);
Schema s = null;
try {
- List<Source> sources = new ArrayList<Source>();
+ List<Source> sources = new ArrayList<>();
for (String loc : locations) {
List<URL> schemaURLs = new LinkedList<URL>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
index 75853f4..7e08db5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBeanTest.java
@@ -40,7 +40,7 @@ public class JAXRSServerFactoryBeanTest extends Assert {
bean.setAddress("http://localhost:8080/rest");
bean.setStart(false);
bean.setResourceClasses(BookStore.class);
- List<Object> providers = new ArrayList<Object>();
+ List<Object> providers = new ArrayList<>();
Object provider1 = new CustomExceptionMapper();
providers.add(provider1);
Object provider2 = new RuntimeExceptionMapper();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
index 075bcab..f07db86 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBodyTest.java
@@ -34,7 +34,7 @@ public class MultipartBodyTest extends Assert {
@Test
public void testGetAttachments() {
- List<Attachment> atts = new ArrayList<Attachment>();
+ List<Attachment> atts = new ArrayList<>();
atts.add(createAttachment("p1"));
atts.add(createAttachment("p2"));
MultipartBody b = new MultipartBody(atts);
@@ -45,7 +45,7 @@ public class MultipartBodyTest extends Assert {
@Test
public void testGetAttachmentsById() {
- List<Attachment> atts = new ArrayList<Attachment>();
+ List<Attachment> atts = new ArrayList<>();
atts.add(createAttachment("p1"));
atts.add(createAttachment("p2"));
MultipartBody b = new MultipartBody(atts);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java
index 92e248d..0948e3a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java
@@ -141,7 +141,7 @@ public class EvaluatePreconditionsTest {
final Map<String, List<String>> map = new HashMap<String, List<String>>();
message.put(Message.PROTOCOL_HEADERS, map);
for (int i = 0; i < headers.length; i += 2) {
- final List<String> l = new ArrayList<String>(1);
+ final List<String> l = new ArrayList<>(1);
l.add(headers[i + 1]);
map.put(headers[i], l);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
index 314b87e..17d33bb 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/HttpHeadersImplTest.java
@@ -501,7 +501,7 @@ public class HttpHeadersImplTest extends Assert {
hs.putSingle("Content-Type", "*/*");
hs.putSingle("Date", "Tue, 21 Oct 2008 17:00:00 GMT");
hs.putSingle("Content-Length", "10");
- List<String> values = new ArrayList<String>();
+ List<String> values = new ArrayList<>();
values.add("1");
values.add("2");
hs.addAll("a", values);
@@ -510,7 +510,7 @@ public class HttpHeadersImplTest extends Assert {
private MetadataMap<String, String> createHeader(String name, String... values) {
MetadataMap<String, String> hs = new MetadataMap<String, String>();
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.addAll(Arrays.asList(values));
hs.put(name, list);
return hs;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
index 7f0c746..70b594d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java
@@ -39,7 +39,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutSingle() {
MetadataMap<String, Object> m = new MetadataMap<String, Object>();
- List<Object> value1 = new ArrayList<Object>();
+ List<Object> value1 = new ArrayList<>();
value1.add("bar");
value1.add("foo");
m.put("baz", value1);
@@ -117,7 +117,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testAddAll() {
MetadataMap<String, Object> m = new MetadataMap<String, Object>();
- List<Object> values = new ArrayList<Object>();
+ List<Object> values = new ArrayList<>();
values.add("foo");
m.addAll("baz", values);
values = m.get("baz");
@@ -134,7 +134,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutSingleCaseInsensitive() {
MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
- List<Object> value1 = new ArrayList<Object>();
+ List<Object> value1 = new ArrayList<>();
value1.add("bar");
value1.add("foo");
m.put("baz", value1);
@@ -192,7 +192,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testPutAllCaseInsensitive() {
MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
- List<Object> value1 = new ArrayList<Object>();
+ List<Object> value1 = new ArrayList<>();
value1.add("bar");
value1.add("foo");
m.put("baz", value1);
@@ -203,7 +203,7 @@ public class MetadataMapTest extends Assert {
assertEquals("foo", values.get(1));
MetadataMap<String, Object> m2 = new MetadataMap<String, Object>(false, true);
- List<Object> value2 = new ArrayList<Object>();
+ List<Object> value2 = new ArrayList<>();
value2.add("bar2");
value2.add("foo2");
m2.put("BaZ", value2);
@@ -220,7 +220,7 @@ public class MetadataMapTest extends Assert {
@Test
public void testRemoveCaseInsensitive() {
MetadataMap<String, Object> m = new MetadataMap<String, Object>(false, true);
- List<Object> value1 = new ArrayList<Object>();
+ List<Object> value1 = new ArrayList<>();
value1.add("bar");
value1.add("foo");
m.put("baz", value1);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
index 0690e9d..1eb524b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java
@@ -91,7 +91,7 @@ public class RequestImplTest extends Assert {
metadata.putSingle(HttpHeaders.ACCEPT_LANGUAGE, "en");
metadata.putSingle(HttpHeaders.ACCEPT_ENCODING, "utf-8");
- List<Variant> list = new ArrayList<Variant>();
+ List<Variant> list = new ArrayList<>();
list.add(new Variant(MediaType.APPLICATION_JSON_TYPE, new Locale("en"), "utf-8"));
assertNull(new RequestImpl(m).selectVariant(list));
@@ -103,7 +103,7 @@ public class RequestImplTest extends Assert {
metadata.putSingle(HttpHeaders.ACCEPT_LANGUAGE, "en");
metadata.putSingle(HttpHeaders.ACCEPT_ENCODING, "utf-8");
- List<Variant> list = new ArrayList<Variant>();
+ List<Variant> list = new ArrayList<>();
list.add(new Variant(MediaType.APPLICATION_JSON_TYPE, new Locale("en"), "utf-8"));
list.add(new Variant(MediaType.APPLICATION_XML_TYPE, new Locale("es"), "utf-8"));
list.add(new Variant(MediaType.APPLICATION_XML_TYPE, new Locale("en"), "abc"));
@@ -117,7 +117,7 @@ public class RequestImplTest extends Assert {
metadata.putSingle(HttpHeaders.ACCEPT_LANGUAGE, "en");
metadata.putSingle(HttpHeaders.ACCEPT_ENCODING, "gzip");
- List<Variant> list = new ArrayList<Variant>();
+ List<Variant> list = new ArrayList<>();
list.add(new Variant(MediaType.APPLICATION_JSON_TYPE, new Locale("en"), "utf-8"));
list.add(new Variant(MediaType.APPLICATION_XML_TYPE, new Locale("es"), "utf-8"));
@@ -133,7 +133,7 @@ public class RequestImplTest extends Assert {
metadata.putSingle(HttpHeaders.ACCEPT_LANGUAGE, "en-us");
metadata.putSingle(HttpHeaders.ACCEPT_ENCODING, "gzip;q=1.0, compress");
- List<Variant> list = new ArrayList<Variant>();
+ List<Variant> list = new ArrayList<>();
list.add(new Variant(MediaType.APPLICATION_JSON_TYPE, new Locale("en"), "gzip"));
Variant var2 = new Variant(MediaType.APPLICATION_XML_TYPE, new Locale("en"), "gzip");
list.add(var2);
@@ -147,7 +147,7 @@ public class RequestImplTest extends Assert {
private void assertSameVariant(MediaType mt, Locale lang, String enc) {
Variant var = new Variant(mt, lang, enc);
- List<Variant> list = new ArrayList<Variant>();
+ List<Variant> list = new ArrayList<>();
list.add(var);
assertSame(var, new RequestImpl(m).selectVariant(list));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
index a605893..65750e5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/SecurityContextImplTest.java
@@ -36,7 +36,7 @@ public class SecurityContextImplTest extends Assert {
Message m = new MessageImpl();
Map<String, List<String>> requestHeaders
= new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
- List<String> values = new ArrayList<String>();
+ List<String> values = new ArrayList<>();
values.add("Digest realm=\"custom\"");
requestHeaders.put("Authorization", values);
m.put(Message.PROTOCOL_HEADERS, requestHeaders);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index b3b1350..1d15810 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -249,7 +249,7 @@ public class JAXBElementProviderTest extends Assert {
@SuppressWarnings("unchecked")
private void testXmlList(JAXBElementProvider<?> provider) throws Exception {
- List<XmlObject> list = new ArrayList<XmlObject>();
+ List<XmlObject> list = new ArrayList<>();
for (int i = 0; i < 10; i++) {
MyObject o = new MyObject();
o.setName("name #" + i);
@@ -340,12 +340,12 @@ public class JAXBElementProviderTest extends Assert {
if (setName) {
provider.setCollectionWrapperName("Books");
}
- List<Book> books = new ArrayList<Book>();
+ List<Book> books = new ArrayList<>();
books.add(new Book("CXF in Action", 123L));
books.add(new Book("CXF Rocks", 124L));
@SuppressWarnings("unchecked")
T o = (T)(type.isArray() ? books.toArray() : type == Set.class
- ? new HashSet<Book>(books) : books);
+ ? new HashSet<>(books) : books);
Method m = CollectionsResource.class.getMethod(mName, new Class[0]);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -729,7 +729,7 @@ public class JAXBElementProviderTest extends Assert {
public void testWriteQualifiedCollection() throws Exception {
JAXBElementProvider<List<TagVO2>> provider = new JAXBElementProvider<List<TagVO2>>();
provider.setCollectionWrapperName("{http://tags}tags");
- List<TagVO2> tags = new ArrayList<TagVO2>();
+ List<TagVO2> tags = new ArrayList<>();
tags.add(new TagVO2("A", "B"));
tags.add(new TagVO2("C", "D"));
Method m = CollectionsResource.class.getMethod("getTags", new Class[0]);
@@ -1137,7 +1137,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testDropElements() throws Exception {
JAXBElementProvider<ManyTags> provider = new JAXBElementProvider<ManyTags>();
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.add("tagVO");
list.add("ManyTags");
list.add("list");
@@ -1158,7 +1158,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testDropQualifiedElements() throws Exception {
JAXBElementProvider<TagVO2> provider = new JAXBElementProvider<TagVO2>();
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
list.add("{http://tags}thetag");
provider.setOutDropElements(list);
Map<String, String> map = new HashMap<String, String>();
@@ -1212,7 +1212,7 @@ public class JAXBElementProviderTest extends Assert {
b2 = ((Book[])o)[1];
} else if (type == Set.class) {
Set<Book> set = CastUtils.cast((Set<?>)o);
- List<Book> books = new ArrayList<Book>(new TreeSet<Book>(set));
+ List<Book> books = new ArrayList<>(new TreeSet<Book>(set));
b1 = books.get(0);
b2 = books.get(1);
} else {
@@ -1283,7 +1283,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testSetSchemasFromClasspath() {
JAXBElementProvider<?> provider = new JAXBElementProvider<Object>();
- List<String> locations = new ArrayList<String>();
+ List<String> locations = new ArrayList<>();
locations.add("classpath:/test.xsd");
provider.setSchemaLocations(locations);
Schema s = provider.getSchema();
@@ -1303,7 +1303,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testSetSchemasFromDisk() throws Exception {
JAXBElementProvider<?> provider = new JAXBElementProvider<Object>();
- List<String> locations = new ArrayList<String>();
+ List<String> locations = new ArrayList<>();
String loc = getClass().getClassLoader().getResource("test.xsd").toURI().getPath();
locations.add("file:" + loc);
@@ -1315,7 +1315,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testWriteWithValidation() throws Exception {
JAXBElementProvider<Book2> provider = new JAXBElementProvider<Book2>();
- List<String> locations = new ArrayList<String>();
+ List<String> locations = new ArrayList<>();
String loc = getClass().getClassLoader().getResource("book1.xsd").toURI().getPath();
locations.add(loc);
provider.setSchemaLocations(locations);
@@ -1337,7 +1337,7 @@ public class JAXBElementProviderTest extends Assert {
@Test
public void testWriteWithFailedValidation() throws Exception {
JAXBElementProvider<Book2> provider = new JAXBElementProvider<Book2>();
- List<String> locations = new ArrayList<String>();
+ List<String> locations = new ArrayList<>();
String loc = getClass().getClassLoader().getResource("test.xsd").toURI().getPath();
locations.add("file:" + loc);
provider.setSchemaLocations(locations);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index 58a66b8..b1b3972 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -454,7 +454,7 @@ public class ProviderFactoryTest extends Assert {
@Test
public void testMessageBodyHandlerHierarchy() throws Exception {
ProviderFactory pf = ServerProviderFactory.getInstance();
- List<Object> providers = new ArrayList<Object>();
+ List<Object> providers = new ArrayList<>();
BookReaderWriter bookHandler = new BookReaderWriter();
providers.add(bookHandler);
SuperBookReaderWriter superBookHandler = new SuperBookReaderWriter();
@@ -477,7 +477,7 @@ public class ProviderFactoryTest extends Assert {
@Test
public void testMessageBodyWriterNoTypes() throws Exception {
ProviderFactory pf = ServerProviderFactory.getInstance();
- List<Object> providers = new ArrayList<Object>();
+ List<Object> providers = new ArrayList<>();
SuperBookReaderWriter2<SuperBook> superBookHandler = new SuperBookReaderWriter2<SuperBook>();
providers.add(superBookHandler);
pf.setUserProviders(providers);
@@ -813,7 +813,7 @@ public class ProviderFactoryTest extends Assert {
ProviderFactory pf = ServerProviderFactory.getInstance();
pf.registerUserProvider(provider);
- List<String> locations = new ArrayList<String>();
+ List<String> locations = new ArrayList<>();
locations.add("classpath:/test.xsd");
pf.setSchemaLocations(locations);
Schema s = provider.getSchema();
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
index 39b5c1e..1ceafe6 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProviderTest.java
@@ -67,7 +67,7 @@ public class XSLTJaxbProviderTest extends Assert {
public void testIsWriteableWithSetClasses() throws Exception {
XSLTJaxbProvider<Book> provider = new XSLTJaxbProvider<Book>();
provider.setOutTemplate(TEMPLATE_LOCATION);
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
names.add(Book.class.getName());
provider.setOutClassNames(names);
provider.isWriteable(Book.class, Book.class, null, MediaType.APPLICATION_XML_TYPE);
@@ -77,7 +77,7 @@ public class XSLTJaxbProviderTest extends Assert {
public void testNotWriteableWithSetClasses() throws Exception {
XSLTJaxbProvider<SuperBook> provider = new XSLTJaxbProvider<SuperBook>();
provider.setOutTemplate(TEMPLATE_LOCATION);
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
names.add(Book.class.getName());
provider.setOutClassNames(names);
provider.isWriteable(SuperBook.class, SuperBook.class, null, MediaType.APPLICATION_XML_TYPE);
@@ -88,7 +88,7 @@ public class XSLTJaxbProviderTest extends Assert {
XSLTJaxbProvider<SuperBook> provider = new XSLTJaxbProvider<SuperBook>();
provider.setSupportJaxbOnly(true);
provider.setOutTemplate(TEMPLATE_LOCATION);
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
names.add(Book.class.getName());
provider.setOutClassNames(names);
provider.isWriteable(SuperBook.class, SuperBook.class, null, MediaType.APPLICATION_XML_TYPE);
@@ -179,7 +179,7 @@ public class XSLTJaxbProviderTest extends Assert {
public void testIsReadableWithSetClasses() throws Exception {
XSLTJaxbProvider<Book> provider = new XSLTJaxbProvider<Book>();
provider.setInTemplate(TEMPLATE_LOCATION);
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
names.add(Book.class.getName());
provider.setInClassNames(names);
provider.isReadable(Book.class, Book.class, null, MediaType.APPLICATION_XML_TYPE);
@@ -189,7 +189,7 @@ public class XSLTJaxbProviderTest extends Assert {
public void testNotReadableWithSetClasses() throws Exception {
XSLTJaxbProvider<SuperBook> provider = new XSLTJaxbProvider<SuperBook>();
provider.setInTemplate(TEMPLATE_LOCATION);
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
names.add(Book.class.getName());
provider.setInClassNames(names);
provider.isReadable(SuperBook.class, SuperBook.class, null, MediaType.APPLICATION_XML_TYPE);
@@ -200,7 +200,7 @@ public class XSLTJaxbProviderTest extends Assert {
XSLTJaxbProvider<SuperBook> provider = new XSLTJaxbProvider<SuperBook>();
provider.setSupportJaxbOnly(true);
provider.setInTemplate(TEMPLATE_LOCATION);
- List<String> names = new ArrayList<String>();
+ List<String> names = new ArrayList<>();
names.add(Book.class.getName());
provider.setInClassNames(names);
provider.isReadable(SuperBook.class, SuperBook.class, null, MediaType.APPLICATION_XML_TYPE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java
index f62d3b4..7c9189d 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Tags.java
@@ -28,7 +28,7 @@ import org.apache.cxf.aegis.type.java5.XmlFlattenedArray;
@XmlRootElement(name = "Tags")
public class Tags {
- private List<TagVO> list = new ArrayList<TagVO>();
+ private List<TagVO> list = new ArrayList<>();
public Tags() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index 74b8f08..8e4885c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -99,18 +99,18 @@ public class InjectionUtilsTest extends Assert {
CustomerBean1 bean1 = new CustomerBean1();
bean1.setA("aValue");
bean1.setB(1L);
- List<String> values = new ArrayList<String>();
+ List<String> values = new ArrayList<>();
values.add("lv1");
values.add("lv2");
bean1.setC(values);
CustomerBean2 bean2 = new CustomerBean2();
bean2.setA("aaValue");
bean2.setB(2L);
- values = new ArrayList<String>();
+ values = new ArrayList<>();
values.add("lv11");
values.add("lv22");
bean2.setC(values);
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
set.add("set1");
set.add("set2");
bean2.setS(set);
@@ -156,7 +156,7 @@ public class InjectionUtilsTest extends Assert {
assertEquals(String.class, str);
ParameterizedType list = (ParameterizedType) InjectionUtils.getGenericResponseType(
GenericInterface.class.getMethod("list"), TestService.class,
- new ArrayList<String>(), ArrayList.class, new ExchangeImpl());
+ new ArrayList<>(), ArrayList.class, new ExchangeImpl());
assertEquals(String.class, list.getActualTypeArguments()[0]);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index 04d5455..767a7c5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -590,7 +590,7 @@ public class JAXRSUtilsTest extends Assert {
@Test
public void testIntersectMimeTypes() throws Exception {
//test basic
- List<MediaType> methodMimeTypes = new ArrayList<MediaType>(
+ List<MediaType> methodMimeTypes = new ArrayList<>(
JAXRSUtils.parseMediaTypes("application/mytype,application/xml,application/json"));
MediaType acceptContentType = MediaType.valueOf("application/json");
@@ -775,11 +775,11 @@ public class JAXRSUtilsTest extends Assert {
compareSortedMediaTypes(Collections.singletonList(m1),
Collections.singletonList(m1)) == 0);
- List<MediaType> sortedList1 = new ArrayList<MediaType>();
+ List<MediaType> sortedList1 = new ArrayList<>();
sortedList1.add(m1);
sortedList1.add(m2);
- List<MediaType> sortedList2 = new ArrayList<MediaType>();
+ List<MediaType> sortedList2 = new ArrayList<>();
sortedList2.add(m1);
sortedList2.add(m2);
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
index 0446546..736ce71 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
@@ -348,7 +348,7 @@ public class DispatchImpl<T> implements Dispatch<T>, BindingProvider, Closeable
= ((JaxWsClientEndpointImpl)client.getEndpoint()).getFeatures();
List<Feature> allFeatures;
if (client.getBus().getFeatures() != null) {
- allFeatures = new ArrayList<Feature>(endpointFeatures.size()
+ allFeatures = new ArrayList<>(endpointFeatures.size()
+ client.getBus().getFeatures().size());
allFeatures.addAll(endpointFeatures);
allFeatures.addAll(client.getBus().getFeatures());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
index 5d89e05..64abb69 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
@@ -755,7 +755,7 @@ public class EndpointImpl extends javax.xml.ws.Endpoint
public List<Feature> getFeatures() {
if (features == null) {
- features = new ArrayList<Feature>();
+ features = new ArrayList<>();
}
return features;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
index 4925241..f491cca 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
@@ -61,7 +61,7 @@ import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
@NoJSR250Annotations
public class JaxWsProxyFactoryBean extends ClientProxyFactoryBean {
@SuppressWarnings("rawtypes")
- List<Handler> handlers = new ArrayList<Handler>();
+ List<Handler> handlers = new ArrayList<>();
boolean loadHandlers = true;
public JaxWsProxyFactoryBean() {
@@ -176,7 +176,7 @@ public class JaxWsProxyFactoryBean extends ClientProxyFactoryBean {
AnnotationHandlerChainBuilder builder = new AnnotationHandlerChainBuilder();
JaxWsServiceFactoryBean sf = (JaxWsServiceFactoryBean)getServiceFactory();
@SuppressWarnings("rawtypes")
- List<Handler> chain = new ArrayList<Handler>(handlers);
+ List<Handler> chain = new ArrayList<>(handlers);
if (loadHandlers) {
chain.addAll(builder.buildHandlerChainFromClass(sf.getServiceClass(),
sf.getEndpointInfo().getName(),
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
index 49ea9b9..6429944 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
@@ -64,7 +64,7 @@ import org.apache.cxf.service.model.EndpointInfo;
public class JaxWsServerFactoryBean extends ServerFactoryBean {
protected boolean doInit;
@SuppressWarnings("rawtypes")
- protected List<Handler> handlers = new ArrayList<Handler>();
+ protected List<Handler> handlers = new ArrayList<>();
private boolean blockPostConstruct;
private boolean blockInjection;
@@ -244,7 +244,7 @@ public class JaxWsServerFactoryBean extends ServerFactoryBean {
private void buildHandlerChain(Server server) {
AnnotationHandlerChainBuilder builder = new AnnotationHandlerChainBuilder();
@SuppressWarnings("rawtypes")
- List<Handler> chain = new ArrayList<Handler>(handlers);
+ List<Handler> chain = new ArrayList<>(handlers);
chain.addAll(builder.buildHandlerChainFromClass(getServiceBeanClass(),
server.getEndpoint().getEndpointInfo().getName(),
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
index df22406..63be5e0 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
@@ -233,7 +233,7 @@ public class ServiceImpl extends ServiceDelegate {
}
private List<WebServiceFeature> getAllFeatures(WebServiceFeature features[]) {
- List<WebServiceFeature> f = new ArrayList<WebServiceFeature>();
+ List<WebServiceFeature> f = new ArrayList<>();
if (features != null) {
f.addAll(Arrays.asList(features));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java
index db128b4..5838464 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java
@@ -29,7 +29,7 @@ import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
public abstract class AbstractBindingImpl implements Binding {
@SuppressWarnings("rawtypes")
- private List<Handler> handlerChain = new ArrayList<Handler>();
+ private List<Handler> handlerChain = new ArrayList<>();
private final JaxWsEndpointImpl endpoint;
public AbstractBindingImpl(JaxWsEndpointImpl imp) {
@@ -40,7 +40,7 @@ public abstract class AbstractBindingImpl implements Binding {
@SuppressWarnings("rawtypes")
public List<Handler> getHandlerChain() {
//per spec, this should be a copy
- return new ArrayList<Handler>(handlerChain);
+ return new ArrayList<>(handlerChain);
}
public void setHandlerChain(@SuppressWarnings("rawtypes") List<Handler> hc) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
index ccb85f3..0671854 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/SOAPBindingImpl.java
@@ -56,7 +56,7 @@ public class SOAPBindingImpl extends AbstractBindingImpl implements SOAPBinding
private void addRequiredRoles() {
if (this.roles == null) {
- this.roles = new HashSet<String>();
+ this.roles = new HashSet<>();
}
if (this.soapBinding instanceof SoapBindingInfo) {
SoapBindingInfo bindingInfo = (SoapBindingInfo) this.soapBinding;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java
index 4b53c62..d8991ff 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java
@@ -128,7 +128,7 @@ class WrappedAttachments implements Set<Attachment> {
public boolean retainAll(Collection<?> c) {
boolean b = false;
- Set<String> ids = new HashSet<String>();
+ Set<String> ids = new HashSet<>();
for (Iterator<?> it = c.iterator(); it.hasNext();) {
Object o = it.next();
if (o instanceof Attachment) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
index a5db0e5..792aaf8 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java
@@ -367,7 +367,7 @@ public class WrappedMessageContext implements MessageContext {
dataHandlers = ((WrappedAttachments) attachments).getAttachments();
} else {
if (attachments == null) {
- attachments = new ArrayList<Attachment>();
+ attachments = new ArrayList<>();
mc.put(Message.ATTACHMENTS, attachments);
}
dataHandlers = AttachmentUtil.getDHMap(attachments);
@@ -384,7 +384,7 @@ public class WrappedMessageContext implements MessageContext {
// map to jaxws
public final Set<String> keySet() {
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
for (String s : message.keySet()) {
set.add(s);
set.add(mapKeyReverse(s));
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
index b72a721..9bbcd98 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
@@ -81,7 +81,7 @@ public class AnnotationHandlerChainBuilder extends HandlerChainBuilder {
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("no HandlerChain annotation on " + clz);
}
- chain = new ArrayList<Handler>();
+ chain = new ArrayList<>();
} else {
hcAnn.validate();
@@ -107,7 +107,7 @@ public class AnnotationHandlerChainBuilder extends HandlerChainBuilder {
"handler-chains".equals(el.getLocalName()),
xml, handlerFileURL));
}
- chain = new ArrayList<Handler>();
+ chain = new ArrayList<>();
Node node = el.getFirstChild();
while (node != null) {
if (node instanceof Element) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
index 7e733b8..2df91b3 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
@@ -68,7 +68,7 @@ public class HandlerChainBuilder {
if (null == hc || hc.size() == 0) {
return null;
}
- List<Handler> handlers = new ArrayList<Handler>();
+ List<Handler> handlers = new ArrayList<>();
for (PortComponentHandlerType pt : hc) {
handlers.addAll(buildHandlerChain(pt, getHandlerClassLoader()));
}
@@ -94,8 +94,8 @@ public class HandlerChainBuilder {
public List<Handler> sortHandlers(List<Handler> handlers) {
final int size = handlers.size();
- List<Handler> logicalHandlers = new ArrayList<Handler>(size);
- List<Handler> protocolHandlers = new ArrayList<Handler>(Math.min(10, size));
+ List<Handler> logicalHandlers = new ArrayList<>(size);
+ List<Handler> protocolHandlers = new ArrayList<>(Math.min(10, size));
for (Handler<?> handler : handlers) {
if (handler instanceof LogicalHandler) {
@@ -116,7 +116,7 @@ public class HandlerChainBuilder {
}
protected List<Handler> buildHandlerChain(PortComponentHandlerType ht, ClassLoader classLoader) {
- List<Handler> handlerChain = new ArrayList<Handler>();
+ List<Handler> handlerChain = new ArrayList<>();
try {
final boolean fineLog = LOG.isLoggable(Level.FINE);
if (fineLog) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
index 4d51df7..f6673dc 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
@@ -602,7 +602,7 @@ public class HandlerChainInvoker {
}
private <T extends Handler<?>> List<T> reverseHandlerChain(List<T> handlerChain) {
- List<T> reversedHandlerChain = new ArrayList<T>();
+ List<T> reversedHandlerChain = new ArrayList<>();
reversedHandlerChain.addAll(handlerChain);
Collections.reverse(reversedHandlerChain);
return reversedHandlerChain;
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java
index 2c2dd01..effaee1 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java
@@ -63,7 +63,7 @@ public class HandlerResolverImpl implements HandlerResolver {
}
private List<Handler> createHandlerChain(PortInfo portInfo) {
- List<Handler> chain = new ArrayList<Handler>();
+ List<Handler> chain = new ArrayList<>();
if (annotationClass != null) {
chain.addAll(getHandlersFromAnnotation(annotationClass, portInfo));
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
index e095713..e83871a 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
@@ -52,13 +52,13 @@ public class SOAPHandlerFaultInInterceptor extends
}
public Set<URI> getRoles() {
- Set<URI> roles = new HashSet<URI>();
+ Set<URI> roles = new HashSet<>();
// TODO
return roles;
}
public Set<QName> getUnderstoodHeaders() {
- Set<QName> understood = new HashSet<QName>();
+ Set<QName> understood = new HashSet<>();
for (Handler<?> h : getBinding().getHandlerChain()) {
if (h instanceof SOAPHandler) {
Set<QName> headers = CastUtils.cast(((SOAPHandler<?>) h).getHeaders());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
index ad1edc6..d99360e 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
@@ -67,13 +67,13 @@ public class SOAPHandlerFaultOutInterceptor extends
}
public Set<URI> getRoles() {
- Set<URI> roles = new HashSet<URI>();
+ Set<URI> roles = new HashSet<>();
// TODO
return roles;
}
public Set<QName> getUnderstoodHeaders() {
- Set<QName> understood = new HashSet<QName>();
+ Set<QName> understood = new HashSet<>();
for (Handler<?> h : getBinding().getHandlerChain()) {
if (h instanceof SOAPHandler) {
Set<QName> headers = CastUtils.cast(((SOAPHandler<?>) h).getHeaders());
http://git-wip-us.apache.org/repos/asf/cxf/blob/00503840/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
index 76a5164..2469150 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
@@ -87,13 +87,13 @@ public class SOAPHandlerInterceptor extends
}
public Set<URI> getRoles() {
- Set<URI> roles = new HashSet<URI>();
+ Set<URI> roles = new HashSet<>();
//TODO
return roles;
}
public Set<QName> getUnderstoodHeaders() {
- Set<QName> understood = new HashSet<QName>();
+ Set<QName> understood = new HashSet<>();
for (Handler<?> h : getBinding().getHandlerChain()) {
if (h instanceof SOAPHandler) {
Set<QName> headers = CastUtils.cast(((SOAPHandler<?>) h).getHeaders());
@@ -256,7 +256,7 @@ public class SOAPHandlerInterceptor extends
setupBindingOperationInfo(exch, sm);
SOAPMessage msg = sm.getMessage();
try {
- List<SOAPElement> params = new ArrayList<SOAPElement>();
+ List<SOAPElement> params = new ArrayList<>();
message.put(MessageContext.REFERENCE_PARAMETERS, params);
SOAPHeader head = SAAJUtils.getHeader(msg);
if (head != null) {