From d93b233a338367376d04cc3a715dc71765ca7ba0 Mon Sep 17 00:00:00 2001 From: Raj Date: Mon, 19 Sep 2016 13:57:12 -0700 Subject: [PATCH] Replace Collections.sort(list) with list.sort() to support earlier jdk-version than jdk-1.8.0_20 (#24) Fixes #20 --- .../mledger/impl/EntryCacheDefaultEvictionPolicy.java | 2 +- .../java/com/yahoo/pulsar/broker/admin/AdminResource.java | 3 +-- .../java/com/yahoo/pulsar/broker/admin/Namespaces.java | 2 +- .../com/yahoo/pulsar/broker/admin/PersistentTopics.java | 2 +- .../java/com/yahoo/pulsar/broker/admin/Properties.java | 2 +- .../yahoo/pulsar/broker/namespace/NamespaceService.java | 2 +- .../PersistentDispatcherSingleActiveConsumer.java | 2 +- .../com/yahoo/pulsar/broker/admin/NamespacesTest.java | 6 +++--- .../util/collections/ConcurrentLongHashMapTest.java | 8 ++++---- .../util/collections/ConcurrentOpenHashMapTest.java | 8 ++++---- .../util/collections/ConcurrentOpenHashSetTest.java | 6 +++--- 11 files changed, 21 insertions(+), 22 deletions(-) diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryCacheDefaultEvictionPolicy.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryCacheDefaultEvictionPolicy.java index 1de49d90ced..a22814254b6 100644 --- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryCacheDefaultEvictionPolicy.java +++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/EntryCacheDefaultEvictionPolicy.java @@ -44,7 +44,7 @@ public class EntryCacheDefaultEvictionPolicy implements EntryCacheEvictionPolicy checkArgument(sizeToFree > 0); checkArgument(!caches.isEmpty()); - Collections.sort(caches, reverseOrder()); + caches.sort(reverseOrder()); long totalSize = 0; for (EntryCache cache : caches) { diff --git a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/AdminResource.java b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/AdminResource.java index 1b251dc3552..ca587557961 100644 --- a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/AdminResource.java +++ b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/AdminResource.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkArgument; import java.net.MalformedURLException; import java.net.URI; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -207,7 +206,7 @@ public abstract class AdminResource extends PulsarWebResource { } } - Collections.sort(namespaces); + namespaces.sort(null); return namespaces; } diff --git a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/Namespaces.java b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/Namespaces.java index 1ac02c5924a..fb6d152cb26 100644 --- a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/Namespaces.java +++ b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/Namespaces.java @@ -132,7 +132,7 @@ public class Namespaces extends AdminResource { throw new RestException(e); } - Collections.sort(namespaces); + namespaces.sort(null); return namespaces; } diff --git a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/PersistentTopics.java b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/PersistentTopics.java index f8ca0dd78b7..0e8deb30e3b 100644 --- a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/PersistentTopics.java +++ b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/PersistentTopics.java @@ -147,7 +147,7 @@ public class PersistentTopics extends AdminResource { throw new RestException(e); } - Collections.sort(destinations); + destinations.sort(null); return destinations; } diff --git a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/Properties.java b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/Properties.java index a79bfce4d97..473930e52c4 100644 --- a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/Properties.java +++ b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/admin/Properties.java @@ -58,7 +58,7 @@ public class Properties extends AdminResource { try { List properties = globalZk().getChildren(path("policies"), false); - Collections.sort(properties); + properties.sort(null); return properties; } catch (Exception e) { log.error("[{}] Failed to get properties list", clientAppId(), e); diff --git a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/namespace/NamespaceService.java b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/namespace/NamespaceService.java index d95a4fdbb4f..ef6b5ec143c 100644 --- a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/namespace/NamespaceService.java +++ b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/namespace/NamespaceService.java @@ -668,7 +668,7 @@ public class NamespaceService { // NoNode means there are no persistent topics for this namespace } - Collections.sort(destinations); + destinations.sort(null); return destinations; } diff --git a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java index 334b72287eb..7b05a6015dd 100644 --- a/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java +++ b/pulsar-broker/src/main/java/com/yahoo/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java @@ -72,7 +72,7 @@ public final class PersistentDispatcherSingleActiveConsumer implements Dispatche private void pickAndScheduleActiveConsumer() { checkArgument(!consumers.isEmpty()); - Collections.sort(consumers, (c1, c2) -> c1.consumerName().compareTo(c2.consumerName())); + consumers.sort((c1, c2) -> c1.consumerName().compareTo(c2.consumerName())); int index = partitionIndex % consumers.size(); Consumer prevConsumer = activeConsumer.getAndSet(consumers.get(index)); diff --git a/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/admin/NamespacesTest.java b/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/admin/NamespacesTest.java index 2e2fd156b80..71eeeef66f5 100644 --- a/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/admin/NamespacesTest.java +++ b/pulsar-broker/src/test/java/com/yahoo/pulsar/broker/admin/NamespacesTest.java @@ -198,12 +198,12 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest { public void testGetNamespaces() throws Exception { List expectedList = Lists.newArrayList(this.testLocalNamespaces.get(0).toString(), this.testLocalNamespaces.get(1).toString()); - Collections.sort(expectedList); + expectedList.sort(null); assertEquals(namespaces.getNamespacesForCluster(this.testProperty, this.testLocalCluster), expectedList); expectedList = Lists.newArrayList(this.testLocalNamespaces.get(0).toString(), this.testLocalNamespaces.get(1).toString(), this.testLocalNamespaces.get(2).toString(), this.testGlobalNamespaces.get(0).toString()); - Collections.sort(expectedList); + expectedList.sort(null); assertEquals(namespaces.getPropertyNamespaces(this.testProperty), expectedList); try { @@ -620,7 +620,7 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest { namespaces.deleteNamespace(testNs.getProperty(), testNs.getCluster(), testNs.getLocalName(), false); List nsList = Lists.newArrayList(this.testLocalNamespaces.get(1).toString(), this.testLocalNamespaces.get(2).toString()); - Collections.sort(nsList); + nsList.sort(null); assertEquals(namespaces.getPropertyNamespaces(this.testProperty), nsList); testNs = this.testLocalNamespaces.get(1); diff --git a/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentLongHashMapTest.java b/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentLongHashMapTest.java index c3a8aae2695..227be1582d2 100644 --- a/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentLongHashMapTest.java +++ b/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentLongHashMapTest.java @@ -253,21 +253,21 @@ public class ConcurrentLongHashMapTest { map.put(2, "two"); List keys = map.keys(); - Collections.sort(keys); + keys.sort(null); assertEquals(keys, Lists.newArrayList(0l, 1l, 2l)); List values = map.values(); - Collections.sort(values); + values.sort(null); assertEquals(values, Lists.newArrayList("one", "two", "zero")); map.put(1, "uno"); keys = map.keys(); - Collections.sort(keys); + keys.sort(null); assertEquals(keys, Lists.newArrayList(0l, 1l, 2l)); values = map.values(); - Collections.sort(values); + values.sort(null); assertEquals(values, Lists.newArrayList("two", "uno", "zero")); map.clear(); diff --git a/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java b/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java index 7225282f1ac..b377987dca3 100644 --- a/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java +++ b/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java @@ -239,21 +239,21 @@ public class ConcurrentOpenHashMapTest { map.put(2l, "two"); List keys = map.keys(); - Collections.sort(keys); + keys.sort(null); assertEquals(keys, Lists.newArrayList(0l, 1l, 2l)); List values = map.values(); - Collections.sort(values); + values.sort(null); assertEquals(values, Lists.newArrayList("one", "two", "zero")); map.put(1l, "uno"); keys = map.keys(); - Collections.sort(keys); + keys.sort(null); assertEquals(keys, Lists.newArrayList(0l, 1l, 2l)); values = map.values(); - Collections.sort(values); + values.sort(null); assertEquals(values, Lists.newArrayList("two", "uno", "zero")); map.clear(); diff --git a/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentOpenHashSetTest.java b/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentOpenHashSetTest.java index 87588df9769..1ae390bbdec 100644 --- a/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentOpenHashSetTest.java +++ b/pulsar-common/src/test/java/com/yahoo/pulsar/common/util/collections/ConcurrentOpenHashSetTest.java @@ -226,7 +226,7 @@ public class ConcurrentOpenHashSetTest { set.add(2l); List values = set.values(); - Collections.sort(values); + values.sort(null); assertEquals(values, Lists.newArrayList(0l, 1l, 2l)); set.clear(); @@ -244,14 +244,14 @@ public class ConcurrentOpenHashSetTest { set.add(7); List values = set.values(); - Collections.sort(values); + values.sort(null); assertEquals(values, Lists.newArrayList(0, 1, 3, 6, 7)); int numOfItemsDeleted = set.removeIf(i -> i < 5); assertEquals(numOfItemsDeleted, 3); assertEquals(set.size(), values.size() - numOfItemsDeleted); values = set.values(); - Collections.sort(values); + values.sort(null); assertEquals(values, Lists.newArrayList(6, 7)); } -- GitLab