INTERNAL: tidy operation codes

naver · Dec 6, 2024 · bd18fe4 · bd18fe4
1 parent 042d9d4
commit bd18fe4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 deletions.
diff --git a/src/main/java/net/spy/memcached/protocol/ascii/BTreeGetBulkOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/BTreeGetBulkOperationImpl.java
@@ -132,7 +132,7 @@ public void handleLine(String line) {
   }
 
   @Override
-  public final void handleRead(ByteBuffer bb) {
+  public void handleRead(ByteBuffer bb) {
     if (lookingFor == '\0' && data == null) {
       while (bb.hasRemaining()) {
         byte b = bb.get();

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/BTreeSortMergeGetOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/BTreeSortMergeGetOperationImpl.java
@@ -149,7 +149,7 @@ public void handleLine(String line) {
   }
 
   @Override
-  public final void handleRead(ByteBuffer bb) {
+  public void handleRead(ByteBuffer bb) {
     switch (readState) {
       case VALUE:
         readValue(bb);

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/CollectionCreateOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/CollectionCreateOperationImpl.java
@@ -52,8 +52,6 @@ public final class CollectionCreateOperationImpl extends OperationImpl
           true, "CREATED", CollectionResponse.CREATED);
   private static final OperationStatus EXISTS = new CollectionOperationStatus(
           false, "EXISTS", CollectionResponse.EXISTS);
-  private static final OperationStatus SERVER_ERROR = new CollectionOperationStatus(
-          false, "SERVER_ERROR", CollectionResponse.SERVER_ERROR);
 
   private final String key;
   private final CollectionCreate collectionCreate;
@@ -92,7 +90,7 @@ assert getState() == OperationState.READING
       return;
     }
     /* ENABLE_MIGRATION end */
-    getCallback().receivedStatus(matchStatus(line, CREATED, EXISTS, SERVER_ERROR));
+    getCallback().receivedStatus(matchStatus(line, CREATED, EXISTS));
     transitionState(OperationState.COMPLETE);
   }
 

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/CollectionGetOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/CollectionGetOperationImpl.java
@@ -149,7 +149,7 @@ public void handleLine(String line) {
   }
 
   @Override
-  public final void handleRead(ByteBuffer bb) {
+  public void handleRead(ByteBuffer bb) {
     // Decode a collection data header.
     if (lookingFor == '\0' && data == null) {
       while (bb.hasRemaining()) {
@@ -166,10 +166,9 @@ public final void handleRead(ByteBuffer bb) {
           tokens.add(byteBuffer.toString());
           byteBuffer.reset();
 
-          if (eFlagIndex >= 0) {
-            if (tokens.size() == eFlagIndex + 1 && tokens.get(eFlagIndex).startsWith("0x")) {
-              eHeadCount++;
-            }
+          if (eFlagIndex >= 0 &&
+                  tokens.size() == eFlagIndex + 1 && tokens.get(eFlagIndex).startsWith("0x")) {
+            eHeadCount++;
           }
           if (tokens.size() == eHeadCount) {
             collectionGet.decodeElemHeader(tokens);

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/CollectionPipedUpdateOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/CollectionPipedUpdateOperationImpl.java
@@ -61,8 +61,6 @@ public final class CollectionPipedUpdateOperationImpl extends OperationImpl impl
           false, "BKEY_MISMATCH", CollectionResponse.BKEY_MISMATCH);
   private static final OperationStatus EFLAG_MISMATCH = new CollectionOperationStatus(
           false, "EFLAG_MISMATCH", CollectionResponse.EFLAG_MISMATCH);
-  private static final OperationStatus SERVER_ERROR = new CollectionOperationStatus(
-          false, "SERVER_ERROR", CollectionResponse.SERVER_ERROR);
 
   private final String key;
   private final CollectionPipedUpdate<?> update;
@@ -114,7 +112,7 @@ assert getState() == OperationState.READING : "Read ``" + line
     if (update.isNotPiped()) {
       OperationStatus status = matchStatus(line, UPDATED, NOT_FOUND,
               NOT_FOUND_ELEMENT, NOTHING_TO_UPDATE, TYPE_MISMATCH,
-              BKEY_MISMATCH, EFLAG_MISMATCH, SERVER_ERROR);
+              BKEY_MISMATCH, EFLAG_MISMATCH);
       if (status.isSuccess()) {
         cb.receivedStatus((successAll) ? END : FAILED_END);
       } else {
@@ -154,7 +152,7 @@ assert getState() == OperationState.READING : "Read ``" + line
     } else {
       OperationStatus status = matchStatus(line, UPDATED, NOT_FOUND,
               NOT_FOUND_ELEMENT, NOTHING_TO_UPDATE, TYPE_MISMATCH,
-              BKEY_MISMATCH, EFLAG_MISMATCH, SERVER_ERROR);
+              BKEY_MISMATCH, EFLAG_MISMATCH);
 
       if (!status.isSuccess()) {
         cb.gotStatus(index, status);

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/CollectionUpdateOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/CollectionUpdateOperationImpl.java
@@ -61,8 +61,6 @@ public final class CollectionUpdateOperationImpl extends OperationImpl implement
           false, "BKEY_MISMATCH", CollectionResponse.BKEY_MISMATCH);
   private static final OperationStatus EFLAG_MISMATCH = new CollectionOperationStatus(
           false, "EFLAG_MISMATCH", CollectionResponse.EFLAG_MISMATCH);
-  private static final OperationStatus SERVER_ERROR = new CollectionOperationStatus(
-          false, "SERVER_ERROR", CollectionResponse.SERVER_ERROR);
 
   private final String key;
   private final String subkey; // e.g.) 0 or 0x00
@@ -104,7 +102,7 @@ assert getState() == OperationState.READING : "Read ``" + line
     /* ENABLE_MIGRATION end */
     OperationStatus status = matchStatus(line, UPDATED, NOT_FOUND, NOT_FOUND_ELEMENT,
             NOTHING_TO_UPDATE, TYPE_MISMATCH, BKEY_MISMATCH,
-            EFLAG_MISMATCH, SERVER_ERROR);
+            EFLAG_MISMATCH);
     getCallback().receivedStatus(status);
     transitionState(OperationState.COMPLETE);
   }