Move classes from jdk package into core so that less need to be public

avaje-jex/src/main/java/io/avaje/jex/DJex.java

@@ -2,9 +2,8 @@
 
 import io.avaje.inject.BeanScope;
 import io.avaje.jex.core.CoreServiceLoader;
-import io.avaje.jex.core.CoreServiceManager;
 import io.avaje.jex.core.HealthPlugin;
-import io.avaje.jex.jdk.JdkServerStart;
+import io.avaje.jex.core.JdkServerStart;
 import io.avaje.jex.routes.RoutesBuilder;
 import io.avaje.jex.routes.SpiRoutes;
 import io.avaje.jex.spi.*;
@@ -121,6 +120,6 @@ public Server start() {
         new RoutesBuilder(routing, config.ignoreTrailingSlashes())
             .build();
 
-    return new JdkServerStart().start(this, routes, CoreServiceManager.create(this));
+    return new JdkServerStart().start(this, routes);
   }
 }

avaje-jex/src/main/java/io/avaje/jex/jdk/BaseFilterChain.java → avaje-jex/src/main/java/io/avaje/jex/core/BaseFilterChain.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.IOException;
 import java.util.List;

avaje-jex/src/main/java/io/avaje/jex/jdk/BufferedOutStream.java → avaje-jex/src/main/java/io/avaje/jex/core/BufferedOutStream.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

avaje-jex/src/main/java/io/avaje/jex/jdk/CookieParser.java → avaje-jex/src/main/java/io/avaje/jex/core/CookieParser.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceManager.java

@@ -20,24 +20,23 @@
 import io.avaje.jex.Routing;
 import io.avaje.jex.core.json.JacksonJsonService;
 import io.avaje.jex.core.json.JsonbJsonService;
-import io.avaje.jex.jdk.JdkContext;
 import io.avaje.jex.spi.JsonService;
 import io.avaje.jex.spi.TemplateRender;
 
 /**
  * Core implementation of SpiServiceManager provided to specific implementations like jetty etc.
  */
-public final class CoreServiceManager implements SpiServiceManager {
+final class CoreServiceManager implements SpiServiceManager {
 
   private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
-  public static final String UTF_8 = "UTF-8";
+  static final String UTF_8 = "UTF-8";
 
   private final HttpMethodMap methodMap = new HttpMethodMap();
   private final JsonService jsonService;
   private final ExceptionManager exceptionHandler;
   private final TemplateManager templateManager;
 
-  public static SpiServiceManager create(Jex jex) {
+  static SpiServiceManager create(Jex jex) {
     return new Builder(jex).build();
   }
 

avaje-jex/src/main/java/io/avaje/jex/jdk/CtxServiceManager.java → avaje-jex/src/main/java/io/avaje/jex/core/CtxServiceManager.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -9,9 +9,8 @@
 
 import io.avaje.jex.Context;
 import io.avaje.jex.Routing;
-import io.avaje.jex.core.SpiServiceManager;
 
-public final class CtxServiceManager implements SpiServiceManager {
+final class CtxServiceManager implements SpiServiceManager {
 
   private final String scheme;
   private final String contextPath;

avaje-jex/src/main/java/io/avaje/jex/core/ExceptionManager.java

@@ -10,7 +10,6 @@
 import io.avaje.jex.http.ErrorCode;
 import io.avaje.jex.http.HttpResponseException;
 import io.avaje.jex.http.InternalServerErrorException;
-import io.avaje.jex.jdk.JdkContext;
 
 public final class ExceptionManager {
 

avaje-jex/src/main/java/io/avaje/jex/jdk/JdkContext.java → avaje-jex/src/main/java/io/avaje/jex/core/JdkContext.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import static io.avaje.jex.core.Constants.APPLICATION_JSON;
 import static io.avaje.jex.core.Constants.APPLICATION_X_JSON_STREAM;
@@ -31,13 +31,12 @@
 import io.avaje.jex.Context;
 import io.avaje.jex.compression.CompressedOutputStream;
 import io.avaje.jex.compression.CompressionConfig;
-import io.avaje.jex.core.Constants;
 import io.avaje.jex.http.ErrorCode;
 import io.avaje.jex.http.RedirectException;
 import io.avaje.jex.security.BasicAuthCredentials;
 import io.avaje.jex.security.Role;
 
-public final class JdkContext implements Context {
+final class JdkContext implements Context {
 
   private static final String UTF8 = "UTF8";
   private static final int SC_MOVED_TEMPORARILY = 302;

avaje-jex/src/main/java/io/avaje/jex/jdk/JdkJexServer.java → avaje-jex/src/main/java/io/avaje/jex/core/JdkJexServer.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import com.sun.net.httpserver.HttpServer;
 import io.avaje.applog.AppLog;

avaje-jex/src/main/java/io/avaje/jex/jdk/JdkServerStart.java → avaje-jex/src/main/java/io/avaje/jex/core/JdkServerStart.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -13,7 +13,6 @@
 import io.avaje.jex.AppLifecycle;
 import io.avaje.jex.Jex;
 import io.avaje.jex.JexConfig;
-import io.avaje.jex.core.SpiServiceManager;
 import io.avaje.jex.routes.SpiRoutes;
 
 import static java.lang.System.Logger.Level.INFO;
@@ -22,7 +21,8 @@ public final class JdkServerStart {
 
   private static final System.Logger log = AppLog.getLogger("io.avaje.jex");
 
-  public Jex.Server start(Jex jex, SpiRoutes routes, SpiServiceManager serviceManager) {
+  public Jex.Server start(Jex jex, SpiRoutes routes) {
+    SpiServiceManager serviceManager = CoreServiceManager.create(jex);
     try {
       final var config = jex.config();
       final var socketAddress = createSocketAddress(config);

avaje-jex/src/main/java/io/avaje/jex/jdk/Mode.java → avaje-jex/src/main/java/io/avaje/jex/core/Mode.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 /** status of the request */
 enum Mode {

avaje-jex/src/main/java/io/avaje/jex/jdk/RoutingHandler.java → avaje-jex/src/main/java/io/avaje/jex/core/RoutingHandler.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.io.IOException;
 import java.util.List;
@@ -14,7 +14,7 @@
 import io.avaje.jex.http.NotFoundException;
 import io.avaje.jex.routes.SpiRoutes;
 
-public final class RoutingHandler implements HttpHandler {
+final class RoutingHandler implements HttpHandler {
 
   private final SpiRoutes routes;
   private final CtxServiceManager mgr;

avaje-jex/src/main/java/io/avaje/jex/core/SpiServiceManager.java

@@ -9,8 +9,6 @@
 
 import io.avaje.jex.Context;
 import io.avaje.jex.Routing;
-import io.avaje.jex.jdk.CtxServiceManager;
-import io.avaje.jex.jdk.JdkContext;
 
 /**
  * Core service methods available to Context implementations.

avaje-jex/src/test/java/io/avaje/jex/StaticFileTest.java

@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.avaje.jex.StaticContentConfig.ResourceLocation;
-import io.avaje.jex.jdk.TestPair;
+import io.avaje.jex.core.TestPair;
 
 class StaticFileTest {
 

avaje-jex/src/test/java/io/avaje/jex/compression/CompressionTest.java

@@ -10,7 +10,7 @@
 import io.avaje.jex.Jex;
 import io.avaje.jex.StaticContentConfig.ResourceLocation;
 import io.avaje.jex.core.Constants;
-import io.avaje.jex.jdk.TestPair;
+import io.avaje.jex.core.TestPair;
 
 class CompressionTest {
 

avaje-jex/src/test/java/io/avaje/jex/jdk/AutoCloseIterator.java → avaje-jex/src/test/java/io/avaje/jex/core/AutoCloseIterator.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicBoolean;

avaje-jex/src/test/java/io/avaje/jex/jdk/CharacterEncodingTest.java → avaje-jex/src/test/java/io/avaje/jex/core/CharacterEncodingTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/ContextAttributeTest.java → avaje-jex/src/test/java/io/avaje/jex/core/ContextAttributeTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/ContextFormParamTest.java → avaje-jex/src/test/java/io/avaje/jex/core/ContextFormParamTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/ContextLengthTest.java → avaje-jex/src/test/java/io/avaje/jex/core/ContextLengthTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/ContextTest.java → avaje-jex/src/test/java/io/avaje/jex/core/ContextTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/CookieParserTest.java → avaje-jex/src/test/java/io/avaje/jex/core/CookieParserTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import org.junit.jupiter.api.Test;
 

avaje-jex/src/test/java/io/avaje/jex/jdk/CookieServerTest.java → avaje-jex/src/test/java/io/avaje/jex/core/CookieServerTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Context;
 import io.avaje.jex.Jex;

avaje-jex/src/test/java/io/avaje/jex/jdk/ExceptionManagerTest.java → avaje-jex/src/test/java/io/avaje/jex/core/ExceptionManagerTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import io.avaje.jex.http.ErrorCode;

avaje-jex/src/test/java/io/avaje/jex/jdk/FilterTest.java → avaje-jex/src/test/java/io/avaje/jex/core/FilterTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/HeadersTest.java → avaje-jex/src/test/java/io/avaje/jex/core/HeadersTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.http.client.HttpClient;
 import io.avaje.http.client.JacksonBodyAdapter;

avaje-jex/src/test/java/io/avaje/jex/jdk/HealthPluginOffTest.java → avaje-jex/src/test/java/io/avaje/jex/core/HealthPluginOffTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/HealthPluginTest.java → avaje-jex/src/test/java/io/avaje/jex/core/HealthPluginTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.http.client.HttpClient;
 import io.avaje.http.client.JacksonBodyAdapter;

avaje-jex/src/test/java/io/avaje/jex/jdk/HelloBean.java → avaje-jex/src/test/java/io/avaje/jex/core/HelloBean.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 public class HelloBean {
 

avaje-jex/src/test/java/io/avaje/jex/jdk/HelloDto.java → avaje-jex/src/test/java/io/avaje/jex/core/HelloDto.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jsonb.Json;
 

avaje-jex/src/test/java/io/avaje/jex/jdk/JdkJexServerTest.java → avaje-jex/src/test/java/io/avaje/jex/core/JdkJexServerTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

avaje-jex/src/test/java/io/avaje/jex/jdk/JsonTest.java → avaje-jex/src/test/java/io/avaje/jex/core/JsonTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;

avaje-jex/src/test/java/io/avaje/jex/jdk/Main.java → avaje-jex/src/test/java/io/avaje/jex/core/Main.java

@@ -1,7 +1,6 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
-import io.avaje.jex.core.HealthPlugin;
 
 public class Main {
 

avaje-jex/src/test/java/io/avaje/jex/jdk/MultiHandlerTest.java → avaje-jex/src/test/java/io/avaje/jex/core/MultiHandlerTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/NestedRoutesTest.java → avaje-jex/src/test/java/io/avaje/jex/core/NestedRoutesTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/QueryParamTest.java → avaje-jex/src/test/java/io/avaje/jex/core/QueryParamTest.java

@@ -1,12 +1,10 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 
 import java.net.http.HttpResponse;
-import java.util.Map;
-import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

avaje-jex/src/test/java/io/avaje/jex/jdk/RedirectTest.java → avaje-jex/src/test/java/io/avaje/jex/core/RedirectTest.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.jex.Jex;
 import org.junit.jupiter.api.AfterAll;

avaje-jex/src/test/java/io/avaje/jex/jdk/TestPair.java → avaje-jex/src/test/java/io/avaje/jex/core/TestPair.java

@@ -1,4 +1,4 @@
-package io.avaje.jex.jdk;
+package io.avaje.jex.core;
 
 import io.avaje.http.client.HttpClient;
 import io.avaje.http.client.HttpClientRequest;

examples/example-jdk-jsonb/README.md

@@ -15,7 +15,7 @@ To Run:
 ./target/mytest
 
 # produces
-# Oct 21, 2022 1:39:36 PM io.avaje.jex.jdk.JdkServerStart start
+# Oct 21, 2022 1:39:36 PM io.avaje.jex.core.JdkServerStart start
 # INFO: started server on port 7003 version 2.5-SNAPSHOT
 ```