Remove org.apacha.commons:commons-lang3

Replace StringUtils.isBlank by custom implementations.

Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>

Author: KarstenSchnitter

cf-java-logging-support-core/pom.xml

@@ -21,12 +21,6 @@
             <version>${logback.version}</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.19.0</version>
-        </dependency>
     </dependencies>
 
     <parent>

cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/converter/LineWriter.java

@@ -1,7 +1,5 @@
 package com.sap.hcp.cf.logging.common.converter;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
@@ -12,7 +10,7 @@ public class LineWriter extends Writer {
 
     StringWriter sw = new StringWriter();
 
-    private List<String> lines = new LinkedList<String>();
+    private final List<String> lines = new LinkedList<String>();
 
     public LineWriter() {
     }
@@ -26,7 +24,7 @@ public List<String> getLines() {
      */
     @Override
     public void write(String str, int off, int len) {
-        if (StringUtils.isNotBlank(str)) {
+        if (str != null && !str.isBlank()) {
             lines.add(str);
         }
     }

cf-java-logging-support-log4j2/src/main/java/com/sap/hcp/cf/log4j2/filter/DynamicLevelPrefixLoggerFilter.java

@@ -1,7 +1,6 @@
 package com.sap.hcp.cf.log4j2.filter;
 
 import com.sap.hcp.cf.logging.common.helper.DynamicLogLevelHelper;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;
@@ -32,7 +31,11 @@ public Result filter(LogEvent event) {
 
     private Level getDynamicLevel(LogEvent event) {
         String logLevel = getContextValue(event, DynamicLogLevelHelper.MDC_DYNAMIC_LOG_LEVEL_KEY);
-        return StringUtils.isNotBlank(logLevel) ? Level.getLevel(logLevel) : null;
+        return isNotBlank(logLevel) ? Level.getLevel(logLevel) : null;
+    }
+
+    private static boolean isNotBlank(String string) {
+        return string != null && !string.isBlank();
     }
 
     private String getContextValue(LogEvent event, String key) {
@@ -54,7 +57,7 @@ private Result filter(Level level, Level dynamicLevel, String loggerFqcn, String
     }
 
     private boolean checkPackages(String loggerFqcn, String logLevelPackages) {
-        if (StringUtils.isNotBlank(logLevelPackages)) {
+        if (isNotBlank(logLevelPackages)) {
             for (String current: logLevelPackages.split(",")) {
                 if (loggerFqcn.startsWith(current)) {
                     return true;
@@ -84,7 +87,7 @@ public Result filter(final Logger logger, final Level level, final Marker marker
 
     private Level getMdcLevel() {
         String mdcLevel = MDC.get(DynamicLogLevelHelper.MDC_DYNAMIC_LOG_LEVEL_KEY);
-        return StringUtils.isNotBlank(mdcLevel) ? Level.getLevel(mdcLevel) : null;
+        return isNotBlank(mdcLevel) ? Level.getLevel(mdcLevel) : null;
     }
 
     private String getMdcPackages() {

cf-java-logging-support-log4j2/src/main/java/com/sap/hcp/cf/log4j2/layout/suppliers/BaseFieldSupplier.java

@@ -3,7 +3,6 @@
 import com.sap.hcp.cf.log4j2.converter.api.Log4jContextFieldSupplier;
 import com.sap.hcp.cf.logging.common.Defaults;
 import com.sap.hcp.cf.logging.common.Fields;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.core.LogEvent;
 
 import java.time.Instant;
@@ -32,13 +31,17 @@ public Map<String, Object> map(LogEvent event) {
         if (event.getThrown() != null) {
             Throwable throwable = event.getThrown();
             fields.put(Fields.EXCEPTION_TYPE, throwable.getClass().getName());
-            if (StringUtils.isNotBlank(throwable.getMessage())) {
+            if (isNotBlank(throwable.getMessage())) {
                 fields.put(Fields.EXCEPTION_MESSAGE, throwable.getMessage());
             }
         }
         return fields;
     }
 
+    private static boolean isNotBlank(String string) {
+        return string != null && !string.isBlank();
+    }
+
     private String getIsoTs(LogEvent event) {
         org.apache.logging.log4j.core.time.Instant instant = event.getInstant();
         return Instant.ofEpochSecond(instant.getEpochSecond(), instant.getNanoOfSecond()).toString();

cf-java-logging-support-logback/src/main/java/com/sap/hcp/cf/logback/encoder/BaseFieldSupplier.java

@@ -6,7 +6,6 @@
 import com.sap.hcp.cf.logging.common.Defaults;
 import com.sap.hcp.cf.logging.common.Fields;
 import com.sap.hcp.cf.logging.common.Markers;
-import org.apache.commons.lang3.StringUtils;
 
 import java.time.Instant;
 import java.util.HashMap;
@@ -34,13 +33,17 @@ public Map<String, Object> map(ILoggingEvent event) {
         if (event.getThrowableProxy() != null && event.getThrowableProxy() instanceof ThrowableProxy) {
             Throwable throwable = ((ThrowableProxy) event.getThrowableProxy()).getThrowable();
             fields.put(Fields.EXCEPTION_TYPE, throwable.getClass().getName());
-            if (StringUtils.isNotBlank(throwable.getMessage())) {
+            if (isNotBlank(throwable.getMessage())) {
                 fields.put(Fields.EXCEPTION_MESSAGE, throwable.getMessage());
             }
         }
         return fields;
     }
 
+    private static boolean isNotBlank(String string) {
+        return string != null && !string.isBlank();
+    }
+
     private String now() {
         Instant now = Instant.now();
         long timestamp = now.getEpochSecond() * 1_000_000_000L + now.getNano();

cf-java-logging-support-logback/src/main/java/com/sap/hcp/cf/logback/filter/DynamicLevelPrefixLoggerTurboFilter.java

@@ -5,7 +5,6 @@
 import ch.qos.logback.classic.turbo.TurboFilter;
 import ch.qos.logback.core.spi.FilterReply;
 import com.sap.hcp.cf.logging.common.helper.DynamicLogLevelHelper;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.MDC;
 import org.slf4j.Marker;
 
@@ -23,7 +22,7 @@ public FilterReply decide(final Marker marker, final Logger logger, final Level
 
     private boolean checkPackages(final Logger logger) {
         final String logLevelPackages = MDC.get(DynamicLogLevelHelper.MDC_DYNAMIC_LOG_LEVEL_PREFIXES);
-        if (StringUtils.isNotBlank(logLevelPackages)) {
+        if (isNotBlank(logLevelPackages)) {
             for (String current: logLevelPackages.split(",")) {
                 if (logger.getName().startsWith(current)) {
                     return true;
@@ -33,4 +32,8 @@ private boolean checkPackages(final Logger logger) {
         return false;
     }
 
+    private static boolean isNotBlank(String string) {
+        return string != null && !string.isBlank();
+    }
+
 }