Move Constants.java to annot

core/src/main/java/com/predic8/membrane/core/Constants.java → 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.*;

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.*;

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 {
 

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.*;

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.*;
 

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.*;

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.*;
 

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.*;

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 {
 

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.*;

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.*;

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.*;

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 {

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 {
 

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 {
 

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 <i>httpClient</i> sends the request of an exchange to a Web

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.*;

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).

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.*;

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.*;

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.*;

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.

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.*;

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;

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.*;

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.*;

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.*;
 

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.*;

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;
 

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.*;

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.*;

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.*;

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;

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 {

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 {