Regression in release-4.0 branch (#1176)

* Rollback to previous revision to fix regression introduced by commit ae1f6ef Signed-off-by: Nicolas NESMON (@NicoNes) <[email protected]> * Re apply only relevant changes form commit ae1f6ef Signed-off-by: Nicolas NESMON (@NicoNes) <[email protected]> * Re apply import ordering changes from commit ae1f6ef Signed-off-by: Nicolas NESMON (@NicoNes) <[email protected]> --------- Signed-off-by: Nicolas NESMON (@NicoNes) <[email protected]> Co-authored-by: Santiago Pericas-Geertsen <[email protected]>
jakartaee · Oct 16, 2023 · 7595659 · 7595659
1 parent e5d1b8d
commit 7595659
Show file tree

Hide file tree

Showing 44 changed files with 2,042 additions and 337 deletions.
diff --git a/examples/src/main/java/jaxrs/examples/bootstrap/BasicJavaSeBootstrapExample.java b/examples/src/main/java/jaxrs/examples/bootstrap/BasicJavaSeBootstrapExample.java
@@ -19,9 +19,6 @@
 import java.net.URI;
 
 import jakarta.ws.rs.SeBootstrap;
-import jakarta.ws.rs.SeBootstrap.Configuration;
-import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Basic Java SE bootstrap example.
@@ -46,21 +43,12 @@ private BasicJavaSeBootstrapExample() {
      * @param args unused command line arguments
      * @throws InterruptedException when process is killed
      */
-    public static final void main(final String[] args) throws InterruptedException {
-        final Application application = new HelloWorld();
-
-        final SeBootstrap.Configuration requestedConfiguration = SeBootstrap.Configuration.builder().build();
-
-        SeBootstrap.start(application, requestedConfiguration).thenAccept(instance -> {
-            Runtime.getRuntime()
-                    .addShutdownHook(new Thread(() -> instance.stop()
-                            .thenAccept(stopResult -> System.out.printf("Stop result: %s [Native stop result: %s].%n",
-                                    stopResult, stopResult.unwrap(Object.class)))));
-
-            final Configuration actualConfigurarion = instance.configuration();
-            final URI uri = UriBuilder.newInstance().scheme(actualConfigurarion.protocol().toLowerCase())
-                    .host(actualConfigurarion.host()).port(actualConfigurarion.port())
-                    .path(actualConfigurarion.rootPath()).build();
+    public static void main(final String[] args) throws InterruptedException {
+        SeBootstrap.start(HelloWorld.class).thenAccept(instance -> {
+            instance.stopOnShutdown(stopResult ->
+                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
+                            stopResult.unwrap(Object.class)));
+            final URI uri = instance.configuration().baseUri();
             System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
                     instance.unwrap(Object.class));
             System.out.println("Send SIGKILL to shutdown.");

diff --git a/...es/src/main/java/jaxrs/examples/bootstrap/ClientAuthenticationJavaSeBootstrapExample.java b/...es/src/main/java/jaxrs/examples/bootstrap/ClientAuthenticationJavaSeBootstrapExample.java
@@ -19,10 +19,7 @@
 import java.net.URI;
 
 import jakarta.ws.rs.SeBootstrap;
-import jakarta.ws.rs.SeBootstrap.Configuration;
 import jakarta.ws.rs.SeBootstrap.Configuration.SSLClientAuthentication;
-import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Java SE Bootstrap Example using TLS Client Authentication.
@@ -62,22 +59,15 @@ private ClientAuthenticationJavaSeBootstrapExample() {
      * @param args unused command line arguments
      * @throws InterruptedException when process is killed
      */
-    public static final void main(final String[] args) throws InterruptedException {
-        final Application application = new HelloWorld();
-
+    public static void main(final String[] args) throws InterruptedException {
         final SeBootstrap.Configuration requestedConfiguration = SeBootstrap.Configuration.builder().protocol("HTTPS")
                 .sslClientAuthentication(SSLClientAuthentication.MANDATORY).build();
 
-        SeBootstrap.start(application, requestedConfiguration).thenAccept(instance -> {
-            Runtime.getRuntime()
-                    .addShutdownHook(new Thread(() -> instance.stop()
-                            .thenAccept(stopResult -> System.out.printf("Stop result: %s [Native stop result: %s].%n",
-                                    stopResult, stopResult.unwrap(Object.class)))));
-
-            final Configuration actualConfigurarion = instance.configuration();
-            final URI uri = UriBuilder.newInstance().scheme(actualConfigurarion.protocol().toLowerCase())
-                    .host(actualConfigurarion.host()).port(actualConfigurarion.port())
-                    .path(actualConfigurarion.rootPath()).build();
+        SeBootstrap.start(HelloWorld.class, requestedConfiguration).thenAccept(instance -> {
+            instance.stopOnShutdown(stopResult ->
+                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
+                            stopResult.unwrap(Object.class)));
+            final URI uri = instance.configuration().baseUri();
             System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
                     instance.unwrap(Object.class));
             System.out.println("Send SIGKILL to shutdown.");

diff --git a/examples/src/main/java/jaxrs/examples/bootstrap/ExplicitJavaSeBootstrapExample.java b/examples/src/main/java/jaxrs/examples/bootstrap/ExplicitJavaSeBootstrapExample.java
@@ -19,10 +19,8 @@
 import java.net.URI;
 
 import jakarta.ws.rs.SeBootstrap;
-import jakarta.ws.rs.SeBootstrap.Configuration;
 import jakarta.ws.rs.SeBootstrap.Configuration.SSLClientAuthentication;
 import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Java SE bootstrap example with explicit configuration.
@@ -56,7 +54,7 @@ private ExplicitJavaSeBootstrapExample() {
      * {@code NONE, OPTIONAL, MANDATORY}.
      * @throws InterruptedException when process is killed
      */
-    public static final void main(final String[] args) throws InterruptedException {
+    public static void main(final String[] args) throws InterruptedException {
         final Application application = new HelloWorld();
 
         final String protocol = args[0];
@@ -69,15 +67,10 @@ public static final void main(final String[] args) throws InterruptedException {
                 .port(port).rootPath(rootPath).sslClientAuthentication(clientAuth).build();
 
         SeBootstrap.start(application, requestedConfiguration).thenAccept(instance -> {
-            Runtime.getRuntime()
-                    .addShutdownHook(new Thread(() -> instance.stop()
-                            .thenAccept(stopResult -> System.out.printf("Stop result: %s [Native stop result: %s].%n",
-                                    stopResult, stopResult.unwrap(Object.class)))));
-
-            final Configuration actualConfigurarion = instance.configuration();
-            final URI uri = UriBuilder.newInstance().scheme(actualConfigurarion.protocol().toLowerCase())
-                    .host(actualConfigurarion.host()).port(actualConfigurarion.port())
-                    .path(actualConfigurarion.rootPath()).build();
+            instance.stopOnShutdown(stopResult ->
+                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
+                            stopResult.unwrap(Object.class)));
+            final URI uri = instance.configuration().baseUri();
             System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
                     instance.unwrap(Object.class));
             System.out.println("Send SIGKILL to shutdown.");

diff --git a/examples/src/main/java/jaxrs/examples/bootstrap/ExternalConfigJavaSeBootstrapExample.java b/examples/src/main/java/jaxrs/examples/bootstrap/ExternalConfigJavaSeBootstrapExample.java
@@ -18,13 +18,10 @@
 
 import java.net.URI;
 
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
-
 import jakarta.ws.rs.SeBootstrap;
-import jakarta.ws.rs.SeBootstrap.Configuration;
 import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.UriBuilder;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 
 /**
  * Java SE bootstrap example utilizing an external configuration system.
@@ -71,7 +68,7 @@ private ExternalConfigJavaSeBootstrapExample() {
      * @param args unused command line arguments
      * @throws InterruptedException when process is killed
      */
-    public static final void main(final String[] args) throws InterruptedException {
+    public static void main(final String[] args) throws InterruptedException {
         final Application application = new HelloWorld();
 
         final Config config = ConfigProvider.getConfig();
@@ -80,15 +77,10 @@ public static final void main(final String[] args) throws InterruptedException {
                 .build();
 
         SeBootstrap.start(application, requestedConfiguration).thenAccept(instance -> {
-            Runtime.getRuntime()
-                    .addShutdownHook(new Thread(() -> instance.stop()
-                            .thenAccept(stopResult -> System.out.printf("Stop result: %s [Native stop result: %s].%n",
-                                    stopResult, stopResult.unwrap(Object.class)))));
-
-            final Configuration actualConfigurarion = instance.configuration();
-            final URI uri = UriBuilder.newInstance().scheme(actualConfigurarion.protocol().toLowerCase())
-                    .host(actualConfigurarion.host()).port(actualConfigurarion.port())
-                    .path(actualConfigurarion.rootPath()).build();
+            instance.stopOnShutdown(stopResult ->
+                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
+                            stopResult.unwrap(Object.class)));
+            final URI uri = instance.configuration().baseUri();
             System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
                     instance.unwrap(Object.class));
             System.out.println("Send SIGKILL to shutdown.");

diff --git a/examples/src/main/java/jaxrs/examples/bootstrap/HttpsJavaSeBootstrapExample.java b/examples/src/main/java/jaxrs/examples/bootstrap/HttpsJavaSeBootstrapExample.java
@@ -19,9 +19,7 @@
 import java.net.URI;
 
 import jakarta.ws.rs.SeBootstrap;
-import jakarta.ws.rs.SeBootstrap.Configuration;
 import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Java SE bootstrap example using HTTPS.
@@ -57,21 +55,16 @@ private HttpsJavaSeBootstrapExample() {
      * @param args unused command line arguments
      * @throws InterruptedException when process is killed
      */
-    public static final void main(final String[] args) throws InterruptedException {
+    public static void main(final String[] args) throws InterruptedException {
         final Application application = new HelloWorld();
 
         final SeBootstrap.Configuration requestedConfiguration = SeBootstrap.Configuration.builder().protocol("HTTPS").build();
 
         SeBootstrap.start(application, requestedConfiguration).thenAccept(instance -> {
-            Runtime.getRuntime()
-                    .addShutdownHook(new Thread(() -> instance.stop()
-                            .thenAccept(stopResult -> System.out.printf("Stop result: %s [Native stop result: %s].%n",
-                                    stopResult, stopResult.unwrap(Object.class)))));
-
-            final Configuration actualConfigurarion = instance.configuration();
-            final URI uri = UriBuilder.newInstance().scheme(actualConfigurarion.protocol().toLowerCase())
-                    .host(actualConfigurarion.host()).port(actualConfigurarion.port())
-                    .path(actualConfigurarion.rootPath()).build();
+            instance.stopOnShutdown(stopResult ->
+                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
+                            stopResult.unwrap(Object.class)));
+            final URI uri = instance.configuration().baseUri();
             System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
                     instance.unwrap(Object.class));
             System.out.println("Send SIGKILL to shutdown.");

diff --git a/examples/src/main/java/jaxrs/examples/bootstrap/NativeJavaSeBootstrapExample.java b/examples/src/main/java/jaxrs/examples/bootstrap/NativeJavaSeBootstrapExample.java
@@ -19,9 +19,7 @@
 import java.net.URI;
 
 import jakarta.ws.rs.SeBootstrap;
-import jakarta.ws.rs.SeBootstrap.Configuration;
 import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Java SE bootstrap example demonstrating the use of native properties.
@@ -56,7 +54,7 @@ private NativeJavaSeBootstrapExample() {
      * @throws InterruptedException when process is killed
      * @throws ClassNotFoundException when Jersey's Grizzly backend is not on the classpath
      */
-    public static final void main(final String[] args) throws InterruptedException, ClassNotFoundException {
+    public static void main(final String[] args) throws InterruptedException, ClassNotFoundException {
         final Application application = new HelloWorld();
 
         final SeBootstrap.Configuration requestedConfiguration = SeBootstrap.Configuration.builder()
@@ -65,15 +63,10 @@ public static final void main(final String[] args) throws InterruptedException,
                 .build();
 
         SeBootstrap.start(application, requestedConfiguration).thenAccept(instance -> {
-            Runtime.getRuntime()
-                    .addShutdownHook(new Thread(() -> instance.stop()
-                            .thenAccept(stopResult -> System.out.printf("Stop result: %s [Native stop result: %s].%n",
-                                    stopResult, stopResult.unwrap(Object.class)))));
-
-            final Configuration actualConfigurarion = instance.configuration();
-            final URI uri = UriBuilder.newInstance().scheme(actualConfigurarion.protocol().toLowerCase())
-                    .host(actualConfigurarion.host()).port(actualConfigurarion.port())
-                    .path(actualConfigurarion.rootPath()).build();
+            instance.stopOnShutdown(stopResult ->
+                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
+                            stopResult.unwrap(Object.class)));
+            final URI uri = instance.configuration().baseUri();
             System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
                     instance.unwrap(Object.class));
             System.out.println("Send SIGKILL to shutdown.");

diff --git a/examples/src/main/java/jaxrs/examples/bootstrap/PropertyProviderJavaSeBootstrapExample.java b/examples/src/main/java/jaxrs/examples/bootstrap/PropertyProviderJavaSeBootstrapExample.java
@@ -18,13 +18,10 @@
 
 import java.net.URI;
 
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
-
 import jakarta.ws.rs.SeBootstrap;
-import jakarta.ws.rs.SeBootstrap.Configuration;
 import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.UriBuilder;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 
 /**
  * Java SE bootstrap example utilizing a property provider.
@@ -69,7 +66,7 @@ private PropertyProviderJavaSeBootstrapExample() {
      * @param args unused command line arguments
      * @throws InterruptedException when process is killed
      */
-    public static final void main(final String[] args) throws InterruptedException {
+    public static void main(final String[] args) throws InterruptedException {
         final Application application = new HelloWorld();
 
         final Config config = ConfigProvider.getConfig();
@@ -78,15 +75,10 @@ public static final void main(final String[] args) throws InterruptedException {
                 .protocol("HTTPS").build();
 
         SeBootstrap.start(application, requestedConfiguration).thenAccept(instance -> {
-            Runtime.getRuntime()
-                    .addShutdownHook(new Thread(() -> instance.stop()
-                            .thenAccept(stopResult -> System.out.printf("Stop result: %s [Native stop result: %s].%n",
-                                    stopResult, stopResult.unwrap(Object.class)))));
-
-            final Configuration actualConfigurarion = instance.configuration();
-            final URI uri = UriBuilder.newInstance().scheme(actualConfigurarion.protocol().toLowerCase())
-                    .host(actualConfigurarion.host()).port(actualConfigurarion.port())
-                    .path(actualConfigurarion.rootPath()).build();
+            instance.stopOnShutdown(stopResult ->
+                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
+                            stopResult.unwrap(Object.class)));
+            final URI uri = instance.configuration().baseUri();
             System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
                     instance.unwrap(Object.class));
             System.out.println("Send SIGKILL to shutdown.");

diff --git a/examples/src/main/java/jaxrs/examples/bootstrap/TlsJavaSeBootstrapExample.java b/examples/src/main/java/jaxrs/examples/bootstrap/TlsJavaSeBootstrapExample.java
@@ -27,9 +27,7 @@
 import java.security.KeyStore;
 
 import jakarta.ws.rs.SeBootstrap;
-import jakarta.ws.rs.SeBootstrap.Configuration;
 import jakarta.ws.rs.core.Application;
-import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Java SE bootstrap example using TLS customization.
@@ -56,7 +54,7 @@ private TlsJavaSeBootstrapExample() {
      * @throws IOException in case file access fails
      * @throws InterruptedException when process is killed
      */
-    public static final void main(final String[] args)
+    public static void main(final String[] args)
             throws GeneralSecurityException, IOException, InterruptedException {
         final Application application = new HelloWorld();
 
@@ -75,15 +73,10 @@ public static final void main(final String[] args)
                 .sslContext(sslContext).build();
 
         SeBootstrap.start(application, requestedConfiguration).thenAccept(instance -> {
-            Runtime.getRuntime()
-                    .addShutdownHook(new Thread(() -> instance.stop()
-                            .thenAccept(stopResult -> System.out.printf("Stop result: %s [Native stop result: %s].%n",
-                                    stopResult, stopResult.unwrap(Object.class)))));
-
-            final Configuration actualConfigurarion = instance.configuration();
-            final URI uri = UriBuilder.newInstance().scheme(actualConfigurarion.protocol().toLowerCase())
-                    .host(actualConfigurarion.host()).port(actualConfigurarion.port())
-                    .path(actualConfigurarion.rootPath()).build();
+            instance.stopOnShutdown(stopResult ->
+                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
+                            stopResult.unwrap(Object.class)));
+            final URI uri = instance.configuration().baseUri();
             System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
                     instance.unwrap(Object.class));
             System.out.println("Send SIGKILL to shutdown.");

diff --git a/examples/src/main/java/jaxrs/examples/bootstrap/package-info.java b/examples/src/main/java/jaxrs/examples/bootstrap/package-info.java
@@ -17,6 +17,6 @@
  *
  * @author Markus KARG ([email protected])
  * @since 3.1
- * @see jakarta.ws.rs.SeBootstrap;
+ * @see jakarta.ws.rs.SeBootstrap
  */
 package jaxrs.examples.bootstrap;
diff --git a/examples/src/main/java/jaxrs/examples/link/LinkExamples.java b/examples/src/main/java/jaxrs/examples/link/LinkExamples.java
@@ -51,7 +51,7 @@ public Response example2() {
      * 1-step process: Build Response and add a link directly to it using either a String or a URI.
      *
      * @return response.
-     * @throws URISyntaxException
+     * @throws URISyntaxException if URI is invalid
      */
     public Response example3() throws URISyntaxException {
         Response r;