refactor(wsdl): streamline WSDL handling, improve logging, and adjust…

core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java

@@ -56,6 +56,7 @@ public static void main(String[] args) {
     }
 
     private static void start(String[] args) {
+        log.debug("CLI started with args: {}", Arrays.toString(args));
         MembraneCommandLine commandLine = getMembraneCommandLine(args);
         if (commandLine.getCommand().isOptionSet("h")) {
             commandLine.getCommand().printHelp();
@@ -249,7 +250,7 @@ private static String getRulesFile(MembraneCommandLine cl) throws IOException {
                 try (InputStream ignored = rm.resolve(filename)) {
                     return filename;
                 } catch (ResourceRetrievalException e) {
-                    System.err.println("Could not open Membrane's configuration file: " + filename + " not found.");
+                    System.err.printf("Could not open Membrane's configuration file: %s not found.%n", filename);
                     System.exit(1);
                 }
             }
@@ -339,7 +340,7 @@ private static boolean canResolveConfigurationFile(ResolverMap rm, String try1,
         try (InputStream ignored = rm.resolve(try1)) {
             return true;
         } catch (Exception e) {
-            log.warn("Could not resolve path to configuration (attempt {}).", attempt, e);
+            log.warn("Could not resolve path to configuration (path: {} attempt: {}).", try1, attempt);
         }
         return false;
     }

core/src/main/java/com/predic8/membrane/core/http/Request.java

@@ -161,7 +161,6 @@ public boolean shouldNotContainBody() {
 				return header.getContentLength() == 0;
             return header.getFirstValue(TRANSFER_ENCODING) == null;
         }
-
 		return false;
 	}
 
@@ -185,7 +184,7 @@ public int estimateHeapSize() {
 
 	@Override
 	public <T extends Message> T createSnapshot(Runnable bodyUpdatedCallback, BodyCollectingMessageObserver.Strategy strategy, long limit) {
-		Request result = createMessageSnapshot(new Request(), bodyUpdatedCallback, strategy, limit);
+		var result = createMessageSnapshot(new Request(), bodyUpdatedCallback, strategy, limit);
 		result.setUri(getUri());
 		result.setMethod(getMethod());
 		return (T) result;
@@ -195,7 +194,7 @@ public final void writeSTOMP(OutputStream out, boolean retainBody) throws IOExce
 		out.write(getMethod().getBytes(UTF_8));
 		out.write(10);
 		for (HeaderField hf : header.getAllHeaderFields())
-			out.write((hf.getHeaderName().toString() + ":" + hf.getValue() + "\n").getBytes(UTF_8));
+			out.write(("%s:%s\n".formatted(hf.getHeaderName().toString(), hf.getValue())).getBytes(UTF_8));
 		out.write(10);
 		body.write(new PlainBodyTransferer(out), retainBody);
 	}

core/src/main/java/com/predic8/membrane/core/interceptor/InterceptorUtil.java

@@ -14,10 +14,11 @@
 package com.predic8.membrane.core.interceptor;
 
 import java.util.*;
+import java.util.function.*;
 
 public class InterceptorUtil {
 
-    public static  <T extends Interceptor> List<T> getInterceptors(List<Interceptor> interceptors, Class<T> clazz) {
+    public static <T extends Interceptor> List<T> getInterceptors(List<Interceptor> interceptors, Class<T> clazz) {
         return interceptors.stream().filter(i -> i.getClass().equals(clazz))
                 .map(clazz::cast)
                 .toList();
@@ -27,5 +28,47 @@ public static <T extends Interceptor> Optional<T> getFirstInterceptorOfType(List
         return getInterceptors(interceptors, type).stream().findFirst();
     }
 
+    /**
+     * Ensures that an interceptor of the given {@code type} is in the first position.
+     * <p>
+     * Behavior:
+     * - If an interceptor of exactly {@code type} exists, the first occurrence is moved to index 0.
+     * - If none exists, a new instance is created using {@code supplier}, inserted at index 0, and returned.
+     * - Returns {@link Optional#empty()} only if {@code supplier} returns {@code null}.
+     * <p>
+     * Notes:
+     * - Matches by exact class equality (same as {@link #getInterceptors(List, Class)}).
+     * - Modifies the provided list in place.
+     */
+    public static <T extends Interceptor> Optional<T> moveToFirstPosition(
+            List<Interceptor> interceptors,
+            Class<T> type,
+            Supplier<T> supplier
+    ) {
+        // Find first exact match
+        for (int i = 0; i < interceptors.size(); i++) {
+            Interceptor current = interceptors.get(i);
+            if (current != null && current.getClass().equals(type)) {
+                @SuppressWarnings("unchecked")
+                T typed = (T) current;
+
+                if (i != 0) {
+                    // Remove and re-add at front
+                    interceptors.remove(i);
+                    interceptors.addFirst(typed);
+                }
+                return Optional.of(typed);
+            }
+        }
+
+        // Not found: create and add
+        T created = supplier.get();
+        if (created == null) {
+            return Optional.empty();
+        }
+        interceptors.addFirst(created);
+        return Optional.of(created);
+    }
+
 }
 

core/src/main/java/com/predic8/membrane/core/interceptor/RelocatingInterceptor.java

@@ -43,16 +43,11 @@ public Outcome handleResponse(Exchange exc) {
 			return CONTINUE;
 		}
 
-		if (!wasGetRequest(exc)) {
+		if (! exc.getRequest().isGETRequest()) {
 			log.debug("{} HTTP method wasn't GET: No relocating done!",name);
 			return CONTINUE;
 		}
 
-		if (!hasContent(exc)) {
-			log.debug("{} No Content: No relocating done!",name);
-			return CONTINUE;
-		}
-
 		if (!exc.getResponse().isXML()) {
 			log.debug("{} Body contains no XML: No relocating done!",name);
 			return CONTINUE;
@@ -74,14 +69,6 @@ public Outcome handleResponse(Exchange exc) {
 
 	abstract void rewrite(Exchange exc) throws Exception;
 
-	private boolean hasContent(Exchange exc) {
-		return exc.getResponse().getHeader().getContentType() != null;
-	}
-
-	private boolean wasGetRequest(Exchange exc) {
-		return Request.METHOD_GET.equals(exc.getRequest().getMethod());
-	}
-
 	protected int getLocationPort(Exchange exc) {
 		if ("".equals(port)) {
 			return -1;

core/src/main/java/com/predic8/membrane/core/interceptor/WSDLInterceptor.java

@@ -18,6 +18,7 @@
 import com.predic8.membrane.core.exchange.*;
 import com.predic8.membrane.core.http.*;
 import com.predic8.membrane.core.transport.http.*;
+import com.predic8.membrane.core.util.*;
 import com.predic8.membrane.core.ws.relocator.*;
 import org.jetbrains.annotations.*;
 import org.slf4j.*;
@@ -30,13 +31,14 @@
 import static com.predic8.membrane.core.http.Header.*;
 import static com.predic8.membrane.core.http.Request.*;
 import static com.predic8.membrane.core.interceptor.Interceptor.Flow.Set.*;
+import static com.predic8.membrane.core.util.soap.WSDLUtil.*;
 import static java.nio.charset.StandardCharsets.*;
 
 /**
  * @description <p>The <i>wsdlRewriter</i> rewrites endpoint addresses of services and XML Schema locations in WSDL documents.</p>
  * @topic 5. Web Services with SOAP and WSDL
  */
-@MCElement(name = "wsdlRewriter", excludeFromFlow = true)
+@MCElement(name = "wsdlRewriter")
 public class WSDLInterceptor extends RelocatingInterceptor {
 
     private final static Logger log = LoggerFactory.getLogger(WSDLInterceptor.class.getName());
@@ -49,6 +51,11 @@ public class WSDLInterceptor extends RelocatingInterceptor {
     private boolean rewriteEndpoint = true;
     private HttpClient hc;
 
+    /**
+     * Path of the service location to rewrite
+     */
+    private String path;
+
     public WSDLInterceptor() {
         name = "wsdl rewriting";
         setAppliedFlow(RESPONSE_FLOW);
@@ -58,6 +65,29 @@ public WSDLInterceptor() {
     public void init() {
         super.init();
         hc = router.getHttpClientFactory().createClient(null);
+
+        if (path != null)
+            setPathRewriterOnWSDLInterceptor(path);
+    }
+
+    public void setPathRewriterOnWSDLInterceptor(String keypath) {
+        if (keypath == null)
+            return;
+        setPathRewriter(generatePathRewriter(keypath));
+    }
+
+    Relocator.@NotNull PathRewriter generatePathRewriter(String keypath) {
+        return path -> {
+            try {
+                if (path.contains("://")) {
+                    return new URL(new URL(path), keypath).toString();
+                }
+                return rewriteRelativeWsdlPath(path, URLUtil.getNameComponent(router.getConfiguration().getUriFactory(), keypath));
+            } catch (URISyntaxException | MalformedURLException e) {
+                log.error("Cannot parse URL {} - {}", path, e);
+                throw new RuntimeException(e);
+            }
+        };
     }
 
     @Override
@@ -200,8 +230,23 @@ public void setHost(String host) {
      * @example 4000
      */
     @MCAttribute
-    @Override
-    public void setPort(String port) {
-        super.setPort(port);
+    public void setPort(int port) {
+        super.setPort(Integer.toString(port));
+    }
+
+    /**
+     * When the wsdlRewriter is used in a SOAPProxy, the path is set to the path/uri from the SOAPProxy.
+     *
+     * @param path
+     * @description Path to use for the service location
+     * @default soapProxy/path/uri
+     */
+    @MCAttribute
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getPath() {
+        return path;
     }
 }

core/src/main/java/com/predic8/membrane/core/interceptor/server/WSDLPublisherInterceptor.java

@@ -30,7 +30,7 @@
 import static com.predic8.membrane.core.http.MimeType.*;
 import static com.predic8.membrane.core.http.Response.*;
 import static com.predic8.membrane.core.interceptor.Outcome.*;
-import static com.predic8.membrane.core.resolver.ResolverMap.combine;
+import static com.predic8.membrane.core.resolver.ResolverMap.*;
 
 /**
  * @description <p>
@@ -47,16 +47,18 @@ public class WSDLPublisherInterceptor extends AbstractInterceptor {
 
     private SOAPProxy soapProxy;
 
+    private String wsdl;
+
     public WSDLPublisherInterceptor() {
         name = "wsdl publisher";
     }
 
     /**
      * Note that this class fulfills two purposes:
      * <p>
-     * * During the initial processDocuments() run, the XSDs are enumerated.
+     * During the initial processDocuments() run, the XSDs are enumerated.
      * <p>
-     * * During later runs (as well as the initial run, but that's result is discarded),
+     * During later runs (as well as the initial run, but that result is discarded),
      * the documents are rewritten.
      */
     private final class RelativePathRewriter implements PathRewriter {
@@ -85,18 +87,31 @@ public String rewrite(String path) {
                         path = Integer.toString(n);
                     }
                 }
-                path = "./" + URLUtil.getName(router.getConfiguration().getUriFactory(), exc.getDestinations().getFirst()) + "?xsd=" + path;
+                path = "./" + URLUtil.getNameComponent(router.getConfiguration().getUriFactory(), exc.getDestinations().getFirst()) + "?xsd=" + path;
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
             return path;
         }
     }
 
+    @Override
+    public void init() {
+        super.init();
+
+        webServerInterceptor = new WebServerInterceptor();
+        webServerInterceptor.init(router);
+
+        // inherit wsdl="..." from SoapProxy
+        if (wsdl != null)
+            return;
+        getWSDLFromEmbeddingSOAPProxy();
+    }
+
     @GuardedBy("paths")
-    private final HashMap<Integer, String> paths = new HashMap<>();
+    private final Map<Integer, String> paths = new HashMap<>();
     @GuardedBy("paths")
-    private final HashMap<String, Integer> paths_reverse = new HashMap<>();
+    private final Map<String, Integer> paths_reverse = new HashMap<>();
     @GuardedBy("paths")
     private final Queue<String> documents_to_process = new LinkedList<>();
 
@@ -109,7 +124,7 @@ private void processDocuments(Exchange exc) {
                     String doc = documents_to_process.poll();
                     if (doc == null)
                         break;
-                    log.debug("WSDLPublisherInterceptor: processing {}", doc);
+                    log.debug("processing: {}", doc);
                     exc.setResponse(webServerInterceptor.createResponse(router.getResolverMap(), doc));
                     WSDLInterceptor wi = new WSDLInterceptor();
                     wi.setRewriteEndpoint(false);
@@ -122,8 +137,6 @@ private void processDocuments(Exchange exc) {
         }
     }
 
-    private String wsdl;
-
     public String getWsdl() {
         return wsdl;
     }
@@ -143,19 +156,6 @@ public void setWsdl(String wsdl) {
         }
     }
 
-    @Override
-    public void init() {
-        super.init();
-
-        webServerInterceptor = new WebServerInterceptor();
-        webServerInterceptor.init(router);
-
-        // inherit wsdl="..." from SoapProxy
-        if (wsdl != null)
-            return;
-        getWSDLFromEmbeddingSOAPProxy();
-    }
-
     private void getWSDLFromEmbeddingSOAPProxy() {
         if (soapProxy == null) {
             throw new ConfigurationException("<wsdlPublisher> can only be used within a <soapProxy> or needs to declare <wsdlPublisher wsdl='...'>");
@@ -170,7 +170,7 @@ public Outcome handleRequest(final Exchange exc) {
             return handleRequestInternal(exc);
         } catch (Exception e) {
             log.error("", e);
-            internal(router.getConfiguration().isProduction(),getDisplayName())
+            internal(router.getConfiguration().isProduction(), getDisplayName())
                     .detail("Could not return WSDL document!")
                     .exception(e)
                     .buildAndSetResponse(exc);
@@ -218,7 +218,7 @@ private Outcome handleRequestInternal(final Exchange exc) throws Exception {
             exc.setResponse(HttpUtil.setHTMLErrorResponse(Response.internalServerError(), "Bad parameter format.", ""));
             return ABORT;
         } catch (ResourceRetrievalException e) {
-            exc.setResponse(Response.notFound().build());
+            exc.setResponse(notFound().build());
             return ABORT;
         }
 
@@ -227,7 +227,7 @@ private Outcome handleRequestInternal(final Exchange exc) throws Exception {
 
     @Override
     public String getShortDescription() {
-        return "Publishes the WSDL at " + wsdl + " under \"?wsdl\" (as well as its dependent schemas under similar URLs).";
+        return "Publishes the WSDL at %s under \"?wsdl\" (as well as its dependent schemas under similar URLs).".formatted(wsdl);
     }
 
     public void setSoapProxy(SOAPProxy soapProxy) {

core/src/main/java/com/predic8/membrane/core/proxies/AbstractProxy.java

@@ -33,9 +33,6 @@ public abstract class AbstractProxy implements Proxy {
     protected String name = "";
     protected RuleKey key;
 
-    protected volatile boolean blockRequest;
-    protected volatile boolean blockResponse;
-
     protected List<Interceptor> interceptors = new ArrayList<>();
 
     private final RuleStatisticCollector ruleStatisticCollector = new RuleStatisticCollector();