[zookeeper] branch master updated: ZOOKEEPER-4467: Format OpCode.addWatch in Request.op2String

[maoling]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5b12b0e4e ZOOKEEPER-4467: Format OpCode.addWatch in Request.op2String
5b12b0e4e is described below

commit 5b12b0e4eb010dca9b46047f559c6847d7e0b5f7
Author: Kezhu Wang <kez...@gmail.com>
AuthorDate: Tue Apr 5 12:14:20 2022 +0800

    ZOOKEEPER-4467: Format OpCode.addWatch in Request.op2String
    
    Changes:
    * Format `OpCode.addWatch` as "addWatch" in `Request.op2String`.
    
    Author: Kezhu Wang <kez...@gmail.com>
    
    Reviewers: Enrico Olivelli <eolive...@apache.org>, maoling 
<maol...@apache.org>
    
    Closes #1819 from kezhuw/ZOOKEEPER-4467-op_code_addWatch_string and 
squashes the following commits:
    
    97f891da1 [Kezhu Wang] fixup! ZOOKEEPER-4467: Format OpCode.addWatch in 
Request.op2String
    ebe6faa30 [Kezhu Wang] ZOOKEEPER-4467: Format OpCode.addWatch in 
Request.op2String
---
 .../main/java/org/apache/zookeeper/server/Request.java |  4 +++-
 .../java/org/apache/zookeeper/server/ToStringTest.java | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/Request.java 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/Request.java
index a68203b20..41e3d7fcd 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/Request.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/Request.java
@@ -355,7 +355,7 @@ public class Request {
             case OpCode.deleteContainer:
                 return "deleteContainer";
             case OpCode.createTTL:
-                return "createTtl";
+                return "createTTL";
             case OpCode.multiRead:
                 return "multiRead";
             case OpCode.auth:
@@ -364,6 +364,8 @@ public class Request {
                 return "setWatches";
             case OpCode.setWatches2:
                 return "setWatches2";
+            case OpCode.addWatch:
+                return "addWatch";
             case OpCode.sasl:
                 return "sasl";
             case OpCode.getEphemerals:
diff --git 
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ToStringTest.java 
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ToStringTest.java
index 365600fba..25f3f5643 100644
--- 
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ToStringTest.java
+++ 
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ToStringTest.java
@@ -18,8 +18,12 @@
 
 package org.apache.zookeeper.server;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
+import java.lang.reflect.Field;
 import org.apache.zookeeper.ZKTestCase;
+import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.proto.SetDataRequest;
 import org.junit.jupiter.api.Test;
 
@@ -37,4 +41,18 @@ public class ToStringTest extends ZKTestCase {
         assertNotSame("ERROR", req.toString());
     }
 
+    @Test
+    public void testOpCodeToString() throws Exception {
+        Class<?> clazz = ZooDefs.OpCode.class;
+        Field[] fields = clazz.getFields();
+
+        assertNotEquals(0, fields.length);
+
+        for (Field field : fields) {
+            int opCode = field.getInt(null);
+            String opString = Request.op2String(opCode);
+            assertEquals(field.getName(), opString);
+        }
+    }
+
 }