From a7db9ba570e449d9ebcfc6137d75ae2581fbb020 Mon Sep 17 00:00:00 2001 From: uhm0311 Date: Tue, 2 Sep 2025 17:58:26 +0900 Subject: [PATCH] FIX: Add static methods to replace the mutable static final fields --- .../memcached/collection/ByteArrayBKey.java | 23 +++++++++++++++++++ .../btree/longbkey/BopGetBulkTest.java | 12 +++++----- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/spy/memcached/collection/ByteArrayBKey.java b/src/main/java/net/spy/memcached/collection/ByteArrayBKey.java index f1393788c..cd54fcdbf 100644 --- a/src/main/java/net/spy/memcached/collection/ByteArrayBKey.java +++ b/src/main/java/net/spy/memcached/collection/ByteArrayBKey.java @@ -23,8 +23,16 @@ public class ByteArrayBKey implements Comparable { + /** + * @deprecated Replaced by {@link ByteArrayBKey#getMin()} + */ + @Deprecated public static final byte[] MIN = new byte[]{(byte) 0}; + /** + * @deprecated Replaced by {@link ByteArrayBKey#getMax()} + */ + @Deprecated public static final byte[] MAX = new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, @@ -34,6 +42,21 @@ public class ByteArrayBKey implements Comparable { (byte) 255, (byte) 255, (byte) 255, (byte) 255 }; + public static byte[] getMin() { + return new byte[]{(byte) 0}; + } + + public static byte[] getMax() { + return new byte[]{(byte) 255, (byte) 255, + (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, + (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, + (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, + (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, + (byte) 255, (byte) 255, (byte) 255, (byte) 255, (byte) 255, + (byte) 255, (byte) 255, (byte) 255, (byte) 255 + }; + } + private final byte[] bkey; public ByteArrayBKey(byte[] bkey) { diff --git a/src/test/manual/net/spy/memcached/collection/btree/longbkey/BopGetBulkTest.java b/src/test/manual/net/spy/memcached/collection/btree/longbkey/BopGetBulkTest.java index a608de020..8aaf2a763 100644 --- a/src/test/manual/net/spy/memcached/collection/btree/longbkey/BopGetBulkTest.java +++ b/src/test/manual/net/spy/memcached/collection/btree/longbkey/BopGetBulkTest.java @@ -90,8 +90,8 @@ void testGetBulkLongBkeyGetAll() { ElementFlagFilter filter = ElementFlagFilter.DO_NOT_FILTER; CollectionGetBulkFuture>> f = mc - .asyncBopGetBulk(keyList, ByteArrayBKey.MIN, - ByteArrayBKey.MAX, filter, 0, 10); + .asyncBopGetBulk(keyList, ByteArrayBKey.getMin(), + ByteArrayBKey.getMax(), filter, 0, 10); Map> results = f.get( 1000L, TimeUnit.MILLISECONDS); @@ -158,8 +158,8 @@ void testGetBulkNotFoundAll() { ElementFlagFilter filter = ElementFlagFilter.DO_NOT_FILTER; CollectionGetBulkFuture>> f = mc - .asyncBopGetBulk(keyList, ByteArrayBKey.MIN, - ByteArrayBKey.MAX, filter, 0, 10); + .asyncBopGetBulk(keyList, ByteArrayBKey.getMin(), + ByteArrayBKey.getMax(), filter, 0, 10); Map> results = f.get( 1000L, TimeUnit.MILLISECONDS); @@ -210,8 +210,8 @@ void testGetBulkNotFoundMixed() { ElementFlagFilter filter = ElementFlagFilter.DO_NOT_FILTER; CollectionGetBulkFuture>> f = mc - .asyncBopGetBulk(keyList, ByteArrayBKey.MIN, - ByteArrayBKey.MAX, filter, 0, 10); + .asyncBopGetBulk(keyList, ByteArrayBKey.getMin(), + ByteArrayBKey.getMax(), filter, 0, 10); Map> results = f.get( 1000L, TimeUnit.MILLISECONDS);