fix: solve invalid java method name generation and handling multiple handlers (#1745)

ssala034 · web-flow · commit 91735c34b19f · 2025-11-12T15:23:58.000+01:00
Co-authored-by: ssala034 &lt;sh.salat@gmail.com&gt;
diff --git a/.changeset/lucky-zebras-wonder.md b/.changeset/lucky-zebras-wonder.md
@@ -0,0 +1,10 @@
+---
+"@asyncapi/generator-components": patch
+"@asyncapi/generator": patch
+---
+
+Fix invalid Java method name generation and properly handle multiple WebSocket handlers
+
+- Generate valid Java method names for WebSocket operation handlers with strange identifiers.
+- Produce distinct @OnTextMessage handler methods for each send operation and add safe default routing for unrecognized messages.
+- Update onClose/onOpen formatting.
diff --git a/packages/components/src/components/OnClose.js b/packages/components/src/components/OnClose.js
@@ -35,13 +35,14 @@ const websocketOnCloseMethod = {
   },
   java: {
     quarkus: (title) => {
-      const onCloseMethod = `@OnClose
-   public void onClose(CloseReason reason, WebSocketClientConnection connection) {
-      int code = reason.getCode();
-      LOG.info("Websocket disconnected from ${title} with Close code: " + code);
+      const onCloseMethod = `
+  @OnClose
+  public void onClose(CloseReason reason, WebSocketClientConnection connection) {
+    int code = reason.getCode();
+    LOG.info("Websocket disconnected from ${title} with Close code: " + code);
   }
 }`;
-      return { onCloseMethod, indent: 2 };
+      return { onCloseMethod, indent: 0 };
     }
   }
 };
diff --git a/packages/components/src/components/OnOpen.js b/packages/components/src/components/OnOpen.js
@@ -34,7 +34,7 @@ public void onOpen() {
     LOG.info("Connected to ${title} server");
     LOG.info(broadcastMessage);
 }`;
-      return { onOpenMethod, indent: 2 };
+      return { onOpenMethod, indent: 2, newLines: 2 };
     }
   }
 };
@@ -60,16 +60,18 @@ const resolveOpenConfig = (language, framework = '') => {
 export function OnOpen({ language, framework='', title }) {
   let onOpenMethod = '';
   let indent = 0;
+  let newLines = 0;
   
   if (websocketOnOpenMethod[language]) {
     const generateOnOpenCode = resolveOpenConfig(language, framework);
     const openResult = generateOnOpenCode(title);
     onOpenMethod = openResult.onOpenMethod;
     indent = openResult.indent ?? 0;
+    newLines = openResult.newLines ?? 1;
   }
 
   return (
-    <Text indent={indent}>
+    <Text newLines={newLines} indent={indent}>
       {onOpenMethod}
     </Text>
   );
diff --git a/packages/components/test/components/__snapshots__/OnClose.test.js.snap b/packages/components/test/components/__snapshots__/OnClose.test.js.snap
@@ -9,11 +9,11 @@ exports[`Testing of OnClose function render dart OnClose method 1`] = `
 
 exports[`Testing of OnClose function render java quarkas OnClose method 1`] = `
 "@OnClose
-     public void onClose(CloseReason reason, WebSocketClientConnection connection) {
-        int code = reason.getCode();
-        LOG.info(\\"Websocket disconnected from HoppscotchEchoWebSocketClient with Close code: \\" + code);
-    }
-  }"
+  public void onClose(CloseReason reason, WebSocketClientConnection connection) {
+    int code = reason.getCode();
+    LOG.info(\\"Websocket disconnected from HoppscotchEchoWebSocketClient with Close code: \\" + code);
+  }
+}"
 `;
 
 exports[`Testing of OnClose function render javascript OnClose method 1`] = `
diff --git a/packages/templates/clients/websocket/java/quarkus/README.md b/packages/templates/clients/websocket/java/quarkus/README.md
@@ -78,4 +78,33 @@ You can use our AsyncAPI's credentials to access different set of events produce
 5. Generate the template client with `node .\apps\generator\cli.js <path-to-custom-document> .\packages\templates\clients\websocket\java\quarkus\ -o outputClient --force-write --param server=<custom-server>`
 6. Navigate to `outputClient` or any other name you gave the output folder
 7. Run `mvn quarkus:dev`
-8. See the output in the terminal
+8. See the output in the terminal
+
+### Deploying with Kubernetes
+
+Quarkus can automatically generate Kubernetes manifests and container images using the Kubernetes extensions added in your template.
+
+Build your project with:
+
+```bash
+mvn clean package
+```
+
+This will generate Kubernetes manifests in `target/kubernetes/`. Deploy your app to a cluster with:
+
+```bash
+kubectl apply -f target/kubernetes/kubernetes.yml
+```
+
+> **Note:**  
+> The generated deployment uses an image like `username/quarkus-websocket:1.0.0-SNAPSHOT` by default.  
+> You can customize the image name in `application.properties`:
+>
+> ```properties
+> quarkus.container-image.group=quarkus
+> quarkus.container-image.name=demo-app
+> quarkus.container-image.tag=1.0
+> ```
+> The resulting image will be `quarkus/demo-app:1.0`.
+
+For more details, see the [Quarkus Kubernetes guide](https://quarkus.io/guides/deploying-to-kubernetes).
diff --git a/packages/templates/clients/websocket/java/quarkus/components/ClientConnector.js b/packages/templates/clients/websocket/java/quarkus/components/ClientConnector.js
@@ -2,8 +2,9 @@ import { Text } from '@asyncapi/generator-react-sdk';
 import InitConnector from './InitConnector';
 import { ConnectorFields } from './ConnectorFields';
 
-export default function ClientConnector({ clientName, query, pathName }) {
+export default function ClientConnector({ clientName, query, pathName, operations }) {
   const queryParamsArray = query && Array.from(query.entries());
+  const sendOperations = operations.filterBySend();
   if (!pathName) {
     pathName = '/';
   }
@@ -17,7 +18,7 @@ export default function ClientConnector({ clientName, query, pathName }) {
 public class ${clientName}Connector{`}
       </Text>
       <ConnectorFields clientName={clientName} queryParamsArray={queryParamsArray} />
-      <InitConnector queryParamsArray={queryParamsArray} pathName={pathName}/>
+      <InitConnector queryParamsArray={queryParamsArray} pathName={pathName} sendOperations={sendOperations} />
     </Text>
   );
 }
diff --git a/packages/templates/clients/websocket/java/quarkus/components/ClientFields.js b/packages/templates/clients/websocket/java/quarkus/components/ClientFields.js
@@ -5,7 +5,7 @@ export function ClientFields({ queryParams, clientName }) {
   let queryParamsVariables = '';
   const queryParamsArray = queryParams && Array.from(queryParams.entries());
   
-  if (queryParamsArray) {
+  if (queryParamsArray && queryParamsArray.length > 0) {
     queryParamsVariables = '\nprivate HashMap<String, String> params;\n';
     queryParamsVariables += queryParamsArray.map((param) => {
       const paramName = toCamelCase(param[0]);
diff --git a/packages/templates/clients/websocket/java/quarkus/components/InitConnector.js b/packages/templates/clients/websocket/java/quarkus/components/InitConnector.js
@@ -3,7 +3,7 @@ import TimedConnection from './TimedConnection';
 import URIParams from './URIParams';
 import { CloseConnection } from '@asyncapi/generator-components';
 
-export default function InitConnector({ queryParamsArray, pathName }) {
+export default function InitConnector({ queryParamsArray, pathName, sendOperations }) {
   return (
     <Text>
       {`
@@ -14,7 +14,7 @@ export default function InitConnector({ queryParamsArray, pathName }) {
             Log.info("Starting WebSocket connection attempt...");`}
       {
         (!queryParamsArray || queryParamsArray.length === 0) && (
-          <TimedConnection />
+          <TimedConnection sendOperations={sendOperations} />
         )
       }
       <URIParams queryParamsArray={queryParamsArray} pathName={pathName} />
diff --git a/packages/templates/clients/websocket/java/quarkus/components/OnTextMessageHandler.js b/packages/templates/clients/websocket/java/quarkus/components/OnTextMessageHandler.js
@@ -1,25 +1,55 @@
 import { Text } from '@asyncapi/generator-react-sdk';
+import { toCamelCase } from '@asyncapi/generator-helpers';
 
 export default function OnTextMessage({ sendOperations }) {
   return (
     <>
       {
+        // If there are operations, emit a single @OnTextMessage
+        (sendOperations && sendOperations.length !== 0) && (
+          <Text newLines={2} indent={2}>
+            {`@OnTextMessage
+public void handleTextMessage(String message, WebSocketClientConnection connection) {
+    LOG.info("Handler received text message: " + message);
+${sendOperations.map((operation, idx) => {
+            const methodName = operation.id();
+            const javaMethodName = toCamelCase(methodName);
+            const condition = idx === 0 ? `    if (message != null && message.contains("${methodName}")) {` : `    else if (message != null && message.contains("${methodName}")) {`;
+            return `${condition}
+        ${javaMethodName}(message, connection);
+    }`;
+          }).join('\n')}
+    else {
+        LOG.warn("Handler received unrecognized message type. Falling back to default handler.");
+        // Note: By default, we route unrecognized messages to the first operation handler.
+        // Depending on your business logic, you may want to change this behavior.
+        ${toCamelCase(sendOperations[0].id())}(message, connection);
+    }
+}`}
+          </Text>
+        )
+      }
+
+      {
+        // Generate handlers for each operation
         (sendOperations && sendOperations.length !== 0) && (
           sendOperations.map((operation) => {
-            const methodName = operation.id();          
+            const methodName = operation.id();
+            const javaMethodName = toCamelCase(methodName);
             return (
               <Text newLines={2} indent={2}>
-                {`@OnTextMessage
-public void ${methodName}(String message, WebSocketClientConnection connection) {
-    LOG.info("Received text message: " + message);
+                {`public void ${javaMethodName}(String message, WebSocketClientConnection connection) {
+    LOG.info("Processing ${methodName} type message: " + message);
+    // TODO: implement processing logic for ${methodName}
 }`}
               </Text>
             );
           })
-        )}
+        )
+      }
 
       {
-        // need a default handler
+        // No operations provided need a default handler
         (!sendOperations || sendOperations.length === 0) && (
           <Text newLines={2} indent={2}>
             {`@OnTextMessage
diff --git a/packages/templates/clients/websocket/java/quarkus/components/TimedConnection.js b/packages/templates/clients/websocket/java/quarkus/components/TimedConnection.js
@@ -1,10 +1,11 @@
 import { Text } from '@asyncapi/generator-react-sdk';
 
-export default function TimedConnection() {
+export default function TimedConnection({ sendOperations }) {
   const initialDelayMs = 2000;
   const messageCount = 5; 
   const messageIntervalMs = 5000; 
   const finalDelayMs = 10000; 
+  const firstOperationId = sendOperations && sendOperations.length > 0 ? sendOperations[0].id() : null;
   return (
     <Text newLines={2}>
       {`
@@ -15,7 +16,8 @@ export default function TimedConnection() {
 
             // Send ${messageCount} messages
             for (int i = 1; i <= ${messageCount}; i++) {
-                String msg = "Message #" + i + " from Quarkus";
+                // Send a message to any available operation by including its operation ID (i.e. "${firstOperationId}")
+                String msg = ${firstOperationId ? `"Message #" + i + " from Quarkus for ${firstOperationId}"` : '"Message #" + i + " from Quarkus"'};
                 connection.sendTextAndAwait(msg);
                 Log.info("Sent: " + msg);
                 Thread.sleep(${messageIntervalMs}); // Wait 5 seconds between messages
diff --git a/packages/templates/clients/websocket/java/quarkus/components/URIParams.js b/packages/templates/clients/websocket/java/quarkus/components/URIParams.js
@@ -18,7 +18,7 @@ export default function URIParams({ queryParamsArray, pathName }) {
         const paramName = toCamelCase(param[0]);
         const variableDefinition = `String ${paramName} = System.getenv("${paramName.toUpperCase()}");`;
         const errorCheck = `if(${paramName} == null || ${paramName}.isEmpty()){`;
-        const errorMessage = ` throw new IllegalArgumentException("Required environment variable ${paramName.toUpperCase()} is missing or empty");`;
+        const errorMessage = `throw new IllegalArgumentException("Required environment variable ${paramName.toUpperCase()} is missing or empty");`;
         const closingTag = '}';
 
         let additionalQuery = '';
diff --git a/packages/templates/clients/websocket/java/quarkus/template/pom.xml b/packages/templates/clients/websocket/java/quarkus/template/pom.xml
@@ -12,7 +12,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.23.0</quarkus.platform.version>
+        <quarkus.platform.version>3.25.2</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.5.2</surefire-plugin.version>
     </properties>
@@ -49,6 +49,20 @@
             <artifactId>quarkus-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <!-- K8s additions -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-jib</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/packages/templates/clients/websocket/java/quarkus/template/src/main/java/com/asyncapi/connector.java.js b/packages/templates/clients/websocket/java/quarkus/template/src/main/java/com/asyncapi/connector.java.js
@@ -9,11 +9,12 @@ export default async function ({ asyncapi, params }) {
   const queryParams = getQueryParams(asyncapi.channels());
   const clientConnectorName = `${clientName}Connector.java`;
   const pathName = server.pathname();
+  const operations = asyncapi.operations();
   
   return (
     <File name={clientConnectorName}>
       <ConnectorDependencies queryParams={queryParams}/>
-      <ClientConnector clientName={clientName} query={queryParams} pathName={pathName}/>
+      <ClientConnector clientName={clientName} query={queryParams} pathName={pathName} operations={operations} />
     </File>
   );
 }
diff --git a/packages/templates/clients/websocket/test/integration-test/__snapshots__/integration.test.js.snap b/packages/templates/clients/websocket/test/integration-test/__snapshots__/integration.test.js.snap

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import TimedConnection from './TimedConnection';`
`3`	`3`	`import URIParams from './URIParams';`
`4`	`4`	`import { CloseConnection } from '@asyncapi/generator-components';`
`5`	`5`
`6`		`-export default function InitConnector({ queryParamsArray, pathName }) {`
	`6`	`+export default function InitConnector({ queryParamsArray, pathName, sendOperations }) {`
`7`	`7`	`return (`
`8`	`8`	`<Text>`
`9`	`9`	{`
`@@ -14,7 +14,7 @@ export default function InitConnector({ queryParamsArray, pathName }) {`
`14`	`14`	Log.info("Starting WebSocket connection attempt...");`}
`15`	`15`	`{`
`16`	`16`	`(!queryParamsArray \|\| queryParamsArray.length === 0) && (`
`17`		`- <TimedConnection />`
	`17`	`+ <TimedConnection sendOperations={sendOperations} />`
`18`	`18`	`)`
`19`	`19`	`}`
`20`	`20`	`<URIParams queryParamsArray={queryParamsArray} pathName={pathName} />`