Make the class generation fail at build time when there are two

same-name sevice methods in the same Java package #1326

extensions/core/deployment/src/main/java/io/quarkiverse/cxf/deployment/QuarkusCxfProcessor.java

@@ -12,8 +12,10 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Random;
@@ -659,7 +661,7 @@ public InputSource resolveEntity(String publicId, String systemId) {
     private static class QuarkusCapture implements GeneratedClassClassLoaderCapture {
         private final ClassOutput classOutput;
 
-        private final Set<String> generatedClasses = new LinkedHashSet<>();
+        private final Map<String, byte[]> generatedClasses = new LinkedHashMap<>();
 
         QuarkusCapture(ClassOutput classOutput) {
             this.classOutput = classOutput;
@@ -668,12 +670,16 @@ private static class QuarkusCapture implements GeneratedClassClassLoaderCapture
         @Override
         public void capture(String name, byte[] bytes) {
             final String dotName = name.indexOf('.') >= 0 ? name : name.replace('/', '.');
-            if (!generatedClasses.contains(dotName)) {
-                final String slashName = name.indexOf('/') >= 0 ? name : name.replace('.', '/');
+            final String slashName = name.indexOf('/') >= 0 ? name : name.replace('.', '/');
+            final byte[] oldVal = generatedClasses.get(dotName);
+            if (oldVal != null && !Arrays.equals(oldVal, bytes)) {
+                throw new IllegalStateException("Cannot overwrite an existing generated class file " + slashName
+                        + " with a different content. Is there perhaps a naming clash among the methods of your service interfaces?");
+            } else {
                 classOutput.getSourceWriter(slashName);
                 LOGGER.debugf("Generated class %s", dotName);
                 classOutput.write(slashName, bytes);
-                generatedClasses.add(dotName);
+                generatedClasses.put(dotName, bytes);
             }
         }
 
@@ -682,7 +688,7 @@ public int getGeneratedClassesCount() {
         }
 
         public String[] getGeneratedClasses() {
-            return generatedClasses.toArray(new String[0]);
+            return generatedClasses.keySet().toArray(new String[0]);
         }
     }
 

extensions/core/deployment/src/test/java/io/quarkiverse/cxf/deployment/test/AsmNamingClashTest.java

@@ -0,0 +1,87 @@
+package io.quarkiverse.cxf.deployment.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkiverse.cxf.annotation.CXFClient;
+import io.quarkus.test.QuarkusUnitTest;
+
+/**
+ * A reproducer for https://github.com/quarkiverse/quarkus-cxf/issues/1326
+ */
+public class AsmNamingClashTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .withApplicationRoot(root -> root.addClasses(HelloServiceString.class, HelloServiceStringImpl.class))
+            .overrideConfigKey("quarkus.cxf.endpoint.\"/helloString\".implementor", HelloServiceStringImpl.class.getName())
+            .overrideConfigKey("quarkus.cxf.client.helloString.service-interface", HelloServiceString.class.getName())
+            .overrideConfigKey("quarkus.cxf.client.helloString.client-endpoint-url",
+                    "http://localhost:8081/services/helloString")
+            .overrideConfigKey("quarkus.cxf.endpoint.\"/helloInt\".implementor", HelloServiceIntImpl.class.getName())
+            .overrideConfigKey("quarkus.cxf.client.helloInt.service-interface", HelloServiceInt.class.getName())
+            .overrideConfigKey("quarkus.cxf.client.helloInt.client-endpoint-url", "http://localhost:8081/services/helloInt")
+            .assertException(t -> Assertions.assertThat(t).isInstanceOf(IllegalStateException.class)
+                    .hasMessageContaining(
+                            "Cannot overwrite an existing generated class file io/quarkiverse/cxf/deployment/test/jaxws_asm/Hello with a different content"));
+
+    @CXFClient("helloString")
+    HelloServiceString helloString;
+
+    @CXFClient("helloInt")
+    HelloServiceInt helloInt;
+
+    @Test
+    void payloadLogged() throws IOException {
+
+        Assertions.assertThat(helloString.hello("Joe")).isEqualTo("Hello Joe!");
+        Assertions.assertThat(helloInt.hello(42)).isEqualTo("Hello 42!");
+
+    }
+
+    @WebService(targetNamespace = "http://deployment.logging.features.cxf.quarkiverse.io/")
+    public interface HelloServiceString {
+
+        @WebMethod
+        String hello(String text);
+
+    }
+
+    @WebService(targetNamespace = "http://deployment.logging.features.cxf.quarkiverse.io/")
+    public interface HelloServiceInt {
+
+        @WebMethod
+        String hello(int i);
+
+    }
+
+    @WebService(serviceName = "HelloService")
+    public static class HelloServiceStringImpl implements HelloServiceString {
+
+        @WebMethod
+        @Override
+        public String hello(String text) {
+            return "Hello " + text + "!";
+        }
+
+    }
+
+    @WebService(serviceName = "HelloService")
+    public static class HelloServiceIntImpl implements HelloServiceInt {
+
+        @WebMethod
+        @Override
+        public String hello(int text) {
+            return "Hello " + text + "!";
+        }
+
+    }
+}

integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/MtomAwtResource.java

@@ -19,6 +19,7 @@
 import jakarta.ws.rs.core.Response;
 
 import io.quarkiverse.cxf.annotation.CXFClient;
+import io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers.ImageServiceWithWrappers;
 
 @Path("/mtom-awt-rest")
 @ApplicationScoped

integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/ImageData.java → integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/wrappers/ImageData.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.cxf.it.ws.mtom.awt.server;
+package io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers;
 
 import java.awt.Image;
 

integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/ImageResponse.java → integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/wrappers/ImageResponse.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.cxf.it.ws.mtom.awt.server;
+package io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers;
 
 import java.awt.Image;
 
@@ -33,4 +33,4 @@ public Image getReturn() {
     public void setReturn(Image data) {
         this._return = data;
     }
-}
+}

integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/ImageServiceWithWrappers.java → integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/wrappers/ImageServiceWithWrappers.java

@@ -1,4 +1,4 @@
-package io.quarkiverse.cxf.it.ws.mtom.awt.server;
+package io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers;
 
 import java.awt.Image;
 
@@ -16,12 +16,12 @@ public interface ImageServiceWithWrappers {
     public static final String NS = "https://quarkiverse.github.io/quarkiverse-docs/quarkus-cxf/test/mtom-awt-with-wrappers";
 
     @WebMethod
-    @ResponseWrapper(localName = "ImageResponse", targetNamespace = NS, className = "io.quarkiverse.cxf.it.ws.mtom.awt.server.ImageResponse")
+    @ResponseWrapper(localName = "ImageResponse", targetNamespace = NS, className = "io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers.ImageResponse")
     Image downloadImage(
             @WebParam(name = "name", targetNamespace = NS) String name);
 
     @WebMethod
-    @RequestWrapper(localName = "ImageData", targetNamespace = NS, className = "io.quarkiverse.cxf.it.ws.mtom.awt.server.ImageData")
+    @RequestWrapper(localName = "ImageData", targetNamespace = NS, className = "io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers.ImageData")
     String uploadImage(
             @WebParam(name = "data", targetNamespace = NS) Image data,
             @WebParam(name = "name", targetNamespace = NS) String name);

integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/ImageServiceWithWrappersImpl.java → integration-tests/mtom-awt/src/main/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/wrappers/ImageServiceWithWrappersImpl.java

@@ -1,12 +1,12 @@
-package io.quarkiverse.cxf.it.ws.mtom.awt.server;
+package io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers;
 
 import java.awt.Image;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import jakarta.jws.WebService;
 
-@WebService(name = "ImageServiceWithWrappers", serviceName = "ImageServiceWithWrappers", endpointInterface = "io.quarkiverse.cxf.it.ws.mtom.awt.server.ImageServiceWithWrappers", targetNamespace = ImageServiceWithWrappers.NS)
+@WebService(name = "ImageServiceWithWrappers", serviceName = "ImageServiceWithWrappers", endpointInterface = "io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers.ImageServiceWithWrappers", targetNamespace = ImageServiceWithWrappers.NS)
 public class ImageServiceWithWrappersImpl implements ImageServiceWithWrappers {
 
     public static final String MSG_SUCCESS = "Upload Successful";

integration-tests/mtom-awt/src/main/resources/application.properties

@@ -9,12 +9,12 @@ quarkus.cxf.client.imageServiceClient.endpoint-namespace = "https://quarkiverse.
 quarkus.cxf.client.imageServiceClient.endpoint-name = ImageService
 quarkus.cxf.client.imageServiceClient.native.runtime-initialized = true
 
-quarkus.cxf.endpoint."/mtom-aws-with-wrappers".implementor = io.quarkiverse.cxf.it.ws.mtom.awt.server.ImageServiceWithWrappersImpl
+quarkus.cxf.endpoint."/mtom-aws-with-wrappers".implementor = io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers.ImageServiceWithWrappersImpl
 quarkus.cxf.endpoint."/mtom-aws-with-wrappers".features = org.apache.cxf.ext.logging.LoggingFeature
 quarkus.cxf.endpoint."/mtom-aws-with-wrappers".handlers = io.quarkiverse.cxf.it.ws.mtom.awt.server.MtomEnforcer
 
 quarkus.cxf.client.imageServiceClientWithWrappers.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/mtom-aws-with-wrappers/ImageServiceWithWrappers
-quarkus.cxf.client.imageServiceClientWithWrappers.service-interface = io.quarkiverse.cxf.it.ws.mtom.awt.server.ImageServiceWithWrappers
+quarkus.cxf.client.imageServiceClientWithWrappers.service-interface = io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers.ImageServiceWithWrappers
 quarkus.cxf.client.imageServiceClientWithWrappers.endpoint-namespace = "https://quarkiverse.github.io/quarkiverse-docs/quarkus-cxf/test/mtom-awt-with-wrappers"
 quarkus.cxf.client.imageServiceClientWithWrappers.endpoint-name = ImageServiceWithWrappers
 quarkus.cxf.client.imageServiceClientWithWrappers.native.runtime-initialized = true

integration-tests/mtom-awt/src/test/java/io/quarkiverse/cxf/it/ws/mtom/awt/server/MtomAwtTest.java

@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkiverse.cxf.it.ws.mtom.awt.server.MtomAwtResource.ClientKey;
+import io.quarkiverse.cxf.it.ws.mtom.awt.server.wrappers.ImageServiceWithWrappersImpl;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;