uses Collection.singletonList when just there is one element
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a381b9f6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a381b9f6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a381b9f6 Branch: refs/heads/master Commit: a381b9f61763228cb3bdab609e8f487bcd9a83e2 Parents: e556346 Author: Otavio Santana <[email protected]> Authored: Tue Dec 4 11:48:36 2018 -0200 Committer: Otavio Santana <[email protected]> Committed: Tue Dec 4 11:48:36 2018 -0200 ---------------------------------------------------------------------- .../openejb/assembler/classic/EnterpriseBeanBuilder.java | 3 ++- .../java/org/apache/openejb/config/AnnotationDeployer.java | 2 +- .../apache/openejb/config/ConfigurableClasspathArchive.java | 3 ++- .../java/org/apache/openejb/config/DeploymentLoader.java | 3 ++- .../java/org/apache/openejb/config/sys/SaxAppCtxConfig.java | 9 +++++---- .../main/java/org/apache/openejb/util/AnnotationFinder.java | 2 +- .../java/org/apache/openejb/util/helper/CommandHelper.java | 5 +++-- .../openejb/core/security/SecurityServiceImplTest.java | 3 ++- .../main/java/org/apache/openejb/junit/OpenEjbRunner.java | 3 ++- 9 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java index 5fd3b16..6886c56 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java @@ -40,6 +40,7 @@ import javax.persistence.SynchronizationType; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -387,7 +388,7 @@ class EnterpriseBeanBuilder { candidateInfo.className = info.className; candidateInfo.id = info.id; candidateInfo.methodName = info.methodName; - candidateInfo.methodParams = Arrays.asList(Timer.class.getName()); + candidateInfo.methodParams = Collections.singletonList(Timer.class.getName()); timeout = MethodInfoUtil.toMethod(ejbClass, candidateInfo); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java index 169cdde..63fcef3 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java @@ -3127,7 +3127,7 @@ public class AnnotationDeployer implements DynamicDeployer { all.local.addAll(xml.local); all.remote.addAll(xml.remote); - final List<Class<?>> classes = strict ? new ArrayList(Arrays.asList(beanClass)) : Classes.ancestors(beanClass); + final List<Class<?>> classes = strict ? new ArrayList(Collections.singletonList(beanClass)) : Classes.ancestors(beanClass); for (final Class<?> clazz : classes) { http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurableClasspathArchive.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurableClasspathArchive.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurableClasspathArchive.java index 76e7376..519790f 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurableClasspathArchive.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurableClasspathArchive.java @@ -34,6 +34,7 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; @@ -56,7 +57,7 @@ public class ConfigurableClasspathArchive extends CompositeArchive implements Sc } public ConfigurableClasspathArchive(final ClassLoader loader, final URL url) { - this(new FakeModule(loader), Arrays.asList(url)); + this(new FakeModule(loader), Collections.singletonList(url)); } public ConfigurableClasspathArchive(final Module module, final boolean forceDescriptor, final Iterable<URL> urls) { http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java index c818503..c9aafc4 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java @@ -837,7 +837,8 @@ public class DeploymentLoader implements DeploymentFilterable { { final Object pXml = appModule.getAltDDs().get("persistence.xml"); - List<URL> persistenceXmls = pXml == null ? null : (List.class.isInstance(pXml) ? (List<URL>) pXml : new ArrayList<>(asList(URL.class.cast(pXml)))); + List<URL> persistenceXmls = pXml == null ? null : (List.class.isInstance(pXml) ? (List<URL>) pXml : + new ArrayList<>(Collections.singletonList(URL.class.cast(pXml)))); if (persistenceXmls == null) { persistenceXmls = new ArrayList<>(); appModule.getAltDDs().put("persistence.xml", persistenceXmls); http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java index 0164794..07bb121 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java @@ -41,6 +41,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Properties; @@ -60,15 +61,15 @@ public class SaxAppCtxConfig { private static final Collection<String> IMPORT_ALIASES = Arrays.asList("import", "include"); private static final Collection<String> APPLICATION_ALIASES = Arrays.asList("appcontext", "app-context", "application"); private static final Collection<String> POJOS_ALIASES = Arrays.asList("pojocontexts", "pojo-contexts", "pojos"); - private static final Collection<String> POJO_ALIASES = Arrays.asList("pojo"); + private static final Collection<String> POJO_ALIASES = Collections.singletonList("pojo"); private static final Collection<String> BEAN_CONTEXTS_ALIASES = Arrays.asList("beancontexts", "bean-contexts", "ejbs"); private static final Collection<String> WEBAPP_ALIASES = Arrays.asList("webapps", "webcontexts", "web-contexts", "wars"); private static final Collection<String> MODULE_ALIASES = Arrays.asList("modulecontext", "module"); private static final Collection<String> BEAN_CONTEXT_ALIASES = Arrays.asList("ejb", "beancontext", "bean-context"); private static final Collection<String> CONFIGURATION_ALIASES = Arrays.asList("configuration", "properties", "settings"); - private static final Collection<String> RESOURCES_ALIASES = Arrays.asList("resources"); - private static final Collection<String> SERVICE_ALIASES = Arrays.asList("service"); - private static final Collection<String> RESOURCE_ALIASES = Arrays.asList("resource"); + private static final Collection<String> RESOURCES_ALIASES = Collections.singletonList("resources"); + private static final Collection<String> SERVICE_ALIASES = Collections.singletonList("service"); + private static final Collection<String> RESOURCE_ALIASES = Collections.singletonList("resource"); private static final Collection<String> ENV_ENTRIES_ALIASES = Arrays.asList("enventries", "env-entries"); private static final Collection<String> ENV_ENTRY_ALIASES = Arrays.asList("enventry", "env-entry"); http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java index 8d9570a..e1c4266 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java @@ -109,7 +109,7 @@ public class AnnotationFinder { } public AnnotationFinder(final ClassLoader classLoader, final URL url) { - this(classLoader, Arrays.asList(url)); + this(classLoader, Collections.singletonList(url)); } public AnnotationFinder(final ClassLoader classLoader, final Collection<URL> urls) { http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-core/src/main/java/org/apache/openejb/util/helper/CommandHelper.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/helper/CommandHelper.java b/container/openejb-core/src/main/java/org/apache/openejb/util/helper/CommandHelper.java index c7a3c84..30c3b8c 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/helper/CommandHelper.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/helper/CommandHelper.java @@ -26,6 +26,7 @@ import org.apache.openejb.table.Lines; import org.apache.openejb.util.JavaSecurityManagers; import java.util.Arrays; +import java.util.Collections; public final class CommandHelper { private CommandHelper() { @@ -69,14 +70,14 @@ public final class CommandHelper { if (!empty) { sb.append(", "); } - sb.append("Local").append(Arrays.asList(bc.getBusinessLocalInterfaces())); + sb.append("Local").append(Collections.singletonList(bc.getBusinessLocalInterfaces())); empty = false; } if (bc.getBusinessRemoteInterface() != null) { if (!empty) { sb.append(", "); } - sb.append("Remote").append(Arrays.asList(bc.getBusinessRemoteInterfaces())); + sb.append("Remote").append(Collections.singletonList(bc.getBusinessRemoteInterfaces())); } return sb.toString(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityServiceImplTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityServiceImplTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityServiceImplTest.java index a6787ea..197747f 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityServiceImplTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityServiceImplTest.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; +import java.util.Collections; import java.util.Enumeration; import java.util.concurrent.atomic.AtomicReference; @@ -36,7 +37,7 @@ public class SecurityServiceImplTest { final ClassLoader jaasLoader = new URLClassLoader(new URL[0]) { @Override public Enumeration<URL> getResources(final String name) throws IOException { - return new ArrayEnumeration(asList(new URL("file:/tmp/jaas/folder+with+plus/login.config"))); + return new ArrayEnumeration(Collections.singletonList(new URL("file:/tmp/jaas/folder+with+plus/login.config"))); } }; Thread.currentThread().setContextClassLoader(jaasLoader); http://git-wip-us.apache.org/repos/asf/tomee/blob/a381b9f6/container/openejb-junit/src/main/java/org/apache/openejb/junit/OpenEjbRunner.java ---------------------------------------------------------------------- diff --git a/container/openejb-junit/src/main/java/org/apache/openejb/junit/OpenEjbRunner.java b/container/openejb-junit/src/main/java/org/apache/openejb/junit/OpenEjbRunner.java index 276c621..bbcdaf4 100644 --- a/container/openejb-junit/src/main/java/org/apache/openejb/junit/OpenEjbRunner.java +++ b/container/openejb-junit/src/main/java/org/apache/openejb/junit/OpenEjbRunner.java @@ -29,6 +29,7 @@ import org.junit.runners.model.InitializationError; import java.lang.reflect.Method; import java.util.Arrays; +import java.util.Collections; public class OpenEjbRunner extends Runner { private final Runner delegate; @@ -54,7 +55,7 @@ public class OpenEjbRunner extends Runner { try { delegate = getDelegateRunner(testClazz); } catch (final Throwable e) { - throw new InitializationError(Arrays.asList(e)); + throw new InitializationError(Collections.singletonList(e)); } }
