diff --git a/core/src/main/java/com/predic8/membrane/core/Constants.java b/annot/src/main/java/com/predic8/membrane/annot/Constants.java
similarity index 96%
rename from core/src/main/java/com/predic8/membrane/core/Constants.java
rename to annot/src/main/java/com/predic8/membrane/annot/Constants.java
index a464de6c98..bebbe4ba45 100644
--- a/core/src/main/java/com/predic8/membrane/core/Constants.java
+++ b/annot/src/main/java/com/predic8/membrane/annot/Constants.java
@@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. */
-package com.predic8.membrane.core;
-
-import com.predic8.membrane.core.http.*;
-import com.predic8.membrane.core.interceptor.rest.*;
+package com.predic8.membrane.annot;
import javax.xml.namespace.*;
import java.io.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java b/core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java
index 93ec5b6aea..188fc84177 100644
--- a/core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java
+++ b/core/src/main/java/com/predic8/membrane/core/cli/RouterCLI.java
@@ -33,7 +33,7 @@
import java.security.SecureRandom;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.cli.util.JwkGenerator.*;
import static com.predic8.membrane.core.config.spring.CheckableBeanFactory.*;
import static com.predic8.membrane.core.config.spring.TrackingFileSystemXmlApplicationContext.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/exchange/ExchangesUtil.java b/core/src/main/java/com/predic8/membrane/core/exchange/ExchangesUtil.java
index c23f985fde..f0ed8c2c8d 100644
--- a/core/src/main/java/com/predic8/membrane/core/exchange/ExchangesUtil.java
+++ b/core/src/main/java/com/predic8/membrane/core/exchange/ExchangesUtil.java
@@ -17,7 +17,7 @@
import java.time.*;
import java.time.format.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
public class ExchangesUtil {
diff --git a/core/src/main/java/com/predic8/membrane/core/exchangestore/FileExchangeStore.java b/core/src/main/java/com/predic8/membrane/core/exchangestore/FileExchangeStore.java
index 396af945d9..afa5dc3eb2 100644
--- a/core/src/main/java/com/predic8/membrane/core/exchangestore/FileExchangeStore.java
+++ b/core/src/main/java/com/predic8/membrane/core/exchangestore/FileExchangeStore.java
@@ -15,7 +15,6 @@
package com.predic8.membrane.core.exchangestore;
import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.*;
import com.predic8.membrane.core.exchange.*;
import com.predic8.membrane.core.http.*;
import com.predic8.membrane.core.interceptor.Interceptor.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/http/Chunk.java b/core/src/main/java/com/predic8/membrane/core/http/Chunk.java
index 7d45b1bc71..8d1f928746 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/Chunk.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/Chunk.java
@@ -15,7 +15,7 @@
package com.predic8.membrane.core.http;
-import com.predic8.membrane.core.*;
+import com.predic8.membrane.annot.Constants;
import java.io.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/http/ChunkedBody.java b/core/src/main/java/com/predic8/membrane/core/http/ChunkedBody.java
index ef28d87edd..9f07134489 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/ChunkedBody.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/ChunkedBody.java
@@ -20,7 +20,7 @@
import java.io.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.ChunkedBodyTransferer.*;
import static com.predic8.membrane.core.util.ByteUtil.readByteArray;
import static java.lang.Long.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/http/ChunkedBodyTransferer.java b/core/src/main/java/com/predic8/membrane/core/http/ChunkedBodyTransferer.java
index 22dfe5cfd7..b015202c35 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/ChunkedBodyTransferer.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/ChunkedBodyTransferer.java
@@ -13,7 +13,7 @@
limitations under the License. */
package com.predic8.membrane.core.http;
-import com.predic8.membrane.core.*;
+import com.predic8.membrane.annot.Constants;
import java.io.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/http/Header.java b/core/src/main/java/com/predic8/membrane/core/http/Header.java
index 531a650f68..68844f5a18 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/Header.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/Header.java
@@ -14,7 +14,7 @@
package com.predic8.membrane.core.http;
-import com.predic8.membrane.core.*;
+import com.predic8.membrane.annot.Constants;
import com.predic8.membrane.core.http.cookie.*;
import com.predic8.membrane.core.util.*;
import jakarta.mail.internet.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/http/HeaderField.java b/core/src/main/java/com/predic8/membrane/core/http/HeaderField.java
index 6b1d4aa829..6a6aa33ab5 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/HeaderField.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/HeaderField.java
@@ -15,7 +15,7 @@
package com.predic8.membrane.core.http;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
public class HeaderField {
diff --git a/core/src/main/java/com/predic8/membrane/core/http/Message.java b/core/src/main/java/com/predic8/membrane/core/http/Message.java
index 89db36f58d..a4e99afbf7 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/Message.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/Message.java
@@ -21,7 +21,7 @@
import java.io.*;
import java.nio.charset.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.util.ContentTypeDetector.EffectiveContentType.*;
import static com.predic8.membrane.core.util.ContentTypeDetector.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/http/Request.java b/core/src/main/java/com/predic8/membrane/core/http/Request.java
index 5bb5c54771..0dfc902bb7 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/Request.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/Request.java
@@ -24,7 +24,7 @@
import java.util.*;
import java.util.regex.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static java.nio.charset.StandardCharsets.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/http/Response.java b/core/src/main/java/com/predic8/membrane/core/http/Response.java
index 864577846c..32cab76a4b 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/Response.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/Response.java
@@ -26,7 +26,7 @@
import java.util.*;
import java.util.regex.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static com.predic8.membrane.core.http.Response.ResponseBuilder.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/http/xml/Exchange.java b/core/src/main/java/com/predic8/membrane/core/http/xml/Exchange.java
index ce962d3534..187716f43e 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/xml/Exchange.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/xml/Exchange.java
@@ -17,7 +17,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import com.predic8.membrane.core.Constants;
+import com.predic8.membrane.annot.Constants;
import com.predic8.membrane.core.config.AbstractXmlElement;
public class Exchange extends AbstractXmlElement {
diff --git a/core/src/main/java/com/predic8/membrane/core/http/xml/Request.java b/core/src/main/java/com/predic8/membrane/core/http/xml/Request.java
index 86443999a4..332077a81a 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/xml/Request.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/xml/Request.java
@@ -18,7 +18,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import com.predic8.membrane.core.Constants;
+import com.predic8.membrane.annot.Constants;
public class Request extends Message {
diff --git a/core/src/main/java/com/predic8/membrane/core/http/xml/Response.java b/core/src/main/java/com/predic8/membrane/core/http/xml/Response.java
index 247238d67f..c224ba4c64 100644
--- a/core/src/main/java/com/predic8/membrane/core/http/xml/Response.java
+++ b/core/src/main/java/com/predic8/membrane/core/http/xml/Response.java
@@ -19,7 +19,7 @@
import org.apache.commons.lang3.StringUtils;
-import com.predic8.membrane.core.Constants;
+import com.predic8.membrane.annot.Constants;
public class Response extends Message {
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/HTTPClientInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/HTTPClientInterceptor.java
index d4bc948576..2c96663857 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/HTTPClientInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/HTTPClientInterceptor.java
@@ -13,24 +13,32 @@
limitations under the License. */
package com.predic8.membrane.core.interceptor;
-import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.*;
-import com.predic8.membrane.core.exchange.*;
-import com.predic8.membrane.core.http.*;
-import com.predic8.membrane.core.proxies.*;
-import com.predic8.membrane.core.transport.http.*;
-import com.predic8.membrane.core.transport.http.client.*;
-import com.predic8.membrane.core.util.*;
-import org.slf4j.*;
-
-import java.io.*;
-import java.net.*;
+import com.predic8.membrane.annot.MCAttribute;
+import com.predic8.membrane.annot.MCChildElement;
+import com.predic8.membrane.annot.MCElement;
+import com.predic8.membrane.core.exchange.Exchange;
+import com.predic8.membrane.core.http.EmptyBody;
+import com.predic8.membrane.core.http.Request;
+import com.predic8.membrane.core.proxies.AbstractServiceProxy;
+import com.predic8.membrane.core.transport.http.HttpClient;
+import com.predic8.membrane.core.transport.http.ProtocolUpgradeDeniedException;
+import com.predic8.membrane.core.transport.http.client.HttpClientConfiguration;
+import com.predic8.membrane.core.util.URLUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
import static com.predic8.membrane.core.exceptions.ProblemDetails.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.Request.METHOD_GET;
-import static com.predic8.membrane.core.interceptor.Interceptor.Flow.Set.*;
-import static com.predic8.membrane.core.interceptor.Outcome.*;
+import static com.predic8.membrane.core.interceptor.Interceptor.Flow.Set.REQUEST_FLOW;
+import static com.predic8.membrane.core.interceptor.Outcome.ABORT;
+import static com.predic8.membrane.core.interceptor.Outcome.RETURN;
/**
* @description The httpClient sends the request of an exchange to a Web
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/IndexInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/IndexInterceptor.java
index 8b9688a998..87a8dda340 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/IndexInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/IndexInterceptor.java
@@ -15,7 +15,6 @@
import com.googlecode.jatl.*;
import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.*;
import com.predic8.membrane.core.exchange.*;
import com.predic8.membrane.core.http.*;
import com.predic8.membrane.core.proxies.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/MessageAnalyser.java b/core/src/main/java/com/predic8/membrane/core/interceptor/MessageAnalyser.java
index e1dfd72a4d..76e24de40d 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/MessageAnalyser.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/MessageAnalyser.java
@@ -15,7 +15,6 @@
package com.predic8.membrane.core.interceptor;
import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.*;
import com.predic8.membrane.core.exchange.*;
import com.predic8.membrane.core.http.*;
import com.predic8.membrane.core.multipart.*;
@@ -24,7 +23,7 @@
import javax.xml.stream.*;
import java.io.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
/**
* @description Analyses XML bodies and stores extracted root element + SOAP operation metadata in Exchange properties (request/response).
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/WSDLInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/WSDLInterceptor.java
index 3135688084..8a92491433 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/WSDLInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/WSDLInterceptor.java
@@ -27,7 +27,7 @@
import java.io.*;
import java.net.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
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.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/administration/AdminPageBuilder.java b/core/src/main/java/com/predic8/membrane/core/interceptor/administration/AdminPageBuilder.java
index 33ebf4dd4d..816ccb5cea 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/administration/AdminPageBuilder.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/administration/AdminPageBuilder.java
@@ -16,7 +16,7 @@
package com.predic8.membrane.core.interceptor.administration;
import com.googlecode.jatl.*;
-import com.predic8.membrane.core.*;
+import com.predic8.membrane.annot.Constants;
import com.predic8.membrane.core.interceptor.*;
import com.predic8.membrane.core.interceptor.Interceptor.*;
import com.predic8.membrane.core.interceptor.balancer.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/administration/DynamicAdminPageInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/administration/DynamicAdminPageInterceptor.java
index b8bcaf9f62..2ff97add01 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/administration/DynamicAdminPageInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/administration/DynamicAdminPageInterceptor.java
@@ -13,7 +13,7 @@
limitations under the License. */
package com.predic8.membrane.core.interceptor.administration;
-import com.predic8.membrane.core.*;
+import com.predic8.membrane.annot.Constants;
import com.predic8.membrane.core.exchange.*;
import com.predic8.membrane.core.exchangestore.*;
import com.predic8.membrane.core.http.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/balancer/XMLElementSessionIdExtractor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/balancer/XMLElementSessionIdExtractor.java
index c94dabe5ce..4af767e927 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/balancer/XMLElementSessionIdExtractor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/balancer/XMLElementSessionIdExtractor.java
@@ -13,17 +13,21 @@
limitations under the License. */
package com.predic8.membrane.core.interceptor.balancer;
-import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.*;
-import com.predic8.membrane.core.config.*;
-import com.predic8.membrane.core.exchange.*;
-import com.predic8.membrane.core.http.*;
-import com.predic8.membrane.core.interceptor.Interceptor.*;
-import com.predic8.xml.beautifier.*;
-import org.jetbrains.annotations.*;
-import org.slf4j.*;
-
-import javax.xml.stream.*;
+import com.predic8.membrane.annot.MCAttribute;
+import com.predic8.membrane.annot.MCElement;
+import com.predic8.membrane.annot.Required;
+import com.predic8.membrane.core.config.AbstractXmlElement;
+import com.predic8.membrane.core.exchange.Exchange;
+import com.predic8.membrane.core.http.Message;
+import com.predic8.membrane.core.interceptor.Interceptor.Flow;
+import com.predic8.xml.beautifier.XMLInputFactoryFactory;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
/**
* @description Extracts a session ID from an XML HTTP request body based on the qualified name of an XML element.
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/oauth2/authorizationservice/AuthorizationService.java b/core/src/main/java/com/predic8/membrane/core/interceptor/oauth2/authorizationservice/AuthorizationService.java
index 41a49703c5..67b82158ee 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/oauth2/authorizationservice/AuthorizationService.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/oauth2/authorizationservice/AuthorizationService.java
@@ -37,7 +37,7 @@
import java.io.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static com.predic8.membrane.core.http.Request.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/opentelemetry/OpenTelemetryConfigurator.java b/core/src/main/java/com/predic8/membrane/core/interceptor/opentelemetry/OpenTelemetryConfigurator.java
index e1bc94be3b..5a59ce0354 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/opentelemetry/OpenTelemetryConfigurator.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/opentelemetry/OpenTelemetryConfigurator.java
@@ -22,7 +22,7 @@
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
-import static com.predic8.membrane.core.Constants.VERSION;
+import static com.predic8.membrane.annot.Constants.VERSION;
import static io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator.getInstance;
import static io.opentelemetry.context.propagation.ContextPropagators.create;
import static io.opentelemetry.sdk.trace.export.BatchSpanProcessor.builder;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/rest/REST2SOAPInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/rest/REST2SOAPInterceptor.java
index eb92d7ca92..660acaa2e9 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/rest/REST2SOAPInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/rest/REST2SOAPInterceptor.java
@@ -30,7 +30,7 @@
import java.util.*;
import java.util.regex.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.exceptions.ProblemDetails.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.MimeType.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/rest/XML2HTTP.java b/core/src/main/java/com/predic8/membrane/core/interceptor/rest/XML2HTTP.java
index 2b8820cf78..bc5d8e4a28 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/rest/XML2HTTP.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/rest/XML2HTTP.java
@@ -13,7 +13,7 @@
limitations under the License. */
package com.predic8.membrane.core.interceptor.rest;
-import com.predic8.membrane.core.*;
+import com.predic8.membrane.annot.Constants;
import com.predic8.membrane.core.http.*;
import com.predic8.xml.beautifier.*;
import org.slf4j.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/AbstractXMLSchemaValidator.java b/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/AbstractXMLSchemaValidator.java
index 8ed2bb18c7..2667ec39ef 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/AbstractXMLSchemaValidator.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/AbstractXMLSchemaValidator.java
@@ -33,7 +33,7 @@
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.interceptor.Outcome.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/WSDLValidator.java b/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/WSDLValidator.java
index addc4dd56e..98447a34fc 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/WSDLValidator.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/WSDLValidator.java
@@ -31,7 +31,7 @@
import java.io.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.SoapVersion.*;
+import static com.predic8.membrane.annot.Constants.SoapVersion.*;
import static com.predic8.membrane.core.interceptor.Outcome.*;
import static com.predic8.membrane.core.util.SOAPUtil.FaultCode.*;
import static com.predic8.membrane.core.util.SOAPUtil.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/XMLSchemaValidator.java b/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/XMLSchemaValidator.java
index e8650bdc22..8d04220ed6 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/XMLSchemaValidator.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/XMLSchemaValidator.java
@@ -30,7 +30,7 @@
import java.io.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.exceptions.ProblemDetails.*;
import static com.predic8.membrane.core.http.Header.VALIDATION_ERROR_SOURCE;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/soap/SampleSoapServiceInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/soap/SampleSoapServiceInterceptor.java
index 5967b9cbf6..c0d624e77b 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/soap/SampleSoapServiceInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/soap/SampleSoapServiceInterceptor.java
@@ -27,7 +27,7 @@
import java.util.*;
import java.util.regex.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.exceptions.ProblemDetails.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.MimeType.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/soap/SoapOperationExtractor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/soap/SoapOperationExtractor.java
index 649f7fac77..5432f2145b 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/soap/SoapOperationExtractor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/soap/SoapOperationExtractor.java
@@ -15,7 +15,6 @@
package com.predic8.membrane.core.interceptor.soap;
import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.*;
import com.predic8.membrane.core.exchange.*;
import com.predic8.membrane.core.interceptor.*;
import com.predic8.membrane.core.multipart.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/soap/WebServiceExplorerInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/soap/WebServiceExplorerInterceptor.java
index 050216a2ba..80a1422a02 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/soap/WebServiceExplorerInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/soap/WebServiceExplorerInterceptor.java
@@ -36,7 +36,7 @@
import java.util.*;
import java.util.regex.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Response.ok;
import static com.predic8.membrane.core.interceptor.Outcome.*;
import static java.util.regex.Pattern.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/interceptor/xmlcontentfilter/SOAPStackTraceFilterInterceptor.java b/core/src/main/java/com/predic8/membrane/core/interceptor/xmlcontentfilter/SOAPStackTraceFilterInterceptor.java
index d49c637faa..03d1f225b3 100644
--- a/core/src/main/java/com/predic8/membrane/core/interceptor/xmlcontentfilter/SOAPStackTraceFilterInterceptor.java
+++ b/core/src/main/java/com/predic8/membrane/core/interceptor/xmlcontentfilter/SOAPStackTraceFilterInterceptor.java
@@ -21,7 +21,7 @@
import javax.xml.xpath.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.interceptor.Interceptor.Flow.Set.REQUEST_RESPONSE_ABORT_FLOW;
import static com.predic8.membrane.core.interceptor.Outcome.ABORT;
import static com.predic8.membrane.core.interceptor.Outcome.CONTINUE;
diff --git a/core/src/main/java/com/predic8/membrane/core/lang/spel/SpELExchangeEvaluationContext.java b/core/src/main/java/com/predic8/membrane/core/lang/spel/SpELExchangeEvaluationContext.java
index 1de53ec156..7747d1295f 100644
--- a/core/src/main/java/com/predic8/membrane/core/lang/spel/SpELExchangeEvaluationContext.java
+++ b/core/src/main/java/com/predic8/membrane/core/lang/spel/SpELExchangeEvaluationContext.java
@@ -31,7 +31,7 @@
import java.io.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.VERSION;
+import static com.predic8.membrane.annot.Constants.VERSION;
import static com.predic8.membrane.core.util.URLParamUtil.DuplicateKeyOrInvalidFormStrategy.*;
public class SpELExchangeEvaluationContext extends StandardEvaluationContext {
diff --git a/core/src/main/java/com/predic8/membrane/core/proxies/SSLableProxy.java b/core/src/main/java/com/predic8/membrane/core/proxies/SSLableProxy.java
index dcc27d4692..159d021d0d 100644
--- a/core/src/main/java/com/predic8/membrane/core/proxies/SSLableProxy.java
+++ b/core/src/main/java/com/predic8/membrane/core/proxies/SSLableProxy.java
@@ -14,12 +14,11 @@
package com.predic8.membrane.core.proxies;
-import com.predic8.membrane.annot.*;
-import com.predic8.membrane.core.*;
-import com.predic8.membrane.core.config.security.*;
-import com.predic8.membrane.core.kubernetes.client.*;
+import com.predic8.membrane.annot.MCAttribute;
+import com.predic8.membrane.annot.MCChildElement;
+import com.predic8.membrane.core.config.security.SSLParser;
import com.predic8.membrane.core.transport.ssl.*;
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.NotNull;
public class SSLableProxy extends AbstractProxy {
diff --git a/core/src/main/java/com/predic8/membrane/core/resolver/HTTPSchemaResolver.java b/core/src/main/java/com/predic8/membrane/core/resolver/HTTPSchemaResolver.java
index 3c6ec2e024..9e5fc20b6c 100644
--- a/core/src/main/java/com/predic8/membrane/core/resolver/HTTPSchemaResolver.java
+++ b/core/src/main/java/com/predic8/membrane/core/resolver/HTTPSchemaResolver.java
@@ -30,7 +30,7 @@
import java.util.*;
import java.util.concurrent.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.Request.Builder;
import static com.predic8.membrane.core.http.Request.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/transport/http/Connection.java b/core/src/main/java/com/predic8/membrane/core/transport/http/Connection.java
index 22b1d1e660..11a43fee2f 100644
--- a/core/src/main/java/com/predic8/membrane/core/transport/http/Connection.java
+++ b/core/src/main/java/com/predic8/membrane/core/transport/http/Connection.java
@@ -26,7 +26,7 @@
import java.net.*;
import java.util.Random;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.transport.http.ByteStreamLogging.wrapConnectionInputStream;
import static com.predic8.membrane.core.transport.http.ByteStreamLogging.wrapConnectionOutputStream;
import static com.predic8.membrane.core.util.text.TextUtil.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/transport/http/HttpServerHandler.java b/core/src/main/java/com/predic8/membrane/core/transport/http/HttpServerHandler.java
index 1c9eb32ef5..5806542bfc 100644
--- a/core/src/main/java/com/predic8/membrane/core/transport/http/HttpServerHandler.java
+++ b/core/src/main/java/com/predic8/membrane/core/transport/http/HttpServerHandler.java
@@ -14,26 +14,36 @@
package com.predic8.membrane.core.transport.http;
-import com.predic8.membrane.core.*;
-import com.predic8.membrane.core.exchange.*;
+import com.predic8.membrane.core.exchange.Exchange;
import com.predic8.membrane.core.http.*;
-import com.predic8.membrane.core.transport.http2.*;
-import com.predic8.membrane.core.transport.ssl.*;
-import com.predic8.membrane.core.util.*;
-import org.jetbrains.annotations.*;
-import org.slf4j.*;
-
-import javax.net.ssl.*;
+import com.predic8.membrane.core.transport.http2.Http2ServerHandler;
+import com.predic8.membrane.core.transport.http2.Http2TlsSupport;
+import com.predic8.membrane.core.transport.ssl.SSLProvider;
+import com.predic8.membrane.core.transport.ssl.TLSUnrecognizedNameException;
+import com.predic8.membrane.core.util.DNSCache;
+import com.predic8.membrane.core.util.EndOfStreamException;
+import com.predic8.membrane.core.util.Util;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLSocket;
import java.io.*;
-import java.net.*;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
import java.util.Random;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicInteger;
import static com.predic8.membrane.core.http.Header.CONNECTION;
import static com.predic8.membrane.core.http.Header.PROXY_CONNECTION;
import static com.predic8.membrane.core.transport.http.ByteStreamLogging.wrapConnectionInputStream;
import static com.predic8.membrane.core.transport.http.ByteStreamLogging.wrapConnectionOutputStream;
-import static com.predic8.membrane.core.transport.http.HttpServerHandler.RequestProcessingResult.*;
+import static com.predic8.membrane.core.transport.http.HttpServerHandler.RequestProcessingResult.continueWithConnection;
+import static com.predic8.membrane.core.transport.http.HttpServerHandler.RequestProcessingResult.terminateWithConnection;
import static com.predic8.membrane.core.transport.http.HttpServerThreadFactory.DEFAULT_THREAD_NAME;
import static com.predic8.membrane.core.util.text.StringUtil.maskNonPrintableCharacters;
import static com.predic8.membrane.core.util.text.StringUtil.truncateAfter;
diff --git a/core/src/main/java/com/predic8/membrane/core/transport/http/client/protocol/Http1ProtocolHandler.java b/core/src/main/java/com/predic8/membrane/core/transport/http/client/protocol/Http1ProtocolHandler.java
index 9260bb048e..c44da77cf0 100644
--- a/core/src/main/java/com/predic8/membrane/core/transport/http/client/protocol/Http1ProtocolHandler.java
+++ b/core/src/main/java/com/predic8/membrane/core/transport/http/client/protocol/Http1ProtocolHandler.java
@@ -26,7 +26,7 @@
import java.io.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.exceptions.ProblemDetails.*;
import static com.predic8.membrane.core.exchange.Exchange.*;
import static com.predic8.membrane.core.http.Header.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/transport/ssl/acme/AcmeClient.java b/core/src/main/java/com/predic8/membrane/core/transport/ssl/acme/AcmeClient.java
index 6e8f313714..56ad774db5 100644
--- a/core/src/main/java/com/predic8/membrane/core/transport/ssl/acme/AcmeClient.java
+++ b/core/src/main/java/com/predic8/membrane/core/transport/ssl/acme/AcmeClient.java
@@ -22,7 +22,6 @@
import com.predic8.membrane.core.config.security.acme.*;
import com.predic8.membrane.core.exchange.*;
import com.predic8.membrane.core.http.*;
-import com.predic8.membrane.core.kubernetes.client.*;
import com.predic8.membrane.core.router.*;
import com.predic8.membrane.core.transport.http.*;
import com.predic8.membrane.core.util.*;
@@ -61,7 +60,7 @@
import java.util.*;
import java.util.stream.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static com.predic8.membrane.core.http.Request.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/util/ContentTypeDetector.java b/core/src/main/java/com/predic8/membrane/core/util/ContentTypeDetector.java
index 1183710d80..398a5e70c6 100644
--- a/core/src/main/java/com/predic8/membrane/core/util/ContentTypeDetector.java
+++ b/core/src/main/java/com/predic8/membrane/core/util/ContentTypeDetector.java
@@ -21,7 +21,7 @@
import javax.xml.stream.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static com.predic8.membrane.core.util.ContentTypeDetector.EffectiveContentType.*;
import static com.predic8.membrane.core.util.ContentTypeDetector.EffectiveContentType.UNKNOWN;
diff --git a/core/src/main/java/com/predic8/membrane/core/util/HttpUtil.java b/core/src/main/java/com/predic8/membrane/core/util/HttpUtil.java
index e256e86c25..e3c07c424c 100644
--- a/core/src/main/java/com/predic8/membrane/core/util/HttpUtil.java
+++ b/core/src/main/java/com/predic8/membrane/core/util/HttpUtil.java
@@ -24,7 +24,7 @@
import java.text.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.X_FORWARDED_FOR;
import static com.predic8.membrane.core.http.MimeType.*;
import static com.predic8.membrane.core.http.Request.*;
diff --git a/core/src/main/java/com/predic8/membrane/core/util/SOAPUtil.java b/core/src/main/java/com/predic8/membrane/core/util/SOAPUtil.java
index ae89b8763d..07e5379e24 100644
--- a/core/src/main/java/com/predic8/membrane/core/util/SOAPUtil.java
+++ b/core/src/main/java/com/predic8/membrane/core/util/SOAPUtil.java
@@ -26,12 +26,11 @@
import javax.xml.stream.events.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static com.predic8.membrane.core.http.Response.*;
import static com.predic8.membrane.core.util.xml.XMLUtil.*;
import static javax.xml.stream.XMLInputFactory.*;
-import static org.apache.commons.text.StringEscapeUtils.*;
public class SOAPUtil {
diff --git a/core/src/main/java/com/predic8/membrane/core/util/TimerManager.java b/core/src/main/java/com/predic8/membrane/core/util/TimerManager.java
index b64370bd88..96bd52ae31 100644
--- a/core/src/main/java/com/predic8/membrane/core/util/TimerManager.java
+++ b/core/src/main/java/com/predic8/membrane/core/util/TimerManager.java
@@ -13,8 +13,8 @@
limitations under the License. */
package com.predic8.membrane.core.util;
-import com.predic8.membrane.core.*;
-import org.slf4j.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Timer;
import java.util.TimerTask;
diff --git a/core/src/main/java/com/predic8/membrane/core/util/WSDLUtil.java b/core/src/main/java/com/predic8/membrane/core/util/WSDLUtil.java
index e8c8e658c6..ce99e9507b 100644
--- a/core/src/main/java/com/predic8/membrane/core/util/WSDLUtil.java
+++ b/core/src/main/java/com/predic8/membrane/core/util/WSDLUtil.java
@@ -13,16 +13,16 @@
limitations under the License. */
package com.predic8.membrane.core.util;
-import com.predic8.membrane.core.*;
+import com.predic8.membrane.annot.Constants;
import com.predic8.wsdl.*;
import org.slf4j.*;
import javax.xml.namespace.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.SoapVersion.*;
-import static com.predic8.membrane.core.Constants.WSDL_SOAP11_NS;
-import static com.predic8.membrane.core.Constants.WSDL_SOAP12_NS;
+import static com.predic8.membrane.annot.Constants.SoapVersion.*;
+import static com.predic8.membrane.annot.Constants.WSDL_SOAP11_NS;
+import static com.predic8.membrane.annot.Constants.WSDL_SOAP12_NS;
import static com.predic8.membrane.core.util.WSDLUtil.Direction.*;
import static com.predic8.membrane.core.util.xml.XMLUtil.groovyToJavaxQName;
diff --git a/core/src/main/java/com/predic8/membrane/core/util/soap/WSDLUtil.java b/core/src/main/java/com/predic8/membrane/core/util/soap/WSDLUtil.java
index 73cea47a66..6fac93896b 100644
--- a/core/src/main/java/com/predic8/membrane/core/util/soap/WSDLUtil.java
+++ b/core/src/main/java/com/predic8/membrane/core/util/soap/WSDLUtil.java
@@ -14,7 +14,6 @@
package com.predic8.membrane.core.util.soap;
-import com.predic8.membrane.core.proxies.*;
import com.predic8.wsdl.*;
import org.slf4j.*;
@@ -22,7 +21,7 @@
import java.util.*;
import java.util.regex.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static java.util.regex.Matcher.quoteReplacement;
public class WSDLUtil {
diff --git a/core/src/main/java/com/predic8/membrane/core/util/text/TerminalColors.java b/core/src/main/java/com/predic8/membrane/core/util/text/TerminalColors.java
index 5e166b5b09..822cd9c189 100644
--- a/core/src/main/java/com/predic8/membrane/core/util/text/TerminalColors.java
+++ b/core/src/main/java/com/predic8/membrane/core/util/text/TerminalColors.java
@@ -14,7 +14,7 @@
package com.predic8.membrane.core.util.text;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
/**
* Provides ANSI terminal color codes with runtime enable/disable support.
diff --git a/core/src/main/java/com/predic8/membrane/core/ws/relocator/Relocator.java b/core/src/main/java/com/predic8/membrane/core/ws/relocator/Relocator.java
index 46e06a70c2..7feffa5d03 100644
--- a/core/src/main/java/com/predic8/membrane/core/ws/relocator/Relocator.java
+++ b/core/src/main/java/com/predic8/membrane/core/ws/relocator/Relocator.java
@@ -25,7 +25,7 @@
import java.net.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
@NotThreadSafe
public class Relocator {
diff --git a/core/src/test/java/com/predic8/membrane/core/exchange/ExchangesUtilTest.java b/core/src/test/java/com/predic8/membrane/core/exchange/ExchangesUtilTest.java
index cffcb6a87f..d0ea3cc9df 100644
--- a/core/src/test/java/com/predic8/membrane/core/exchange/ExchangesUtilTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/exchange/ExchangesUtilTest.java
@@ -14,7 +14,7 @@
package com.predic8.membrane.core.exchange;
-import com.predic8.membrane.core.Constants;
+import com.predic8.membrane.annot.Constants;
import com.predic8.membrane.core.http.Request;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core/src/test/java/com/predic8/membrane/core/http/ChunkedBodyTest.java b/core/src/test/java/com/predic8/membrane/core/http/ChunkedBodyTest.java
index 8d67fe8157..05536ee3a1 100644
--- a/core/src/test/java/com/predic8/membrane/core/http/ChunkedBodyTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/http/ChunkedBodyTest.java
@@ -38,7 +38,7 @@
import java.util.concurrent.atomic.*;
import static com.google.common.io.Resources.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.ChunkedBody.*;
import static com.predic8.membrane.core.http.ChunksBuilder.*;
import static com.predic8.membrane.core.http.Request.*;
diff --git a/core/src/test/java/com/predic8/membrane/core/http/ChunksBuilder.java b/core/src/test/java/com/predic8/membrane/core/http/ChunksBuilder.java
index a2eef5ea13..22dcc59545 100644
--- a/core/src/test/java/com/predic8/membrane/core/http/ChunksBuilder.java
+++ b/core/src/test/java/com/predic8/membrane/core/http/ChunksBuilder.java
@@ -13,7 +13,7 @@
limitations under the License. */
package com.predic8.membrane.core.http;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
public class ChunksBuilder {
diff --git a/core/src/test/java/com/predic8/membrane/core/http/ChunksBuilderTest.java b/core/src/test/java/com/predic8/membrane/core/http/ChunksBuilderTest.java
index da97a1ae6b..231d681fb8 100644
--- a/core/src/test/java/com/predic8/membrane/core/http/ChunksBuilderTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/http/ChunksBuilderTest.java
@@ -18,7 +18,7 @@
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.ChunksBuilder.chunks;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/core/src/test/java/com/predic8/membrane/core/http/RequestTest.java b/core/src/test/java/com/predic8/membrane/core/http/RequestTest.java
index 5b6ee5b9f2..b41adee1ca 100644
--- a/core/src/test/java/com/predic8/membrane/core/http/RequestTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/http/RequestTest.java
@@ -20,7 +20,7 @@
import java.io.*;
import java.net.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static com.predic8.membrane.core.http.Request.*;
import static com.predic8.membrane.core.util.HttpTestUtil.*;
diff --git a/core/src/test/java/com/predic8/membrane/core/interceptor/MessageAnalyserTest.java b/core/src/test/java/com/predic8/membrane/core/interceptor/MessageAnalyserTest.java
index e85874b534..eba46ab609 100644
--- a/core/src/test/java/com/predic8/membrane/core/interceptor/MessageAnalyserTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/interceptor/MessageAnalyserTest.java
@@ -13,13 +13,10 @@
limitations under the License. */
package com.predic8.membrane.core.interceptor;
-import com.predic8.membrane.core.*;
+import com.predic8.membrane.annot.Constants;
import com.predic8.membrane.core.exchange.*;
-import com.predic8.membrane.core.http.*;
import org.junit.jupiter.api.*;
-import java.io.*;
-
import static com.predic8.membrane.core.http.Request.post;
import static com.predic8.membrane.core.http.Response.ok;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/core/src/test/java/com/predic8/membrane/core/interceptor/WSDLInterceptorTest.java b/core/src/test/java/com/predic8/membrane/core/interceptor/WSDLInterceptorTest.java
index 732b52e4c9..90e21f15b9 100644
--- a/core/src/test/java/com/predic8/membrane/core/interceptor/WSDLInterceptorTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/interceptor/WSDLInterceptorTest.java
@@ -25,7 +25,7 @@
import java.io.*;
import java.util.regex.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Request.*;
import static com.predic8.membrane.core.http.Response.*;
import static com.predic8.membrane.core.interceptor.Outcome.*;
diff --git a/core/src/test/java/com/predic8/membrane/core/interceptor/schemavalidation/SOAPUtilTest.java b/core/src/test/java/com/predic8/membrane/core/interceptor/schemavalidation/SOAPUtilTest.java
index 909a80e81b..5362b48e4c 100644
--- a/core/src/test/java/com/predic8/membrane/core/interceptor/schemavalidation/SOAPUtilTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/interceptor/schemavalidation/SOAPUtilTest.java
@@ -22,7 +22,7 @@
import javax.xml.namespace.*;
import java.io.*;
-import static com.predic8.membrane.core.Constants.SoapVersion.*;
+import static com.predic8.membrane.annot.Constants.SoapVersion.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static com.predic8.membrane.core.http.Response.*;
import static com.predic8.membrane.core.util.SOAPUtil.*;
diff --git a/core/src/test/java/com/predic8/membrane/core/util/ByteUtilTest.java b/core/src/test/java/com/predic8/membrane/core/util/ByteUtilTest.java
index 5f7b827a71..1a90d7df9c 100644
--- a/core/src/test/java/com/predic8/membrane/core/util/ByteUtilTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/util/ByteUtilTest.java
@@ -19,7 +19,7 @@
import java.io.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.util.ByteUtil.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/core/src/test/java/com/predic8/membrane/core/util/HttpUtilTest.java b/core/src/test/java/com/predic8/membrane/core/util/HttpUtilTest.java
index 2c1541321e..3ed1595a8c 100644
--- a/core/src/test/java/com/predic8/membrane/core/util/HttpUtilTest.java
+++ b/core/src/test/java/com/predic8/membrane/core/util/HttpUtilTest.java
@@ -23,7 +23,7 @@
import java.net.*;
import java.util.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.util.HttpTestUtil.convertMessage;
import static com.predic8.membrane.core.util.HttpUtil.*;
diff --git a/core/src/test/java/com/predic8/membrane/integration/withoutinternet/interceptor/oauth2/OAuth2AuthorizationServerInterceptorBase.java b/core/src/test/java/com/predic8/membrane/integration/withoutinternet/interceptor/oauth2/OAuth2AuthorizationServerInterceptorBase.java
index e364f6d737..26ff984e8a 100644
--- a/core/src/test/java/com/predic8/membrane/integration/withoutinternet/interceptor/oauth2/OAuth2AuthorizationServerInterceptorBase.java
+++ b/core/src/test/java/com/predic8/membrane/integration/withoutinternet/interceptor/oauth2/OAuth2AuthorizationServerInterceptorBase.java
@@ -33,7 +33,7 @@
import java.util.concurrent.*;
import java.util.regex.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/core/src/test/java/com/predic8/membrane/integration/withoutinternet/interceptor/oauth2/OAuth2AuthorizationServerInterceptorNormalTest.java b/core/src/test/java/com/predic8/membrane/integration/withoutinternet/interceptor/oauth2/OAuth2AuthorizationServerInterceptorNormalTest.java
index 8fba223385..6304b449c5 100644
--- a/core/src/test/java/com/predic8/membrane/integration/withoutinternet/interceptor/oauth2/OAuth2AuthorizationServerInterceptorNormalTest.java
+++ b/core/src/test/java/com/predic8/membrane/integration/withoutinternet/interceptor/oauth2/OAuth2AuthorizationServerInterceptorNormalTest.java
@@ -22,7 +22,7 @@
import java.util.*;
import java.util.concurrent.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static com.predic8.membrane.core.http.Header.*;
import static com.predic8.membrane.core.http.MimeType.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/distribution/src/test/java/com/predic8/membrane/examples/withinternet/env/HelpLinkExistenceTest.java b/distribution/src/test/java/com/predic8/membrane/examples/withinternet/env/HelpLinkExistenceTest.java
index 0d56312d36..97ab0372fd 100644
--- a/distribution/src/test/java/com/predic8/membrane/examples/withinternet/env/HelpLinkExistenceTest.java
+++ b/distribution/src/test/java/com/predic8/membrane/examples/withinternet/env/HelpLinkExistenceTest.java
@@ -24,7 +24,7 @@
import org.junit.jupiter.api.Test;
import com.predic8.membrane.annot.MCElement;
-import com.predic8.membrane.core.Constants;
+import com.predic8.membrane.annot.Constants;
import com.predic8.membrane.core.router.DefaultRouter;
import com.predic8.membrane.core.http.Request;
import com.predic8.membrane.core.http.Response;
diff --git a/distribution/src/test/java/com/predic8/membrane/examples/withoutinternet/env/ConsistentVersionNumbers.java b/distribution/src/test/java/com/predic8/membrane/examples/withoutinternet/env/ConsistentVersionNumbers.java
index 7fc3795ce7..5f12839397 100644
--- a/distribution/src/test/java/com/predic8/membrane/examples/withoutinternet/env/ConsistentVersionNumbers.java
+++ b/distribution/src/test/java/com/predic8/membrane/examples/withoutinternet/env/ConsistentVersionNumbers.java
@@ -146,7 +146,7 @@ private static void transformRecursively(File baseDirectory, VersionTransformer
handleHelpReference(new File(baseDirectory.getAbsolutePath(), "/annot/src/main/java/com/predic8/membrane/annot/generator/HelpReference.java"), versionTransformer);
handleRpmSpec(new File(baseDirectory.getAbsolutePath(), "/membrane.spec"), versionTransformer);
- handleConstants(new File(baseDirectory.getAbsolutePath(), "core/src/main/java/com/predic8/membrane/core/Constants.java"), versionTransformer);
+ handleConstants(new File(baseDirectory.getAbsolutePath(), "annot/src/main/java/com/predic8/membrane/annot/Constants.java"), versionTransformer);
handleYamlSchemas(baseDirectory, versionTransformer);
handleDockerScripts(baseDirectory, versionTransformer);
diff --git a/distribution/src/test/java/com/predic8/membrane/tutorials/soap/AbstractCityServiceTest.java b/distribution/src/test/java/com/predic8/membrane/tutorials/soap/AbstractCityServiceTest.java
index 3c025907dd..a95cf51c21 100644
--- a/distribution/src/test/java/com/predic8/membrane/tutorials/soap/AbstractCityServiceTest.java
+++ b/distribution/src/test/java/com/predic8/membrane/tutorials/soap/AbstractCityServiceTest.java
@@ -18,7 +18,7 @@
import java.io.*;
-import static com.predic8.membrane.core.Constants.WSDL_SOAP11_NS;
+import static com.predic8.membrane.annot.Constants.WSDL_SOAP11_NS;
import static io.restassured.RestAssured.given;
import static io.restassured.http.ContentType.XML;
import static org.hamcrest.Matchers.containsString;
diff --git a/distribution/src/test/java/com/predic8/membrane/tutorials/soap/WSDLRewriterTutorialTest.java b/distribution/src/test/java/com/predic8/membrane/tutorials/soap/WSDLRewriterTutorialTest.java
index 1fb1c8e5cb..b0e0ac6fb7 100644
--- a/distribution/src/test/java/com/predic8/membrane/tutorials/soap/WSDLRewriterTutorialTest.java
+++ b/distribution/src/test/java/com/predic8/membrane/tutorials/soap/WSDLRewriterTutorialTest.java
@@ -18,7 +18,7 @@
import java.io.*;
-import static com.predic8.membrane.core.Constants.*;
+import static com.predic8.membrane.annot.Constants.*;
import static io.restassured.RestAssured.*;
import static io.restassured.http.ContentType.*;
import static org.hamcrest.Matchers.*;
diff --git a/war/src/main/java/com/predic8/membrane/servlet/MembraneServletContextListener.java b/war/src/main/java/com/predic8/membrane/servlet/MembraneServletContextListener.java
index 5352affd98..dcb7000c93 100644
--- a/war/src/main/java/com/predic8/membrane/servlet/MembraneServletContextListener.java
+++ b/war/src/main/java/com/predic8/membrane/servlet/MembraneServletContextListener.java
@@ -14,7 +14,6 @@
package com.predic8.membrane.servlet;
-import com.predic8.membrane.core.Constants;
import com.predic8.membrane.core.router.DefaultRouter;
import com.predic8.membrane.servlet.config.spring.BaseLocationXmlWebApplicationContext;
import jakarta.servlet.ServletContextEvent;
@@ -23,6 +22,8 @@
import org.slf4j.LoggerFactory;
import org.springframework.web.context.support.XmlWebApplicationContext;
+import static com.predic8.membrane.annot.Constants.PRODUCT_NAME;
+
public class MembraneServletContextListener implements ServletContextListener {
private static Logger log = LoggerFactory.getLogger(MembraneServletContextListener.class);
@@ -31,7 +32,7 @@ public class MembraneServletContextListener implements ServletContextListener {
public void contextInitialized(ServletContextEvent sce) {
try {
- log.info(Constants.PRODUCT_NAME + " starting...");
+ log.info(PRODUCT_NAME + " starting...");
log.debug("loading proxies configuration from: " + getProxiesXmlLocation(sce));
@@ -40,7 +41,7 @@ public void contextInitialized(ServletContextEvent sce) {
if (router != null)
throw new RuntimeException("A with a cannot be used with MembraneServletContextListener. Use MembraneServlet instead.");
- log.info(Constants.PRODUCT_NAME + " running.");
+ log.info(PRODUCT_NAME + " running.");
} catch (Exception ex) {
log.error("Router not started!", ex);
throw new RuntimeException("Router not started!", ex);