kokuwaio/micronaut-logging
1
0
Fork 0
Code Issues 1 Pull requests Releases 6 Activity

Bump to java 17 (micronaut dependency) (#157)

Browse source
This commit is contained in:
Stephan Schnabel 2023-05-17 14:49:47 +02:00 • committed by GitHub
parent bdd423ee8d
commit 1d5156a3d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/ci.yaml vendored
View file

@ -31,10 +31,10 @@ jobs:
- uses: actions/setup-java@v3 - uses: actions/setup-java@v3
with: with:
distribution: temurin distribution: temurin
java-version: 11 java-version: 17
cache: maven cache: maven
- run: mvn -B -ntp dependency:go-offline - run: mvn -B -ntp dependency:go-offline
- run: mvn -B -ntp javadoc:javadoc-no-fork -Dmaven.javadoc.failOnWarnings=true -Ddoclint=all - run: mvn -B -ntp javadoc:javadoc-no-fork -Ddoclint=all
checkstyle: checkstyle:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -43,7 +43,7 @@ jobs:
- uses: actions/setup-java@v3 - uses: actions/setup-java@v3
with: with:
distribution: temurin distribution: temurin
java-version: 11 java-version: 17
cache: maven cache: maven
- run: mvn -B -ntp dependency:go-offline - run: mvn -B -ntp dependency:go-offline
- run: mvn -B -ntp checkstyle:check - run: mvn -B -ntp checkstyle:check
@ -55,7 +55,7 @@ jobs:
- uses: actions/setup-java@v3 - uses: actions/setup-java@v3
with: with:
distribution: temurin distribution: temurin
java-version: 11 java-version: 17
cache: maven cache: maven
server-id: sonatype-nexus server-id: sonatype-nexus
server-username: SERVER_USERNAME server-username: SERVER_USERNAME

2
.github/workflows/release.yaml vendored
View file

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

4
pom.xml
View file

@ -65,8 +65,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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>
<maven.compiler.parameters>true</maven.compiler.parameters> <maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation> <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<maven.compiler.showWarnings>true</maven.compiler.showWarnings> <maven.compiler.showWarnings>true</maven.compiler.showWarnings>

20
src/main/java/io/kokuwa/micronaut/logging/configurator/RootAutoSelectAppenderAction.java
View file

@ -70,21 +70,15 @@ public class RootAutoSelectAppenderAction extends Action {
private void setAppender(Logger rootLogger, String appenderName) { private void setAppender(Logger rootLogger, String appenderName) {
addInfo("Use appender: " + appenderName); addInfo("Use appender: " + appenderName);
Layout<ILoggingEvent> layout; Layout<ILoggingEvent> 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 ..."); addError("Appender " + appenderName + " not found. Using console ...");
layout = console(); yield console();
} }
};
layout.start(); layout.start();
var encoder = new LayoutWrappingEncoder<ILoggingEvent>(); var encoder = new LayoutWrappingEncoder<ILoggingEvent>();

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

@ -40,7 +40,7 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
@Value("${" + PREFIX + ".prefix}") Optional<String> prefix, @Value("${" + PREFIX + ".prefix}") Optional<String> prefix,
@Value("${" + PREFIX + ".order}") Optional<Integer> order) { @Value("${" + PREFIX + ".order}") Optional<Integer> order) {
super(order.orElse(DEFAULT_ORDER), prefix.orElse(null)); 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).collect(Collectors.toUnmodifiableSet());
log.info("Configured with header names {}", headers); log.info("Configured with header names {}", headers);
} }
@ -48,9 +48,7 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) { public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
var mdc = new HashMap<String, String>(); var mdc = new HashMap<String, String>();
for (var header : headers) { 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); return doFilter(request, chain, mdc);
} }