Handle deprecation of Logback Markers

The old method providing the first marker was deprecated. This implementation can
now handle the entire marker list. It is sufficient for a request log if the list contains
the request marker.

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

Author: KarstenSchnitter

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/request/RequestRecordBuilderTest.java

@@ -1,7 +1,6 @@
 package com.sap.hcp.cf.logging.common.request;
 
 import com.fasterxml.jackson.jr.ob.JSON;
-import com.fasterxml.jackson.jr.ob.JSONObjectException;
 import com.sap.hcp.cf.logging.common.Defaults;
 import org.junit.jupiter.api.Test;
 

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

@@ -5,12 +5,13 @@
 import com.sap.hcp.cf.logback.converter.api.LogbackContextFieldSupplier;
 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 java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.sap.hcp.cf.logback.encoder.ILoggingEventUtilities.isRequestLog;
+
 public class BaseFieldSupplier implements LogbackContextFieldSupplier {
 
     @Override
@@ -50,8 +51,4 @@ private String now() {
         return String.valueOf(timestamp);
     }
 
-    private boolean isRequestLog(ILoggingEvent event) {
-        return Markers.REQUEST_MARKER.equals(event.getMarker());
-    }
-
 }

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

@@ -2,7 +2,9 @@
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import com.sap.hcp.cf.logging.common.Markers;
+import org.slf4j.Marker;
 
+import java.util.List;
 import java.util.Map;
 
 public final class ILoggingEventUtilities {
@@ -11,7 +13,11 @@ private ILoggingEventUtilities() {
     }
 
     public static boolean isRequestLog(ILoggingEvent event) {
-        return Markers.REQUEST_MARKER.equals(event.getMarker());
+        List<Marker> markerList = event.getMarkerList();
+        if (markerList == null || markerList.isEmpty()) {
+            return false;
+        }
+        return markerList.stream().anyMatch(Markers.REQUEST_MARKER::equals);
     }
 
     public static Map<?, ?> getMap(ILoggingEvent event) {

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

@@ -290,9 +290,13 @@ private String getJson(ILoggingEvent event) {
     }
 
     private <P extends ComposerBase> void addMarkers(ObjectComposer<P> oc, ILoggingEvent event) throws IOException {
-        if (sendDefaultValues || event.getMarker() != null) {
+        if (sendDefaultValues || (event.getMarkerList() != null && !event.getMarkerList().isEmpty())) {
             ArrayComposer<ObjectComposer<P>> ac = oc.startArrayField(Fields.CATEGORIES);
-            addMarker(ac, event.getMarker());
+            if (event.getMarkerList() != null) {
+                for (Marker marker: event.getMarkerList()) {
+                    addMarker(ac, marker);
+                }
+            }
             ac.end();
         }
     }

cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logback/encoder/ILoggingEventUtilitiesTest.java

@@ -0,0 +1,47 @@
+package com.sap.hcp.cf.logback.encoder;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import com.sap.hcp.cf.logging.common.Markers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.slf4j.Marker;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class ILoggingEventUtilitiesTest {
+
+    @Mock
+    private ILoggingEvent event;
+
+    @Test
+    void noMarkersIsNotRequqstLog() {
+        assertFalse(ILoggingEventUtilities.isRequestLog(event));
+    }
+
+    @Test
+    void emptyMarkerListIsNotRequestLog() {
+        when(event.getMarkerList()).thenReturn(Collections.emptyList());
+        assertFalse(ILoggingEventUtilities.isRequestLog(event));
+    }
+
+    @Test
+    void withRequestMarkerIsNotRequestLog() {
+        when(event.getMarkerList()).thenReturn(Arrays.asList(mock(Marker.class), Markers.REQUEST_MARKER));
+        assertTrue(ILoggingEventUtilities.isRequestLog(event));
+    }
+
+    @Test
+    void withOtherMarkerIsNotRequestLog() {
+        when(event.getMarkerList()).thenReturn(Arrays.asList(mock(Marker.class), mock(Marker.class)));
+        assertFalse(ILoggingEventUtilities.isRequestLog(event));
+    }
+}

cf-java-logging-support-logback/src/test/java/com/sap/hcp/cf/logback/encoder/RequestRecordFieldSupplierTest.java

@@ -7,7 +7,10 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.slf4j.Marker;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import static com.sap.hcp.cf.logging.common.request.RequestRecordBuilder.requestRecord;
@@ -17,13 +20,15 @@
 @ExtendWith(MockitoExtension.class)
 public class RequestRecordFieldSupplierTest {
 
+    private static final List<Marker> REQUEST_MARKER = Collections.singletonList(Markers.REQUEST_MARKER);
+
     private final LogbackContextFieldSupplier fieldSupplier = new RequestRecordFieldSupplier();
     @Mock
     private ILoggingEvent event;
 
     @Test
     public void nullArgumentArray() {
-        when(event.getMarker()).thenReturn(Markers.REQUEST_MARKER);
+        when(event.getMarkerList()).thenReturn(REQUEST_MARKER);
         when(event.getFormattedMessage()).thenReturn("");
 
         Map<String, Object> fields = fieldSupplier.map(event);
@@ -33,7 +38,7 @@ public void nullArgumentArray() {
 
     @Test
     public void emptyArgumentArray() {
-        when(event.getMarker()).thenReturn(Markers.REQUEST_MARKER);
+        when(event.getMarkerList()).thenReturn(REQUEST_MARKER);
         when(event.getFormattedMessage()).thenReturn("");
         when(event.getArgumentArray()).thenReturn(new Object[0]);
 
@@ -44,7 +49,7 @@ public void emptyArgumentArray() {
 
     @Test
     public void requestRecordArgument() {
-        when(event.getMarker()).thenReturn(Markers.REQUEST_MARKER);
+        when(event.getMarkerList()).thenReturn(REQUEST_MARKER);
         when(event.getArgumentArray()).thenReturn(new Object[] { requestRecord("test").build() });
 
         Map<String, Object> fields = fieldSupplier.map(event);