Skip to content

Commit 1f915cc

Browse files
IvanPuntevIvanPuntev
committed
Added possibility to provide external object mapper.
 # dependency-version: 0.8.14 # dependency-type: direct:development # update-type: version-update:semver-patch # dependency-version: 0.8.14 # dependency-type: direct:production # update-type: version-update:semver-patch # dependency-version: 3.29.0 # dependency-type: direct:production # update-type: version-update:semver-minor # dependency-version: 3.29.0 # dependency-type: direct:production # update-type: version-update:semver-minor # dependency-version: 3.29.0 # dependency-type: direct:production # update-type: version-update:semver-minor # dependency-version: 3.29.0 # dependency-type: direct:production # update-type: version-update:semver-minor # dependency-version: 3.29.0 # dependency-type: direct:production # update-type: version-update:semver-minor # dependency-version: 3.29.0 # dependency-type: direct:development # update-type: version-update:semver-minor #dependency-version: 3.29.0 # dependency-type: direct:development
1 parent c5564cf commit 1f915cc

34 files changed

+357
-673
lines changed

‎.github/project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: Quarkus Logging JSON
22
release:
3-
current-version: 3.3.1
4-
next-version: 3.3.2-SNAPSHOT
3+
current-version: 3.4.0
4+
next-version: 3.4.1-SNAPSHOT

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,8 @@ jobs:
5757

5858
- name: Build with Maven (Native)
5959
run: mvn -B install -Dnative -Dquarkus.native.container-build -Dnative.surefire.skip
60+
61+
- name: Check for uncommitted changes
62+
run: |
63+
err_msg="Changes found!!! Run 'mvn -B clean package' and commit changes"
64+
git -c color.ui=always diff --exit-code ':(exclude)docs/modules/ROOT/pages/includes/attributes.adoc' || (>&2 echo "${err_msg}" && exit 1)

‎deployment/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.quarkiverse.loggingjson</groupId>
66
<artifactId>quarkus-logging-json-parent</artifactId>
7-
<version>3.3.2-SNAPSHOT</version>
7+
<version>3.4.1-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>io.quarkiverse.loggingjson</groupId>
2525
<artifactId>quarkus-logging-json</artifactId>
26-
<version>3.3.2-SNAPSHOT</version>
26+
<version>3.4.1-SNAPSHOT</version>
2727
</dependency>
2828
<!-- test dependencies -->
2929
<dependency>

‎deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.quarkiverse.loggingjson.LoggingJsonRecorder;
99
import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory;
1010
import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory;
11+
import io.quarkiverse.loggingjson.providers.ObjectMapperProvider;
1112
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
1213
import io.quarkus.deployment.Capabilities;
1314
import io.quarkus.deployment.Capability;
@@ -33,26 +34,31 @@ FeatureBuildItem feature() {
3334
@BuildStep
3435
@Record(ExecutionTime.RUNTIME_INIT)
3536
LogConsoleFormatBuildItem setUpConsoleFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) {
36-
return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(jsonFactory(capabilities)));
37+
return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(resolveJsonFactoryType(capabilities)));
3738
}
3839

3940
@BuildStep
4041
@Record(ExecutionTime.RUNTIME_INIT)
4142
LogFileFormatBuildItem setUpFileFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) {
42-
return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(jsonFactory(capabilities)));
43+
return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(resolveJsonFactoryType(capabilities)));
4344
}
4445

4546
@BuildStep
4647
@Record(ExecutionTime.RUNTIME_INIT)
4748
LogSocketFormatBuildItem setUpSocketFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) {
48-
return new LogSocketFormatBuildItem(recorder.initializeSocketJsonLogging(jsonFactory(capabilities)));
49+
return new LogSocketFormatBuildItem(recorder.initializeSocketJsonLogging(resolveJsonFactoryType(capabilities)));
4950
}
5051

51-
private JsonFactory jsonFactory(Capabilities capabilities) {
52+
@BuildStep
53+
AdditionalBeanBuildItem registerObjectMapperProvider() {
54+
return AdditionalBeanBuildItem.unremovableOf(ObjectMapperProvider.class);
55+
}
56+
57+
private Class<? extends JsonFactory> resolveJsonFactoryType(Capabilities capabilities) {
5258
if (capabilities.isPresent(Capability.JACKSON)) {
53-
return new JacksonJsonFactory();
59+
return JacksonJsonFactory.class;
5460
} else if (capabilities.isPresent(Capability.JSONB)) {
55-
return new JsonbJsonFactory();
61+
return JsonbJsonFactory.class;
5662
} else {
5763
throw new RuntimeException(
5864
"Missing json implementation to use for logging-json. Supported: [quarkus-jackson, quarkus-jsonb]");

‎docs/modules/ROOT/pages/includes/attributes.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
:project-version: 3.3.1
1+
:project-version: 3.4.0
22

33
:examples-dir: ./../examples/

‎docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.quarkiverse.loggingjson</groupId>
66
<artifactId>quarkus-logging-json-parent</artifactId>
7-
<version>3.3.2-SNAPSHOT</version>
7+
<version>3.4.1-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

‎integration-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.quarkiverse.loggingjson</groupId>
66
<artifactId>quarkus-logging-json-parent</artifactId>
7-
<version>3.3.2-SNAPSHOT</version>
7+
<version>3.4.1-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<groupId>io.quarkiverse.loggingjson</groupId>
1111
<artifactId>quarkus-logging-json-parent</artifactId>
1212
<name>Quarkus Logging JSON - Parent</name>
13-
<version>3.3.2-SNAPSHOT</version>
13+
<version>3.4.1-SNAPSHOT</version>
1414
<packaging>pom</packaging>
1515

1616
<properties>
@@ -19,8 +19,8 @@
1919
<maven.compiler.release>11</maven.compiler.release>
2020
<maven.compiler.parameters>true</maven.compiler.parameters>
2121
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
22-
<quarkus.version>3.28.0</quarkus.version>
23-
<jacoco.version>0.8.13</jacoco.version>
22+
<quarkus.version>3.29.0</quarkus.version>
23+
<jacoco.version>0.8.14</jacoco.version>
2424
<!-- Sonar properties -->
2525
<sonar.projectKey>quarkiverse_quarkus-logging-json</sonar.projectKey>
2626
<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>

‎runtime/pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.quarkiverse.loggingjson</groupId>
66
<artifactId>quarkus-logging-json-parent</artifactId>
7-
<version>3.3.2-SNAPSHOT</version>
7+
<version>3.4.1-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

@@ -30,6 +30,10 @@
3030
<artifactId>quarkus-jsonb</artifactId>
3131
<optional>true</optional>
3232
</dependency>
33+
<dependency>
34+
<groupId>org.eclipse</groupId>
35+
<artifactId>yasson</artifactId>
36+
</dependency>
3337

3438
<dependency>
3539
<groupId>io.quarkus</groupId>

‎runtime/src/main/java/io/quarkiverse/loggingjson/JsonFactory.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
import java.io.IOException;
44

5+
import io.quarkiverse.loggingjson.config.Config;
6+
57
public interface JsonFactory {
8+
void setConfig(Config config);
69

710
JsonGenerator createGenerator(StringBuilderWriter writer) throws IOException;
811
}

0 commit comments

Comments
 (0)