From a8000d5b959b570e1531d638bdbade23ff4cd3a5 Mon Sep 17 00:00:00 2001
From: jiejc1 <jiejc1@lenovo.com>
Date: Fri, 29 Mar 2024 17:07:15 +0800
Subject: [PATCH 1/3] fix: clean magic value, and update if-else to switch

---
 .../src/main/java/common/Client.java          | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/services/console-proxy/rdpconsole/src/main/java/common/Client.java b/services/console-proxy/rdpconsole/src/main/java/common/Client.java
index 742f5c9f0cd4..74ac15a6d6a9 100644
--- a/services/console-proxy/rdpconsole/src/main/java/common/Client.java
+++ b/services/console-proxy/rdpconsole/src/main/java/common/Client.java
@@ -47,6 +47,10 @@ enum Protocol {
         NONE, VNC, RDP, HYPERV
     }
 
+    private static final String VNC = "vnc";
+    private static final String RDP = "rdp";
+    private static final String HYPERV = "hyperv";
+
     // Common options
     private final Option help = new Option() {
         {
@@ -299,21 +303,25 @@ private Element setMainElementAndAddressBasedOnProtocol(Protocol protocol, SSLSt
 
     private Protocol parseOptions(String[] args) {
         String protocolName = (args.length > 0) ? args[0] : "";
-        Protocol protocol = Protocol.NONE;
+        Protocol protocol;
 
         Option[] options;
-        if (protocolName.equals("vnc")) {
-            protocol = Protocol.VNC;
-            options = join(commonOptions, vncOptions);
-        } else if (protocolName.equals("rdp")) {
-            protocol = Protocol.RDP;
-            options = join(commonOptions, rdpOptions);
-        } else if (protocolName.equals("hyperv")) {
-            protocol = Protocol.HYPERV;
-            options = join(commonOptions, hyperVOptions);
-        } else {
-            help();
-            return Protocol.NONE;
+        switch (protocolName) {
+            case VNC:
+                protocol = Protocol.VNC;
+                options = join(commonOptions, vncOptions);
+                break;
+            case RDP:
+                protocol = Protocol.RDP;
+                options = join(commonOptions, rdpOptions);
+                break;
+            case HYPERV:
+                protocol = Protocol.HYPERV;
+                options = join(commonOptions, hyperVOptions);
+                break;
+            default:
+                help();
+                return Protocol.NONE;
         }
 
         // Parse all options for given protocol
@@ -373,7 +381,7 @@ private Option[] join(Option[] a1, Option[] a2) {
         return result;
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         // *DEBUG*/System.setProperty("javax.net.debug", "ssl");
         // * DEBUG */System.setProperty("javax.net.debug", "ssl:record:packet");
 

From 78fac07cb9e0caca6e4a8eedd5c85a7038a6ed5d Mon Sep 17 00:00:00 2001
From: jiejc1 <jiejc1@lenovo.com>
Date: Fri, 29 Mar 2024 17:18:01 +0800
Subject: [PATCH 2/3] fix: return the (String args[])

---
 .../console-proxy/rdpconsole/src/main/java/common/Client.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/console-proxy/rdpconsole/src/main/java/common/Client.java b/services/console-proxy/rdpconsole/src/main/java/common/Client.java
index 74ac15a6d6a9..1830a8aab6cf 100644
--- a/services/console-proxy/rdpconsole/src/main/java/common/Client.java
+++ b/services/console-proxy/rdpconsole/src/main/java/common/Client.java
@@ -381,7 +381,7 @@ private Option[] join(Option[] a1, Option[] a2) {
         return result;
     }
 
-    public static void main(String[] args) {
+    public static void main(String args[]) {
         // *DEBUG*/System.setProperty("javax.net.debug", "ssl");
         // * DEBUG */System.setProperty("javax.net.debug", "ssl:record:packet");
 

From d29fda7712b3557649e7c42b8eb6a8d7f02be499 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Tue, 27 Jan 2026 16:27:53 +0530
Subject: [PATCH 3/3] review

---
 .../rdpconsole/src/main/java/common/Client.java  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/services/console-proxy/rdpconsole/src/main/java/common/Client.java b/services/console-proxy/rdpconsole/src/main/java/common/Client.java
index 1830a8aab6cf..972d5d753e8f 100644
--- a/services/console-proxy/rdpconsole/src/main/java/common/Client.java
+++ b/services/console-proxy/rdpconsole/src/main/java/common/Client.java
@@ -47,10 +47,6 @@ enum Protocol {
         NONE, VNC, RDP, HYPERV
     }
 
-    private static final String VNC = "vnc";
-    private static final String RDP = "rdp";
-    private static final String HYPERV = "hyperv";
-
     // Common options
     private final Option help = new Option() {
         {
@@ -214,7 +210,6 @@ private void help() {
     public void runClient(String[] args) {
 
         try {
-
             Protocol protocol = parseOptions(args);
             if (protocol == Protocol.NONE)
                 return;
@@ -306,17 +301,20 @@ private Protocol parseOptions(String[] args) {
         Protocol protocol;
 
         Option[] options;
-        switch (protocolName) {
+        try {
+            protocol = Protocol.valueOf(protocolName);
+        } catch (IllegalArgumentException e) {
+            protocol = Protocol.NONE;
+        }
+
+        switch (protocol) {
             case VNC:
-                protocol = Protocol.VNC;
                 options = join(commonOptions, vncOptions);
                 break;
             case RDP:
-                protocol = Protocol.RDP;
                 options = join(commonOptions, rdpOptions);
                 break;
             case HYPERV:
-                protocol = Protocol.HYPERV;
                 options = join(commonOptions, hyperVOptions);
                 break;
             default: