Merge branch 'master' of github.com:qos-ch/logback

qos-ch · Sep 9, 2021 · 5586c25 · 5586c25
2 parents 5889356 + 7357bcf
commit 5586c25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...ack-classic/src/test/java/ch/qos/logback/classic/pattern/LoggerNameConverterPerfTest.java b/...ack-classic/src/test/java/ch/qos/logback/classic/pattern/LoggerNameConverterPerfTest.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -56,7 +57,7 @@ public void setUp() {
 		ocsl.setContext(loggerContext);
 		ocsl.start();
 		loggerContext.getStatusManager().add(ocsl);
-		loggerConverter.setOptionList(List.of("30"));
+		loggerConverter.setOptionList(Arrays.asList("30"));
 		loggerConverter.setContext(loggerContext);
 		loggerConverter.start();
 	}

diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java
@@ -23,6 +23,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -165,7 +166,7 @@ public void testWithMarker() throws Exception {
         checkForEquality(event, remoteEvent);
 
         assertNotNull(remoteEvent.getMarkerList());
-        assertEquals(List.of(marker), remoteEvent.getMarkerList());
+        assertEquals(Arrays.asList(marker), remoteEvent.getMarkerList());
     }
 
     @Test
@@ -182,7 +183,7 @@ public void testWithTwoMarkers() throws Exception {
         checkForEquality(event, remoteEvent);
 
         assertNotNull(remoteEvent.getMarkerList());
-        assertEquals(List.of(marker), remoteEvent.getMarkerList());
+        assertEquals(Arrays.asList(marker), remoteEvent.getMarkerList());
     }
 
     @Test