You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/05/14 09:50:30 UTC
[cxf] branch master updated: replace
Collection::addAll(Arrays.asList(...)) with Collections::addAll
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 6d467ad replace Collection::addAll(Arrays.asList(...)) with Collections::addAll
6d467ad is described below
commit 6d467ad059267d48be066334a81e1488c9b7b152
Author: amarkevich <am...@talend.com>
AuthorDate: Mon May 13 12:09:13 2019 +0300
replace Collection::addAll(Arrays.asList(...)) with Collections::addAll
---
.../org/apache/cxf/attachment/AttachmentUtil.java | 6 +-
.../java/org/apache/cxf/common/util/Compiler.java | 3 +-
.../security/SecureAnnotationsInterceptor.java | 9 +-
.../org/apache/cxf/maven_plugin/WsdlUtilities.java | 6 +-
.../maven_plugin/wsdl2java/WsdlOptionLoader.java | 3 +-
.../cxf/maven_plugin/wadlto/OptionLoader.java | 8 +-
.../apache/cxf/maven_plugin/WSDLValidatorMojo.java | 6 +-
.../cxf/aegis/type/encoded/ArrayTypeInfo.java | 3 +-
.../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 3 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 2 +-
.../ext/logging/event/DefaultLogEventMapper.java | 2 +-
.../cxf/jaxrs/impl/VariantListBuilderImpl.java | 8 +-
.../java/org/apache/cxf/jaxws/ServiceImpl.java | 6 +-
.../org/apache/cxf/javascript/fortest/AnyImpl.java | 4 +-
.../security/oauth/filters/AbstractAuthFilter.java | 4 +-
.../security/oauth2/filters/OAuthScopesFilter.java | 9 +-
.../interceptor/ClaimsAuthorizingInterceptor.java | 17 +-
.../ClaimsAuthorizingInterceptorTest.java | 2 +-
.../cxf/ws/policy/PolicyAnnotationListener.java | 8 +-
.../factory/ReflectionServiceFactoryBean.java | 17 +-
.../apache/cxf/sts/claims/mapper/ClaimUtils.java | 4 +-
.../xkms/x509/repo/file/FileCertificateRepo.java | 9 +-
.../JavaFirstSchemaValidationTest.java | 6 +-
.../systest/type_test/AbstractTypeTestClient2.java | 25 +-
.../type_test/corba/CORBADocLitClientTypeTest.java | 335 ++++++++++-----------
.../type_test/soap/SOAPDocLitClientTypeTest.java | 6 +-
26 files changed, 241 insertions(+), 270 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 0b0b3c3..4dd44bc 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -34,6 +34,7 @@ import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -133,15 +134,14 @@ public final class AttachmentUtil {
String[] mimeTypes = super.getMimeTypes();
String[] defMimeTypes = DEFAULT_COMMAND_MAP.getMimeTypes();
Set<String> mimeTypeSet = new HashSet<>();
- mimeTypeSet.addAll(Arrays.asList(mimeTypes));
- mimeTypeSet.addAll(Arrays.asList(defMimeTypes));
+ Collections.addAll(mimeTypeSet, mimeTypes);
+ Collections.addAll(mimeTypeSet, defMimeTypes);
String[] mimeArray = new String[0];
return mimeTypeSet.toArray(mimeArray);
}
}
-
private AttachmentUtil() {
}
diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
index 3c5bc4c..97f38dd 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -182,7 +183,7 @@ public class Compiler {
String classpath = list.get(classpathIdx + 1);
checkLongClasspath(classpath, list, classpathIdx);
int idx = list.size();
- list.addAll(Arrays.asList(files));
+ Collections.addAll(list, files);
return internalCompile(list.toArray(new String[0]), idx);
}
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
index 71e2cc3..2fa2007 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
@@ -38,13 +38,8 @@ public class SecureAnnotationsInterceptor extends SimpleAuthorizingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(SecureAnnotationsInterceptor.class);
private static final String DEFAULT_ANNOTATION_CLASS_NAME = "javax.annotation.security.RolesAllowed";
- private static final Set<String> SKIP_METHODS;
- static {
- SKIP_METHODS = new HashSet<>();
- SKIP_METHODS.addAll(Arrays.asList(
- new String[] {"wait", "notify", "notifyAll",
- "equals", "toString", "hashCode"}));
- }
+ private static final Set<String> SKIP_METHODS = new HashSet<>(
+ Arrays.asList("wait", "notify", "notifyAll", "equals", "toString", "hashCode"));
private String annotationClassName = DEFAULT_ANNOTATION_CLASS_NAME;
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
index cb408be..b944ce7 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
@@ -21,7 +21,7 @@ package org.apache.cxf.maven_plugin;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.cxf.helpers.CastUtils;
@@ -63,9 +63,9 @@ public final class WsdlUtilities {
List<String> exList = new ArrayList<>();
if (excludes != null) {
- exList.addAll(Arrays.asList(excludes));
+ Collections.addAll(exList, excludes);
}
- exList.addAll(Arrays.asList(org.codehaus.plexus.util.FileUtils.getDefaultExcludes()));
+ Collections.addAll(exList, org.codehaus.plexus.util.FileUtils.getDefaultExcludes());
String inc = joinWithComma(includes);
String ex = joinWithComma(exList.toArray(new String[0]));
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
index 7b1ba9d..f70e089 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
@@ -21,7 +21,6 @@ package org.apache.cxf.maven_plugin.wsdl2java;
import java.io.File;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -144,7 +143,7 @@ public final class WsdlOptionLoader {
final String[] options = readOptionsFromFile(wsdl.getParentFile(), wsdlName);
if (options.length > 0) {
- wsdlOption.getExtraargs().addAll(Arrays.asList(options));
+ Collections.addAll(wsdlOption.getExtraargs(), options);
}
List<File> bindingFiles = FileUtils.getFiles(wsdl.getParentFile(), wsdlName + WSDL_BINDINGS);
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
index d3e9115..85e0254 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
@@ -22,7 +22,7 @@ package org.apache.cxf.maven_plugin.wadlto;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -122,9 +122,9 @@ public final class OptionLoader {
List<String> exList = new ArrayList<>();
if (excludes != null) {
- exList.addAll(Arrays.asList(excludes));
+ Collections.addAll(exList, excludes);
}
- exList.addAll(Arrays.asList(org.codehaus.plexus.util.FileUtils.getDefaultExcludes()));
+ Collections.addAll(exList, org.codehaus.plexus.util.FileUtils.getDefaultExcludes());
String inc = joinWithComma(includes);
String ex = joinWithComma(exList.toArray(new String[0]));
@@ -166,7 +166,7 @@ public final class OptionLoader {
final String[] options = readOptionsFromFile(wadl.getParentFile(), wadlName);
if (options.length > 0) {
- wadlOption.getExtraargs().addAll(Arrays.asList(options));
+ Collections.addAll(wadlOption.getExtraargs(), options);
}
List<File> bindingFiles = FileUtils.getFiles(wadl.getParentFile(), wadlName + WADL_BINDINGS);
diff --git a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
index 0da2c7c..a10e819 100644
--- a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
+++ b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
@@ -23,7 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.cxf.helpers.CastUtils;
@@ -91,9 +91,9 @@ public class WSDLValidatorMojo extends AbstractMojo {
List<String> exList = new ArrayList<>();
if (excludes != null) {
- exList.addAll(Arrays.asList(excludes));
+ Collections.addAll(exList, excludes);
}
- exList.addAll(Arrays.asList(org.codehaus.plexus.util.FileUtils.getDefaultExcludes()));
+ Collections.addAll(exList, org.codehaus.plexus.util.FileUtils.getDefaultExcludes());
String inc = getIncludeExcludeString(includes);
String ex = getIncludeExcludeString(exList.toArray(new String[0]));
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 479ecba..5b9e916 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
@@ -20,7 +20,6 @@ package org.apache.cxf.aegis.type.encoded;
import java.lang.reflect.Array;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
@@ -54,7 +53,7 @@ public class ArrayTypeInfo {
public ArrayTypeInfo(QName typeName, int ranks, Integer... dimensions) {
this.typeName = typeName;
this.ranks = ranks;
- this.dimensions.addAll(Arrays.asList(dimensions));
+ Collections.addAll(this.dimensions, dimensions);
}
public ArrayTypeInfo(MessageReader reader, TypeMapping tm) {
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 54d6beb..8f9d75f 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -221,8 +221,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
}
public JAXBDataBinding(Class<?>... classes) throws JAXBException {
- contextClasses = new LinkedHashSet<>();
- contextClasses.addAll(Arrays.asList(classes));
+ contextClasses = new LinkedHashSet<>(Arrays.asList(classes));
setContext(createJAXBContext(contextClasses)); //NOPMD - specifically allow this
}
public JAXBDataBinding(boolean qualified, Map<String, Object> props) throws JAXBException {
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 b019d4c..fcdb3a4 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
@@ -738,7 +738,7 @@ public final class JAXBEncoderDecoder {
Object o = unmarshall(u, source, elName, clazz, unwrap);
if (o != null && o.getClass().isArray() && isList(part)) {
List<Object> ret = createList(part);
- ret.addAll(Arrays.asList((Object[])o));
+ Collections.addAll(ret, (Object[])o);
o = ret;
}
return o;
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 abbdc2a..107b240 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
@@ -62,7 +62,7 @@ public class DefaultLogEventMapper {
public void addBinaryContentMediaTypes(String mediaTypes) {
if (mediaTypes != null) {
- binaryContentMediaTypes.addAll(Arrays.asList(mediaTypes.split(";")));
+ Collections.addAll(binaryContentMediaTypes, mediaTypes.split(";"));
}
}
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 a2cce93..a49d00c 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
@@ -21,7 +21,7 @@
package org.apache.cxf.jaxrs.impl;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Locale;
@@ -57,13 +57,13 @@ public class VariantListBuilderImpl extends VariantListBuilder {
@Override
public VariantListBuilder encodings(String... encs) {
- encodings.addAll(Arrays.asList(encs));
+ Collections.addAll(encodings, encs);
return this;
}
@Override
public VariantListBuilder mediaTypes(MediaType... types) {
- mediaTypes.addAll(Arrays.asList(types));
+ Collections.addAll(mediaTypes, types);
return this;
}
@@ -118,7 +118,7 @@ public class VariantListBuilderImpl extends VariantListBuilder {
@Override
public VariantListBuilder languages(Locale... ls) {
- languages.addAll(Arrays.asList(ls));
+ Collections.addAll(languages, ls);
return this;
}
}
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 6004b9a..85a0e77 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
@@ -23,7 +23,7 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -234,10 +234,10 @@ public class ServiceImpl extends ServiceDelegate {
private List<WebServiceFeature> getAllFeatures(WebServiceFeature[] features) {
List<WebServiceFeature> f = new ArrayList<>();
if (features != null) {
- f.addAll(Arrays.asList(features));
+ Collections.addAll(f, features);
}
if (serviceFeatures != null) {
- f.addAll(Arrays.asList(serviceFeatures));
+ Collections.addAll(f, serviceFeatures);
}
return f;
}
diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java
index 9f3a692..0331ab3 100644
--- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java
+++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java
@@ -19,7 +19,7 @@
package org.apache.cxf.javascript.fortest;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -159,7 +159,7 @@ public class AnyImpl implements AcceptAny {
a1 = new Alternative1();
a1.setChalk("sidewalk");
objects[3] = a1;
- r.getAny().addAll(Arrays.asList(objects));
+ Collections.addAll(r.getAny(), objects);
return r;
}
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
index 61a373f..70e451b 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
@@ -68,10 +68,8 @@ public class AbstractAuthFilter {
OAuth.OAUTH_NONCE
};
- private static final Set<String> ALLOWED_OAUTH_PARAMETERS;
+ private static final Set<String> ALLOWED_OAUTH_PARAMETERS = new HashSet<>(Arrays.asList(REQUIRED_PARAMETERS));
static {
- ALLOWED_OAUTH_PARAMETERS = new HashSet<>();
- ALLOWED_OAUTH_PARAMETERS.addAll(Arrays.asList(REQUIRED_PARAMETERS));
ALLOWED_OAUTH_PARAMETERS.add(OAuth.OAUTH_VERSION);
ALLOWED_OAUTH_PARAMETERS.add(OAuthConstants.OAUTH_CONSUMER_SECRET);
}
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java
index a5c7b06..b3f2520 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java
@@ -48,13 +48,8 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthContextUtils;
public class OAuthScopesFilter implements ContainerRequestFilter {
private static final Logger LOG = LogUtils.getL7dLogger(OAuthScopesFilter.class);
- private static final Set<String> SKIP_METHODS;
- static {
- SKIP_METHODS = new HashSet<>();
- SKIP_METHODS.addAll(Arrays.asList(
- new String[] {"wait", "notify", "notifyAll",
- "equals", "toString", "hashCode"}));
- }
+ private static final Set<String> SKIP_METHODS = new HashSet<>(
+ Arrays.asList("wait", "notify", "notifyAll", "equals", "toString", "hashCode"));
@Context
private MessageContext mc;
diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptor.java b/rt/security/src/main/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptor.java
index 5bcb3c0..05c13f5 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptor.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptor.java
@@ -51,13 +51,8 @@ public class ClaimsAuthorizingInterceptor extends AbstractPhaseInterceptor<Messa
private static final Logger LOG = LogUtils.getL7dLogger(ClaimsAuthorizingInterceptor.class);
- private static final Set<String> SKIP_METHODS;
- static {
- SKIP_METHODS = new HashSet<>();
- SKIP_METHODS.addAll(Arrays.asList(
- new String[] {"wait", "notify", "notifyAll",
- "equals", "toString", "hashCode"}));
- }
+ private static final Set<String> SKIP_METHODS = new HashSet<>(
+ Arrays.asList("wait", "notify", "notifyAll", "equals", "toString", "hashCode"));
private Map<String, List<ClaimBean>> claims = new HashMap<>();
private Map<String, String> nameAliases = Collections.emptyMap();
@@ -205,11 +200,13 @@ public class ClaimsAuthorizingInterceptor extends AbstractPhaseInterceptor<Messa
Claims claimsAnn, Claim claimAnn) {
List<ClaimBean> claimsList = new ArrayList<>();
- List<Claim> annClaims = new ArrayList<>();
+ final List<Claim> annClaims;
if (claimsAnn != null) {
- annClaims.addAll(Arrays.asList(claimsAnn.value()));
+ annClaims = Arrays.asList(claimsAnn.value());
} else if (claimAnn != null) {
- annClaims.add(claimAnn);
+ annClaims = Collections.singletonList(claimAnn);
+ } else {
+ annClaims = Collections.emptyList();
}
for (Claim ann : annClaims) {
org.apache.cxf.rt.security.claims.Claim claim = new org.apache.cxf.rt.security.claims.Claim();
diff --git a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
index 97a3cc8..2a2e19d 100644
--- a/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
+++ b/rt/security/src/test/java/org/apache/cxf/rt/security/claims/interceptor/ClaimsAuthorizingInterceptorTest.java
@@ -246,7 +246,7 @@ public class ClaimsAuthorizingInterceptorTest {
org.apache.cxf.rt.security.claims.Claim... claim)
throws Exception {
ClaimCollection claims = new ClaimCollection();
- claims.addAll(Arrays.asList(claim));
+ Collections.addAll(claims, claim);
Set<Principal> roles =
parseRolesFromClaims(claims, roleName,
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
index 66a9024..df288f0 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
@@ -22,7 +22,7 @@ package org.apache.cxf.ws.policy;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
import java.util.logging.Level;
@@ -130,7 +130,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
list.add(p);
}
if (ps != null) {
- list.addAll(Arrays.asList(ps.value()));
+ Collections.addAll(list, ps.value());
}
ListIterator<Policy> it = list.listIterator();
while (it.hasNext()) {
@@ -250,7 +250,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
list.add(p);
}
if (ps != null) {
- list.addAll(Arrays.asList(ps.value()));
+ Collections.addAll(list, ps.value());
}
addPolicies(factory, endpoint, cls, list, Policy.Placement.SERVICE);
}
@@ -312,7 +312,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
list.add(p);
}
if (ps != null) {
- list.addAll(Arrays.asList(ps.value()));
+ Collections.addAll(list, ps.value());
}
ListIterator<Policy> it = list.listIterator();
while (it.hasNext()) {
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index 81e2ea3..d68c693 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -163,7 +163,14 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
private QName serviceName;
private Invoker invoker;
private Executor executor;
- private List<String> ignoredClasses = new ArrayList<>();
+ private List<String> ignoredClasses = new ArrayList<>(Arrays.asList(
+ "java.lang.Object",
+ "java.lang.Throwable",
+ "org.omg.CORBA_2_3.portable.ObjectImpl",
+ "org.omg.CORBA.portable.ObjectImpl",
+ "javax.ejb.EJBObject",
+ "javax.rmi.CORBA.Stub"
+ ));
private List<Method> ignoredMethods = new ArrayList<>();
private MethodDispatcher methodDispatcher = new SimpleMethodDispatcher();
private Boolean wrappedStyle;
@@ -183,14 +190,6 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
public ReflectionServiceFactoryBean() {
getServiceConfigurations().add(0, new DefaultServiceConfiguration());
- ignoredClasses.addAll(Arrays.asList(new String[] {
- "java.lang.Object",
- "java.lang.Throwable",
- "org.omg.CORBA_2_3.portable.ObjectImpl",
- "org.omg.CORBA.portable.ObjectImpl",
- "javax.ejb.EJBObject",
- "javax.rmi.CORBA.Stub"
- }));
}
protected DataBinding createDefaultDataBinding() {
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
index c8ef597..2df3e68 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/mapper/ClaimUtils.java
@@ -21,7 +21,7 @@ package org.apache.cxf.sts.claims.mapper;
import java.net.URI;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -86,7 +86,7 @@ public class ClaimUtils {
processedClaim.setClaimType(URI.create(processedClaimTypeURI));
}
if (values != null) {
- processedClaim.getValues().addAll(Arrays.asList(values));
+ Collections.addAll(processedClaim.getValues(), values);
}
return processedClaim;
}
diff --git a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java
index e178596..3a34bae 100644
--- a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java
+++ b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/repo/file/FileCertificateRepo.java
@@ -34,6 +34,7 @@ import java.security.cert.X509CRL;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
@@ -161,10 +162,10 @@ public class FileCertificateRepo implements CertificateRepo {
private File[] getX509Files() {
List<File> certificateFiles = new ArrayList<>();
try {
- certificateFiles.addAll(Arrays.asList(storageDir.listFiles()));
- certificateFiles.addAll(Arrays.asList(new File(storageDir + "/" + TRUSTED_CAS_PATH).listFiles()));
- certificateFiles.addAll(Arrays.asList(new File(storageDir + "/" + CAS_PATH).listFiles()));
- certificateFiles.addAll(Arrays.asList(new File(storageDir + "/" + CRLS_PATH).listFiles()));
+ Collections.addAll(certificateFiles, storageDir.listFiles());
+ Collections.addAll(certificateFiles, new File(storageDir, TRUSTED_CAS_PATH).listFiles());
+ Collections.addAll(certificateFiles, new File(storageDir, CAS_PATH).listFiles());
+ Collections.addAll(certificateFiles, new File(storageDir, CRLS_PATH).listFiles());
} catch (NullPointerException e) {
//
}
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
index a5d1c11..bcb83a3 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/schemavalidation/JavaFirstSchemaValidationTest.java
@@ -21,7 +21,7 @@ package org.apache.cxf.systest.jaxws.schemavalidation;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -376,7 +376,7 @@ public class JavaFirstSchemaValidationTest {
clientFactory.setAddress(getAddress(port, serviceClass));
if (features != null) {
- clientFactory.getFeatures().addAll(Arrays.asList(features));
+ Collections.addAll(clientFactory.getFeatures(), features);
}
@SuppressWarnings("unchecked")
@@ -405,7 +405,7 @@ public class JavaFirstSchemaValidationTest {
svrFactory.setServiceClass(serviceImpl.getClass());
if (features != null) {
- svrFactory.getFeatures().addAll(Arrays.asList(features));
+ Collections.addAll(svrFactory.getFeatures(), features);
}
if (type != null) {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
index f3ca605..a25dd92 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient2.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.type_test;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import javax.xml.bind.JAXBElement;
@@ -357,10 +358,10 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
return;
}
FixedArray x = new FixedArray();
- x.getItem().addAll(Arrays.asList(Integer.MIN_VALUE, 0, Integer.MAX_VALUE));
+ Collections.addAll(x.getItem(), Integer.MIN_VALUE, 0, Integer.MAX_VALUE);
FixedArray yOrig = new FixedArray();
- yOrig.getItem().addAll(Arrays.asList(-1, 0, 1));
+ Collections.addAll(yOrig.getItem(), -1, 0, 1);
Holder<FixedArray> y = new Holder<>(yOrig);
Holder<FixedArray> z = new Holder<>();
@@ -391,9 +392,9 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
return;
}
BoundedArray x = new BoundedArray();
- x.getItem().addAll(Arrays.asList(-100.00f, 0f, 100.00f));
+ Collections.addAll(x.getItem(), -100.00f, 0f, 100.00f);
BoundedArray yOrig = new BoundedArray();
- yOrig.getItem().addAll(Arrays.asList(-1f, 0f, 1f));
+ Collections.addAll(yOrig.getItem(), -1f, 0f, 1f);
Holder<BoundedArray> y = new Holder<>(yOrig);
Holder<BoundedArray> z = new Holder<>();
@@ -446,9 +447,9 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
return;
}
UnboundedArray x = new UnboundedArray();
- x.getItem().addAll(Arrays.asList("AAA", "BBB", "CCC"));
+ Collections.addAll(x.getItem(), "AAA", "BBB", "CCC");
UnboundedArray yOrig = new UnboundedArray();
- yOrig.getItem().addAll(Arrays.asList("XXX", "YYY", "ZZZ"));
+ Collections.addAll(yOrig.getItem(), "XXX", "YYY", "ZZZ");
Holder<UnboundedArray> y = new Holder<>(yOrig);
Holder<UnboundedArray> z = new Holder<>();
@@ -481,12 +482,12 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
return;
}
CompoundArray x = new CompoundArray();
- x.getArray1().addAll(Arrays.asList("AAA", "BBB", "CCC"));
- x.getArray2().addAll(Arrays.asList("aaa", "bbb", "ccc"));
+ Collections.addAll(x.getArray1(), "AAA", "BBB", "CCC");
+ Collections.addAll(x.getArray2(), "aaa", "bbb", "ccc");
CompoundArray yOrig = new CompoundArray();
- yOrig.getArray1().addAll(Arrays.asList("XXX", "YYY", "ZZZ"));
- yOrig.getArray2().addAll(Arrays.asList("xxx", "yyy", "zzz"));
+ Collections.addAll(yOrig.getArray1(), "XXX", "YYY", "ZZZ");
+ Collections.addAll(yOrig.getArray2(), "xxx", "yyy", "zzz");
Holder<CompoundArray> y = new Holder<>(yOrig);
Holder<CompoundArray> z = new Holder<>();
@@ -524,10 +525,10 @@ public abstract class AbstractTypeTestClient2 extends AbstractTypeTestClient {
for (int i = 0; i < 3; i++) {
UnboundedArray xx = new UnboundedArray();
- xx.getItem().addAll(Arrays.asList(xs[i]));
+ Collections.addAll(xx.getItem(), xs[i]);
xList.add(xx);
UnboundedArray yy = new UnboundedArray();
- yy.getItem().addAll(Arrays.asList(ys[i]));
+ Collections.addAll(yy.getItem(), ys[i]);
yList.add(yy);
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
index eb1a166..6ec9e34 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
@@ -45,181 +45,173 @@ public class CORBADocLitClientTypeTest extends AbstractTypeTestClient5 {
protected static final QName PORT_NAME = new QName("http://apache.org/type_test/doc",
"TypeTestCORBAPort");
- private static final Set<String> NOT_WORKING_TESTS = new HashSet<>();
- private static final Set<String> RUN_TESTS = new HashSet<>();
+ private static final Set<String> NOT_WORKING_TESTS = new HashSet<>(Arrays.asList(
+ "AnonEnumList",
+ "AnonymousType",
+ "AnyURIRestriction",
+ "Base64BinaryRestriction",
+ "ChoiceArray",
+ "ChoiceOfChoice",
+ "ChoiceOfSeq",
+ "ChoiceWithAnyAttribute",
+ "ChoiceWithGroupChoice",
+ "ChoiceWithGroups",
+ "ChoiceWithGroupSeq",
+ "ChoiceWithSubstitutionGroup",
+ "ChoiceWithSubstitutionGroupAbstract",
+ "ChoiceWithSubstitutionGroupNil",
+ "ComplexArray",
+ "ComplexChoice",
+ "ComplexStruct",
+ "ComplexRestriction",
+ "ComplexRestriction2",
+ "ComplexRestriction3",
+ "ComplexRestriction4",
+ "ComplexRestriction5",
+ "ComplexTypeWithAttributeGroup",
+ "ComplexTypeWithAttributeGroup1",
+ "ComplexTypeWithAttributes",
+ "DateTime",
+ "DerivedAllBaseAll",
+ "DerivedAllBaseChoice",
+ "DerivedAllBaseStruct",
+ "DerivedChoiceBaseAll",
+ "DerivedChoiceBaseArray",
+ "DerivedChoiceBaseChoice",
+ "DerivedChoiceBaseComplex",
+ "DerivedChoiceBaseStruct",
+ "DerivedNoContent",
+ "DerivedStructBaseChoice",
+ "DerivedStructBaseEmpty",
+ "DerivedStructBaseStruct",
+ "Document",
+ "EmptyStruct",
+ "ExtBase64Binary",
+ "ExtColourEnum",
+ "ExtendsSimpleContent",
+ "ExtendsSimpleType",
+ "GroupDirectlyInComplexType",
+ "HexBinaryRestriction",
+ "IDTypeAttribute",
+ "InheritanceEmptyAllDerivedEmpty",
+ "InheritanceNestedStruct",
+ "InheritanceSimpleChoiceDerivedStruct",
+ "InheritanceSimpleStructDerivedStruct",
+ "InheritanceUnboundedArrayDerivedChoice",
+ "MRecSeqA",
+ "MRecSeqC",
+ "NestedStruct",
+ "NMTOKENS",
+ "NumberList",
+ "Occuri ngStruct2",
+ "OccuringAll",
+ "OccuringChoice",
+ "OccuringChoice1",
+ "OccuringChoice2",
+ "OccuringChoiceWithAnyAttribute",
+ "OccuringStruct",
+ "OccuringStruct1",
+ "OccuringStruct2",
+ "OccuringStructWithAnyAttribute",
+ "QName",
+ "QNameList",
+ "RecElType",
+ "RecOuterType",
+ "RecSeqB6918",
+ "RecursiveStruct",
+ "RecursiveStructArray",
+ "RecursiveUnion",
+ "RecursiveUnionData",
+ "RestrictedAllBaseAll",
+ "RestrictedChoiceBaseChoice",
+ "RestrictedStructBaseStruct",
+ "SequenceWithGroupChoice",
+ "SequenceWithGroups",
+ "SequenceWithGroupSeq",
+ "SequenceWithOccuringGroup",
+ "SimpleAll",
+ "SimpleContent1",
+ "SimpleContent2",
+ "SimpleContent3",
+ "SimpleContentExtWithAnyAttribute",
+ "SimpleListRestriction2",
+ "SimpleRestriction2",
+ "SimpleRestriction3",
+ "SimpleRestriction5",
+ "SimpleRestriction6",
+ "SimpleStruct",
+ "SimpleUnionList",
+ "StringI18N",
+ "StringList",
+ "StructWithAny",
+ "StructWithAnyArray",
+ "StructWithAnyArrayLax",
+ "StructWithAnyArrayLaxComplex",
+ "StructWithAnyAttribute",
+ "StructWithAnyStrict",
+ "StructWithAnyStrictComplex",
+ "StructWithAnyXsi",
+ "StructWithInvalidAny",
+ "StructWithInvalidAnyArray",
+ "StructWithList",
+ "StructWithMultipleSubstitutionGroups",
+ "StructWithNillableChoice",
+ "StructWithNillableStruct",
+ "StructWithOccuringChoice",
+ "StructWithOccuringStruct",
+ "StructWithOccuringStruct2",
+ "StructWithOptionals",
+ "StructWithSubstitutionGroup",
+ "StructWithSubstitutionGroupAbstract",
+ "StructWithSubstitutionGroupNil",
+ "StructWithUnion",
+ "UnionSimpleContent",
+ "UnionWithAnonEnum",
+ "UnionWithAnonList",
+ "UnionWithStringList",
+ "UnionWithStringListRestriction",
+ "UnsignedByte"
+ ));
static {
-
- String[] notWorking = new String[] {
- "AnonEnumList",
- "AnonymousType",
- "AnyURIRestriction",
- "Base64BinaryRestriction",
- "ChoiceArray",
- "ChoiceOfChoice",
- "ChoiceOfSeq",
- "ChoiceWithAnyAttribute",
- "ChoiceWithGroupChoice",
- "ChoiceWithGroups",
- "ChoiceWithGroupSeq",
- "ChoiceWithSubstitutionGroup",
- "ChoiceWithSubstitutionGroupAbstract",
- "ChoiceWithSubstitutionGroupNil",
- "ComplexArray",
- "ComplexChoice",
- "ComplexStruct",
- "ComplexRestriction",
- "ComplexRestriction2",
- "ComplexRestriction3",
- "ComplexRestriction4",
- "ComplexRestriction5",
- "ComplexTypeWithAttributeGroup",
- "ComplexTypeWithAttributeGroup1",
- "ComplexTypeWithAttributes",
- "DateTime",
- "DerivedAllBaseAll",
- "DerivedAllBaseChoice",
- "DerivedAllBaseStruct",
- "DerivedChoiceBaseAll",
- "DerivedChoiceBaseArray",
- "DerivedChoiceBaseChoice",
- "DerivedChoiceBaseComplex",
- "DerivedChoiceBaseStruct",
- "DerivedNoContent",
- "DerivedStructBaseChoice",
- "DerivedStructBaseEmpty",
- "DerivedStructBaseStruct",
- "Document",
- "EmptyStruct",
- "ExtBase64Binary",
- "ExtColourEnum",
- "ExtendsSimpleContent",
- "ExtendsSimpleType",
- "GroupDirectlyInComplexType",
- "HexBinaryRestriction",
- "IDTypeAttribute",
- "InheritanceEmptyAllDerivedEmpty",
- "InheritanceNestedStruct",
- "InheritanceSimpleChoiceDerivedStruct",
- "InheritanceSimpleStructDerivedStruct",
- "InheritanceUnboundedArrayDerivedChoice",
- "MRecSeqA",
- "MRecSeqC",
- "NestedStruct",
- "NMTOKENS",
- "NumberList",
- "Occuri ngStruct2",
- "OccuringAll",
- "OccuringChoice",
- "OccuringChoice1",
- "OccuringChoice2",
- "OccuringChoiceWithAnyAttribute",
- "OccuringStruct",
- "OccuringStruct1",
- "OccuringStruct2",
- "OccuringStructWithAnyAttribute",
- "QName",
- "QNameList",
- "RecElType",
- "RecOuterType",
- "RecSeqB6918",
- "RecursiveStruct",
- "RecursiveStructArray",
- "RecursiveUnion",
- "RecursiveUnionData",
- "RestrictedAllBaseAll",
- "RestrictedChoiceBaseChoice",
- "RestrictedStructBaseStruct",
- "SequenceWithGroupChoice",
- "SequenceWithGroups",
- "SequenceWithGroupSeq",
- "SequenceWithOccuringGroup",
- "SimpleAll",
- "SimpleContent1",
- "SimpleContent2",
- "SimpleContent3",
- "SimpleContentExtWithAnyAttribute",
- "SimpleListRestriction2",
- "SimpleRestriction2",
- "SimpleRestriction3",
- "SimpleRestriction5",
- "SimpleRestriction6",
- "SimpleStruct",
- "SimpleUnionList",
- "StringI18N",
- "StringList",
- "StructWithAny",
- "StructWithAnyArray",
- "StructWithAnyArrayLax",
- "StructWithAnyArrayLaxComplex",
- "StructWithAnyAttribute",
- "StructWithAnyStrict",
- "StructWithAnyStrictComplex",
- "StructWithAnyXsi",
- "StructWithInvalidAny",
- "StructWithInvalidAnyArray",
- "StructWithList",
- "StructWithMultipleSubstitutionGroups",
- "StructWithNillableChoice",
- "StructWithNillableStruct",
- "StructWithOccuringChoice",
- "StructWithOccuringStruct",
- "StructWithOccuringStruct2",
- "StructWithOptionals",
- "StructWithSubstitutionGroup",
- "StructWithSubstitutionGroupAbstract",
- "StructWithSubstitutionGroupNil",
- "StructWithUnion",
- "UnionSimpleContent",
- "UnionWithAnonEnum",
- "UnionWithAnonList",
- "UnionWithStringList",
- "UnionWithStringListRestriction",
- "UnsignedByte",
- };
- NOT_WORKING_TESTS.addAll(Arrays.asList(notWorking));
-
- String[] notWorkingIBM = new String[] {
- "AnyURIEnum",
- "NMTokenEnum",
- "DecimalEnum",
- "StringEnum",
- "NumberEnum",
- "ColourEnum",
- "Base64Binary",
- "HexBinary",
- "Decimal",
- "UnsignedShort",
- "SimpleChoice",
- "EmptyChoice",
- "NestedArray",
- "CompoundArray",
- "UnboundedArray",
- "BoundedArray",
- "FixedArray",
- "AnonymousStruct",
- "StructWithNillables",
- "ChoiceWithBinary",
- "StructWithBinary",
- "MultipleOccursSequenceInSequence",
- "DerivedEmptyBaseEmptyChoice"
- };
- String[] notWorkingJDK11 = new String[] {
- "SimpleRestriction",
- "SimpleRestriction4",
- "AnyURIEnum",
- "DecimalEnum",
- "NumberEnum",
- "StringEnum"
- };
if (System.getProperty("java.vendor").contains("IBM")) {
- NOT_WORKING_TESTS.addAll(Arrays.asList(notWorkingIBM));
+ NOT_WORKING_TESTS.addAll(Arrays.asList(
+ "AnyURIEnum",
+ "NMTokenEnum",
+ "DecimalEnum",
+ "StringEnum",
+ "NumberEnum",
+ "ColourEnum",
+ "Base64Binary",
+ "HexBinary",
+ "Decimal",
+ "UnsignedShort",
+ "SimpleChoice",
+ "EmptyChoice",
+ "NestedArray",
+ "CompoundArray",
+ "UnboundedArray",
+ "BoundedArray",
+ "FixedArray",
+ "AnonymousStruct",
+ "StructWithNillables",
+ "ChoiceWithBinary",
+ "StructWithBinary",
+ "MultipleOccursSequenceInSequence",
+ "DerivedEmptyBaseEmptyChoice"
+ ));
}
if (JavaUtils.isJava11Compatible()) {
- NOT_WORKING_TESTS.addAll(Arrays.asList(notWorkingJDK11));
+ NOT_WORKING_TESTS.addAll(Arrays.asList(
+ "SimpleRestriction",
+ "SimpleRestriction4",
+ "AnyURIEnum",
+ "DecimalEnum",
+ "NumberEnum",
+ "StringEnum"
+ ));
}
}
-
@BeforeClass
public static void startServers() throws Exception {
boolean ok = launchServer(CORBADocLitServerImpl.class, true);
@@ -239,13 +231,8 @@ public class CORBADocLitClientTypeTest extends AbstractTypeTestClient5 {
public boolean shouldRunTest(String name) {
if (!NOT_WORKING_TESTS.contains(name)) {
- boolean b = super.shouldRunTest(name);
- if (b) {
- RUN_TESTS.add(name);
- }
- return b;
+ return super.shouldRunTest(name);
}
- //return true;
return false;
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java
index 4b3efa3..eb26744 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.systest.type_test.soap;
-import java.util.Arrays;
+import java.util.Collections;
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
@@ -58,8 +58,8 @@ public class SOAPDocLitClientTypeTest extends AbstractTypeTestClient5 {
FixedArray x = new FixedArray();
FixedArray yOrig = new FixedArray();
- x.getItem().addAll(Arrays.asList(24, 42, 2008));
- yOrig.getItem().addAll(Arrays.asList(24, 0, 1));
+ Collections.addAll(x.getItem(), 24, 42, 2008);
+ Collections.addAll(yOrig.getItem(), 24, 0, 1);
Holder<FixedArray> y = new Holder<>(yOrig);
Holder<FixedArray> z = new Holder<>();