Format only changes

- sorts Context/Jex members
- adds auto-formatter

Author: SentryMan

.github/workflows/format.yml

@@ -0,0 +1,20 @@
+name: Auto-Format
+on: [push, workflow_dispatch]
+jobs:
+  format:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'zulu'
+      - name: Format Code
+        uses: axel-op/googlejavaformat-action@v3
+        with:
+          args: "--skip-sorting-imports --replace"

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

@@ -21,20 +21,28 @@ public DJexConfig config() {
   }
 
   @Override
-  public Jex routing(Routing.HttpService routes) {
-    routing.add(routes);
+  public Jex config(Consumer<JexConfig> configure) {
+    configure.accept(config);
     return this;
   }
 
   @Override
-  public Jex routing(Collection<Routing.HttpService> routes) {
-    routing.addAll(routes);
+  public Jex configureWith(BeanScope beanScope) {
+    lifecycle.onShutdown(beanScope::close);
+    for (JexPlugin plugin : beanScope.list(JexPlugin.class)) {
+      plugin.apply(this);
+    }
+    routing.addAll(beanScope.list(Routing.HttpService.class));
+    beanScope.getOptional(JsonService.class).ifPresent(this::jsonService);
+    beanScope.getOptional(HttpsConfigurator.class).ifPresent(config()::httpsConfig);
+    beanScope.getOptional(HttpServerProvider.class).ifPresent(config()::serverProvider);
     return this;
   }
 
   @Override
-  public Routing routing() {
-    return routing;
+  public Jex contextPath(String contextPath) {
+    config.contextPath(contextPath);
+    return this;
   }
 
   @Override
@@ -44,53 +52,45 @@ public Jex jsonService(JsonService jsonService) {
   }
 
   @Override
-  public Jex plugin(JexPlugin plugin) {
-    plugin.apply(this);
-    return this;
+  public AppLifecycle lifecycle() {
+    return lifecycle;
   }
 
   @Override
-  public Jex configureWith(BeanScope beanScope) {
-    lifecycle.onShutdown(beanScope::close);
-    for (JexPlugin plugin : beanScope.list(JexPlugin.class)) {
-      plugin.apply(this);
-    }
-    routing.addAll(beanScope.list(Routing.HttpService.class));
-    beanScope.getOptional(JsonService.class).ifPresent(this::jsonService);
-    beanScope.getOptional(HttpsConfigurator.class).ifPresent(config()::httpsConfig);
-    beanScope.getOptional(HttpServerProvider.class).ifPresent(config()::serverProvider);
+  public Jex plugin(JexPlugin plugin) {
+    plugin.apply(this);
     return this;
   }
 
   @Override
-  public Jex config(Consumer<JexConfig> configure) {
-    configure.accept(config);
+  public Jex port(int port) {
+    config.port(port);
     return this;
   }
 
   @Override
-  public Jex port(int port) {
-    config.port(port);
+  public Jex register(TemplateRender renderer, String... extensions) {
+    for (String extension : extensions) {
+      config.renderer(extension, renderer);
+    }
     return this;
   }
 
   @Override
-  public Jex contextPath(String contextPath) {
-    config.contextPath(contextPath);
-    return this;
+  public Routing routing() {
+    return routing;
   }
 
   @Override
-  public Jex register(TemplateRender renderer, String... extensions) {
-    for (String extension : extensions) {
-      config.renderer(extension, renderer);
-    }
+  public Jex routing(Collection<Routing.HttpService> routes) {
+    routing.addAll(routes);
     return this;
   }
 
   @Override
-  public AppLifecycle lifecycle() {
-    return lifecycle;
+  public Jex routing(Routing.HttpService routes) {
+    routing.add(routes);
+    return this;
   }
 
   @Override

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

@@ -31,17 +31,21 @@ final class DJexConfig implements JexConfig {
   private HttpServerProvider serverProvider;
 
   @Override
-  public JexConfig host(String host) {
-    this.host = host;
-    return this;
+  public CompressionConfig compression() {
+    return compression;
   }
 
   @Override
-  public JexConfig port(int port) {
-    this.port = port;
+  public JexConfig compression(Consumer<CompressionConfig> consumer) {
+    consumer.accept(compression);
     return this;
   }
 
+  @Override
+  public String contextPath() {
+    return contextPath;
+  }
+
   @Override
   public JexConfig contextPath(String contextPath) {
     if (!this.contextPath.equals(contextPath)) {
@@ -55,79 +59,74 @@ public JexConfig contextPath(String contextPath) {
   }
 
   @Override
-  public JexConfig socketBacklog(int socketBacklog) {
-    this.socketBacklog = socketBacklog;
-    return this;
-  }
-
-  @Override
-  public JexConfig health(boolean health) {
-    this.health = health;
-    return this;
+  public Executor executor() {
+    if (executor == null) {
+      executor =
+          Executors.newThreadPerTaskExecutor(
+              Thread.ofVirtual().name("avaje-jex-http-", 0).factory());
+    }
+    return executor;
   }
 
   @Override
-  public JexConfig ignoreTrailingSlashes(boolean ignoreTrailingSlashes) {
-    this.ignoreTrailingSlashes = ignoreTrailingSlashes;
+  public JexConfig executor(Executor executor) {
+    this.executor = executor;
     return this;
   }
 
   @Override
-  public JexConfig jsonService(JsonService jsonService) {
-    this.jsonService = jsonService;
-    return this;
+  public boolean health() {
+    return health;
   }
 
   @Override
-  public JexConfig renderer(String extension, TemplateRender renderer) {
-    renderers.put(extension, renderer);
+  public JexConfig health(boolean health) {
+    this.health = health;
     return this;
   }
 
   @Override
-  public Executor executor() {
-    if (executor == null) {
-      executor =
-          Executors.newThreadPerTaskExecutor(
-              Thread.ofVirtual().name("avaje-jex-http-", 0).factory());
-    }
-    return executor;
+  public String host() {
+    return host;
   }
 
   @Override
-  public JexConfig executor(Executor executor) {
-    this.executor = executor;
+  public JexConfig host(String host) {
+    this.host = host;
     return this;
   }
 
   @Override
-  public String host() {
-    return host;
+  public HttpsConfigurator httpsConfig() {
+    return httpsConfig;
   }
 
   @Override
-  public int port() {
-    return port;
+  public JexConfig httpsConfig(HttpsConfigurator httpsConfig) {
+    this.httpsConfig = httpsConfig;
+    return this;
   }
 
   @Override
-  public String contextPath() {
-    return contextPath;
+  public boolean ignoreTrailingSlashes() {
+    return ignoreTrailingSlashes;
   }
 
   @Override
-  public int socketBacklog() {
-    return socketBacklog;
+  public JexConfig ignoreTrailingSlashes(boolean ignoreTrailingSlashes) {
+    this.ignoreTrailingSlashes = ignoreTrailingSlashes;
+    return this;
   }
 
   @Override
-  public boolean health() {
-    return health;
+  public int initialStreamBufferSize() {
+    return bufferInitial;
   }
 
   @Override
-  public boolean ignoreTrailingSlashes() {
-    return ignoreTrailingSlashes;
+  public JexConfig initialStreamBufferSize(int initialSize) {
+    bufferInitial = initialSize;
+    return this;
   }
 
   @Override
@@ -136,67 +135,68 @@ public JsonService jsonService() {
   }
 
   @Override
-  public Map<String, TemplateRender> renderers() {
-    return renderers;
+  public JexConfig jsonService(JsonService jsonService) {
+    this.jsonService = jsonService;
+    return this;
   }
 
   @Override
-  public String scheme() {
-    return httpsConfig == null ? "http" : "https";
+  public long maxStreamBufferSize() {
+    return bufferMax;
   }
 
   @Override
-  public HttpsConfigurator httpsConfig() {
-    return httpsConfig;
+  public JexConfig maxStreamBufferSize(long maxSize) {
+    bufferMax = maxSize;
+    return this;
   }
 
   @Override
-  public JexConfig httpsConfig(HttpsConfigurator httpsConfig) {
-    this.httpsConfig = httpsConfig;
-    return this;
+  public int port() {
+    return port;
   }
 
   @Override
-  public JexConfig compression(Consumer<CompressionConfig> consumer) {
-    consumer.accept(compression);
+  public JexConfig port(int port) {
+    this.port = port;
     return this;
   }
 
   @Override
-  public CompressionConfig compression() {
-    return compression;
+  public JexConfig renderer(String extension, TemplateRender renderer) {
+    renderers.put(extension, renderer);
+    return this;
   }
 
   @Override
-  public long maxStreamBufferSize() {
-    return bufferMax;
+  public Map<String, TemplateRender> renderers() {
+    return renderers;
   }
 
   @Override
-  public int initialStreamBufferSize() {
-    return bufferInitial;
+  public String scheme() {
+    return httpsConfig == null ? "http" : "https";
   }
 
   @Override
-  public JexConfig initialStreamBufferSize(int initialSize) {
-    bufferInitial = initialSize;
-    return this;
+  public HttpServerProvider serverProvider() {
+    return this.serverProvider != null ? serverProvider : HttpServerProvider.provider();
   }
 
   @Override
-  public JexConfig maxStreamBufferSize(long maxSize) {
-    bufferMax = maxSize;
+  public JexConfig serverProvider(HttpServerProvider serverProvider) {
+    this.serverProvider = serverProvider;
     return this;
   }
 
   @Override
-  public HttpServerProvider serverProvider() {
-    return this.serverProvider != null ? serverProvider : HttpServerProvider.provider();
+  public int socketBacklog() {
+    return socketBacklog;
   }
 
   @Override
-  public JexConfig serverProvider(HttpServerProvider serverProvider) {
-    this.serverProvider = serverProvider;
+  public JexConfig socketBacklog(int socketBacklog) {
+    this.socketBacklog = socketBacklog;
     return this;
   }
 }