Tutorials edits - Terminate on configuration error - Terminal Color

annot/src/main/java/com/predic8/membrane/annot/generator/JsonSchemaGenerator.java

@@ -39,6 +39,8 @@
  */
 public class JsonSchemaGenerator extends AbstractGrammar {
 
+    public static final String MEMBRANE_SCHEMA_JSON_FILENAME = "membrane.schema.json";
+
     private final Map<String, Boolean> topLevelAdded = new HashMap<>();
 
     public JsonSchemaGenerator(ProcessingEnvironment processingEnv) {
@@ -166,7 +168,7 @@ private FileObject createFile(MainInfo main) throws IOException {
                 .createResource(
                         CLASS_OUTPUT,
                         main.getAnnotation().outputPackage().replaceAll("\\.spring$", ".json"),
-                        "membrane.schema.json",
+                        MEMBRANE_SCHEMA_JSON_FILENAME,
                         sources.toArray(new Element[0])
                 );
     }

annot/src/main/java/com/predic8/membrane/annot/yaml/BeanRegistryImplementation.java

@@ -143,6 +143,7 @@ private void activationRun() {
                 uidsToRemove.add(bd.getUid());
             } catch (Exception e) {
                 log.error("Could not handle {} {}/{}", bd.getAction(), bd.getNamespace(), bd.getName(), e);
+                throw new RuntimeException(e);
             }
         }
         for (String uid : uidsToRemove)

core/src/main/java/com/predic8/membrane/core/Constants.java

@@ -25,7 +25,15 @@ public class Constants {
 
 	public static final String MEMBRANE_HOME = "MEMBRANE_HOME";
 
-	public static final String CRLF = "" + ((char) 13) + ((char) 10);
+    // Java System Properties
+
+    /**
+     * System property set by start script based on MEMBRANE_DISABLE_TERM_COLORS detection.
+     * Users should use the environment variable instead.
+     */
+    public static final String MEMBRANE_DISABLE_TERM_COLORS_PROPERTY = "membrane.disable.term.colors";
+
+    public static final String CRLF = "" + ((char) 13) + ((char) 10);
 
 	public static final byte[] CRLF_BYTES = { 13, 10 };
 
@@ -42,7 +50,7 @@ public class Constants {
 				Properties p = new Properties(); // Development
 				p.load(new FileInputStream("target/maven-archiver/pom.properties"));
 				version = p.getProperty("version") + " - DEVELOPMENT";
-			} catch (Exception e2) {
+			} catch (Exception ignored) {
 			}
 		}
 		VERSION = version;

core/src/main/java/com/predic8/membrane/core/Router.java

@@ -52,6 +52,7 @@
 import com.predic8.membrane.core.util.DNSCache;
 import com.predic8.membrane.core.util.TimerManager;
 import com.predic8.membrane.core.util.URIFactory;
+import com.predic8.membrane.core.util.text.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -67,10 +68,11 @@
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 
-import static com.predic8.membrane.core.Constants.PRODUCT_NAME;
-import static com.predic8.membrane.core.Constants.VERSION;
+import static com.predic8.membrane.core.Constants.*;
 import static com.predic8.membrane.core.jmx.JmxExporter.JMX_EXPORTER_NAME;
 import static com.predic8.membrane.core.util.DLPUtil.displayTraceWarning;
+import static com.predic8.membrane.core.util.text.TerminalColors.BRIGHT_CYAN;
+import static com.predic8.membrane.core.util.text.TerminalColors.RESET;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 
 /**
@@ -355,7 +357,11 @@ public void start() {
 
         ApiInfo.logInfosAboutStartedProxies(ruleManager);
         if (!asynchronousInitialization)
-            log.info("{} {} up and running!", PRODUCT_NAME, VERSION);
+            logStartupMessage();
+    }
+
+    private static void logStartupMessage() {
+        log.info("{}{} {} up and running!{}", BRIGHT_CYAN(), PRODUCT_NAME, VERSION, RESET());
     }
 
     private void startJmx() {
@@ -662,40 +668,25 @@ public GlobalInterceptor getGlobalInterceptor() {
         return globalInterceptor;
     }
 
-    public synchronized boolean isAsynchronousInitialization() {
-        return asynchronousInitialization;
-    }
-
     public synchronized void setAsynchronousInitialization(boolean asynchronousInitialization) {
         this.asynchronousInitialization = asynchronousInitialization;
         notifyAll();
     }
 
-    public synchronized void waitForAsynchronousInitialization() {
-        while (asynchronousInitialization) {
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
     public void handleAsynchronousInitializationResult(boolean success) {
         if (!success && !retryInit)
             System.exit(1);
         ApiInfo.logInfosAboutStartedProxies(ruleManager);
-        log.info("{} {} up and running!", PRODUCT_NAME, VERSION);
+        logStartupMessage();
         setAsynchronousInitialization(false);
     }
 
     @Override
     public void handleBeanEvent(BeanDefinition bd, Object bean, Object oldBean) throws IOException {
-        if (!(bean instanceof Proxy)) {
+        if (!(bean instanceof Proxy newProxy)) {
             throw new IllegalArgumentException("Bean must be a Proxy instance, but got: " + bean.getClass().getName());
         }
 
-        Proxy newProxy = (Proxy) bean;
         if (newProxy.getName() == null)
             newProxy.setName(bd.getName());
 

core/src/main/java/com/predic8/membrane/core/exchangestore/FileExchangeStore.java

@@ -29,7 +29,7 @@
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import static com.predic8.membrane.core.util.TextUtil.*;
+import static com.predic8.membrane.core.util.xml.XMLTextUtil.*;
 import static java.nio.charset.StandardCharsets.*;
 import static java.util.Calendar.*;
 

core/src/main/java/com/predic8/membrane/core/graphql/GraphQLProtectionInterceptor.java

@@ -21,6 +21,7 @@
 import com.predic8.membrane.core.http.*;
 import com.predic8.membrane.core.interceptor.*;
 import com.predic8.membrane.core.util.*;
+import com.predic8.membrane.core.util.text.*;
 import org.slf4j.*;
 
 import java.security.*;
@@ -29,6 +30,7 @@
 import static com.predic8.membrane.core.http.Request.METHOD_GET;
 import static com.predic8.membrane.core.http.Request.METHOD_POST;
 import static com.predic8.membrane.core.interceptor.Outcome.*;
+import static com.predic8.membrane.core.util.text.TextUtil.*;
 
 /**
  * @description Check GraphQL-over-HTTP requests, enforcing several limits and/or restrictions. This effectively helps to reduce
@@ -187,7 +189,7 @@ public String getLongDescription() {
                 "graphql-over-http/blob/a1e6d8ca248c9a19eb59a2eedd988c204909ee3f/spec/GraphQLOverHTTP.md\">" +
                 "GraphQL-over-HTTP</a> specs).<br/>" +
                 "GraphQL extensions: " + (allowExtensions ? "Allowed." : "Forbidden.") + "<br/>" +
-                "Allowed HTTP verbs: " + TextUtil.toEnglishList("and", allowedMethods.toArray(new String[0])) + ".<br/>" +
+                "Allowed HTTP verbs: " + toEnglishList("and", allowedMethods.toArray(new String[0])) + ".<br/>" +
                 "Maximum allowed nested query levels: " + maxDepth + "<br/>" +
                 "Maximum allowed recursion levels (nested repetitions of the same word): " + maxRecursion + ".</div>";
     }

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

@@ -25,7 +25,7 @@
 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.*;
-import static com.predic8.membrane.core.util.TextUtil.getCharset;
+import static com.predic8.membrane.core.util.text.TextUtil.getCharset;
 
 /**
  * A HTTP message (request or response).

core/src/main/java/com/predic8/membrane/core/interceptor/acl/Resource.java

@@ -28,7 +28,7 @@
 import com.predic8.membrane.core.Router;
 import com.predic8.membrane.core.config.AbstractXmlElement;
 import com.predic8.membrane.core.config.GenericComplexElement;
-import com.predic8.membrane.core.util.TextUtil;
+import com.predic8.membrane.core.util.text.TextUtil;
 
 public class Resource extends AbstractXmlElement {
 

core/src/main/java/com/predic8/membrane/core/interceptor/acl/matchers/GlobMatcher.java

@@ -15,7 +15,7 @@
 
 import com.predic8.membrane.core.interceptor.acl.TypeMatcher;
 
-import static com.predic8.membrane.core.util.TextUtil.globToRegExp;
+import static com.predic8.membrane.core.util.text.TextUtil.globToRegExp;
 import static java.util.regex.Pattern.compile;
 
 public class GlobMatcher implements TypeMatcher {

core/src/main/java/com/predic8/membrane/core/interceptor/administration/AdminPageBuilder.java

@@ -24,7 +24,6 @@
 import com.predic8.membrane.core.proxies.*;
 import com.predic8.membrane.core.proxies.Proxy;
 import com.predic8.membrane.core.transport.http.*;
-import com.predic8.membrane.core.util.*;
 import org.apache.commons.text.*;
 
 import java.io.*;
@@ -36,6 +35,7 @@
 import static com.predic8.membrane.core.interceptor.balancer.BalancerUtil.*;
 import static com.predic8.membrane.core.interceptor.balancer.Node.Status.*;
 import static com.predic8.membrane.core.util.URLParamUtil.*;
+import static com.predic8.membrane.core.util.xml.XMLTextUtil.isValidXMLSnippet;
 import static java.nio.charset.StandardCharsets.*;
 import static java.util.Objects.requireNonNull;
 import static org.apache.commons.lang3.time.DurationFormatUtils.*;
@@ -618,12 +618,12 @@ private void createInterceptorVisualization(Interceptor i, int columnSpan, Strin
             String longDescription = i.getLongDescription();
             boolean same = longDescription.equals(shortDescription);
 
-            if (!TextUtil.isValidXMLSnippet(shortDescription)) {
+            if (!isValidXMLSnippet(shortDescription)) {
                 shortDescription = StringEscapeUtils.escapeHtml4(shortDescription).replace("\n", "<br/>");
                 if (same)
                     longDescription = shortDescription;
             }
-            if (!same && !TextUtil.isValidXMLSnippet(longDescription)) {
+            if (!same && !isValidXMLSnippet(longDescription)) {
                 longDescription = StringEscapeUtils.escapeHtml4(longDescription).replace("\n", "<br/>");
             }
 
@@ -636,9 +636,9 @@ private void createInterceptorVisualization(Interceptor i, int columnSpan, Strin
 
             String iid = "i" + id;
             div().id("i" + id);
-            createHelpIcon(i, id);
+            createHelpIcon(i);
             if (!shortDescription.isEmpty() && !longDescription.equals(shortDescription)) {
-                createExpandIcon(i, id);
+                createExpandIcon(id);
             }
             end();
             createShowIconsScript(did, iid);
@@ -700,7 +700,7 @@ private void createInterceptorVisualization(Interceptor i, int columnSpan, Strin
         end();
     }
 
-    private void createExpandIcon(Interceptor i, String id) {
+    private void createExpandIcon(String id) {
         div().style("float:right;");
         span().id("e" + id).classAttr("ui-icon ui-icon-triangle-1-w").title("expand").end();
         end();
@@ -709,7 +709,7 @@ private void createExpandIcon(Interceptor i, String id) {
         end();
     }
 
-    private void createHelpIcon(Interceptor i, String id) {
+    private void createHelpIcon(Interceptor i) {
         String helpId = i.getHelpId();
         if (helpId != null) {
             div().style("float:right;");

core/src/main/java/com/predic8/membrane/core/interceptor/administration/AdminRESTInterceptor.java

@@ -36,7 +36,7 @@
 import static com.predic8.membrane.core.http.Response.ok;
 import static com.predic8.membrane.core.transport.http2.Http2ServerHandler.*;
 import static com.predic8.membrane.core.util.ComparatorFactory.*;
-import static com.predic8.membrane.core.util.TextUtil.*;
+import static com.predic8.membrane.core.util.xml.XMLTextUtil.formatXML;
 import static java.nio.charset.StandardCharsets.*;
 
 @SuppressWarnings("unused")

core/src/main/java/com/predic8/membrane/core/interceptor/groovy/GroovyInterceptor.java

@@ -28,7 +28,7 @@
 import java.util.*;
 
 import static com.predic8.membrane.core.interceptor.Interceptor.Flow.Set.*;
-import static com.predic8.membrane.core.util.TextUtil.*;
+import static com.predic8.membrane.core.util.text.TextUtil.*;
 import static org.apache.commons.text.StringEscapeUtils.*;
 
 /**

core/src/main/java/com/predic8/membrane/core/interceptor/javascript/JavascriptInterceptor.java

@@ -20,7 +20,7 @@
 import com.predic8.membrane.core.util.*;
 import org.slf4j.*;
 
-import static com.predic8.membrane.core.util.TextUtil.*;
+import static com.predic8.membrane.core.util.text.TextUtil.*;
 import static org.apache.commons.lang3.StringUtils.*;
 import static org.apache.commons.text.StringEscapeUtils.*;
 

core/src/main/java/com/predic8/membrane/core/interceptor/jwt/Jwks.java

@@ -22,7 +22,7 @@
 import com.predic8.membrane.core.config.security.Blob;
 import com.predic8.membrane.core.interceptor.oauth2.authorizationservice.AuthorizationService;
 import com.predic8.membrane.core.resolver.ResolverMap;
-import com.predic8.membrane.core.util.TextUtil;
+import com.predic8.membrane.core.util.text.TextUtil;
 
 import java.io.IOException;
 import java.io.InputStream;

core/src/main/java/com/predic8/membrane/core/interceptor/log/LogInterceptor.java

@@ -20,6 +20,7 @@
 import com.predic8.membrane.core.interceptor.*;
 import com.predic8.membrane.core.interceptor.lang.*;
 import com.predic8.membrane.core.lang.*;
+import com.predic8.membrane.core.util.text.*;
 import org.slf4j.*;
 
 import java.io.*;
@@ -28,6 +29,7 @@
 import static com.predic8.membrane.core.interceptor.Interceptor.Flow.ABORT;
 import static com.predic8.membrane.core.interceptor.Outcome.*;
 import static com.predic8.membrane.core.interceptor.log.LogInterceptor.Level.*;
+import static com.predic8.membrane.core.util.text.TerminalColors.*;
 import static org.slf4j.LoggerFactory.*;
 
 /**
@@ -39,6 +41,8 @@
  *   <li>Operational visibility in production (metadata-only, masked values, message, body).</li>
  * </ul>
  * </p>
+ * When supported, the log uses terminal colors to make the output easier to read and find. To overwrite the detection
+ * of color support, set the system property <code>MEMBRANE_TERM_COLORS</code> to <code>true</code> or <code>false</code>.
  * @topic 4. Monitoring, Logging and Statistics
  */
 @MCElement(name = "log")
@@ -133,13 +137,12 @@ private static String dumpBody(Message msg) {
     }
 
     private void writeLog(String msg) {
-
         switch (level) {
             case TRACE -> getLogger(category).trace(msg);
             case DEBUG -> getLogger(category).debug(msg);
-            case INFO -> getLogger(category).info(msg);
-            case WARN -> getLogger(category).warn(msg);
-            case ERROR, FATAL -> getLogger(category).error(msg);
+            case INFO -> getLogger(category).info(brightBlue( msg));
+            case WARN -> getLogger(category).warn(brightMagenta( msg));
+            case ERROR, FATAL -> getLogger(category).error(brightRed(msg));
         }
     }
 

core/src/main/java/com/predic8/membrane/core/interceptor/log/access/AccessLogInterceptorService.java

@@ -17,7 +17,6 @@
 
 import com.predic8.membrane.core.exchange.*;
 import com.predic8.membrane.core.http.*;
-import com.predic8.membrane.core.interceptor.log.AccessLogInterceptor;
 import com.predic8.membrane.core.interceptor.log.AdditionalVariable;
 import com.predic8.membrane.core.lang.spel.*;
 import org.slf4j.*;
@@ -29,7 +28,7 @@
 import java.util.stream.*;
 
 import static com.predic8.membrane.core.interceptor.Interceptor.Flow.*;
-import static com.predic8.membrane.core.util.TextUtil.*;
+import static com.predic8.membrane.core.util.text.TextUtil.*;
 
 public class AccessLogInterceptorService {
 

core/src/main/java/com/predic8/membrane/core/interceptor/rewrite/RewriteInterceptor.java

@@ -30,7 +30,7 @@
 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.rewrite.RewriteInterceptor.Type.*;
-import static com.predic8.membrane.core.util.TextUtil.*;
+import static com.predic8.membrane.core.util.text.TextUtil.*;
 import static java.util.Locale.US;
 
 /**

core/src/main/java/com/predic8/membrane/core/interceptor/schemavalidation/ValidatorInterceptor.java

@@ -33,7 +33,7 @@
 import static com.predic8.membrane.core.interceptor.Outcome.ABORT;
 import static com.predic8.membrane.core.interceptor.Outcome.*;
 import static com.predic8.membrane.core.resolver.ResolverMap.*;
-import static com.predic8.membrane.core.util.TextUtil.linkURL;
+import static com.predic8.membrane.core.util.text.TextUtil.linkURL;
 
 /**
  * Basically switches over {@link WSDLValidator}, {@link XMLSchemaValidator},

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

@@ -20,6 +20,7 @@
 import com.predic8.membrane.core.interceptor.*;
 import com.predic8.membrane.core.resolver.*;
 import com.predic8.membrane.core.util.*;
+import com.predic8.membrane.core.util.text.*;
 import org.apache.commons.lang3.*;
 import org.jetbrains.annotations.*;
 import org.slf4j.*;
@@ -36,6 +37,7 @@
 import static com.predic8.membrane.core.interceptor.Outcome.*;
 import static com.predic8.membrane.core.resolver.ResolverMap.combine;
 import static com.predic8.membrane.core.util.HttpUtil.*;
+import static com.predic8.membrane.core.util.text.TextUtil.*;
 import static java.lang.System.currentTimeMillis;
 
 /**
@@ -313,7 +315,7 @@ public void setGenerateIndex(boolean generateIndex) {
 
     @Override
     public String getShortDescription() {
-        return "Serves static files from<br/>" + TextUtil.linkURL(docBase) + " .";
+        return "Serves static files from<br/>" + linkURL(docBase) + " .";
     }
 
 }