build: add package-info.java with non-null by default

jknack · jknack · commit 0db06c10a0db · 2024-07-21T19:03:07.000-03:00
diff --git a/jooby/src/main/java/io/jooby/buffer/DataBufferWrapper.java b/jooby/src/main/java/io/jooby/buffer/DataBufferWrapper.java
@@ -71,8 +71,7 @@ public int capacity() {
 
   @Override
   public DataBuffer duplicate() {
-    this.delegate.duplicate();
-    return this;
+    return new DataBufferWrapper(this.delegate.duplicate());
   }
 
   @Override
diff --git a/jooby/src/main/java/io/jooby/exception/package-info.java b/jooby/src/main/java/io/jooby/exception/package-info.java
@@ -1,2 +1,3 @@
 /** Built-in exceptions for common HTTP error codes. */
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
 package io.jooby.exception;
diff --git a/modules/jooby-avaje-inject/src/main/java/io/jooby/avaje/inject/package-info.java b/modules/jooby-avaje-inject/src/main/java/io/jooby/avaje/inject/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.avaje.inject;
diff --git a/modules/jooby-avaje-jsonb/src/main/java/io/jooby/avaje/jsonb/package-info.java b/modules/jooby-avaje-jsonb/src/main/java/io/jooby/avaje/jsonb/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.avaje.jsonb;
diff --git a/modules/jooby-awssdk-v1/src/main/java/io/jooby/awssdkv1/package-info.java b/modules/jooby-awssdk-v1/src/main/java/io/jooby/awssdkv1/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.awssdkv1;
diff --git a/modules/jooby-caffeine/src/main/java/io/jooby/caffeine/package-info.java b/modules/jooby-caffeine/src/main/java/io/jooby/caffeine/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.caffeine;
diff --git a/modules/jooby-camel/src/main/java/io/jooby/camel/package-info.java b/modules/jooby-camel/src/main/java/io/jooby/camel/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.camel;
diff --git a/modules/jooby-commons-email/src/main/java/io/jooby/commons/mail/package-info.java b/modules/jooby-commons-email/src/main/java/io/jooby/commons/mail/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.commons.mail;
diff --git a/modules/jooby-conscrypt/src/main/java/io/jooby/conscrypt/package-info.java b/modules/jooby-conscrypt/src/main/java/io/jooby/conscrypt/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.conscrypt;
diff --git a/modules/jooby-ebean/src/main/java/io/jooby/ebean/package-info.java b/modules/jooby-ebean/src/main/java/io/jooby/ebean/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.ebean;
diff --git a/modules/jooby-flyway/src/main/java/io/jooby/flyway/package-info.java b/modules/jooby-flyway/src/main/java/io/jooby/flyway/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.flyway;
diff --git a/modules/jooby-freemarker/src/main/java/io/jooby/freemarker/package-info.java b/modules/jooby-freemarker/src/main/java/io/jooby/freemarker/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.freemarker;
diff --git a/modules/jooby-graphiql/src/main/java/io/jooby/graphiql/package-info.java b/modules/jooby-graphiql/src/main/java/io/jooby/graphiql/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.graphiql;
diff --git a/modules/jooby-graphql-playground/src/main/java/io/jooby/graphql/playground/package-info.java b/modules/jooby-graphql-playground/src/main/java/io/jooby/graphql/playground/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.graphql.playground;
diff --git a/modules/jooby-graphql/src/main/java/io/jooby/graphql/package-info.java b/modules/jooby-graphql/src/main/java/io/jooby/graphql/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.graphql;
diff --git a/modules/jooby-gson/src/main/java/io/jooby/gson/package-info.java b/modules/jooby-gson/src/main/java/io/jooby/gson/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.gson;
diff --git a/modules/jooby-guice/src/main/java/io/jooby/guice/package-info.java b/modules/jooby-guice/src/main/java/io/jooby/guice/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.guice;
diff --git a/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/package-info.java b/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.hibernate;
diff --git a/modules/jooby-hikari/src/main/java/io/jooby/hikari/package-info.java b/modules/jooby-hikari/src/main/java/io/jooby/hikari/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.hikari;
diff --git a/modules/jooby-jackson/src/main/java/io/jooby/jackson/package-info.java b/modules/jooby-jackson/src/main/java/io/jooby/jackson/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.jackson;
diff --git a/modules/jooby-jasypt/src/main/java/io/jooby/jasypt/package-info.java b/modules/jooby-jasypt/src/main/java/io/jooby/jasypt/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.jasypt;
diff --git a/modules/jooby-jdbi/src/main/java/io/jooby/jdbi/package-info.java b/modules/jooby-jdbi/src/main/java/io/jooby/jdbi/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.jdbi;
diff --git a/modules/jooby-jetty/src/main/java/io/jooby/jetty/package-info.java b/modules/jooby-jetty/src/main/java/io/jooby/jetty/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.jetty;
diff --git a/modules/jooby-jstachio/src/main/java/io/jooby/jstachio/package-info.java b/modules/jooby-jstachio/src/main/java/io/jooby/jstachio/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.jstachio;
diff --git a/modules/jooby-jte/src/main/java/io/jooby/jte/package-info.java b/modules/jooby-jte/src/main/java/io/jooby/jte/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.jte;
diff --git a/modules/jooby-jwt/src/main/java/io/jooby/jwt/package-info.java b/modules/jooby-jwt/src/main/java/io/jooby/jwt/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.jwt;
diff --git a/modules/jooby-kafka/src/main/java/io/jooby/kafka/package-info.java b/modules/jooby-kafka/src/main/java/io/jooby/kafka/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.kafka;
diff --git a/modules/jooby-log4j/src/main/java/io/jooby/log4j/package-info.java b/modules/jooby-log4j/src/main/java/io/jooby/log4j/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.log4j;
diff --git a/modules/jooby-logback/src/main/java/io.jooby.logback/package-info.java b/modules/jooby-logback/src/main/java/io.jooby.logback/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.logback;
diff --git a/modules/jooby-metrics/src/main/java/io/jooby/metrics/package-info.java b/modules/jooby-metrics/src/main/java/io/jooby/metrics/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.metrics;
diff --git a/modules/jooby-mutiny/src/main/java/io/jooby/mutiny/package-info.java b/modules/jooby-mutiny/src/main/java/io/jooby/mutiny/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.mutiny;
diff --git a/modules/jooby-netty/src/main/java/io/jooby/netty/buffer/package-info.java b/modules/jooby-netty/src/main/java/io/jooby/netty/buffer/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.netty.buffer;
diff --git a/modules/jooby-netty/src/main/java/io/jooby/netty/package-info.java b/modules/jooby-netty/src/main/java/io/jooby/netty/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.netty;
diff --git a/modules/jooby-pac4j/src/main/java/io/jooby/pac4j/package-info.java b/modules/jooby-pac4j/src/main/java/io/jooby/pac4j/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.pac4j;
diff --git a/modules/jooby-pebble/src/main/java/io/jooby/pebble/package-info.java b/modules/jooby-pebble/src/main/java/io/jooby/pebble/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.pebble;
diff --git a/modules/jooby-quartz/src/main/java/io/jooby/quartz/package-info.java b/modules/jooby-quartz/src/main/java/io/jooby/quartz/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.quartz;
diff --git a/modules/jooby-reactor/src/main/java/io/jooby/reactor/package-info.java b/modules/jooby-reactor/src/main/java/io/jooby/reactor/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.reactor;
diff --git a/modules/jooby-redis/src/main/java/io/jooby/redis/package-info.java b/modules/jooby-redis/src/main/java/io/jooby/redis/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.redis;
diff --git a/modules/jooby-rocker/src/main/java/io/jooby/rocker/package-info.java b/modules/jooby-rocker/src/main/java/io/jooby/rocker/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.rocker;
diff --git a/modules/jooby-rxjava3/src/main/java/io/jooby/rxjava3/package-info.java b/modules/jooby-rxjava3/src/main/java/io/jooby/rxjava3/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.rxjava3;
diff --git a/modules/jooby-test/src/main/java/io/jooby/test/package-info.java b/modules/jooby-test/src/main/java/io/jooby/test/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.test;
diff --git a/modules/jooby-thymeleaf/src/main/java/io/jooby/thymeleaf/package-info.java b/modules/jooby-thymeleaf/src/main/java/io/jooby/thymeleaf/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.thymeleaf;
diff --git a/modules/jooby-undertow/src/main/java/io/jooby/undertow/UndertowServer.java b/modules/jooby-undertow/src/main/java/io/jooby/undertow/UndertowServer.java
@@ -15,9 +15,7 @@
 
 import javax.net.ssl.SSLContext;
 
-import org.xnio.Options;
-import org.xnio.Sequence;
-import org.xnio.SslClientAuthMode;
+import org.xnio.*;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Jooby;
@@ -57,6 +55,7 @@ public class UndertowServer extends Server.Base {
 
   private ServerOptions options =
       new ServerOptions().setIoThreads(ServerOptions.IO_THREADS).setServer("utow");
+  private XnioWorker worker;
 
   @NonNull @Override
   public UndertowServer setOptions(@NonNull ServerOptions options) {
@@ -102,6 +101,19 @@ public String getName() {
       if (options.isExpectContinue() == Boolean.TRUE) {
         handler = new HttpContinueReadHandler(handler);
       }
+      var xnio = Xnio.getInstance(Undertow.class.getClassLoader());
+      this.worker =
+          xnio.createWorker(
+              OptionMap.builder()
+                  .set(Options.WORKER_IO_THREADS, options.getIoThreads())
+                  .set(Options.CONNECTION_HIGH_WATER, 1000000)
+                  .set(Options.CONNECTION_LOW_WATER, 1000000)
+                  .set(Options.WORKER_TASK_CORE_THREADS, options.getWorkerThreads())
+                  .set(Options.WORKER_TASK_MAX_THREADS, options.getWorkerThreads())
+                  .set(Options.TCP_NODELAY, true)
+                  .set(Options.CORK, true)
+                  .addAll(OptionMap.create(Options.WORKER_NAME, "worker"))
+                  .getMap());
 
       Undertow.Builder builder =
           Undertow.builder()
@@ -116,9 +128,7 @@ public String getName() {
               .setServerOption(UndertowOptions.RECORD_REQUEST_START_TIME, false)
               .setServerOption(UndertowOptions.DECODE_URL, false)
               /** Worker: */
-              .setIoThreads(options.getIoThreads())
-              .setWorkerOption(Options.WORKER_NAME, "worker")
-              .setWorkerThreads(options.getWorkerThreads())
+              .setWorker(worker)
               .setHandler(handler);
 
       if (!options.isHttpsOnly()) {
@@ -141,16 +151,14 @@ public String getName() {
       } else if (options.isHttpsOnly()) {
         throw new StartupException("Server configured for httpsOnly, but ssl options not set");
       }
-
+      fireStart(applications, worker);
       server = builder.build();
       server.start();
-      // NOT IDEAL, but we need to fire onStart after server.start to get access to Worker
-      fireStart(applications, server.getWorker());
 
       fireReady(Collections.singletonList(application));
 
       return this;
-    } catch (RuntimeException x) {
+    } catch (Exception x) {
       Throwable sourceException = x;
       Throwable cause = Optional.ofNullable(x.getCause()).orElse(x);
       if (Server.isAddressInUse(cause)) {
@@ -166,14 +174,11 @@ public List<String> getLoggerOff() {
   }
 
   private SslClientAuthMode toSslClientAuthMode(SslOptions.ClientAuth clientAuth) {
-    switch (clientAuth) {
-      case REQUESTED:
-        return SslClientAuthMode.REQUESTED;
-      case REQUIRED:
-        return SslClientAuthMode.REQUIRED;
-      default:
-        return SslClientAuthMode.NOT_REQUESTED;
-    }
+    return switch (clientAuth) {
+      case REQUESTED -> SslClientAuthMode.REQUESTED;
+      case REQUIRED -> SslClientAuthMode.REQUIRED;
+      default -> SslClientAuthMode.NOT_REQUESTED;
+    };
   }
 
   @NonNull @Override
@@ -196,8 +201,27 @@ private void shutdownServer() {
       try {
         server.stop();
       } finally {
+        shutdownWorker();
         server = null;
       }
     }
   }
+
+  private void shutdownWorker() {
+    /*
+     * Only shutdown the worker if it was created during start()
+     */
+    if (worker != null) {
+      worker.shutdown();
+      try {
+        worker.awaitTermination();
+      } catch (InterruptedException e) {
+        worker.shutdownNow();
+        Thread.currentThread().interrupt();
+        throw new RuntimeException(e);
+      } finally {
+        worker = null;
+      }
+    }
+  }
 }
diff --git a/modules/jooby-undertow/src/main/java/io/jooby/undertow/package-info.java b/modules/jooby-undertow/src/main/java/io/jooby/undertow/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.undertow;
diff --git a/modules/jooby-undertow/src/test/java/io/jooby/internal/undertow/UndertowFileUploadTest.java b/modules/jooby-undertow/src/test/java/io/jooby/internal/undertow/UndertowFileUploadTest.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby.internal.utow;
+package io.jooby.internal.undertow;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.doThrow;
@@ -14,7 +14,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.jooby.internal.undertow.UndertowFileUpload;
 import io.undertow.server.handlers.form.FormData;
 
 public class UndertowFileUploadTest {
diff --git a/modules/jooby-whoops/src/main/java/io/jooby/whoops/package-info.java b/modules/jooby-whoops/src/main/java/io/jooby/whoops/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.whoops;
diff --git a/modules/jooby-yasson/src/main/java/io/jooby/yasson/package-info.java b/modules/jooby-yasson/src/main/java/io/jooby/yasson/package-info.java
@@ -0,0 +1,2 @@
+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault
+package io.jooby.yasson;

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ public int capacity() {`
`71`	`71`
`72`	`72`	`@Override`
`73`	`73`	`public DataBuffer duplicate() {`
`74`		`- this.delegate.duplicate();`
`75`		`- return this;`
	`74`	`+ return new DataBufferWrapper(this.delegate.duplicate());`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`/** Built-in exceptions for common HTTP error codes. */`
	`2`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
`2`	`3`	`package io.jooby.exception;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
	`2`	`+package io.jooby.avaje.inject;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
	`2`	`+package io.jooby.avaje.jsonb;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
	`2`	`+package io.jooby.awssdkv1;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
	`2`	`+package io.jooby.caffeine;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
	`2`	`+package io.jooby.camel;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
	`2`	`+package io.jooby.commons.mail;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
	`2`	`+package io.jooby.conscrypt;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault`
	`2`	`+package io.jooby.ebean;`