From 4d950a3817f2f1aa6552ccf15cb453ccdb4015ad Mon Sep 17 00:00:00 2001 From: oliviarla Date: Mon, 6 Jan 2025 14:22:39 +0900 Subject: [PATCH] CLEANUP: remove useless constructor and change parameter order in delete command class --- .../java/net/spy/memcached/ArcusClient.java | 20 +++--- .../spy/memcached/collection/BTreeDelete.java | 63 +++---------------- .../spy/memcached/collection/ListDelete.java | 16 ++--- .../spy/memcached/collection/MapDelete.java | 8 +-- .../spy/memcached/collection/SetDelete.java | 8 +-- .../net/spy/memcached/MultibyteKeyTest.java | 2 +- .../ProtocolBTreeDeleteTest.java | 30 +++++---- .../ProtocolListDeleteTest.java | 18 ++---- .../ProtocolMapDeleteTest.java | 17 ++--- .../ProtocolSetDeleteTest.java | 24 ++----- 10 files changed, 56 insertions(+), 150 deletions(-) diff --git a/src/main/java/net/spy/memcached/ArcusClient.java b/src/main/java/net/spy/memcached/ArcusClient.java index d3c718857..820d15117 100644 --- a/src/main/java/net/spy/memcached/ArcusClient.java +++ b/src/main/java/net/spy/memcached/ArcusClient.java @@ -1522,7 +1522,7 @@ public CollectionFuture asyncBopDelete(String key, long bkey, ElementFlagFilter eFlagFilter, boolean dropIfEmpty) { BTreeUtil.validateBkey(bkey); - BTreeDelete delete = new BTreeDelete(bkey, false, dropIfEmpty, eFlagFilter); + BTreeDelete delete = new BTreeDelete(bkey, eFlagFilter, dropIfEmpty, false); return asyncCollectionDelete(key, delete); } @@ -1532,7 +1532,7 @@ public CollectionFuture asyncBopDelete(String key, ElementFlagFilter eFlagFilter, int count, boolean dropIfEmpty) { BTreeUtil.validateBkey(from, to); - BTreeDelete delete = new BTreeDelete(from, to, count, false, dropIfEmpty, eFlagFilter); + BTreeDelete delete = new BTreeDelete(from, to, count, eFlagFilter, dropIfEmpty, false); return asyncCollectionDelete(key, delete); } @@ -1540,7 +1540,7 @@ public CollectionFuture asyncBopDelete(String key, public CollectionFuture asyncMopDelete(String key, boolean dropIfEmpty) { List mkeyList = new ArrayList<>(); - MapDelete delete = new MapDelete(mkeyList, false, dropIfEmpty); + MapDelete delete = new MapDelete(mkeyList, dropIfEmpty, false); return asyncCollectionDelete(key, delete); } @@ -1553,7 +1553,7 @@ public CollectionFuture asyncMopDelete(String key, String mkey, validateMKey(mkey); List mkeyList = new ArrayList<>(1); mkeyList.add(mkey); - MapDelete delete = new MapDelete(mkeyList, false, dropIfEmpty); + MapDelete delete = new MapDelete(mkeyList, dropIfEmpty, false); return asyncCollectionDelete(key, delete); } @@ -1574,21 +1574,21 @@ public CollectionFuture asyncMopDelete(String key, String mkey, @Override public CollectionFuture asyncLopDelete(String key, int index, boolean dropIfEmpty) { - ListDelete delete = new ListDelete(index, false, dropIfEmpty); + ListDelete delete = new ListDelete(index, dropIfEmpty, false); return asyncCollectionDelete(key, delete); } @Override public CollectionFuture asyncLopDelete(String key, int from, int to, boolean dropIfEmpty) { - ListDelete delete = new ListDelete(from, to, false, dropIfEmpty); + ListDelete delete = new ListDelete(from, to, dropIfEmpty, false); return asyncCollectionDelete(key, delete); } @Override public CollectionFuture asyncSopDelete(String key, Object value, boolean dropIfEmpty) { - SetDelete delete = new SetDelete<>(value, false, dropIfEmpty, + SetDelete delete = new SetDelete<>(value, dropIfEmpty, false, collectionTranscoder); return asyncCollectionDelete(key, delete); } @@ -1596,7 +1596,7 @@ public CollectionFuture asyncSopDelete(String key, Object value, @Override public CollectionFuture asyncSopDelete(String key, T value, boolean dropIfEmpty, Transcoder tc) { - SetDelete delete = new SetDelete<>(value, false, dropIfEmpty, tc); + SetDelete delete = new SetDelete<>(value, dropIfEmpty, false, tc); return asyncCollectionDelete(key, delete); } @@ -2873,7 +2873,7 @@ public CollectionFuture asyncBopDelete(String key, ElementFlagFilter eFlagFilter, int count, boolean dropIfEmpty) { BTreeUtil.validateBkey(from, to); - BTreeDelete delete = new BTreeDelete(from, to, count, false, dropIfEmpty, eFlagFilter); + BTreeDelete delete = new BTreeDelete(from, to, count, eFlagFilter, dropIfEmpty, false); return asyncCollectionDelete(key, delete); } @@ -2882,7 +2882,7 @@ public CollectionFuture asyncBopDelete(String key, byte[] bkey, ElementFlagFilter eFlagFilter, boolean dropIfEmpty) { BTreeUtil.validateBkey(bkey); - BTreeDelete delete = new BTreeDelete(bkey, false, dropIfEmpty, eFlagFilter); + BTreeDelete delete = new BTreeDelete(bkey, eFlagFilter, dropIfEmpty, false); return asyncCollectionDelete(key, delete); } diff --git a/src/main/java/net/spy/memcached/collection/BTreeDelete.java b/src/main/java/net/spy/memcached/collection/BTreeDelete.java index 426ad3a5e..a894f5097 100644 --- a/src/main/java/net/spy/memcached/collection/BTreeDelete.java +++ b/src/main/java/net/spy/memcached/collection/BTreeDelete.java @@ -25,47 +25,33 @@ public class BTreeDelete extends CollectionDelete { protected ElementFlagFilter elementFlagFilter; - public BTreeDelete(long bkey, boolean noreply) { + public BTreeDelete(long bkey, ElementFlagFilter elementFlagFilter, + boolean dropIfEmpty, boolean noreply) { this.range = String.valueOf(bkey); - this.noreply = noreply; - } - - public BTreeDelete(long bkey, boolean noreply, boolean dropIfEmpty, - ElementFlagFilter elementFlagFilter) { - this(bkey, noreply); - this.dropIfEmpty = dropIfEmpty; this.elementFlagFilter = elementFlagFilter; - } - - public BTreeDelete(long from, long to, boolean noreply) { - this.range = from + ".." + to; + this.dropIfEmpty = dropIfEmpty; this.noreply = noreply; } - public BTreeDelete(long from, long to, int count, boolean noreply) { + public BTreeDelete(long from, long to, int count, ElementFlagFilter elementFlagFilter, + boolean dropIfEmpty, boolean noreply) { this.range = from + ".." + to; this.count = count; - this.noreply = noreply; - } - - public BTreeDelete(long from, long to, int count, boolean noreply, boolean dropIfEmpty, - ElementFlagFilter elementFlagFilter) { - this(from, to, count, noreply); this.dropIfEmpty = dropIfEmpty; this.noreply = noreply; this.elementFlagFilter = elementFlagFilter; } - public BTreeDelete(byte[] bkey, boolean noreply, boolean dropIfEmpty, - ElementFlagFilter elementFlagFilter) { + public BTreeDelete(byte[] bkey, ElementFlagFilter elementFlagFilter, + boolean dropIfEmpty, boolean noreply) { this.range = BTreeUtil.toHex(bkey); this.noreply = noreply; this.dropIfEmpty = dropIfEmpty; this.elementFlagFilter = elementFlagFilter; } - public BTreeDelete(byte[] from, byte[] to, int count, boolean noreply, boolean dropIfEmpty, - ElementFlagFilter elementFlagFilter) { + public BTreeDelete(byte[] from, byte[] to, int count, ElementFlagFilter elementFlagFilter, + boolean dropIfEmpty, boolean noreply) { this.range = BTreeUtil.toHex(from) + ".." + BTreeUtil.toHex(to); this.count = count; this.noreply = noreply; @@ -73,37 +59,6 @@ public BTreeDelete(byte[] from, byte[] to, int count, boolean noreply, boolean d this.elementFlagFilter = elementFlagFilter; } - public BTreeDelete(long bkey, boolean noreply, boolean dropIfEmpty, - ElementMultiFlagsFilter elementMultiFlagsFilter) { - this(bkey, noreply); - this.dropIfEmpty = dropIfEmpty; - this.elementFlagFilter = elementMultiFlagsFilter; - } - - public BTreeDelete(long from, long to, int count, boolean noreply, boolean dropIfEmpty, - ElementMultiFlagsFilter elementMultiFlagsFilter) { - this(from, to, count, noreply); - this.dropIfEmpty = dropIfEmpty; - this.elementFlagFilter = elementMultiFlagsFilter; - } - - public BTreeDelete(byte[] bkey, boolean noreply, boolean dropIfEmpty, - ElementMultiFlagsFilter elementMultiFlagsFilter) { - this.range = BTreeUtil.toHex(bkey); - this.noreply = noreply; - this.dropIfEmpty = dropIfEmpty; - this.elementFlagFilter = elementMultiFlagsFilter; - } - - public BTreeDelete(byte[] from, byte[] to, int count, boolean noreply, boolean dropIfEmpty, - ElementMultiFlagsFilter elementMultiFlagsFilter) { - this.range = BTreeUtil.toHex(from) + ".." + BTreeUtil.toHex(to); - this.count = count; - this.noreply = noreply; - this.dropIfEmpty = dropIfEmpty; - this.elementFlagFilter = elementMultiFlagsFilter; - } - @Override public byte[] getAdditionalArgs() { return null; diff --git a/src/main/java/net/spy/memcached/collection/ListDelete.java b/src/main/java/net/spy/memcached/collection/ListDelete.java index 977554a91..2065049da 100644 --- a/src/main/java/net/spy/memcached/collection/ListDelete.java +++ b/src/main/java/net/spy/memcached/collection/ListDelete.java @@ -20,24 +20,16 @@ public class ListDelete extends CollectionDelete { private static final String command = "lop delete"; - public ListDelete(int index, boolean noreply) { + public ListDelete(int index, boolean dropIfEmpty, boolean noreply) { this.range = String.valueOf(index); - this.noreply = noreply; - } - - public ListDelete(int index, boolean noreply, boolean dropIfEmpty) { - this(index, noreply); this.dropIfEmpty = dropIfEmpty; - } - - public ListDelete(int from, int to, boolean noreply) { - this.range = String.valueOf(from) + ".." + String.valueOf(to); this.noreply = noreply; } - public ListDelete(int from, int to, boolean noreply, boolean dropIfEmpty) { - this(from, to, noreply); + public ListDelete(int from, int to, boolean dropIfEmpty, boolean noreply) { + this.range = from + ".." + to; this.dropIfEmpty = dropIfEmpty; + this.noreply = noreply; } @Override diff --git a/src/main/java/net/spy/memcached/collection/MapDelete.java b/src/main/java/net/spy/memcached/collection/MapDelete.java index 7742a9814..e187cc10a 100644 --- a/src/main/java/net/spy/memcached/collection/MapDelete.java +++ b/src/main/java/net/spy/memcached/collection/MapDelete.java @@ -26,14 +26,10 @@ public class MapDelete extends CollectionDelete { private String spaceSeparatedKeys; protected byte[] additionalArgs; - public MapDelete(List mkeyList, boolean noreply) { + public MapDelete(List mkeyList, boolean dropIfEmpty, boolean noreply) { this.mkeyList = mkeyList; - this.noreply = noreply; - } - - public MapDelete(List mkeyList, boolean noreply, boolean dropIfEmpty) { - this(mkeyList, noreply); this.dropIfEmpty = dropIfEmpty; + this.noreply = noreply; } public void setKeySeparator(String keySeparator) { diff --git a/src/main/java/net/spy/memcached/collection/SetDelete.java b/src/main/java/net/spy/memcached/collection/SetDelete.java index ba7a64cc6..c4c2bfca7 100644 --- a/src/main/java/net/spy/memcached/collection/SetDelete.java +++ b/src/main/java/net/spy/memcached/collection/SetDelete.java @@ -26,18 +26,14 @@ public class SetDelete extends CollectionDelete { protected byte[] additionalArgs; protected Transcoder tc; - public SetDelete(T value, boolean noreply, Transcoder tc) { + public SetDelete(T value, boolean dropIfEmpty, boolean noreply, Transcoder tc) { this.value = value; + this.dropIfEmpty = dropIfEmpty; this.noreply = noreply; this.tc = tc; this.additionalArgs = tc.encode(value).getData(); } - public SetDelete(T value, boolean noreply, boolean dropIfEmpty, Transcoder tc) { - this(value, noreply, tc); - this.dropIfEmpty = dropIfEmpty; - } - public T getValue() { return value; } diff --git a/src/test/manual/net/spy/memcached/MultibyteKeyTest.java b/src/test/manual/net/spy/memcached/MultibyteKeyTest.java index 254f22c62..ff8de989e 100644 --- a/src/test/manual/net/spy/memcached/MultibyteKeyTest.java +++ b/src/test/manual/net/spy/memcached/MultibyteKeyTest.java @@ -446,7 +446,7 @@ public void complete() { void CollectionDeleteOperationImplTest() { try { opFact.collectionDelete(MULTIBYTE_KEY, - new BTreeDelete(1L, false), + new BTreeDelete(1L, ElementFlagFilter.DO_NOT_FILTER, true, false), new OperationCallback() { @Override public void receivedStatus(OperationStatus status) { diff --git a/src/test/manual/net/spy/memcached/emptycollection/ProtocolBTreeDeleteTest.java b/src/test/manual/net/spy/memcached/emptycollection/ProtocolBTreeDeleteTest.java index 982616fce..c3da74b25 100644 --- a/src/test/manual/net/spy/memcached/emptycollection/ProtocolBTreeDeleteTest.java +++ b/src/test/manual/net/spy/memcached/emptycollection/ProtocolBTreeDeleteTest.java @@ -27,34 +27,32 @@ class ProtocolBTreeDeleteTest { @Test void testStringify() { - // default setting : dropIfEmpty = true - assertEquals("10 drop", - (new BTreeDelete(10, false)).stringify()); + (new BTreeDelete(10, ElementFlagFilter.DO_NOT_FILTER, true, false)).stringify()); - assertEquals("10", (new BTreeDelete(10, false, false, - ElementFlagFilter.DO_NOT_FILTER)).stringify()); - assertEquals("10 drop", (new BTreeDelete(10, false, - true, ElementFlagFilter.DO_NOT_FILTER)).stringify()); + assertEquals("10", (new BTreeDelete(10, ElementFlagFilter.DO_NOT_FILTER, false, + false)).stringify()); + assertEquals("10 drop", (new BTreeDelete(10, ElementFlagFilter.DO_NOT_FILTER, + true, false)).stringify()); assertEquals("10..20 1", (new BTreeDelete(10, 20, 1, - false, false, ElementFlagFilter.DO_NOT_FILTER)).stringify()); + ElementFlagFilter.DO_NOT_FILTER, false, false)).stringify()); assertEquals("10..20 1 drop", (new BTreeDelete(10, 20, - 1, false, true, ElementFlagFilter.DO_NOT_FILTER)).stringify()); + 1, ElementFlagFilter.DO_NOT_FILTER, true, false)).stringify()); - assertEquals("10 drop noreply", (new BTreeDelete(10, - true)).stringify()); + assertEquals("10 drop noreply", (new BTreeDelete(10, ElementFlagFilter.DO_NOT_FILTER, + true, true)).stringify()); - assertEquals("10 noreply", (new BTreeDelete(10, true, - false, ElementFlagFilter.DO_NOT_FILTER)).stringify()); + assertEquals("10 noreply", (new BTreeDelete(10, ElementFlagFilter.DO_NOT_FILTER, + false, true)).stringify()); assertEquals("10 drop noreply", (new BTreeDelete(10, - true, true, ElementFlagFilter.DO_NOT_FILTER)).stringify()); + ElementFlagFilter.DO_NOT_FILTER, true, true)).stringify()); assertEquals("10..20 1 noreply", (new BTreeDelete(10, - 20, 1, true, false, ElementFlagFilter.DO_NOT_FILTER)) + 20, 1, ElementFlagFilter.DO_NOT_FILTER, false, true)) .stringify()); assertEquals("10..20 1 drop noreply", (new BTreeDelete( - 10, 20, 1, true, true, ElementFlagFilter.DO_NOT_FILTER)) + 10, 20, 1, ElementFlagFilter.DO_NOT_FILTER, true, true)) .stringify()); } } diff --git a/src/test/manual/net/spy/memcached/emptycollection/ProtocolListDeleteTest.java b/src/test/manual/net/spy/memcached/emptycollection/ProtocolListDeleteTest.java index d026cb7f8..10ef8c128 100644 --- a/src/test/manual/net/spy/memcached/emptycollection/ProtocolListDeleteTest.java +++ b/src/test/manual/net/spy/memcached/emptycollection/ProtocolListDeleteTest.java @@ -26,31 +26,23 @@ class ProtocolListDeleteTest { @Test void testStringify() { - // default setting : dropIfEmpty = true - - assertEquals("10 drop", - (new ListDelete(10, false)).stringify()); - assertEquals("10", (new ListDelete(10, false, false)).stringify()); assertEquals("10 drop", - (new ListDelete(10, false, true)).stringify()); + (new ListDelete(10, true, false)).stringify()); assertEquals("10..20", (new ListDelete(10, 20, false, false)).stringify()); assertEquals("10..20 drop", (new ListDelete(10, 20, - false, true)).stringify()); - - assertEquals("10 drop noreply", - (new ListDelete(10, true)).stringify()); + true, false)).stringify()); - assertEquals("10 noreply", (new ListDelete(10, true, - false)).stringify()); + assertEquals("10 noreply", (new ListDelete(10, false, + true)).stringify()); assertEquals("10 drop noreply", (new ListDelete(10, true, true)).stringify()); assertEquals("10..20 noreply", (new ListDelete(10, 20, - true, false)).stringify()); + false, true)).stringify()); assertEquals("10..20 drop noreply", (new ListDelete(10, 20, true, true)).stringify()); } diff --git a/src/test/manual/net/spy/memcached/emptycollection/ProtocolMapDeleteTest.java b/src/test/manual/net/spy/memcached/emptycollection/ProtocolMapDeleteTest.java index 7336dc55f..9887752b4 100644 --- a/src/test/manual/net/spy/memcached/emptycollection/ProtocolMapDeleteTest.java +++ b/src/test/manual/net/spy/memcached/emptycollection/ProtocolMapDeleteTest.java @@ -35,39 +35,30 @@ void testStringify() { List mkeyList2 = new ArrayList<>(); mkeyList2.add("mkey1"); mkeyList2.add("mkey2"); - // default setting : dropIfEmpty = true MapDelete mapDelete; - mapDelete = new MapDelete(mkeyList, false); - mapDelete.setKeySeparator(" "); - assertEquals("4 1 drop", mapDelete.stringify()); - mapDelete = new MapDelete(mkeyList, false, false); mapDelete.setKeySeparator(" "); assertEquals("4 1", mapDelete.stringify()); - mapDelete = new MapDelete(mkeyList, false, true); + mapDelete = new MapDelete(mkeyList, true, false); mapDelete.setKeySeparator(" "); assertEquals("4 1 drop", mapDelete.stringify()); mapDelete = new MapDelete(mkeyList2, false, false); mapDelete.setKeySeparator(" "); assertEquals("11 2", mapDelete.stringify()); - mapDelete = new MapDelete(mkeyList2, false, true); + mapDelete = new MapDelete(mkeyList2, true, false); mapDelete.setKeySeparator(" "); assertEquals("11 2 drop", mapDelete.stringify()); - mapDelete = new MapDelete(mkeyList, true); - mapDelete.setKeySeparator(" "); - assertEquals("4 1 drop noreply", mapDelete.stringify()); - - mapDelete = new MapDelete(mkeyList, true, false); + mapDelete = new MapDelete(mkeyList, false, true); mapDelete.setKeySeparator(" "); assertEquals("4 1 noreply", mapDelete.stringify()); mapDelete = new MapDelete(mkeyList, true, true); mapDelete.setKeySeparator(" "); assertEquals("4 1 drop noreply", mapDelete.stringify()); - mapDelete = new MapDelete(mkeyList2, true, false); + mapDelete = new MapDelete(mkeyList2, false, true); mapDelete.setKeySeparator(" "); assertEquals("11 2 noreply", mapDelete.stringify()); mapDelete = new MapDelete(mkeyList2, true, true); diff --git a/src/test/manual/net/spy/memcached/emptycollection/ProtocolSetDeleteTest.java b/src/test/manual/net/spy/memcached/emptycollection/ProtocolSetDeleteTest.java index 1813243c9..4a82afeae 100644 --- a/src/test/manual/net/spy/memcached/emptycollection/ProtocolSetDeleteTest.java +++ b/src/test/manual/net/spy/memcached/emptycollection/ProtocolSetDeleteTest.java @@ -31,21 +31,13 @@ class ProtocolSetDeleteTest { @Test void testStringify() { - // default setting : dropIfEmpty = true - - SetDelete del = new SetDelete<>(value, false, testTranscoder); - assertEquals("5 drop", del.stringify()); - - del = new SetDelete<>(value, false, false, testTranscoder); + SetDelete del = new SetDelete<>(value, false, false, testTranscoder); assertEquals("5", del.stringify()); - del = new SetDelete<>(value, false, true, testTranscoder); + del = new SetDelete<>(value, true, false, testTranscoder); assertEquals("5 drop", del.stringify()); - del = new SetDelete<>(value, true, testTranscoder); - assertEquals("5 drop noreply", del.stringify()); - - del = new SetDelete<>(value, true, false, testTranscoder); + del = new SetDelete<>(value, false, true, testTranscoder); assertEquals("5 noreply", del.stringify()); del = new SetDelete<>(value, true, true, testTranscoder); @@ -55,21 +47,15 @@ void testStringify() { @Test void testGetAdditionalArgs() { byte[] expected = new byte[]{'v', 'a', 'l', 'u', 'e'}; - SetDelete del = new SetDelete<>(value, false, testTranscoder); + SetDelete del = new SetDelete<>(value, false, false, testTranscoder); assertArrayEquals(expected, del.getAdditionalArgs()); - del = new SetDelete<>(value, false, false, testTranscoder); + del = new SetDelete<>(value, true, false, testTranscoder); assertArrayEquals(expected, del.getAdditionalArgs()); del = new SetDelete<>(value, false, true, testTranscoder); assertArrayEquals(expected, del.getAdditionalArgs()); - del = new SetDelete<>(value, true, testTranscoder); - assertArrayEquals(expected, del.getAdditionalArgs()); - - del = new SetDelete<>(value, true, false, testTranscoder); - assertArrayEquals(expected, del.getAdditionalArgs()); - del = new SetDelete<>(value, true, true, testTranscoder); assertArrayEquals(expected, del.getAdditionalArgs()); }