Bump to java 17 (micronaut dependency) #157
5 changed files with 17 additions and 25 deletions
8
.github/workflows/ci.yaml
vendored
8
.github/workflows/ci.yaml
vendored
|
@ -31,10 +31,10 @@ jobs:
|
|||
- uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: 11
|
||||
java-version: 17
|
||||
cache: maven
|
||||
- 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:
|
||||
runs-on: ubuntu-latest
|
||||
|
@ -43,7 +43,7 @@ jobs:
|
|||
- uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: 11
|
||||
java-version: 17
|
||||
cache: maven
|
||||
- run: mvn -B -ntp dependency:go-offline
|
||||
- run: mvn -B -ntp checkstyle:check
|
||||
|
@ -55,7 +55,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
|
||||
|
|
2
.github/workflows/release.yaml
vendored
2
.github/workflows/release.yaml
vendored
|
@ -18,7 +18,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
|
||||
|
|
4
pom.xml
4
pom.xml
|
@ -65,8 +65,8 @@
|
|||
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<maven.compiler.parameters>true</maven.compiler.parameters>
|
||||
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
|
||||
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
|
||||
|
|
|
@ -70,21 +70,15 @@ public class RootAutoSelectAppenderAction extends Action {
|
|||
private void setAppender(Logger rootLogger, String appenderName) {
|
||||
addInfo("Use appender: " + appenderName);
|
||||
|
||||
Layout<ILoggingEvent> layout;
|
||||
switch (appenderName) {
|
||||
case APPENDER_JSON:
|
||||
layout = json();
|
||||
break;
|
||||
case APPENDER_GCP:
|
||||
layout = gcp();
|
||||
break;
|
||||
case APPENDER_CONSOLE:
|
||||
layout = console();
|
||||
break;
|
||||
default:
|
||||
Layout<ILoggingEvent> layout = switch (appenderName) {
|
||||
case APPENDER_JSON -> json();
|
||||
case APPENDER_GCP -> gcp();
|
||||
case APPENDER_CONSOLE -> console();
|
||||
default -> {
|
||||
addError("Appender " + appenderName + " not found. Using console ...");
|
||||
layout = console();
|
||||
yield console();
|
||||
}
|
||||
};
|
||||
layout.start();
|
||||
|
||||
var encoder = new LayoutWrappingEncoder<ILoggingEvent>();
|
||||
|
|
|
@ -40,7 +40,7 @@ public class HeaderMdcFilter extends AbstractMdcFilter {
|
|||
@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).collect(Collectors.toUnmodifiableSet());
|
||||
log.info("Configured with header names {}", headers);
|
||||
}
|
||||
|
||||
|
@ -48,9 +48,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()
|
||||
.getFirst(header)
|
||||
.ifPresent(value -> mdc.put(header, String.valueOf(value)));
|
||||
request.getHeaders().getFirst(header).ifPresent(value -> mdc.put(header, String.valueOf(value)));
|
||||
}
|
||||
return doFilter(request, chain, mdc);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue