Move static method

entur · Jan 18, 2025 · 7141685 · 7141685
1 parent fde70ae
commit 7141685
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 26 deletions.
diff --git a/...ok-test/src/main/java/no/entur/logging/cloud/logbook/logbook/test/PrettyPrintingSink.java b/...ok-test/src/main/java/no/entur/logging/cloud/logbook/logbook/test/PrettyPrintingSink.java
@@ -74,7 +74,7 @@ protected void requestMessage(HttpRequest request, StringBuilder messageBuilder)
 
         String contentType = request.getContentType();
         boolean isJson = ContentType.isJsonMediaType(contentType);
-        boolean isXml = AbstractLogLevelLogstashLogbackSink.isXmlMediaType(contentType);
+        boolean isXml = isXmlMediaType(contentType);
 
         if(isJson || isXml) {
             final String body = request.getBodyAsString();
@@ -91,7 +91,7 @@ protected void responseMessage(Correlation correlation, HttpRequest request, Htt
 
         String contentType = response.getContentType();
         boolean isJson = ContentType.isJsonMediaType(contentType);
-        boolean isXml = AbstractLogLevelLogstashLogbackSink.isXmlMediaType(contentType);
+        boolean isXml = isXmlMediaType(contentType);
 
         if(isJson || isXml) {
             final String body = response.getBodyAsString();

diff --git a/...ook/src/main/java/no/entur/logging/cloud/logbook/AbstractLogLevelLogstashLogbackSink.java b/...ook/src/main/java/no/entur/logging/cloud/logbook/AbstractLogLevelLogstashLogbackSink.java
@@ -15,30 +15,6 @@
 
 public abstract class AbstractLogLevelLogstashLogbackSink extends AbstractLogLevelSink {
 
-    public static boolean isXmlMediaType(@Nullable final String contentType) {
-        if (contentType == null) {
-            return false;
-        }
-
-        String contentTypeWithoutEncoding;
-        // text/xml;charset=UTF-8
-        int index = contentType.indexOf(';');
-        if(index == -1) {
-            contentTypeWithoutEncoding = contentType;
-        } else {
-            contentTypeWithoutEncoding = contentType.substring(0, index).trim();
-        }
-
-        final String lowerCasedContentType = contentTypeWithoutEncoding.toLowerCase();
-
-        boolean isApplicationOrText = lowerCasedContentType.startsWith("application/") || lowerCasedContentType.startsWith("text/");
-        if(!isApplicationOrText) {
-            return false;
-        }
-
-        return lowerCasedContentType.endsWith("+xml") || lowerCasedContentType.endsWith("/xml");
-    }
-
     protected final MaxSizeJsonFilter maxSizeJsonFilter;
     protected final JsonValidator jsonValidator;
 

diff --git a/...t-response/logbook/src/main/java/no/entur/logging/cloud/logbook/AbstractLogLevelSink.java b/...t-response/logbook/src/main/java/no/entur/logging/cloud/logbook/AbstractLogLevelSink.java
@@ -3,12 +3,37 @@
 import org.slf4j.Marker;
 import org.zalando.logbook.*;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.function.BiConsumer;
 import java.util.function.BooleanSupplier;
 
 public abstract class AbstractLogLevelSink implements Sink {
 
+    public static boolean isXmlMediaType(@Nullable final String contentType) {
+        if (contentType == null) {
+            return false;
+        }
+
+        String contentTypeWithoutEncoding;
+        // text/xml;charset=UTF-8
+        int index = contentType.indexOf(';');
+        if(index == -1) {
+            contentTypeWithoutEncoding = contentType;
+        } else {
+            contentTypeWithoutEncoding = contentType.substring(0, index).trim();
+        }
+
+        final String lowerCasedContentType = contentTypeWithoutEncoding.toLowerCase();
+
+        boolean isApplicationOrText = lowerCasedContentType.startsWith("application/") || lowerCasedContentType.startsWith("text/");
+        if(!isApplicationOrText) {
+            return false;
+        }
+
+        return lowerCasedContentType.endsWith("+xml") || lowerCasedContentType.endsWith("/xml");
+    }
+
     protected final BooleanSupplier logLevelEnabled;
 
     protected final BiConsumer<Marker, String> logConsumer;