Use AppLog and update avaje-jsonb

rbygrave · rbygrave · commit 3894904bc2bc · 2022-10-20T20:41:29.000+13:00
diff --git a/avaje-jex-grizzly/src/main/java/io/avaje/jex/grizzly/GrizzlyJexServer.java b/avaje-jex-grizzly/src/main/java/io/avaje/jex/grizzly/GrizzlyJexServer.java
@@ -1,5 +1,6 @@
 package io.avaje.jex.grizzly;
 
+import io.avaje.applog.AppLog;
 import io.avaje.jex.AppLifecycle;
 import io.avaje.jex.Jex;
 import org.glassfish.grizzly.http.server.HttpServer;
@@ -11,7 +12,7 @@
 
 class GrizzlyJexServer implements Jex.Server {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex");
+  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
 
   private final HttpServer server;
   private final AppLifecycle lifecycle;
diff --git a/avaje-jex-grizzly/src/main/java/io/avaje/jex/grizzly/GrizzlyServerStart.java b/avaje-jex-grizzly/src/main/java/io/avaje/jex/grizzly/GrizzlyServerStart.java
@@ -1,5 +1,6 @@
 package io.avaje.jex.grizzly;
 
+import io.avaje.applog.AppLog;
 import io.avaje.jex.Jex;
 import io.avaje.jex.spi.SpiRoutes;
 import io.avaje.jex.spi.SpiServiceManager;
@@ -12,7 +13,7 @@
 
 public class GrizzlyServerStart implements SpiStartServer {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex");
+  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
 
   @Override
   public Jex.Server start(Jex jex, SpiRoutes routes, SpiServiceManager serviceManager) {
diff --git a/avaje-jex-grizzly/src/main/java/io/avaje/jex/grizzly/HttpServerBuilder.java b/avaje-jex-grizzly/src/main/java/io/avaje/jex/grizzly/HttpServerBuilder.java
@@ -1,5 +1,6 @@
 package io.avaje.jex.grizzly;
 
+import io.avaje.applog.AppLog;
 import org.glassfish.grizzly.http.server.*;
 import org.glassfish.grizzly.ssl.SSLEngineConfigurator;
 import org.glassfish.grizzly.utils.Charsets;
@@ -8,7 +9,7 @@
 
 public class HttpServerBuilder {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex");
+  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
 
   private int port = -1;
   private String host = "0.0.0.0";
diff --git a/avaje-jex-jdk/src/main/java/io/avaje/jex/jdk/JdkJexServer.java b/avaje-jex-jdk/src/main/java/io/avaje/jex/jdk/JdkJexServer.java
@@ -1,14 +1,15 @@
 package io.avaje.jex.jdk;
 
 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;
 
 class JdkJexServer implements Jex.Server {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex");
+  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
 
   private final HttpServer server;
   private final AppLifecycle lifecycle;
diff --git a/avaje-jex-jdk/src/main/java/io/avaje/jex/jdk/JdkServerStart.java b/avaje-jex-jdk/src/main/java/io/avaje/jex/jdk/JdkServerStart.java
@@ -1,6 +1,7 @@
 package io.avaje.jex.jdk;
 
 import com.sun.net.httpserver.HttpServer;
+import io.avaje.applog.AppLog;
 import io.avaje.jex.AppLifecycle;
 import io.avaje.jex.Jex;
 import io.avaje.jex.spi.SpiRoutes;
@@ -14,7 +15,7 @@
 
 public class JdkServerStart implements SpiStartServer {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex");
+  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
 
   @Override
   public Jex.Server start(Jex jex, SpiRoutes routes, SpiServiceManager serviceManager) {
diff --git a/avaje-jex-test/pom.xml b/avaje-jex-test/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>1.0-RC1</version>
+      <version>1.0-RC3</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/avaje-jex/pom.xml b/avaje-jex/pom.xml
@@ -15,10 +15,16 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-applog</artifactId>
+      <version>1.0</version>
+    </dependency>
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>2.0</version>
+      <version>2.3</version>
       <optional>true</optional>
     </dependency>
 
@@ -39,7 +45,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>0.16</version>
+      <version>1.0-RC3</version>
       <optional>true</optional>
     </dependency>
 
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,5 +1,7 @@
 package io.avaje.jex;
 
+import io.avaje.applog.AppLog;
+
 import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10,7 +12,7 @@
 
 final class DefaultLifecycle implements AppLifecycle {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex");
+  private static final System.Logger log = AppLog.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/CoreServiceManager.java b/avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceManager.java
@@ -1,5 +1,6 @@
 package io.avaje.jex.core;
 
+import io.avaje.applog.AppLog;
 import io.avaje.jex.*;
 import io.avaje.jex.spi.HeaderKeys;
 import io.avaje.jex.spi.JsonService;
@@ -18,7 +19,7 @@
  */
 class CoreServiceManager implements SpiServiceManager {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex.Jex");
+  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
   public 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,5 +1,6 @@
 package io.avaje.jex.core;
 
+import io.avaje.applog.AppLog;
 import io.avaje.jex.ErrorHandling;
 import io.avaje.jex.ExceptionHandler;
 import io.avaje.jex.http.HttpResponseException;
@@ -12,7 +13,7 @@
 
 class ExceptionManager {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex");
+  private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
 
   private final ErrorHandling errorHandling;
 
diff --git a/avaje-jex/src/main/java/io/avaje/jex/core/JsonbJsonService.java b/avaje-jex/src/main/java/io/avaje/jex/core/JsonbJsonService.java
@@ -38,9 +38,7 @@ public <T> T jsonRead(Class<T> clazz, SpiContext ctx) {
   @Override
   public void jsonWrite(Object bean, SpiContext ctx) {
     // gzip compression etc ?
-    try (JsonWriter writer = jsonb.writer(ctx.outputStream())) {
-      jsonb.type(Object.class).toJson(bean, writer);
-    }
+    jsonb.toJson(bean, ctx.outputStream());
   }
 
   @Override
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
@@ -1,5 +1,6 @@
 package io.avaje.jex.routes;
 
+import io.avaje.applog.AppLog;
 import io.avaje.jex.Routing;
 import io.avaje.jex.spi.SpiContext;
 import io.avaje.jex.spi.SpiRoutes;
@@ -12,7 +13,7 @@
 
 class Routes implements SpiRoutes {
 
-  private static final System.Logger log = System.getLogger("io.avaje.jex");
+  private static final System.Logger log = AppLog.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
@@ -14,6 +14,7 @@
   exports io.avaje.jex.core;
 
   requires transitive java.net.http;
+  requires transitive io.avaje.applog;
   requires static com.fasterxml.jackson.core;
   requires static com.fasterxml.jackson.databind;
   requires static io.avaje.jsonb;
diff --git a/examples/example-jdk-jsonb/pom.xml b/examples/example-jdk-jsonb/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>3.8</version>
+    <version>3.9</version>
     <relativePath/>
   </parent>
 
@@ -19,7 +19,7 @@
 <!--    <maven.compiler.target>18</maven.compiler.target>-->
 <!--    <javadoc.source>11</javadoc.source>-->
     <java.release>17</java.release>
-    <native.maven.plugin.version>0.9.11</native.maven.plugin.version>
+    <native.maven.plugin.version>0.9.16</native.maven.plugin.version>
   </properties>
 
   <dependencies>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>0.16</version>
+      <version>1.0-RC3</version>
     </dependency>
 
 <!--    <dependency>-->
@@ -87,7 +87,7 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-jsonb-generator</artifactId>
-              <version>0.16</version>
+              <version>1.0-RC3</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/examples/example-jdk-jsonb/src/main/java/module-info.java b/examples/example-jdk-jsonb/src/main/java/module-info.java
@@ -1,8 +1,10 @@
+import io.avaje.jsonb.Jsonb;
+
 module example.jdkTwo {
 
   requires io.avaje.jex.jdk;
   requires io.avaje.jsonb;
 
-  provides io.avaje.jsonb.Jsonb.Component with org.example.jsonb.GeneratedJsonComponent;
+  provides Jsonb.GeneratedComponent with org.example.jsonb.GeneratedJsonComponent;
 
 }
diff --git a/examples/example-jetty/pom.xml b/examples/example-jetty/pom.xml
@@ -43,13 +43,13 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>0.16</version>
+      <version>1.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb-generator</artifactId>
-      <version>0.16</version>
+      <version>1.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/examples/example-katie/pom.xml b/examples/example-katie/pom.xml
@@ -27,7 +27,7 @@
 <!--    <dependency>-->
 <!--      <groupId>io.avaje</groupId>-->
 <!--      <artifactId>avaje-jsonb</artifactId>-->
-<!--      <version>0.16</version>-->
+<!--      <version>1.0-RC3</version>-->
 <!--    </dependency>-->
 
     <dependency>
@@ -95,7 +95,7 @@
 <!--            <path>-->
 <!--              <groupId>io.avaje</groupId>-->
 <!--              <artifactId>avaje-jsonb-generator</artifactId>-->
-<!--              <version>0.16</version>-->
+<!--              <version>1.0-RC3</version>-->
 <!--            </path>-->
           </annotationProcessorPaths>
         </configuration>
