refactor: add centralized validation inside Op enum

jenkinsci · Nov 28, 2024 · 080895b · 080895b
1 parent 2f7440a
commit 080895b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/cli/src/main/java/hudson/cli/PlainCLIProtocol.java b/cli/src/main/java/hudson/cli/PlainCLIProtocol.java
@@ -77,6 +77,12 @@ private enum Op {
         Op(boolean clientSide) {
             this.clientSide = clientSide;
         }
+
+        void validate(boolean isClient) throws ProtocolException {
+            if (this.clientSide != isClient) {
+                throw new ProtocolException("Operation not allowed on this side: " + this);
+            }
+        }
     }
 
     interface Output extends Closeable {
@@ -273,7 +279,7 @@ abstract static class ServerSide extends EitherSide {
 
         @Override
         protected final boolean handle(Op op, DataInputStream dis) throws IOException {
-            assert op.clientSide;
+            op.validate(false);
             switch (op) {
             case ARG:
                 onArg(dis.readUTF());
@@ -332,7 +338,7 @@ abstract static class ClientSide extends EitherSide {
 
         @Override
         protected boolean handle(Op op, DataInputStream dis) throws IOException {
-            assert !op.clientSide;
+            op.validate(true);
             switch (op) {
             case EXIT:
                 onExit(dis.readInt());