diff --git a/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java b/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java index 4d3e0fb..b9ccb71 100644 --- a/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java +++ b/deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java @@ -8,6 +8,7 @@ import io.quarkiverse.loggingjson.LoggingJsonRecorder; import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory; import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory; +import io.quarkiverse.loggingjson.providers.ObjectMapperProvider; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.Capability; @@ -33,26 +34,31 @@ FeatureBuildItem feature() { @BuildStep @Record(ExecutionTime.RUNTIME_INIT) LogConsoleFormatBuildItem setUpConsoleFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) { - return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(jsonFactory(capabilities))); + return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(resolveJsonFactoryType(capabilities))); } @BuildStep @Record(ExecutionTime.RUNTIME_INIT) LogFileFormatBuildItem setUpFileFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) { - return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(jsonFactory(capabilities))); + return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(resolveJsonFactoryType(capabilities))); } @BuildStep @Record(ExecutionTime.RUNTIME_INIT) LogSocketFormatBuildItem setUpSocketFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) { - return new LogSocketFormatBuildItem(recorder.initializeSocketJsonLogging(jsonFactory(capabilities))); + return new LogSocketFormatBuildItem(recorder.initializeSocketJsonLogging(resolveJsonFactoryType(capabilities))); } - private JsonFactory jsonFactory(Capabilities capabilities) { + @BuildStep + AdditionalBeanBuildItem registerObjectMapperProvider() { + return AdditionalBeanBuildItem.unremovableOf(ObjectMapperProvider.class); + } + + private Class resolveJsonFactoryType(Capabilities capabilities) { if (capabilities.isPresent(Capability.JACKSON)) { - return new JacksonJsonFactory(); + return JacksonJsonFactory.class; } else if (capabilities.isPresent(Capability.JSONB)) { - return new JsonbJsonFactory(); + return JsonbJsonFactory.class; } else { throw new RuntimeException( "Missing json implementation to use for logging-json. Supported: [quarkus-jackson, quarkus-jsonb]"); diff --git a/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/GreetingResource.java b/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/GreetingResource.java index dc812e7..3fcd9ed 100644 --- a/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/GreetingResource.java +++ b/integration-tests/src/main/java/io/quarkiverse/loggingjson/it/GreetingResource.java @@ -1,16 +1,16 @@ package io.quarkiverse.loggingjson.it; -import java.util.logging.Logger; - import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.jboss.logging.Logger; + @Path("/hello") public class GreetingResource { - private static final Logger logger = Logger.getLogger(GreetingResource.class.getName()); + private static final Logger logger = Logger.getLogger(GreetingResource.class); @GET @Produces(MediaType.TEXT_PLAIN) diff --git a/runtime/pom.xml b/runtime/pom.xml index 8c0fe0b..256fa1e 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -30,6 +30,10 @@ quarkus-jsonb true + + org.eclipse + yasson + io.quarkus diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java b/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java index ba2e696..afe567d 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java @@ -1,16 +1,16 @@ package io.quarkiverse.loggingjson; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +import java.util.*; +import java.util.function.Supplier; import java.util.logging.Formatter; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.jboss.logging.Logger; import io.quarkiverse.loggingjson.config.Config; import io.quarkiverse.loggingjson.config.ConfigFormatter; +import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory; +import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory; import io.quarkiverse.loggingjson.providers.*; import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableInstance; @@ -19,31 +19,34 @@ @Recorder public class LoggingJsonRecorder { - private static final Logger log = LoggerFactory.getLogger(LoggingJsonRecorder.class); - + private static final Logger log = Logger.getLogger(LoggingJsonRecorder.class); + private static final Map, Supplier> jsonFactories = Map.of( + JacksonJsonFactory.class, LoggingJsonRecorder::initializeJacksonJsonFactory, + JsonbJsonFactory.class, JsonbJsonFactory::new); private final RuntimeValue config; public LoggingJsonRecorder(RuntimeValue config) { this.config = config; } - public RuntimeValue> initializeConsoleJsonLogging(JsonFactory jsonFactory) { - return initializeJsonLogging(config.getValue().console(), config.getValue(), jsonFactory); + public RuntimeValue> initializeConsoleJsonLogging(Class jsonFactoryClass) { + return initializeJsonLogging(config.getValue().console(), config.getValue(), jsonFactoryClass); } - public RuntimeValue> initializeFileJsonLogging(JsonFactory jsonFactory) { - return initializeJsonLogging(config.getValue().file(), config.getValue(), jsonFactory); + public RuntimeValue> initializeFileJsonLogging(Class jsonFactoryClass) { + return initializeJsonLogging(config.getValue().file(), config.getValue(), jsonFactoryClass); } - public RuntimeValue> initializeSocketJsonLogging(JsonFactory jsonFactory) { - return initializeJsonLogging(config.getValue().socket(), config.getValue(), jsonFactory); + public RuntimeValue> initializeSocketJsonLogging(Class jsonFactoryClass) { + return initializeJsonLogging(config.getValue().socket(), config.getValue(), jsonFactoryClass); } public RuntimeValue> initializeJsonLogging(ConfigFormatter formatter, Config config, - JsonFactory jsonFactory) { + Class jsonFactoryClass) { if (formatter == null || !formatter.isEnabled()) { return new RuntimeValue<>(Optional.empty()); } + JsonFactory jsonFactory = getJsonFactory(jsonFactoryClass); jsonFactory.setConfig(config); List providers; @@ -68,12 +71,29 @@ public RuntimeValue> initializeJsonLogging(ConfigFormatter f if (log.isDebugEnabled()) { String installedProviders = providers.stream().map(p -> p.getClass().toString()) .collect(Collectors.joining(", ", "[", "]")); - log.debug("Installed json providers {}", installedProviders); + log.debug("Installed json providers " + installedProviders); } return new RuntimeValue<>(Optional.of(new JsonFormatter(providers, jsonFactory, config))); } + private JsonFactory getJsonFactory(Class jsonFactoryType) { + Supplier jsonFactorySupplier = jsonFactories.get(jsonFactoryType); + if (jsonFactorySupplier == null) { + throw new IllegalArgumentException("Unsupported json factory type: " + jsonFactoryType); + } + return jsonFactorySupplier.get(); + } + + private static JacksonJsonFactory initializeJacksonJsonFactory() { + ObjectMapperProvider objectMapperProvider = Arc.container().instance(ObjectMapperProvider.class).orElse(null); + if (objectMapperProvider != null) { + return new JacksonJsonFactory(objectMapperProvider.get()); + } + log.warn("ObjectMapperProvider not found, falling back to default ObjectMapper."); + return new JacksonJsonFactory(); + } + private List defaultFormat(Config config) { List providers = new ArrayList<>(); providers.add(new TimestampJsonProvider(config.fields().timestamp())); diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/jackson/JacksonJsonFactory.java b/runtime/src/main/java/io/quarkiverse/loggingjson/jackson/JacksonJsonFactory.java index 87d291c..91ed7ba 100644 --- a/runtime/src/main/java/io/quarkiverse/loggingjson/jackson/JacksonJsonFactory.java +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/jackson/JacksonJsonFactory.java @@ -3,6 +3,8 @@ import java.io.IOException; import java.util.ServiceConfigurationError; +import org.jboss.logging.Logger; + import com.fasterxml.jackson.core.JsonFactoryBuilder; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -13,29 +15,32 @@ import io.quarkiverse.loggingjson.config.Config; public class JacksonJsonFactory implements JsonFactory { - + private static final Logger log = Logger.getLogger(JacksonJsonFactory.class); + private final ObjectMapper objectMapper; private com.fasterxml.jackson.core.JsonFactory jsonFactory; - public JacksonJsonFactory() { - jsonFactory = createJsonFactory(false); + public JacksonJsonFactory(ObjectMapper objectMapper) { + this.objectMapper = objectMapper == null ? initializeObjectMapper() : objectMapper; //just in case + this.jsonFactory = createJsonFactory(false); } - private com.fasterxml.jackson.core.JsonFactory createJsonFactory(boolean prettyPrint) { - ObjectMapper objectMapper = new ObjectMapper() - /* - * Assume empty beans are ok. - */ - .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); + public JacksonJsonFactory() { + this.objectMapper = initializeObjectMapper(); + this.jsonFactory = createJsonFactory(false); + } + private ObjectMapper initializeObjectMapper() { + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS); try { objectMapper.findAndRegisterModules(); } catch (ServiceConfigurationError serviceConfigurationError) { - // TODO Fix output of error message - - System.err.println("Error occurred while dynamically loading jackson modules"); - serviceConfigurationError.printStackTrace(); + log.error("Error occurred while dynamically loading jackson modules.", serviceConfigurationError); } + return objectMapper; + } + private com.fasterxml.jackson.core.JsonFactory createJsonFactory(boolean prettyPrint) { final JsonFactoryBuilder builder = new JsonFactoryBuilder(objectMapper.getFactory()); if (prettyPrint) { builder.addDecorator((factory, generator) -> generator.useDefaultPrettyPrinter()); diff --git a/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ObjectMapperProvider.java b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ObjectMapperProvider.java new file mode 100644 index 0000000..6631d35 --- /dev/null +++ b/runtime/src/main/java/io/quarkiverse/loggingjson/providers/ObjectMapperProvider.java @@ -0,0 +1,18 @@ +package io.quarkiverse.loggingjson.providers; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; + +import com.fasterxml.jackson.databind.ObjectMapper; + +@Singleton +public class ObjectMapperProvider { + + @Inject + ObjectMapper mapper; + + public ObjectMapper get() { + return this.mapper; + } + +} diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java index 3cc81cb..540cfda 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorMessageJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final ErrorMessageJsonProvider provider = new ErrorMessageJsonProvider(config); final RuntimeException t = new RuntimeException("Testing errorMessage"); @@ -37,7 +36,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("em"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("em", false); final ErrorMessageJsonProvider provider = new ErrorMessageJsonProvider(config); final RuntimeException t = new RuntimeException("Testing errorMessage"); @@ -52,7 +51,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("Testing errorMessage", em); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("em"), Optional.of(true)); + config = fieldConfig("em", true); Assertions.assertTrue(new ErrorMessageJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java index bc9f2d1..0f9ac96 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ErrorTypeJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final ErrorTypeJsonProvider provider = new ErrorTypeJsonProvider(config); final RuntimeException t = new RuntimeException("Testing errorType"); @@ -37,7 +36,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("et"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("et", false); final ErrorTypeJsonProvider provider = new ErrorTypeJsonProvider(config); final RuntimeException t = new RuntimeException("Testing errorType"); @@ -52,7 +51,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("java.lang.RuntimeException", et); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("et"), Optional.of(true)); + config = fieldConfig("et", true); Assertions.assertTrue(new ErrorTypeJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java index c633c0a..c152608 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/HostNameJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final HostNameJsonProvider provider = new HostNameJsonProvider(config); final JsonNode result = getResultAsJsonNode(provider, new ExtLogRecord(Level.ALL, "", "")); @@ -32,7 +31,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("host"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("host", false); final HostNameJsonProvider provider = new HostNameJsonProvider(config); final JsonNode result = getResultAsJsonNode(provider, new ExtLogRecord(Level.ALL, "", "")); @@ -42,7 +41,7 @@ void testCustomConfig() throws Exception { Assertions.assertFalse(hostName.isEmpty()); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("host"), Optional.of(true)); + config = fieldConfig("host", true); Assertions.assertTrue(new HostNameJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/JsonProviderBaseTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/JsonProviderBaseTest.java index d03600f..b674d65 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/JsonProviderBaseTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/JsonProviderBaseTest.java @@ -69,17 +69,17 @@ protected JsonNode getResultAsJsonNode(JsonProvider jsonProvider, ExtLogRecord e return mapper.readValue(getResult(jsonProvider, event), JsonNode.class); } - protected Config.FieldConfig fieldConfig(Optional fieldName, Optional enabled) { + protected Config.FieldConfig fieldConfig(String fieldName, Boolean enabled) { return new Config.FieldConfig() { @Override public Optional fieldName() { - return fieldName; + return Optional.ofNullable(fieldName); } @Override public Optional enabled() { - return enabled; + return Optional.ofNullable(enabled); } }; } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java index 2045114..feaa68e 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LogLevelJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final LogLevelJsonProvider provider = new LogLevelJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -34,7 +33,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("logLevel"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("logLevel", false); final LogLevelJsonProvider provider = new LogLevelJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -46,7 +45,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("ALL", logger); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("logLevel"), Optional.of(true)); + config = fieldConfig("logLevel", true); Assertions.assertTrue(new LogLevelJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProviderJsonbTest.java index 012062d..ab377af 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerClassNameJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final LoggerClassNameJsonProvider provider = new LoggerClassNameJsonProvider(config); final JsonNode result = getResultAsJsonNode(provider, @@ -34,7 +33,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("loggerClass"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("loggerClass", false); final LoggerClassNameJsonProvider provider = new LoggerClassNameJsonProvider(config); final JsonNode result = getResultAsJsonNode(provider, @@ -46,7 +45,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("LoggerClassNameJsonProviderTest", loggerClass); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("loggerClass"), Optional.of(true)); + config = fieldConfig("loggerClass", true); Assertions.assertTrue(new LoggerClassNameJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProviderJsonbTest.java index 1c22ca4..607eff6 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/LoggerNameJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final LoggerNameJsonProvider provider = new LoggerNameJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -35,7 +34,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("logger"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("logger", false); final LoggerNameJsonProvider provider = new LoggerNameJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -48,7 +47,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("LoggerNameJsonProviderTest", logger); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("logger"), Optional.of(true)); + config = fieldConfig("logger", true); Assertions.assertTrue(new LoggerNameJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MessageJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MessageJsonProviderJsonbTest.java index 66bb16f..8fbc7b7 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MessageJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/MessageJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final MessageJsonProvider provider = new MessageJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "TestMessage {0}", ""); @@ -36,7 +35,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("msg"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("msg", false); final MessageJsonProvider provider = new MessageJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "TestMessage {0}", ""); @@ -49,7 +48,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("TestMessage param0", msg); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("msg"), Optional.of(true)); + config = fieldConfig("msg", true); Assertions.assertTrue(new MessageJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/NDCJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/NDCJsonProviderJsonbTest.java index c55d51a..cf2a48b 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/NDCJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/NDCJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final NDCJsonProvider provider = new NDCJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -35,7 +34,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("n"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("n", false); final NDCJsonProvider provider = new NDCJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -48,7 +47,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("NDCTest", n); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("n"), Optional.of(true)); + config = fieldConfig("n", true); Assertions.assertTrue(new NDCJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProviderJsonbTest.java index 60e1f28..72e4786 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessIdJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final ProcessIdJsonProvider provider = new ProcessIdJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -33,7 +32,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("pid"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("pid", false); final ProcessIdJsonProvider provider = new ProcessIdJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -44,7 +43,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals(23847, pid); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("pid"), Optional.of(true)); + config = fieldConfig("pid", true); Assertions.assertTrue(new ProcessIdJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProviderJsonbTest.java index f0cbe2a..20a6153 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ProcessNameJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final ProcessNameJsonProvider provider = new ProcessNameJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -35,7 +34,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("pn"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("pn", false); final ProcessNameJsonProvider provider = new ProcessNameJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -48,7 +47,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("TestProcess", pn); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("pn"), Optional.of(true)); + config = fieldConfig("pn", true); Assertions.assertTrue(new ProcessNameJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/SequenceJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/SequenceJsonProviderJsonbTest.java index ee20b67..c644d75 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/SequenceJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/SequenceJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final SequenceJsonProvider provider = new SequenceJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -33,7 +32,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("seq"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("seq", false); final SequenceJsonProvider provider = new SequenceJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -44,7 +43,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals(4356, seq); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("seq"), Optional.of(true)); + config = fieldConfig("seq", true); Assertions.assertTrue(new SequenceJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProviderJsonbTest.java index 10148e6..cded24d 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/StackTraceJsonProviderJsonbTest.java @@ -2,7 +2,6 @@ import java.io.PrintWriter; import java.io.StringWriter; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -21,7 +20,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final StackTraceJsonProvider provider = new StackTraceJsonProvider(config); final RuntimeException t = new RuntimeException("Testing stackTrace"); @@ -42,7 +41,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("st"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("st", false); final StackTraceJsonProvider provider = new StackTraceJsonProvider(config); final RuntimeException t = new RuntimeException("Testing stackTrace"); @@ -60,7 +59,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals(out.toString(), st); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("st"), Optional.of(true)); + config = fieldConfig("st", true); Assertions.assertTrue(new StackTraceJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProviderJsonbTest.java index 99bdf26..cf4e0a1 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadIdJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final ThreadIdJsonProvider provider = new ThreadIdJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -33,7 +32,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("tid"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("tid", false); final ThreadIdJsonProvider provider = new ThreadIdJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -44,7 +43,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals(3249, tid); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("tid"), Optional.of(true)); + config = fieldConfig("tid", true); Assertions.assertTrue(new ThreadIdJsonProvider(config).isEnabled()); } } diff --git a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProviderJsonbTest.java b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProviderJsonbTest.java index 0e1ae8d..13386e8 100644 --- a/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProviderJsonbTest.java +++ b/runtime/src/test/java/io/quarkiverse/loggingjson/providers/ThreadNameJsonProviderJsonbTest.java @@ -1,6 +1,5 @@ package io.quarkiverse.loggingjson.providers; -import java.util.Optional; import java.util.logging.Level; import org.jboss.logmanager.ExtLogRecord; @@ -19,7 +18,7 @@ protected Type type() { @Test void testDefaultConfig() throws Exception { - final Config.FieldConfig config = fieldConfig(Optional.empty(), Optional.empty()); + final Config.FieldConfig config = fieldConfig(null, null); final ThreadNameJsonProvider provider = new ThreadNameJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -35,7 +34,7 @@ void testDefaultConfig() throws Exception { @Test void testCustomConfig() throws Exception { - Config.FieldConfig config = fieldConfig(Optional.of("tn"), Optional.of(false)); + Config.FieldConfig config = fieldConfig("tn", false); final ThreadNameJsonProvider provider = new ThreadNameJsonProvider(config); final ExtLogRecord event = new ExtLogRecord(Level.ALL, "", ""); @@ -48,7 +47,7 @@ void testCustomConfig() throws Exception { Assertions.assertEquals("TestThread", tn); Assertions.assertFalse(provider.isEnabled()); - config = fieldConfig(Optional.of("tn"), Optional.of(true)); + config = fieldConfig("tn", true); Assertions.assertTrue(new ThreadNameJsonProvider(config).isEnabled()); } }