Bump to java 17 (micronaut dependency)

.github/workflows/build.yaml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: maven
       - run: mvn $MAVEN_ARGS dependency:go-offline
       - run: mvn $MAVEN_ARGS deploy

.github/workflows/pr.yaml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: maven
       - run: mvn $MAVEN_ARGS dependency:go-offline
       - run: mvn $MAVEN_ARGS verify

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
           cache: maven
           server-id: sonatype-nexus
           server-username: SERVER_USERNAME

pom.xml

@@ -62,8 +62,8 @@
 		<!-- ============================== Build ================================ -->
 		<!-- ===================================================================== -->
 
-		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.target>17</maven.compiler.target>
 
 		<!-- ===================================================================== -->
 		<!-- ============================= Versions ============================== -->

src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java

@@ -30,12 +30,13 @@ public class RootAutoSelectAppenderAction extends Action {
 	private static final String APPENDER_GCP = "GCP";
 	private static final String LOGBACK_APPENDER = "LOGBACK_APPENDER";
 	private static final String LOGBACK_PATTERN = "LOGBACK_PATTERN";
-	private static final String LOGBACK_PATTERN_DEFAULT = "%cyan(%d{HH:mm:ss.SSS})"
+	private static final String LOGBACK_PATTERN_DEFAULT = """
-			+ " %gray(%-6.6thread)"
+			%cyan(%d{HH:mm:ss.SSS}) \
-			+ " %highlight(%-5level)"
+			%gray(%-6.6thread) \
-			+ " %magenta(%32logger{32})"
+			%highlight(%-5level) \
-			+ " %mdc"
+			%magenta(%32logger{32}) \
-			+ " %msg%n";
+			%mdc \
+			%msg%n""";
 
 	@Override
 	public void begin(SaxEventInterpretationContext ic, String name, org.xml.sax.Attributes attributes) {
@@ -70,21 +71,15 @@ public class RootAutoSelectAppenderAction extends Action {
 	private void setAppender(Logger rootLogger, String appenderName) {
 		addInfo("Use appender: " + appenderName);
 
-		Layout<ILoggingEvent> layout;
+		var layout = switch (appenderName) {
-		switch (appenderName) {
+			case APPENDER_JSON -> json();
-			case APPENDER_JSON:
+			case APPENDER_GCP -> gcp();
-				layout = json();
+			case APPENDER_CONSOLE -> console();
-				break;
+			default -> {
-			case APPENDER_GCP:
-				layout = gcp();
-				break;
-			case APPENDER_CONSOLE:
-				layout = console();
-				break;
-			default:
 				addError("Appender " + appenderName + " not found. Using console ...");
-				layout = console();
+				yield console();
 			}
+		};
 		layout.start();
 
 		var encoder = new LayoutWrappingEncoder<ILoggingEvent>();

src/main/java/io/kokuwa/micronaut/logging/http/mdc/HeaderMdcFilter.java

@@ -3,8 +3,6 @@ package io.kokuwa.micronaut.logging.http.mdc;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.reactivestreams.Publisher;
 
@@ -33,14 +31,14 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
 	public static final String PREFIX = "logger.http.header";
 	public static final int DEFAULT_ORDER = ServerFilterPhase.FIRST.before();
 
-	private final Set<String> headers;
+	private final List<String> headers;
 
 	public HeaderMdcFilter(
 			@Value("${" + PREFIX + ".names}") List<String> headers,
 			@Value("${" + PREFIX + ".prefix}") Optional<String> prefix,
 			@Value("${" + PREFIX + ".order}") Optional<Integer> order) {
 		super(order.orElse(DEFAULT_ORDER), prefix.orElse(null));
-		this.headers = headers.stream().map(String::toLowerCase).collect(Collectors.toSet());
+		this.headers = headers.stream().map(String::toLowerCase).toList();
 		log.info("Configured with header names {}", headers);
 	}
 
@@ -48,9 +46,7 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
 	public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
 		var mdc = new HashMap<String, String>();
 		for (var header : headers) {
-			request.getHeaders()
+			request.getHeaders().getFirst(header).ifPresent(value -> mdc.put(header, String.valueOf(value)));
-					.getFirst(header)
-					.ifPresent(value -> mdc.put(header, String.valueOf(value)));
 		}
 		return doFilter(request, chain, mdc);
 	}

src/main/java/io/kokuwa/micronaut/logging/layout/JsonLayout.java

@@ -90,7 +90,7 @@ public class JsonLayout extends LayoutBase<ILoggingEvent> {
 			var throwableProxy = value.getThrowableProxy();
 			if (throwableProxy != null) {
 				var ex = throwableHandlingConverter.convert(value);
-				if (ex != null && !ex.equals("")) {
+				if (ex != null && !ex.isEmpty()) {
 					map.put(fieldName, ex);
 				}
 			}

src/test/java/io/kokuwa/micronaut/logging/http/mdc/PathMdcFilterTest.java

@@ -89,9 +89,9 @@ public class PathMdcFilterTest extends AbstractFilterTest {
 
 	@DisplayName("mdc: test for documentation example")
 	@Test
-	@Property(name = "logger.http.path.patterns", value = ""
+	@Property(name = "logger.http.path.patterns", value = """
-			+ "\\/gateway\\/(?<gatewayId>[a-f0-9\\-]{36}),"
+			\\/gateway\\/(?<gatewayId>[a-f0-9\\-]{36}),\
-			+ "\\/gateway\\/(?<gatewayId>[a-f0-9\\-]{36})\\/configuration\\/(?<config>[a-z]+)")
+			\\/gateway\\/(?<gatewayId>[a-f0-9\\-]{36})\\/configuration\\/(?<config>[a-z]+)""")
 	void mdcMatchExample() {
 		var uuid = UUID.randomUUID().toString();
 		assertContext(Map.of("gatewayId", uuid), "/gateway/" + uuid);