Merge pull request #5306 from aoudiamoncef/master

style(*): Propagate Jboss Logmanager
quarkusio · Nov 14, 2019 · 56477a3 · 56477a3
2 parents deb27a3 + 0d61950
commit 56477a3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateExtensionMojo.java
@@ -28,8 +28,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
 
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.FileTemplateLoader;
@@ -61,7 +60,7 @@ public class CreateExtensionMojo extends AbstractMojo {
 
     private static final String QUOTED_DOLLAR = Matcher.quoteReplacement("$");
 
-    private static final Logger log = LoggerFactory.getLogger(CreateExtensionMojo.class);
+    private static final Logger log = Logger.getLogger(CreateExtensionMojo.class);
 
     private static final Pattern BRACKETS_PATTERN = Pattern.compile("[()]+");
     private static final String CLASSPATH_PREFIX = "classpath:";
@@ -717,7 +716,7 @@ static TemplateLoader createTemplateLoader(Path basedir, String templatesUriBase
 
     static void evalTemplate(Configuration cfg, String templateUri, Path dest, Charset charset, TemplateParams model)
             throws IOException, TemplateException {
-        log.info("Adding '{}'", dest);
+        log.infof("Adding '%s'", dest);
         final Template template = cfg.getTemplate(templateUri);
         Files.createDirectories(dest.getParent());
         try (Writer out = Files.newBufferedWriter(dest)) {

diff --git a/docs/src/main/asciidoc/kafka-streams.adoc b/docs/src/main/asciidoc/kafka-streams.adoc
@@ -116,8 +116,7 @@ import java.util.stream.Collectors;
 import javax.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
 
 import io.reactivex.Flowable;
 import io.smallrye.reactive.messaging.kafka.KafkaMessage;
@@ -131,7 +130,7 @@ import io.smallrye.reactive.messaging.kafka.KafkaMessage;
 @ApplicationScoped
 public class ValuesGenerator {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ValuesGenerator.class);
+    private static final Logger LOG = Logger.getLogger(ValuesGenerator.class);
 
     private Random random = new Random();
 

diff --git a/docs/src/main/asciidoc/lifecycle.adoc b/docs/src/main/asciidoc/lifecycle.adoc
@@ -70,13 +70,12 @@ import javax.enterprise.event.Observes;
 
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
 
 @ApplicationScoped
 public class AppLifecycleBean {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger("ListenerBean");
+    private static final Logger LOGGER = Logger.getLogger("ListenerBean");
 
     void onStart(@Observes StartupEvent ev) {               // <1>
         LOGGER.info("The application is starting...");

diff --git a/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java b/integration-tests/mongodb-client/src/test/java/io/quarkus/it/mongodb/BookResourceTest.java
@@ -10,12 +10,11 @@
 import javax.json.bind.Jsonb;
 import javax.json.bind.JsonbBuilder;
 
+import org.jboss.logging.Logger;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodStarter;
@@ -35,7 +34,7 @@
 @QuarkusTest
 class BookResourceTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BookResourceTest.class);
+    private static final Logger LOGGER = Logger.getLogger(BookResourceTest.class);
     private static MongodExecutable MONGO;
 
     private static Jsonb jsonb;
@@ -66,7 +65,7 @@ public static void releaseMapper() throws Exception {
     public static void startMongoDatabase() throws IOException {
         Version.Main version = Version.Main.V4_0;
         int port = 27018;
-        LOGGER.info("Starting Mongo {} on port {}", version, port);
+        LOGGER.infof("Starting Mongo %s on port %s", version, port);
         IMongodConfig config = new MongodConfigBuilder()
                 .version(version)
                 .net(new Net(port, Network.localhostIsIPv6()))

diff --git a/...n-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/BookResourceTest.java b/...n-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/BookResourceTest.java
@@ -14,12 +14,11 @@
 import java.util.GregorianCalendar;
 import java.util.List;
 
+import org.jboss.logging.Logger;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -44,7 +43,7 @@
 
 @QuarkusTest
 class BookResourceTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BookResourceTest.class);
+    private static final Logger LOGGER = Logger.getLogger(BookResourceTest.class);
     private static final TypeRef<List<BookDTO>> LIST_OF_BOOK_TYPE_REF = new TypeRef<List<BookDTO>>() {
     };
     private static final TypeRef<List<Person>> LIST_OF_PERSON_TYPE_REF = new TypeRef<List<Person>>() {
@@ -56,7 +55,7 @@ class BookResourceTest {
     public static void startMongoDatabase() throws IOException {
         Version.Main version = Version.Main.V4_0;
         int port = 27018;
-        LOGGER.info("Starting Mongo {} on port {}", version, port);
+        LOGGER.infof("Starting Mongo %s on port %s", version, port);
         IMongodConfig config = new MongodConfigBuilder()
                 .version(version)
                 .net(new Net(port, Network.localhostIsIPv6()))

diff --git a/integration-tests/vault-app/src/main/java/io/quarkus/it/vault/VaultTestService.java b/integration-tests/vault-app/src/main/java/io/quarkus/it/vault/VaultTestService.java
@@ -12,15 +12,14 @@
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
 
 import io.quarkus.vault.VaultKVSecretEngine;
 
 @ApplicationScoped
 public class VaultTestService {
 
-    private static final Logger log = LoggerFactory.getLogger(VaultTestService.class);
+    private static final Logger log = Logger.getLogger(VaultTestService.class);
 
     @Inject
     EntityManager entityManager;