Uses list.sort instead of Collections.sort method.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3a613ff0 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3a613ff0 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3a613ff0 Branch: refs/heads/master Commit: 3a613ff08d70e46b56385f720d4852956dca6d52 Parents: 8eb7338 Author: Otavio Santana <[email protected]> Authored: Thu Dec 20 08:35:46 2018 -0200 Committer: Otavio Santana <[email protected]> Committed: Thu Dec 20 08:35:46 2018 -0200 ---------------------------------------------------------------------- .../java/org/apache/openejb/assembler/classic/Assembler.java | 6 +++--- .../openejb/assembler/classic/InterceptorBindingBuilder.java | 6 +++--- .../openejb/assembler/classic/MethodConcurrencyBuilder.java | 4 ++-- .../org/apache/openejb/assembler/classic/MethodInfoUtil.java | 2 +- .../openejb/assembler/classic/MethodTransactionBuilder.java | 2 +- .../java/org/apache/openejb/cdi/OptimizedLoaderService.java | 2 +- .../java/org/apache/openejb/config/AnnotationDeployer.java | 6 +++--- .../org/apache/openejb/config/rules/CheckClassLoading.java | 2 +- .../main/java/org/apache/openejb/config/sys/WikiGenerator.java | 2 +- .../src/main/java/org/apache/openejb/core/TempClassLoader.java | 2 +- .../main/java/org/apache/openejb/monitoring/ManagedMBean.java | 4 ++-- .../src/main/java/org/apache/openejb/util/ConfUtils.java | 2 +- .../classic/InterceptorBindingInfoComparatorTest.java | 4 ++-- .../assembler/classic/MethodTransactionInfoComparatorTest.java | 2 +- .../java/org/apache/openejb/core/timer/GetAllTimersTest.java | 2 +- .../test/java/org/apache/openejb/util/UrlComparatorTest.java | 4 ++-- .../java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 808725e..29a3347 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -1829,7 +1829,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A // Sort all the singletons to the back of the list. We want to make sure // all non-singletons are created first so that if a singleton refers to them // they are available. - Collections.sort(deployments, new Comparator<BeanContext>() { + deployments.sort(new Comparator<BeanContext>() { @Override public int compare(final BeanContext a, final BeanContext b) { final int aa = a.getComponentType() == BeanType.SINGLETON ? 1 : 0; @@ -1855,7 +1855,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A // Now Sort all the MDBs to the back of the list. The Resource Adapter // may attempt to use the MDB on endpointActivation and the MDB may have // references to other ejbs that would need to be available first. - Collections.sort(deployments, new Comparator<BeanContext>() { + deployments.sort(new Comparator<BeanContext>() { @Override public int compare(final BeanContext a, final BeanContext b) { final int aa = a.getComponentType() == BeanType.MESSAGE_DRIVEN ? 1 : 0; @@ -1973,7 +1973,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } } - Collections.sort(resources, new Comparator<DestroyingResource>() { // end by destroying RA after having closed CF pool (for jms for instance) + resources.sort(new Comparator<DestroyingResource>() { // end by destroying RA after having closed CF pool (for jms for instance) @Override public int compare(final DestroyingResource o1, final DestroyingResource o2) { final boolean ra1 = isRa(o1.instance); http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java index c330ca9..fd2e131 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/InterceptorBindingBuilder.java @@ -57,7 +57,7 @@ public class InterceptorBindingBuilder { public InterceptorBindingBuilder(final ClassLoader cl, final EjbJarInfo ejbJarInfo) throws OpenEJBException { bindings = new ArrayList<>(ejbJarInfo.interceptorBindings); - Collections.sort(bindings, new IntercpetorBindingComparator()); + bindings.sort(new IntercpetorBindingComparator()); Collections.reverse(bindings); packageAndClassBindings = new ArrayList<>(); @@ -321,7 +321,7 @@ public class InterceptorBindingBuilder { logger.warning("Interceptor method not found (skipping): public Object " + callbackInfo.method + "(InvocationContext); in class " + clazz.getName()); } } - Collections.sort(methods, new MethodCallbackComparator()); + methods.sort(new MethodCallbackComparator()); callbacks.addAll(methods); } @@ -392,7 +392,7 @@ public class InterceptorBindingBuilder { throw new IllegalStateException(message, e); } } - Collections.sort(methods, new MethodCallbackComparator()); + methods.sort(new MethodCallbackComparator()); callbacks.addAll(methods); } http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java index b70fda8..58f74cf 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodConcurrencyBuilder.java @@ -132,10 +132,10 @@ public class MethodConcurrencyBuilder { } Collections.reverse(lockInfos); - Collections.sort(lockInfos, new MethodConcurrencyBuilder.MethodConcurrencyComparator()); + lockInfos.sort(new MethodConcurrencyComparator()); Collections.reverse(accessTimeoutInfos); - Collections.sort(accessTimeoutInfos, new MethodConcurrencyBuilder.MethodConcurrencyComparator()); + accessTimeoutInfos.sort(new MethodConcurrencyComparator()); } public static class MethodConcurrencyComparator extends MethodInfoUtil.BaseComparator<MethodConcurrencyInfo> { http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/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 95d592e..67e807d 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 @@ -238,7 +238,7 @@ public class MethodInfoUtil { } } - Collections.sort(normalized, new MethodPermissionComparator()); + normalized.sort(new MethodPermissionComparator()); return normalized; } http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java index 3f856ba..d53184c 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/MethodTransactionBuilder.java @@ -97,7 +97,7 @@ public class MethodTransactionBuilder { } Collections.reverse(normalized); - Collections.sort(normalized, new MethodTransactionComparator()); + normalized.sort(new MethodTransactionComparator()); return normalized; } http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java index 742ce47..adeb4e6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java @@ -113,7 +113,7 @@ public class OptimizedLoaderService implements LoaderService { if ("true".equals(OptimizedLoaderService.this.config.getProperty("openejb.cdi.extensions.sorted", SystemInstance.get().getProperty("openejb.cdi.extensions.sorted")))) { - Collections.sort(list, new Comparator<Extension>() { + list.sort(new Comparator<Extension>() { @Override public int compare(final Extension o1, final Extension o2) { final int val1 = getVal(o1); http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/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 1edd22b..5e9380d 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 @@ -5660,7 +5660,7 @@ public class AnnotationDeployer implements DynamicDeployer { } public static List<Annotated<Class<?>>> sortClasses(final List<Annotated<Class<?>>> list) { - Collections.sort(list, new Comparator<Annotated<Class<?>>>() { + list.sort(new Comparator<Annotated<Class<?>>>() { @Override public int compare(final Annotated<Class<?>> o1, final Annotated<Class<?>> o2) { return compareClasses(o1.get(), o2.get()); @@ -5670,7 +5670,7 @@ public class AnnotationDeployer implements DynamicDeployer { } public static List<Class<?>> sortClassesParentFirst(final List<Class<?>> list) { - Collections.sort(list, new Comparator<Class<?>>() { + list.sort(new Comparator<Class<?>>() { @Override public int compare(final Class<?> o1, final Class<?> o2) { return compareClasses(o2, o1); @@ -5680,7 +5680,7 @@ public class AnnotationDeployer implements DynamicDeployer { } public static List<Annotated<Method>> sortMethods(final List<Annotated<Method>> list) { - Collections.sort(list, new Comparator<Annotated<Method>>() { + list.sort(new Comparator<Annotated<Method>>() { @Override public int compare(final Annotated<Method> o1, final Annotated<Method> o2) { return compareClasses(o1.get().getDeclaringClass(), o2.get().getDeclaringClass()); http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java index f5ba718..3057f49 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java @@ -148,7 +148,7 @@ public class CheckClassLoading extends ValidationBase { } } - Collections.sort(diff, DiffItemComparator.getInstance()); + diff.sort(DiffItemComparator.getInstance()); return diff; } http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java index deb4d64..97bc2c7 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/sys/WikiGenerator.java @@ -60,7 +60,7 @@ public class WikiGenerator { // generate containers final List<ServiceProvider> serviceProvider = servicesJar.getServiceProvider(); - Collections.sort(serviceProvider, new Comparator<ServiceProvider>() { + serviceProvider.sort(new Comparator<ServiceProvider>() { @Override public int compare(final ServiceProvider o1, final ServiceProvider o2) { return grade(o2) - grade(o1); http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java index 393bfe6..9417aa0 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java @@ -107,7 +107,7 @@ public class TempClassLoader extends URLClassLoader { while (resources.hasMoreElements()) { l.add(resources.nextElement()); } - Collections.sort(l, new ResourceComparator(getParent(), name)); + l.sort(new ResourceComparator(getParent(), name)); return l.iterator().next(); } return url; http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java index 3708487..f39499d 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java @@ -244,8 +244,8 @@ public class ManagedMBean implements DynamicMBean { } } - sort(operations, MBeanFeatureInfoComparator.INSTANCE); - sort(attributes, MBeanFeatureInfoComparator.INSTANCE); + operations.sort(MBeanFeatureInfoComparator.INSTANCE); + attributes.sort(MBeanFeatureInfoComparator.INSTANCE); if (filterAttributes) { final Iterator<MBeanAttributeInfo> iterator = attributes.iterator(); http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java index 475c216..1da0002 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ConfUtils.java @@ -81,7 +81,7 @@ public class ConfUtils { } // Sort so that the URL closest to openejb.base is first - Collections.sort(urls, new UrlComparator(SystemInstance.get().getBase().getDirectory())); + urls.sort(new UrlComparator(SystemInstance.get().getBase().getDirectory())); return urls.get(0); } http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java index 50299ff..236e68d 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/InterceptorBindingInfoComparatorTest.java @@ -62,7 +62,7 @@ public class InterceptorBindingInfoComparatorTest extends TestCase { final ArrayList<InterceptorBindingInfo> actual = new ArrayList<>(expected); Collections.shuffle(actual); - Collections.sort(actual, new InterceptorBindingBuilder.IntercpetorBindingComparator()); + actual.sort(new InterceptorBindingBuilder.IntercpetorBindingComparator()); for (int i = 0; i < actual.size(); i++) { final InterceptorBindingInfo a = actual.get(i); @@ -127,7 +127,7 @@ public class InterceptorBindingInfoComparatorTest extends TestCase { info.interceptorOrder.add("TotalOrderingDefaultInterceptor"); actual.set(0, info); - Collections.sort(actual, new InterceptorBindingBuilder.IntercpetorBindingComparator()); + actual.sort(new InterceptorBindingBuilder.IntercpetorBindingComparator()); for (int i = 0; i < actual.size(); i++) { final InterceptorBindingInfo a = actual.get(i); http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java index 3246bff..0a03e82 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/MethodTransactionInfoComparatorTest.java @@ -73,7 +73,7 @@ public class MethodTransactionInfoComparatorTest extends TestCase { final ArrayList<MethodTransactionInfo> actual = new ArrayList<>(expected); Collections.shuffle(actual); - Collections.sort(actual, new MethodTransactionBuilder.MethodTransactionComparator()); + actual.sort(new MethodTransactionBuilder.MethodTransactionComparator()); for (int i = 0; i < actual.size(); i++) { final MethodTransactionInfo a = actual.get(i); http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java index ae92370..ba5349a 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/timer/GetAllTimersTest.java @@ -77,7 +77,7 @@ public class GetAllTimersTest { } private void checkList(final Collection<Timer> in) { - final List<Timer> list = new ArrayList<>(in); Collections.sort(list, new Comparator<Timer>() { + final List<Timer> list = new ArrayList<>(in); list.sort(new Comparator<Timer>() { @Override public int compare(final Timer o1, final Timer o2) { return o1.getInfo().toString().compareTo(o2.getInfo().toString()); http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java index 8fe8aa1..0f8f161 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java @@ -35,11 +35,11 @@ public class UrlComparatorTest extends TestCase { urls.add(new URL("file:///Users/jstuart/one")); urls.add(new URL("file:///Users/scobert/three")); - Collections.sort(urls, new UrlComparator(new URL("file:///Users/jstuart"))); + urls.sort(new UrlComparator(new URL("file:///Users/jstuart"))); assertEquals(new URL("file:///Users/jstuart/two"), urls.get(0)); - Collections.sort(urls, new UrlComparator(new URL("file:///Users/jstuart/one"))); + urls.sort(new UrlComparator(new URL("file:///Users/jstuart/one"))); assertEquals(new URL("file:///Users/jstuart/one"), urls.get(0)); } http://git-wip-us.apache.org/repos/asf/tomee/blob/3a613ff0/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java ---------------------------------------------------------------------- diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java index 61c7e6a..1ce9abb 100644 --- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java +++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/PropertiesAdapter.java @@ -69,7 +69,7 @@ public class PropertiesAdapter extends XmlAdapter<String, Properties> { @Override public Enumeration<Object> keys() { final List<Object> list = new ArrayList<>(Collections.list(super.keys())); - Collections.sort(list, new Comparator<Object>() { + list.sort(new Comparator<Object>() { @Override public int compare(final Object o1, final Object o2) { return String.valueOf(o1).compareTo(String.valueOf(o2));
