You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2021/11/14 10:11:42 UTC

[bookkeeper] branch master updated: Remove unnecessary boxing unboxing (#2859)

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new ea63b19  Remove unnecessary boxing unboxing (#2859)
ea63b19 is described below

commit ea63b19cf7398dc59f81b7087c877fa03413f040
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Sun Nov 14 18:11:34 2021 +0800

    Remove unnecessary boxing unboxing (#2859)
---
 .../bookkeeper/client/DynamicWeightedRandomSelectionImpl.java  |  2 +-
 .../src/main/java/org/apache/bookkeeper/server/Main.java       |  3 +--
 .../apache/bookkeeper/bookie/InterleavedLedgerStorageTest.java | 10 +++++-----
 .../java/org/apache/bookkeeper/bookie/LedgerCacheTest.java     |  2 +-
 .../org/apache/bookkeeper/bookie/SortedLedgerStorageTest.java  |  4 ++--
 .../java/org/apache/bookkeeper/client/TestReadLastEntry.java   |  2 +-
 .../org/apache/bookkeeper/server/http/TestHttpService.java     |  6 +++---
 .../java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java    |  2 +-
 .../java/org/apache/bookkeeper/test/BookieFailureTest.java     |  2 +-
 .../java/org/apache/bookkeeper/test/BookieReadWriteTest.java   |  2 +-
 .../bookkeeper/util/AvailabilityOfEntriesOfLedgerTest.java     |  2 +-
 .../bookkeeper/stats/prometheus/TestPrometheusFormatter.java   |  2 +-
 .../java/org/apache/bookkeeper/common/coder/VarIntCoder.java   |  2 +-
 .../org/apache/bookkeeper/common/router/HashRouterTest.java    |  4 ++--
 .../org/apache/distributedlog/tools/DistributedLogTool.java    |  6 +++---
 .../apache/distributedlog/tools/TestDistributedLogTool.java    |  2 +-
 .../org/apache/bookkeeper/statelib/impl/kv/RocksdbKVStore.java |  2 +-
 .../statelib/impl/rocksdb/checkpoint/CheckpointInfo.java       |  2 +-
 .../storage/impl/sc/DefaultStorageContainerControllerTest.java |  4 ++--
 19 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DynamicWeightedRandomSelectionImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DynamicWeightedRandomSelectionImpl.java
index 84c0abe..cb299c2 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DynamicWeightedRandomSelectionImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DynamicWeightedRandomSelectionImpl.java
@@ -115,7 +115,7 @@ class DynamicWeightedRandomSelectionImpl<T> implements WeightedRandomSelection<T
                     if ((weightMap.containsKey(node))) {
                         weight = weightMap.get(node).getWeight();
                     }
-                    return Long.valueOf(weight);
+                    return weight;
                 };
                 ArrayList<Long> weightList = selectedNodes.stream().map(weightFunc)
                         .collect(Collectors.toCollection(ArrayList::new));
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java
index d44e25b..64da95c 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/Main.java
@@ -169,8 +169,7 @@ public class Main {
             if (cmdLine.hasOption('p')) {
                 String sPort = cmdLine.getOptionValue('p');
                 log.info("Get cmdline bookie port: {}", sPort);
-                Integer iPort = Integer.parseInt(sPort);
-                conf.setBookiePort(iPort.intValue());
+                conf.setBookiePort(Integer.parseInt(sPort));
             }
 
             if (cmdLine.hasOption('j')) {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorageTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorageTest.java
index b403bb7..d372288 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorageTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorageTest.java
@@ -208,7 +208,7 @@ public class InterleavedLedgerStorageTest {
             entriesOfLedger.forEachRemaining(addMethod);
             assertEquals("Number of entries", numWrites, arrayList.size());
             assertTrue("Entries of Ledger", IntStream.range(0, arrayList.size()).allMatch(i -> {
-                return arrayList.get(i).longValue() == (i * entriesPerWrite);
+                return arrayList.get(i) == (i * entriesPerWrite);
             }));
         }
 
@@ -240,7 +240,7 @@ public class InterleavedLedgerStorageTest {
             entriesOfLedger.forEachRemaining(addMethod);
             assertEquals("Number of entries", moreNumOfWrites, arrayList.size());
             assertTrue("Entries of Ledger", IntStream.range(0, arrayList.size()).allMatch(i -> {
-                return arrayList.get(i).longValue() == (i * entriesPerWrite);
+                return arrayList.get(i) == (i * entriesPerWrite);
             }));
         }
     }
@@ -372,13 +372,13 @@ public class InterleavedLedgerStorageTest {
 
                 Matcher sizeMatcher = sizePattern.matcher(s);
                 if (sizeMatcher.matches()) {
-                    size = Long.valueOf(sizeMatcher.group(1));
+                    size = Long.parseLong(sizeMatcher.group(1));
                     return;
                 }
 
                 Matcher entriesMatcher = entriesPattern.matcher(s);
                 if (entriesMatcher.matches()) {
-                    entries = Long.valueOf(entriesMatcher.group(1));
+                    entries = Long.parseLong(entriesMatcher.group(1));
                     return;
                 }
 
@@ -417,7 +417,7 @@ public class InterleavedLedgerStorageTest {
                         Assert.assertTrue((curEntry.get() % entriesPerWrite) == 0);
                         Assert.assertTrue(curEntry.get() <= numWrites * entriesPerWrite);
                         if (someEntryLogger.get() == -1) {
-                            someEntryLogger.set(Long.valueOf(logId));
+                            someEntryLogger.set(Long.parseLong(logId));
                         }
                     } else {
                         Assert.assertEquals(matcher.group("logid"), null);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
index 4d5a35d..b1f1b38 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
@@ -282,7 +282,7 @@ public class LedgerCacheTest {
         // Create ledger index file
         ledgerStorage.setMasterKey(1, "key".getBytes());
 
-        CachedFileInfo fileInfo = ledgerCache.getIndexPersistenceManager().getFileInfo(Long.valueOf(1), null);
+        CachedFileInfo fileInfo = ledgerCache.getIndexPersistenceManager().getFileInfo(1L, null);
 
         // Add entries
         ledgerStorage.addEntry(generateEntry(1, 1));
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SortedLedgerStorageTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SortedLedgerStorageTest.java
index c1ead05..2fc8961 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SortedLedgerStorageTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SortedLedgerStorageTest.java
@@ -139,7 +139,7 @@ public class SortedLedgerStorageTest {
             entriesOfLedger.forEachRemaining(addMethod);
             assertEquals("Number of entries", numWrites, arrayList.size());
             assertTrue("Entries of Ledger", IntStream.range(0, arrayList.size()).allMatch(i -> {
-                return arrayList.get(i).longValue() == (i * entriesPerWrite);
+                return arrayList.get(i) == (i * entriesPerWrite);
             }));
         }
 
@@ -187,7 +187,7 @@ public class SortedLedgerStorageTest {
             entriesOfLedger.forEachRemaining(addMethod);
             assertEquals("Number of entries", moreNumOfWrites, arrayList.size());
             assertTrue("Entries of Ledger", IntStream.range(0, arrayList.size()).allMatch(i -> {
-                return arrayList.get(i).longValue() == (i * entriesPerWrite);
+                return arrayList.get(i) == (i * entriesPerWrite);
             }));
         }
     }
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadLastEntry.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadLastEntry.java
index c314676..0748d30 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadLastEntry.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadLastEntry.java
@@ -105,7 +105,7 @@ public class TestReadLastEntry extends BookKeeperClusterTestCase {
             public void readComplete(int rc, LedgerHandle lh, Enumeration<LedgerEntry> seq, Object ctx) {
                 rcStore.set(rc);
                 LedgerEntry entry = seq.nextElement();
-                lastByteStore.set(Integer.valueOf(entry.getEntry()[1023]));
+                lastByteStore.set(entry.getEntry()[1023]);
                 latch1.countDown();
             }
         }, null);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java
index 8475584..35f97e7 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/TestHttpService.java
@@ -333,7 +333,7 @@ public class TestHttpService extends BookKeeperClusterTestCase {
 
         //3,  delete first ledger, should return OK, and should only get 3 ledgers after delete.
         HashMap<String, String> params = Maps.newHashMap();
-        Long ledgerId = Long.valueOf(lh[0].getId());
+        Long ledgerId = lh[0].getId();
         params.put("ledger_id", ledgerId.toString());
         HttpServiceRequest request3 = new HttpServiceRequest(null, HttpServer.Method.DELETE, params);
         HttpServiceResponse response3 = deleteLedgerService.handle(request3);
@@ -382,7 +382,7 @@ public class TestHttpService extends BookKeeperClusterTestCase {
 
         //2,  parameters for GET first ledger, should return OK, and contains metadata
         HashMap<String, String> params = Maps.newHashMap();
-        Long ledgerId = Long.valueOf(lh[0].getId());
+        Long ledgerId = lh[0].getId();
         params.put("ledger_id", ledgerId.toString());
         HttpServiceRequest request2 = new HttpServiceRequest(null, HttpServer.Method.GET, params);
         HttpServiceResponse response2 = getLedgerMetaService.handle(request2);
@@ -431,7 +431,7 @@ public class TestHttpService extends BookKeeperClusterTestCase {
         //2,  parameters for GET first ledger, should return OK
         // no start/end entry id, so return all the 100 entries.
         HashMap<String, String> params = Maps.newHashMap();
-        Long ledgerId = Long.valueOf(lh[0].getId());
+        Long ledgerId = lh[0].getId();
         params.put("ledger_id", ledgerId.toString());
         HttpServiceRequest request2 = new HttpServiceRequest(null, HttpServer.Method.GET, params);
         HttpServiceResponse response2 = readLedgerEntryService.handle(request2);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java
index 1f8717b..c045311 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java
@@ -183,7 +183,7 @@ public class AsyncLedgerOpsTest extends BookKeeperClusterTestCase
                 Integer retrEntry = result.getInt();
                 LOG.debug("Retrieved entry: " + retrEntry);
                 assertTrue("Checking entry " + i + " for equality", origEntry.equals(retrEntry));
-                assertTrue("Checking entry " + i + " for size", entry.length == entriesSize.get(i).intValue());
+                assertTrue("Checking entry " + i + " for size", entry.length == entriesSize.get(i));
                 i++;
             }
             assertTrue("Checking number of read entries", i == numEntriesToWrite);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
index e7da5cc..cd8fc0f 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
@@ -223,7 +223,7 @@ public class BookieFailureTest extends BookKeeperClusterTestCase
                 Integer retrEntry = result.getInt();
                 LOG.debug("Retrieved entry: " + i);
                 assertTrue("Checking entry " + i + " for equality", origEntry.equals(retrEntry));
-                assertTrue("Checking entry " + i + " for size", entry.length == entriesSize.get(i).intValue());
+                assertTrue("Checking entry " + i + " for size", entry.length == entriesSize.get(i));
                 i++;
             }
 
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java
index 7e4f442..2782947 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java
@@ -251,7 +251,7 @@ public class BookieReadWriteTest extends BookKeeperClusterTestCase
                 Integer retrEntry = result.getInt();
                 LOG.debug("Retrieved entry: " + retrEntry);
                 assertTrue("Checking entry " + i + " for equality", origEntry.equals(retrEntry));
-                assertTrue("Checking entry " + i + " for size", entry.length == entriesSize.get(i).intValue());
+                assertTrue("Checking entry " + i + " for size", entry.length == entriesSize.get(i));
                 i++;
             }
             assertTrue("Checking number of read entries", i == numEntriesToWrite);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/AvailabilityOfEntriesOfLedgerTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/AvailabilityOfEntriesOfLedgerTest.java
index 1f6e62a..672ae3c 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/AvailabilityOfEntriesOfLedgerTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/AvailabilityOfEntriesOfLedgerTest.java
@@ -295,7 +295,7 @@ public class AvailabilityOfEntriesOfLedgerTest {
         for (int i = 0; i < bitSetOfAvailability.length(); i++) {
             long entryId = startEntryId + i;
             if (bitSetOfAvailability.get(i)) {
-                assertTrue("Unavailable entry", unavailableEntries.contains(Long.valueOf(entryId)));
+                assertTrue("Unavailable entry", unavailableEntries.contains(entryId));
             }
         }
     }
diff --git a/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java b/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java
index 9106e6a..7d31d8d 100644
--- a/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java
+++ b/bookkeeper-stats-providers/prometheus-metrics-provider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java
@@ -203,7 +203,7 @@ public class TestPrometheusFormatter {
             String name = matcher.group(1);
 
             Metric m = new Metric();
-            m.value = Double.valueOf(matcher.group(4));
+            m.value = Double.parseDouble(matcher.group(4));
 
             String tags = matcher.group(3);
             if (tags != null) {
diff --git a/stream/common/src/main/java/org/apache/bookkeeper/common/coder/VarIntCoder.java b/stream/common/src/main/java/org/apache/bookkeeper/common/coder/VarIntCoder.java
index 9f93757..929a04b 100644
--- a/stream/common/src/main/java/org/apache/bookkeeper/common/coder/VarIntCoder.java
+++ b/stream/common/src/main/java/org/apache/bookkeeper/common/coder/VarIntCoder.java
@@ -50,7 +50,7 @@ public class VarIntCoder implements Coder<Integer> {
         ByteBufOutputStream output = new ByteBufOutputStream(buf);
 
         try {
-            VarInt.encode(value.intValue(), output);
+            VarInt.encode(value, output);
         } catch (IOException e) {
             throw new IllegalStateException("Failed to encode integer '" + value + "' into the provided buffer", e);
         }
diff --git a/stream/common/src/test/java/org/apache/bookkeeper/common/router/HashRouterTest.java b/stream/common/src/test/java/org/apache/bookkeeper/common/router/HashRouterTest.java
index 8fad535..a36b291 100644
--- a/stream/common/src/test/java/org/apache/bookkeeper/common/router/HashRouterTest.java
+++ b/stream/common/src/test/java/org/apache/bookkeeper/common/router/HashRouterTest.java
@@ -62,11 +62,11 @@ public class HashRouterTest {
         assertEquals(hash128[0], guavaHash128);
 
         ByteBufHashRouter router = ByteBufHashRouter.of();
-        long routingHash = router.getRoutingKey(key).longValue();
+        long routingHash = router.getRoutingKey(key);
         log.info("Routing hash = {}", routingHash);
         assertEquals(hash128[0], routingHash);
         BytesHashRouter bytesRouter = BytesHashRouter.of();
-        long bytesRoutingHash = bytesRouter.getRoutingKey(keyBytes).longValue();
+        long bytesRoutingHash = bytesRouter.getRoutingKey(keyBytes);
         assertEquals(hash128[0], bytesRoutingHash);
     }
 
diff --git a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/DistributedLogTool.java b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/DistributedLogTool.java
index bec9abf..5268f95 100644
--- a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/DistributedLogTool.java
+++ b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/DistributedLogTool.java
@@ -1039,7 +1039,7 @@ import org.slf4j.LoggerFactory;
             long eidFirst = 0;
             for (SortedMap.Entry<Long, ? extends List<BookieId>>
                     entry : LedgerReader.bookiesForLedger(lh).entrySet()) {
-                long eidLast = entry.getKey().longValue();
+                long eidLast = entry.getKey();
                 long count = eidLast - eidFirst + 1;
                 for (BookieId bookie : entry.getValue()) {
                     merge(stats, bookie, (int) count);
@@ -1051,7 +1051,7 @@ import org.slf4j.LoggerFactory;
 
         void merge(Map<BookieId, Integer> m, BookieId bookie, Integer count) {
             if (m.containsKey(bookie)) {
-                m.put(bookie, count + m.get(bookie).intValue());
+                m.put(bookie, count + m.get(bookie));
             } else {
                 m.put(bookie, count);
             }
@@ -1147,7 +1147,7 @@ import org.slf4j.LoggerFactory;
         }
 
         long countToLastRecord(DistributedLogManager dlm) throws Exception {
-            return FutureUtils.result(dlm.getLogRecordCountAsync(startDLSN)).longValue();
+            return FutureUtils.result(dlm.getLogRecordCountAsync(startDLSN));
         }
 
         @Override
diff --git a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/tools/TestDistributedLogTool.java b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/tools/TestDistributedLogTool.java
index 4e03554..d98cead 100644
--- a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/tools/TestDistributedLogTool.java
+++ b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/tools/TestDistributedLogTool.java
@@ -161,7 +161,7 @@ public class TestDistributedLogTool extends TestDistributedLogBase {
         DumpCommand cmd = new DumpCommand();
         cmd.setUri(defaultUri);
         cmd.setStreamName("DefaultStream");
-        cmd.setFromTxnId(Long.valueOf(0));
+        cmd.setFromTxnId(0L);
         assertEquals(0, cmd.runCmd());
     }
 
diff --git a/stream/statelib/src/main/java/org/apache/bookkeeper/statelib/impl/kv/RocksdbKVStore.java b/stream/statelib/src/main/java/org/apache/bookkeeper/statelib/impl/kv/RocksdbKVStore.java
index c016089..8af5399 100644
--- a/stream/statelib/src/main/java/org/apache/bookkeeper/statelib/impl/kv/RocksdbKVStore.java
+++ b/stream/statelib/src/main/java/org/apache/bookkeeper/statelib/impl/kv/RocksdbKVStore.java
@@ -403,7 +403,7 @@ public class RocksdbKVStore<K, V> implements KVStore<K, V> {
                         dbDir.getAbsolutePath(),
                         Lists.newArrayList(metaDesc, dataDesc),
                         cfHandles,
-                        Lists.newArrayList(Integer.valueOf(0), Integer.valueOf(ttlSeconds)),
+                        Lists.newArrayList(0, ttlSeconds),
                         false)
                     : RocksDB.open(
                         options,
diff --git a/stream/statelib/src/main/java/org/apache/bookkeeper/statelib/impl/rocksdb/checkpoint/CheckpointInfo.java b/stream/statelib/src/main/java/org/apache/bookkeeper/statelib/impl/rocksdb/checkpoint/CheckpointInfo.java
index 166d308..49d06c9 100644
--- a/stream/statelib/src/main/java/org/apache/bookkeeper/statelib/impl/rocksdb/checkpoint/CheckpointInfo.java
+++ b/stream/statelib/src/main/java/org/apache/bookkeeper/statelib/impl/rocksdb/checkpoint/CheckpointInfo.java
@@ -84,7 +84,7 @@ public class CheckpointInfo implements Comparable<CheckpointInfo> {
             }
             // for proper sorting
             public Long getCreatedAt() {
-                return Long.valueOf(0);
+                return 0L;
             }
         };
     }
diff --git a/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/sc/DefaultStorageContainerControllerTest.java b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/sc/DefaultStorageContainerControllerTest.java
index 027964e..8d01068 100644
--- a/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/sc/DefaultStorageContainerControllerTest.java
+++ b/stream/storage/impl/src/test/java/org/apache/bookkeeper/stream/storage/impl/sc/DefaultStorageContainerControllerTest.java
@@ -155,7 +155,7 @@ public class DefaultStorageContainerControllerTest {
         assertTrue(Sets.difference(currentCluster, assignedServers).isEmpty());
         // all containers should be assigned
         Set<Long> expectedContainers = LongStream.range(0L, NUM_STORAGE_CONTAINERS)
-            .mapToObj(scId -> Long.valueOf(scId))
+            .boxed()
             .collect(Collectors.toSet());
         assertTrue(Sets.difference(expectedContainers, assignedContainers).isEmpty());
     }
@@ -200,7 +200,7 @@ public class DefaultStorageContainerControllerTest {
         assertTrue(Sets.difference(currentCluster, assignedServers).isEmpty());
         // all containers should be assigned
         Set<Long> expectedContainers = LongStream.range(0L, NUM_STORAGE_CONTAINERS)
-            .mapToObj(scId -> Long.valueOf(scId))
+            .boxed()
             .collect(Collectors.toSet());
         assertTrue(Sets.difference(expectedContainers, assignedContainers).isEmpty());
     }