Repository: tomee Updated Branches: refs/heads/master c1f9d1976 -> 4c835ca03
Uses constructor instead of addAll method for performance proposes Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b06bd4eb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b06bd4eb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b06bd4eb Branch: refs/heads/master Commit: b06bd4eb194bb1b09c601a814f25f084536c7c00 Parents: 7ff618f Author: Otavio Santana <[email protected]> Authored: Tue Dec 4 11:20:21 2018 -0200 Committer: Otavio Santana <[email protected]> Committed: Tue Dec 4 11:20:21 2018 -0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/BeanContext.java | 3 +-- .../src/main/java/org/apache/openejb/ClassLoaderUtil.java | 3 +-- .../src/main/java/org/apache/openejb/OpenEjbContainer.java | 3 +-- .../apache/openejb/assembler/classic/MethodInfoUtil.java | 3 +-- .../main/java/org/apache/openejb/cdi/WebappBeanManager.java | 3 +-- .../java/org/apache/openejb/config/DeploymentLoader.java | 9 +++------ .../java/org/apache/openejb/core/BaseSessionContext.java | 3 +-- .../java/org/apache/openejb/core/timer/EJBCronTrigger.java | 4 +--- .../org/apache/openejb/core/timer/MemoryTimerStore.java | 3 +-- .../apache/openejb/core/stateful/StatefulContainerTest.java | 6 ++---- .../openejb/core/stateless/StatelessContainerTest.java | 3 +-- .../core/stateless/StatelessInvocationStatsTest.java | 3 +-- .../openejb/core/stateless/StatelessMetaAnnotationTest.java | 3 +-- .../openejb/core/stateless/StatelessPoolStatsTest.java | 3 +-- 14 files changed, 17 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java index 0b98269..778c3f3 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java @@ -211,8 +211,7 @@ public class BeanContext extends DeploymentContext { if (timeout != null) { final AnnotatedType annotatedType = cdiEjbBean.getAnnotatedType(); final AnnotationManager annotationManager = getWebBeansContext().getAnnotationManager(); - final Collection<Annotation> annotations = new HashSet<>(); - annotations.addAll(annotationManager.getInterceptorAnnotations(annotatedType.getAnnotations())); + final Collection<Annotation> annotations = new HashSet<>(annotationManager.getInterceptorAnnotations(annotatedType.getAnnotations())); final Set<AnnotatedMethod<?>> methods = annotatedType.getMethods(); for (final AnnotatedMethod<?> m : methods) { if (timeout.equals(m.getJavaMember())) { http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java index d36eb60..642ceab 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java @@ -334,8 +334,7 @@ public class ClassLoaderUtil { urls = rawUrls; } else { final CompositeClassLoaderConfigurer configurer = new CompositeClassLoaderConfigurer(configurer1, configurer2, configurer3); - final Collection<URL> list = new ArrayList<>(); - list.addAll(Arrays.asList(rawUrls)); + final Collection<URL> list = new ArrayList<>(Arrays.asList(rawUrls)); ClassLoaderConfigurer.Helper.configure(list, configurer); urls = list.toArray(new URL[list.size()]); } http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java index fb3cae2..6713824 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java @@ -278,8 +278,7 @@ public final class OpenEjbContainer extends EJBContainer { final Set<String> callers; if (map.containsKey(OPENEJB_ADDITIONNAL_CALLERS_KEY)) { - callers = new LinkedHashSet<>(); - callers.addAll(Arrays.asList(((String) map.get(OPENEJB_ADDITIONNAL_CALLERS_KEY)).split(","))); + callers = new LinkedHashSet<>(Arrays.asList(((String) map.get(OPENEJB_ADDITIONNAL_CALLERS_KEY)).split(","))); } else { callers = NewLoaderLogic.callers(); } http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java index f3dc4c9..95d592e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodInfoUtil.java @@ -432,10 +432,9 @@ public class MethodInfoUtil { } private static List<Method> getWildCardView(final BeanContext info) { - final List<Method> methods = new ArrayList<>(); final List<Method> beanMethods = asList(info.getBeanClass().getMethods()); - methods.addAll(beanMethods); + final List<Method> methods = new ArrayList<>(beanMethods); if (info.getRemoteInterface() != null) { methods.addAll(exclude(beanMethods, info.getRemoteInterface().getMethods())); http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java index 73ab2b0..055afbc 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappBeanManager.java @@ -90,8 +90,7 @@ public class WebappBeanManager extends BeanManagerImpl { @Override public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(final T event, final EventMetadataImpl metadata) { - final Set<ObserverMethod<? super T>> set = new HashSet<>(); - set.addAll(super.resolveObserverMethods(event, metadata)); + final Set<ObserverMethod<? super T>> set = new HashSet<>(super.resolveObserverMethods(event, metadata)); if (isEvent(event)) { final BeanManagerImpl parentBm = getParentBm(); http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/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 22d92e4..c818503 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 @@ -268,10 +268,9 @@ public class DeploymentLoader implements DeploymentFilterable { } public static void addWebModuleDescriptors(final URL baseUrl, final WebModule webModule, final AppModule appModule) throws OpenEJBException { - final Map<String, Object> otherDD = new HashMap<>(); final List<URL> urls = webModule.getScannableUrls(); final ResourceFinder finder = new ResourceFinder("", urls.toArray(new URL[urls.size()])); - otherDD.putAll(getDescriptors(finder, false)); + final Map<String, Object> otherDD = new HashMap<>(getDescriptors(finder, false)); // "persistence.xml" is done separately since we manage a list of url and not s single url try { @@ -965,9 +964,8 @@ public class DeploymentLoader implements DeploymentFilterable { // determine war class path - final List<URL> webUrls = new ArrayList<>(); ensureContainerUrls(); - webUrls.addAll(containerUrls); + final List<URL> webUrls = new ArrayList<>(containerUrls); final SystemInstance systemInstance = SystemInstance.get(); @@ -1543,8 +1541,7 @@ public class DeploymentLoader implements DeploymentFilterable { } // create the class loader - final List<URL> classPath = new ArrayList<>(); - classPath.addAll(rarLibs.values()); + final List<URL> classPath = new ArrayList<>(rarLibs.values()); final ClassLoaderConfigurer configurer = QuickJarsTxtParser.parse(new File(rarFile, "META-INF/" + QuickJarsTxtParser.FILE_NAME)); if (configurer != null) { http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java b/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java index 8a3edb7..f88a230 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/BaseSessionContext.java @@ -148,8 +148,7 @@ public abstract class BaseSessionContext extends BaseContext implements SessionC if (InterfaceType.LOCALBEAN.equals(interfaceType)) { return LocalBeanProxyFactory.constructProxy(di.get(BeanContext.ProxyClass.class).getProxy(), handler); } else { - final List<Class> interfaces = new ArrayList<>(); - interfaces.addAll(di.getInterfaces(interfaceType)); + final List<Class> interfaces = new ArrayList<>(di.getInterfaces(interfaceType)); interfaces.add(Serializable.class); interfaces.add(IntraVmProxy.class); if (BeanType.STATEFUL.equals(type) || BeanType.MANAGED.equals(type)) { http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java index 83cc0e0..585a3e9 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java @@ -971,9 +971,7 @@ public class EJBCronTrigger extends CronTriggerImpl { private TreeSet<Integer> getNewValuesFromDynamicExpressions(final Calendar calendar) { - final TreeSet<Integer> newValues = new TreeSet<>(); - - newValues.addAll(values); + final TreeSet<Integer> newValues = new TreeSet<>(values); for (final RangeExpression weekDayRangeExpression : weekDayRangeExpressions) { http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java index ab110d5..178ee90 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/MemoryTimerStore.java @@ -225,8 +225,7 @@ public class MemoryTimerStore implements TimerStore { @Override public Map<Long, TimerData> getTasks() { checkThread(); - final TreeMap<Long, TimerData> allTasks = new TreeMap<>(); - allTasks.putAll(taskStore); + final TreeMap<Long, TimerData> allTasks = new TreeMap<>(taskStore); for (final Long key : remove) { allTasks.remove(key); } http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java index 45b42b3..56fb812 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java @@ -60,8 +60,7 @@ public class StatefulContainerTest extends TestCase { } public void testBusinessLocalBeanInterface() throws Exception { - final List localbeanExpectedLifecycle = new ArrayList(); - localbeanExpectedLifecycle.addAll(expectedLifecycle); + final List localbeanExpectedLifecycle = new ArrayList(expectedLifecycle); // WAS can't avoid the extra constructor call // NOW it was rewritten to avoid it @@ -162,8 +161,7 @@ public class StatefulContainerTest extends TestCase { } public void testBusinessLocalBeanInterfaceInTx() throws Exception { - final List localbeanExpectedLifecycle = new ArrayList(); - localbeanExpectedLifecycle.addAll(inTxExpectedLifecycle); + final List localbeanExpectedLifecycle = new ArrayList(inTxExpectedLifecycle); // WAS can't avoid the extra constructor call // NOW it was rewritten to avoid it http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java index 2eda85f..d7a5554 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessContainerTest.java @@ -74,8 +74,7 @@ public class StatelessContainerTest extends TestCase { assertSame("lifecycle", lifecycle, WidgetBean.lifecycle); // Check the lifecycle of the bean - final List localBeanExpected = new ArrayList(); - localBeanExpected.addAll(expected); + final List localBeanExpected = new ArrayList(expected); assertEquals(join("\n", localBeanExpected), join("\n", lifecycle)); } { http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInvocationStatsTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInvocationStatsTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInvocationStatsTest.java index 2abd084..dc26b02 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInvocationStatsTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInvocationStatsTest.java @@ -285,8 +285,7 @@ public class StatelessInvocationStatsTest { expectedOperations.add(new MBeanOperationInfo(s + ".values", "", new MBeanParameterInfo[0], "[D", MBeanOperationInfo.UNKNOWN)); } - final List<MBeanOperationInfo> actualOperations1 = new ArrayList<>(); - actualOperations1.addAll(Arrays.asList(beanInfo.getOperations())); + final List<MBeanOperationInfo> actualOperations1 = new ArrayList<>(Arrays.asList(beanInfo.getOperations())); //Verify invocation operation information and remove bean. Assert.assertEquals(expectedOperations, actualOperations1); http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java index 36e2de9..84eff8f 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessMetaAnnotationTest.java @@ -85,8 +85,7 @@ public class StatelessMetaAnnotationTest extends TestCase { assertSame("lifecycle", lifecycle, WidgetBean.lifecycle); // Check the lifecycle of the bean - final List localBeanExpected = new ArrayList(); - localBeanExpected.addAll(expected); + final List localBeanExpected = new ArrayList(expected); assertEquals(join("\n", localBeanExpected), join("\n", lifecycle)); } { http://git-wip-us.apache.org/repos/asf/tomee/blob/b06bd4eb/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java index 6a878bc..b991671 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java @@ -199,8 +199,7 @@ public class StatelessPoolStatsTest extends TestCase { operations, "void", MBeanOperationInfo.UNKNOWN)); expectedOperations.add(new MBeanOperationInfo("flush", "", new MBeanParameterInfo[0], "void", MBeanOperationInfo.UNKNOWN)); - final List<MBeanOperationInfo> actualOperations = new ArrayList<>(); - actualOperations.addAll(Arrays.asList(poolMBeanInfo.getOperations())); + final List<MBeanOperationInfo> actualOperations = new ArrayList<>(Arrays.asList(poolMBeanInfo.getOperations())); assertEquals(expectedOperations, actualOperations); }
