Merge branch 'remove-applog' of https://github.com/SentryMan/avaje-jex …

…into SentryMan-remove-applog
avaje · Dec 2, 2024 · b011ac0 · b011ac0
2 parents 81e0647 + d70e49e
commit b011ac0
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 25 deletions.
diff --git a/avaje-jex/pom.xml b/avaje-jex/pom.xml
@@ -14,12 +14,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-applog</artifactId>
-      <version>1.0</version>
-    </dependency>
-
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>

diff --git a/avaje-jex/src/main/java/io/avaje/jex/DefaultLifecycle.java b/avaje-jex/src/main/java/io/avaje/jex/DefaultLifecycle.java
@@ -1,9 +1,6 @@
 package io.avaje.jex;
 
-import io.avaje.applog.AppLog;
-
 import java.lang.System.Logger.Level;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -13,7 +10,7 @@
 
 final class DefaultLifecycle implements AppLifecycle {
 
-  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
+  private static final System.Logger log = System.getLogger("io.avaje.jex");
 
   private final List<Pair> shutdownRunnable = new ArrayList<>();
   private final ReentrantLock lock = new ReentrantLock();

diff --git a/avaje-jex/src/main/java/io/avaje/jex/core/BootstrapServer.java b/avaje-jex/src/main/java/io/avaje/jex/core/BootstrapServer.java
@@ -2,7 +2,7 @@
 
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsServer;
-import io.avaje.applog.AppLog;
+
 import io.avaje.jex.AppLifecycle;
 import io.avaje.jex.Jex;
 import io.avaje.jex.JexConfig;
@@ -19,7 +19,7 @@
 
 public final class BootstrapServer {
 
-  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
+  private static final System.Logger log = System.getLogger("io.avaje.jex");
 
   public static Jex.Server start(Jex jex) {
     final var config = jex.config();

diff --git a/avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceManager.java b/avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceManager.java
@@ -14,7 +14,6 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import io.avaje.applog.AppLog;
 import io.avaje.jex.Context;
 import io.avaje.jex.Jex;
 import io.avaje.jex.Routing;
@@ -28,7 +27,7 @@
  */
 final class CoreServiceManager implements SpiServiceManager {
 
-  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
+  private static final System.Logger log = System.getLogger("io.avaje.jex");
   static final String UTF_8 = "UTF-8";
 
   private final HttpMethodMap methodMap = new HttpMethodMap();

diff --git a/avaje-jex/src/main/java/io/avaje/jex/core/ExceptionManager.java b/avaje-jex/src/main/java/io/avaje/jex/core/ExceptionManager.java
@@ -1,10 +1,9 @@
 package io.avaje.jex.core;
 
-import static java.lang.System.Logger.Level.WARNING;
+import static java.lang.System.Logger.Level.ERROR;
 
 import java.util.Map;
 
-import io.avaje.applog.AppLog;
 import io.avaje.jex.Context;
 import io.avaje.jex.ExceptionHandler;
 import io.avaje.jex.http.ErrorCode;
@@ -15,7 +14,7 @@ final class ExceptionManager {
 
   private static final String APPLICATION_JSON = "application/json";
 
-  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
+  private static final System.Logger log = System.getLogger("io.avaje.jex");
 
   private final Map<Class<?>, ExceptionHandler<?>> handlers;
 
@@ -52,7 +51,7 @@ void handle(JdkContext ctx, Exception e) {
   }
 
   private void unhandledException(JdkContext ctx, Exception e) {
-    log.log(WARNING, "Uncaught exception", e);
+    log.log(ERROR, "Uncaught exception", e);
     defaultHandling(ctx, new InternalServerErrorException(ErrorCode.INTERNAL_SERVER_ERROR.message()));
   }
 

diff --git a/avaje-jex/src/main/java/io/avaje/jex/core/JdkJexServer.java b/avaje-jex/src/main/java/io/avaje/jex/core/JdkJexServer.java
@@ -1,15 +1,15 @@
 package io.avaje.jex.core;
 
+import java.lang.System.Logger.Level;
+
 import com.sun.net.httpserver.HttpServer;
-import io.avaje.applog.AppLog;
+
 import io.avaje.jex.AppLifecycle;
 import io.avaje.jex.Jex;
 
-import java.lang.System.Logger.Level;
-
 final class JdkJexServer implements Jex.Server {
 
-  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
+  private static final System.Logger log = System.getLogger("io.avaje.jex");
 
   private final HttpServer server;
   private final AppLifecycle lifecycle;

diff --git a/avaje-jex/src/main/java/io/avaje/jex/routes/Routes.java b/avaje-jex/src/main/java/io/avaje/jex/routes/Routes.java
@@ -6,13 +6,12 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.LockSupport;
 
-import io.avaje.applog.AppLog;
 import io.avaje.jex.HttpFilter;
 import io.avaje.jex.Routing;
 
 final class Routes implements SpiRoutes {
 
-  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
+  private static final System.Logger log = System.getLogger("io.avaje.jex");
 
   /**
    * The "real" handlers by http method.

diff --git a/avaje-jex/src/main/java/module-info.java b/avaje-jex/src/main/java/module-info.java
@@ -29,7 +29,6 @@
 
   requires transitive java.net.http;
   requires transitive jdk.httpserver;
-  requires transitive io.avaje.applog;
   requires static com.fasterxml.jackson.core;
   requires static com.fasterxml.jackson.databind;
   requires static io.avaje.jsonb;