improve Kotlin support

quarkusio · Jan 7, 2025 · e83c0c0 · e83c0c0
1 parent 4a42b5a
commit e83c0c0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...xt/deployment/src/main/java/io/quarkus/websockets/next/deployment/WebSocketProcessor.java b/...xt/deployment/src/main/java/io/quarkus/websockets/next/deployment/WebSocketProcessor.java
@@ -771,12 +771,13 @@ static String getPathPrefix(IndexView index, DotName enclosingClassName) {
 
     private void validateOnPingMessage(Callback callback) {
         if (KotlinUtils.isKotlinMethod(callback.method)) {
-            if (!callback.isReturnTypeVoid() && !callback.isKotlinSuspendFunctionReturningUnit()) {
+            if (!callback.isReturnTypeVoid() && !isUniVoid(callback.returnType())
+                    && !callback.isKotlinSuspendFunctionReturningUnit()) {
                 throw new WebSocketServerException(
-                        "@OnPingMessage callback must return Unit: " + callback.asString());
+                        "@OnPingMessage callback must return Unit or Uni<Void>: " + callback.asString());
             }
         } else {
-            if (callback.returnType().kind() != Kind.VOID && !WebSocketProcessor.isUniVoid(callback.returnType())) {
+            if (!callback.isReturnTypeVoid() && !isUniVoid(callback.returnType())) {
                 throw new WebSocketServerException(
                         "@OnPingMessage callback must return void or Uni<Void>: " + callback.asString());
             }