Refactoring

membrane · Nov 14, 2024 · 8c9bbcb · 8c9bbcb
1 parent a852db2
commit 8c9bbcb
Show file tree

Hide file tree

Showing 13 changed files with 877 additions and 668 deletions.
diff --git a/core/src/main/java/com/predic8/membrane/core/Constants.java b/core/src/main/java/com/predic8/membrane/core/Constants.java
@@ -17,6 +17,7 @@
 import com.predic8.membrane.core.http.*;
 import com.predic8.membrane.core.interceptor.rest.*;
 
+import javax.xml.namespace.*;
 import java.io.*;
 import java.util.*;
 
@@ -58,6 +59,13 @@ public class Constants {
 	public static final String WSDL_SOAP11_NS = "http://schemas.xmlsoap.org/wsdl/soap/";
 	public static final String WSDL_SOAP12_NS = "http://schemas.xmlsoap.org/wsdl/soap12/";
 	public static final String WSDL_HTTP_NS = "http://schemas.xmlsoap.org/wsdl/http/";
+
+	public static final QName WSDL11_ADDRESS_SOAP11 = new QName(WSDL_SOAP11_NS,
+			"address");
+	public static final QName WSDL11_ADDRESS_SOAP12 = new QName(WSDL_SOAP12_NS,
+			"address");
+	public static final QName WSDL11_ADDRESS_HTTP = new QName(WSDL_HTTP_NS, "address");
+
 	public static final String WADL_NS = "http://wadl.dev.java.net/2009/02";
 	public static final String XSD_NS = "http://www.w3.org/2001/XMLSchema";
 

diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/RelocatingInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/RelocatingInterceptor.java
@@ -25,6 +25,8 @@
 import javax.xml.stream.XMLStreamException;
 import java.io.StringWriter;
 
+import static com.predic8.membrane.core.interceptor.Outcome.CONTINUE;
+
 abstract public class RelocatingInterceptor extends AbstractInterceptor {
 
 	private static Logger log = LoggerFactory.getLogger(RelocatingInterceptor.class.getName());
@@ -39,30 +41,30 @@ public Outcome handleResponse(Exchange exc) throws Exception {
 
 		if (exc.getRule() instanceof ProxyRule) {
 			log.debug(name + " ProxyRule found: No relocating done!");
-			return Outcome.CONTINUE;
+			return CONTINUE;
 		}
 
 		if (!wasGetRequest(exc)) {
 			log.debug(name + " HTTP method wasn't GET: No relocating done!");
-			return Outcome.CONTINUE;
+			return CONTINUE;
 		}
 
 		if (!hasContent(exc)) {
 			log.debug(name + " No Content: No relocating done!");
-			return Outcome.CONTINUE;
+			return CONTINUE;
 		}
 
 		if (!exc.getResponse().isXML()) {
 			log.debug(name + " Body contains no XML: No relocating done!");
-			return Outcome.CONTINUE;
+			return CONTINUE;
 		}
 
 		try {
 			rewrite(exc);
 		} catch (XMLStreamException e) {
 			throw new Exception("while rewriting " + exc.getRequestURI(), e);
 		}
-		return Outcome.CONTINUE;
+		return CONTINUE;
 	}
 
 	abstract void rewrite(Exchange exc) throws Exception;