Add unit test to prevent axiom loading with enableJSONOnly=true

Author: robertlazarski

modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/asyncdoclit/client/AsyncClient.java

@@ -23,7 +23,7 @@
 
 public class AsyncClient {
 
-    private static final int max_isasleep_check = 30;
+    private static final int max_isasleep_check = 60;
 
     /**
      * Auxiliary method used for doiing isAsleep checks. Will perform isAsleep

modules/jaxws-integration/test-resources/axis2_addressing.xml

@@ -173,7 +173,7 @@
     <!-- ================================================= -->
     <transportReceiver name="http"
                        class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port">9090</parameter>
+        <!-- <parameter name="port">9090</parameter> Port dynamically allocated by test framework -->
         <!-- Here is the complete list of supported parameters (see example settings further below):
             port: the port to listen on (default 6060)
             hostname:  if non-null, url prefix used in reply-to endpoint references                                 (default null)

modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java

@@ -73,8 +73,17 @@ protected void startServer(ConfigurationContext configurationContext) throws Thr
     @Override
     protected void stopServer() {
         System.out.println("[Axis2Server] stopServer() invoked, setting port to -1");
+        if (server != null) {
+            server.stop();
+            server = null;
+
+            // Add small delay to ensure port is fully released before next test
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
         port = -1;
-        server.stop();
-        server = null;
     }
 }

modules/testutils/src/main/java/org/apache/axis2/testutils/PortAllocator.java

@@ -20,20 +20,47 @@
 
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.util.concurrent.ThreadLocalRandom;
 
 public final class PortAllocator {
     private PortAllocator() {}
 
     /**
      * Allocate a TCP port.
-     * 
+     *
      * @return the allocated port
      */
     public static int allocatePort() {
         try {
             ServerSocket ss = new ServerSocket(0);
             int port = ss.getLocalPort();
             ss.close();
+
+            // Add retry mechanism to reduce race condition where another process
+            // grabs the port between close() and actual bind
+            for (int retry = 0; retry < 5; retry++) {
+                try {
+                    // Test if the port is still available by trying to bind again
+                    ServerSocket testSocket = new ServerSocket(port);
+                    testSocket.close();
+
+                    // Add small random delay to reduce parallel test conflicts
+                    if (retry > 0) {
+                        Thread.sleep(ThreadLocalRandom.current().nextInt(10, 50));
+                    }
+
+                    return port;
+                } catch (IOException bindEx) {
+                    // Port already taken, try allocating a new one
+                    ss = new ServerSocket(0);
+                    port = ss.getLocalPort();
+                    ss.close();
+                } catch (InterruptedException ie) {
+                    Thread.currentThread().interrupt();
+                    break;
+                }
+            }
+
             return port;
         } catch (IOException ex) {
             throw new Error("Unable to allocate TCP port", ex);

modules/transport/http/pom.xml

@@ -82,6 +82,11 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

modules/transport/http/src/main/java/org/apache/axis2/transport/http/AxisServlet.java

@@ -247,8 +247,10 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                     throw new ServletException(e2);
                 }
             } finally {
-                closeStaxBuilder(msgContext);
-                TransportUtils.deleteAttachments(msgContext);
+                if (!enableJSONOnly) {
+                    closeStaxBuilder(msgContext);
+                    TransportUtils.deleteAttachments(msgContext);
+                }
             }
         } else {
             if (!disableREST) {