java.util.logging instead of SLF4J, to avoid dependency

Gmugra · Jan 2, 2021 · e7139fb · e7139fb
1 parent 2414671
commit e7139fb
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 97 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -20,22 +20,11 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

diff --git a/core/src/main/java/net/cactusthorn/routing/RoutingServlet.java b/core/src/main/java/net/cactusthorn/routing/RoutingServlet.java
@@ -5,13 +5,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.servlet.*;
 import javax.servlet.http.*;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import net.cactusthorn.routing.EntryPointScanner.EntryPoint;
 import net.cactusthorn.routing.RoutingConfig.ConfigProperty;
 import net.cactusthorn.routing.PathTemplate.PathValues;
@@ -25,7 +24,7 @@ public class RoutingServlet extends HttpServlet {
 
     private static final long serialVersionUID = 0L;
 
-    private static final Logger LOG = LoggerFactory.getLogger(RoutingServlet.class);
+    private static final Logger LOG = Logger.getLogger(RoutingServlet.class.getName());
 
     private transient Map<Class<? extends Annotation>, List<EntryPoint>> allEntryPoints;
     private transient ServletContext servletContext;
@@ -142,8 +141,8 @@ private String getPath(String contentType, HttpServletRequest req) {
         } else if (!"/".equals(path) && path.charAt(path.length() - 1) != '/') {
             path += '/';
         }
-        LOG.debug("{}({} {}) PathInfo -> original: \"{}\", corrected: \"{}\"", req.getMethod(), contentType, req.getCharacterEncoding(),
-                original, path);
+        LOG.log(Level.FINE, "{0}({1} {2}) PathInfo -> original: \"{3}\", corrected: \"{4}\"",
+                new Object[] {req.getMethod(), contentType, req.getCharacterEncoding(), original, path});
         return path;
     }
 
@@ -156,7 +155,7 @@ private void produce(HttpServletRequest req, HttpServletResponse resp, EntryPoin
         String contentType = entryPoint.produces();
         resp.setContentType(contentType);
         producers.get(contentType).produce(result, entryPoint.template(), contentType, req, resp);
-        LOG.debug("Producer processing done for Content-Type: {}", contentType);
+        LOG.log(Level.FINE, "Producer processing done for Content-Type: {0}", new Object[] {contentType});
     }
 
     private void produce(HttpServletRequest req, HttpServletResponse resp, EntryPoint entryPoint, Response response) throws IOException {
@@ -187,10 +186,10 @@ private void produce(HttpServletRequest req, HttpServletResponse resp, EntryPoin
             if (response.body() != null) {
                 resp.getWriter().write(String.valueOf(response.body()));
             }
-            LOG.debug("Producer processing skipped!");
+            LOG.fine("Producer processing skipped!");
             return;
         }
         producers.get(contentType).produce(response.body(), template, contentType, req, resp);
-        LOG.debug("Producer processing done for Content-Type: {}", contentType);
+        LOG.log(Level.FINE, "Producer processing done for Content-Type: {0}", new Object[] {contentType});
     }
 }
diff --git a/core/src/main/java/net/cactusthorn/routing/producer/TextPlainProducer.java b/core/src/main/java/net/cactusthorn/routing/producer/TextPlainProducer.java
@@ -1,6 +1,7 @@
 package net.cactusthorn.routing.producer;
 
 import java.io.IOException;
+import java.util.logging.Logger;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -9,13 +10,16 @@ public class TextPlainProducer implements Producer {
 
     public static final String MEDIA_TYPE = "text/plain";
 
+    private static final Logger LOG = Logger.getLogger(TextPlainProducer.class.getName());
+
     @Override //
     public void produce(Object object, String template, String mediaType, HttpServletRequest req, HttpServletResponse resp)
             throws IOException {
         if (object == null) {
             if (resp.getStatus() == HttpServletResponse.SC_OK) {
                 resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
             }
+            LOG.fine("NO CONTENT");
             return;
         }
         resp.getWriter().write(String.valueOf(object));

diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml
diff --git a/demo-jetty/pom.xml b/demo-jetty/pom.xml
@@ -27,19 +27,16 @@
             <artifactId>core</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>net.cactusthorn.routing</groupId>
             <artifactId>json-gson</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>net.cactusthorn.routing</groupId>
             <artifactId>thymeleaf</artifactId>
             <version>${project.version}</version>
         </dependency>
-
         <dependency>
             <groupId>net.cactusthorn.routing</groupId>
             <artifactId>validation-javax</artifactId>
@@ -51,6 +48,14 @@
             <artifactId>dagger</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/demo-jetty/src/main/java/net/cactusthorn/routing/demo/jetty/Application.java b/demo-jetty/src/main/java/net/cactusthorn/routing/demo/jetty/Application.java
@@ -11,6 +11,7 @@
 import java.security.Principal;
 import java.time.LocalDate;
 import java.util.EnumSet;
+import java.util.logging.Level;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
@@ -29,13 +30,19 @@
 import org.eclipse.jetty.util.resource.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.bridge.SLF4JBridgeHandler;
 
 public class Application {
 
     private static final Logger LOG = LoggerFactory.getLogger(Application.class);
 
     public static void main(String... args) {
 
+        // java.util.loggingg -> SLF4j
+        SLF4JBridgeHandler.removeHandlersForRootLogger();
+        SLF4JBridgeHandler.install();
+        java.util.logging.Logger.getLogger("").setLevel(Level.FINEST);
+
         HandlerList handlers = new HandlerList();
         handlers.addHandler(createStaticResourcesServlet());
         handlers.addHandler(createRoutingServlet());

diff --git a/json-gson/pom.xml b/json-gson/pom.xml
@@ -31,12 +31,6 @@
             <artifactId>gson</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/json-gson/src/main/java/net/cactusthorn/routing/gson/SimpleGsonProducer.java b/json-gson/src/main/java/net/cactusthorn/routing/gson/SimpleGsonProducer.java
@@ -5,9 +5,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.stream.JsonWriter;
@@ -16,8 +13,6 @@
 
 public class SimpleGsonProducer implements Producer {
 
-    private static final Logger LOG = LoggerFactory.getLogger(SimpleGsonProducer.class);
-
     private Gson gson;
 
     public SimpleGsonProducer(Gson gson) {
@@ -32,7 +27,6 @@ public SimpleGsonProducer() {
     public void produce(Object object, String template, String mediaType, HttpServletRequest req, HttpServletResponse resp)
             throws IOException {
         if (object == null) {
-            LOG.warn("Entry point return Object is NULL");
             if (resp.getStatus() == HttpServletResponse.SC_OK) {
                 resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
             }

diff --git a/json-gson/src/test/resources/logback-test.xml b/json-gson/src/test/resources/logback-test.xml
diff --git a/pom.xml b/pom.xml
@@ -130,12 +130,6 @@
     <dependencyManagement>
         <dependencies>
 
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${dependency.slf4j}</version>
-            </dependency>
-
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
@@ -182,6 +176,16 @@
                 <version>${dependency.dagger}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${dependency.slf4j}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jul-to-slf4j</artifactId>
+                <version>${dependency.slf4j}</version>
+            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>

diff --git a/thymeleaf/src/main/java/net/cactusthorn/routing/thymeleaf/SimpleThymeleafProducer.java b/thymeleaf/src/main/java/net/cactusthorn/routing/thymeleaf/SimpleThymeleafProducer.java
@@ -8,8 +8,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.thymeleaf.ITemplateEngine;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.templatemode.TemplateMode;
@@ -21,8 +19,6 @@
 
 public class SimpleThymeleafProducer implements Producer {
 
-    private static final Logger LOG = LoggerFactory.getLogger(SimpleThymeleafProducer.class);
-
     private ITemplateEngine templateEngine;
 
     public SimpleThymeleafProducer(ITemplateEngine templateEngine) {
@@ -69,7 +65,6 @@ public void produce(Object object, String template, String mediaType, HttpServle
         }
 
         templateEngine.process(template, ctx, resp.getWriter());
-        LOG.debug("processed template: {}", template);
     }
 
 }
diff --git a/thymeleaf/src/test/resources/logback-test.xml b/thymeleaf/src/test/resources/logback-test.xml