From 059a6fb233c06c76f88fe90f35f0f8056b652ffb Mon Sep 17 00:00:00 2001
From: Nagarjun HP <nagarjunahp88@gmail.com>
Date: Tue, 23 Dec 2025 20:30:34 +0530
Subject: [PATCH 1/3] Fix SubscriptionModeConverter to handle null and invalid
 values

---
 .../common/protocol/SubscriptionModeConverter.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java
index bdb3c41acf..e3b05ff328 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java
@@ -25,7 +25,14 @@ public class SubscriptionModeConverter implements Converter<String, Subscription
 
     @Override
     public SubscriptionMode convert(String value) {
-        return SubscriptionMode.valueOf(value);
+       if(value==null || value.trim().isEmpty()){
+        return null;
+       }
+       try{
+        return SubscriptionMode.valueOf(value.trim().toUpperCase());
+       }catch (IllegalArgumentException e ){
+          return null;
+       }
     }
 
     @Override

From c601289ea7d772dde0c1eaad90cd4d2f0860c076 Mon Sep 17 00:00:00 2001
From: Nagarjun HP <nagarjunahp88@gmail.com>
Date: Tue, 23 Dec 2025 21:09:33 +0530
Subject: [PATCH 2/3] Add tests for SubscriptionModeConverter invalid values

---
 .../SubscriptionModeConverterTest.java        | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java

diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java
new file mode 100644
index 0000000000..1971883b62
--- /dev/null
+++ b/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java
@@ -0,0 +1,42 @@
+package org.apache.eventmesh.common.protocol;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class SubscriptionModeConverterTest {
+
+    private final SubscriptionModeConverter converter =
+            new SubscriptionModeConverter();
+
+    @Test
+    public void testNullValue() {
+        assertNull(converter.convert(null));
+    }
+
+    @Test
+    public void testEmptyValue() {
+        assertNull(converter.convert(""));
+    }
+
+    @Test
+    public void testInvalidValue() {
+        assertNull(converter.convert("invalid_value"));
+    }
+
+    @Test
+    public void testLowerCaseValue() {
+        assertEquals(
+                SubscriptionMode.CLUSTERING,
+                converter.convert("clustering")
+        );
+    }
+
+    @Test
+    public void testUpperCaseValue() {
+        assertEquals(
+                SubscriptionMode.BROADCASTING,
+                converter.convert("BROADCASTING")
+        );
+    }
+}
\ No newline at end of file

From b4e566f2050b4665bedd6390eaad2eb61ec90de4 Mon Sep 17 00:00:00 2001
From: Nagarjun HP <nagarjunahp88@gmail.com>
Date: Tue, 23 Dec 2025 21:49:56 +0530
Subject: [PATCH 3/3] style: align SubscriptionModeConverter and add tests for
 invalid values

---
 .../protocol/SubscriptionModeConverter.java   |  4 +-
 .../SubscriptionModeConverterTest.java        | 42 ++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java
index e3b05ff328..633abbbc14 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java
@@ -26,12 +26,12 @@ public class SubscriptionModeConverter implements Converter<String, Subscription
     @Override
     public SubscriptionMode convert(String value) {
        if(value==null || value.trim().isEmpty()){
-        return null;
+        return SubscriptionMode.UNRECOGNIZED;
        }
        try{
         return SubscriptionMode.valueOf(value.trim().toUpperCase());
        }catch (IllegalArgumentException e ){
-          return null;
+         return SubscriptionMode.UNRECOGNIZED;
        }
     }
 
diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java
index 1971883b62..ce9b0bd556 100644
--- a/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java
+++ b/eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java
@@ -2,41 +2,45 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class SubscriptionModeConverterTest {
 
-    private final SubscriptionModeConverter converter =
-            new SubscriptionModeConverter();
+    private final SubscriptionModeConverter converter = new SubscriptionModeConverter();
 
     @Test
-    public void testNullValue() {
-        assertNull(converter.convert(null));
+    public void testValidBroadcasting() {
+        SubscriptionMode result = converter.convert("BROADCASTING");
+        assertEquals(SubscriptionMode.BROADCASTING, result);
     }
 
     @Test
-    public void testEmptyValue() {
-        assertNull(converter.convert(""));
+    public void testValidClusteringLowerCase() {
+        SubscriptionMode result = converter.convert("clustering");
+        assertEquals(SubscriptionMode.CLUSTERING, result);
     }
 
     @Test
-    public void testInvalidValue() {
-        assertNull(converter.convert("invalid_value"));
+    public void testValidWithSpaces() {
+        SubscriptionMode result = converter.convert("  broadcasting  ");
+        assertEquals(SubscriptionMode.BROADCASTING, result);
     }
 
     @Test
-    public void testLowerCaseValue() {
-        assertEquals(
-                SubscriptionMode.CLUSTERING,
-                converter.convert("clustering")
-        );
+    public void testNullValue() {
+        SubscriptionMode result = converter.convert(null);
+        assertEquals(SubscriptionMode.UNRECOGNIZED, result);
     }
 
     @Test
-    public void testUpperCaseValue() {
-        assertEquals(
-                SubscriptionMode.BROADCASTING,
-                converter.convert("BROADCASTING")
-        );
+    public void testEmptyValue() {
+        SubscriptionMode result = converter.convert("");
+        assertEquals(SubscriptionMode.UNRECOGNIZED, result);
+    }
+
+    @Test
+    public void testInvalidValue() {
+        SubscriptionMode result = converter.convert("invalid_value");
+        assertEquals(SubscriptionMode.UNRECOGNIZED, result);
     }
 }
\ No newline at end of file