Upgrade to Helidon 4 and move to WME version 2.2

Author: rjeberhard

build-helper-mojo/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <artifactId>wls-exporter-parent</artifactId>
         <groupId>com.oracle.wls.exporter</groupId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>build-helper-mojo</artifactId>

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.oracle.wls.exporter</groupId>
     <artifactId>wls-exporter-parent</artifactId>
-    <version>2.1.10-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <modules>
         <module>build-helper-mojo</module>
         <module>wls-exporter-core</module>
@@ -339,7 +339,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-nop</artifactId>
-                <version>2.0.11</version>
+                <version>2.0.12</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -350,7 +350,7 @@
             <dependency>
               <groupId>org.junit.jupiter</groupId>
               <artifactId>junit-jupiter</artifactId>
-              <version>5.10.1</version>
+              <version>5.10.2</version>
               <scope>test</scope>
             </dependency>
             <dependency>

wls-exporter-core/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>wls-exporter-parent</artifactId>
         <groupId>com.oracle.wls.exporter</groupId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>wls-exporter-core</artifactId>

wls-exporter-sidecar/pom.xml

@@ -8,16 +8,16 @@
     <parent>
         <groupId>com.oracle.wls.exporter</groupId>
         <artifactId>wls-exporter-parent</artifactId>
-        <version>2.1.10-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>wls-exporter-sidecar</artifactId>
     <name>WebLogic Monitoring Exporter Sidecar</name>
 
     <properties>
-        <helidon.version>3.2.5</helidon.version>
+        <helidon.version>4.0.5</helidon.version>
         <mainClass>com.oracle.wls.exporter.sidecar.Main</mainClass>
 
-        <version.plugin.helidon>3.0.7</version.plugin.helidon>
+        <version.plugin.helidon>4.0.5</version.plugin.helidon>
     </properties>
 
     <dependencyManagement>
@@ -97,8 +97,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.helidon.webserver</groupId>
-            <artifactId>helidon-webserver-test-support</artifactId>
+            <groupId>io.helidon.webserver.testing.junit5</groupId>
+            <artifactId>helidon-webserver-testing-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <artifactId>helidon-logging-jul</artifactId>
+            <groupId>io.helidon.logging</groupId>
             <scope>test</scope>
         </dependency>
         <dependency>

wls-exporter-sidecar/src/main/java/com/oracle/wls/exporter/sidecar/HelidonInvocationContext.java

@@ -1,24 +1,20 @@
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2024, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package com.oracle.wls.exporter.sidecar;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.net.URI;
-import java.util.concurrent.TimeUnit;
 
 import com.oracle.wls.exporter.InvocationContext;
 import com.oracle.wls.exporter.UrlBuilder;
-import com.oracle.wls.exporter.WebAppConstants;
-import io.helidon.common.http.DataChunk;
-import io.helidon.common.http.Http;
-import io.helidon.common.http.MediaType;
-import io.helidon.common.reactive.Single;
-import io.helidon.webserver.ServerRequest;
-import io.helidon.webserver.ServerResponse;
+import io.helidon.http.HeaderNames;
+import io.helidon.common.media.type.MediaType;
+import io.helidon.http.Status;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
 
 public class HelidonInvocationContext implements InvocationContext {
 
@@ -47,7 +43,7 @@ public String getApplicationContext() {
 
     @Override
     public String getAuthenticationHeader() {
-        return request.headers().first(WebAppConstants.AUTHENTICATION_HEADER).orElse(null);
+        return request.headers().first(HeaderNames.AUTHORIZATION).orElse(null);
     }
 
     @Override
@@ -62,10 +58,7 @@ public String getInstanceName() {
 
     @Override
     public InputStream getRequestStream() {
-        return request.content().as(String.class)
-                .thenApply(String::getBytes)
-                .thenApply(ByteArrayInputStream::new)
-                .await(10, TimeUnit.SECONDS);
+        return request.content().inputStream();
     }
 
     @Override
@@ -82,12 +75,12 @@ public void sendError(int status, String msg) {
     public void sendRedirect(String location) {
         response.headers().location(URI.create(location));
 
-        response.status(Http.Status.FOUND_302).send();
+        response.status(Status.FOUND_302).send();
     }
 
     @Override
     public void setResponseHeader(String name, String value) {
-        response.headers().add(name, value);
+        response.headers().add(HeaderNames.create(name), value);
     }
 
     @Override
@@ -97,6 +90,8 @@ public void setStatus(int status) {
 
     @Override
     public void close() {
-        response.send(Single.just(DataChunk.create(baos.toByteArray())));
+        if (!response.isSent()) {
+            response.send(baos.toByteArray());
+        }
     }
 }

wls-exporter-sidecar/src/main/java/com/oracle/wls/exporter/sidecar/Main.java

@@ -1,14 +1,12 @@
-// Copyright (c) 2021, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2024, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package com.oracle.wls.exporter.sidecar;
 
-import java.util.concurrent.TimeUnit;
-
 import com.oracle.wls.exporter.WebClientFactoryImpl;
-import io.helidon.common.LogConfig;
-import io.helidon.webserver.Routing;
+import io.helidon.logging.common.LogConfig;
 import io.helidon.webserver.WebServer;
+import io.helidon.webserver.http.HttpRouting;
 
 
 // Main program for the Exporter sidecar using Helidon
@@ -19,10 +17,9 @@ public static void main(String[] args) {
         final MetricsService metricsService = new MetricsService(configuration, new WebClientFactoryImpl());
 
         WebServer.builder()
-                .addRouting(Routing.builder().register(metricsService).build())
+                .addRouting(HttpRouting.builder().register(metricsService))
                 .port(metricsService.getListenPort())
                 .build()
-                .start()
-                .await(10, TimeUnit.SECONDS);
+                .start();
     }
 }

wls-exporter-sidecar/src/main/java/com/oracle/wls/exporter/sidecar/MetricsService.java

@@ -1,10 +1,9 @@
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2024, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package com.oracle.wls.exporter.sidecar;
 
 import java.io.IOException;
-import java.util.concurrent.ExecutorService;
 import java.util.function.BiFunction;
 
 import com.oracle.wls.exporter.AuthenticatedCall;
@@ -15,16 +14,15 @@
 import com.oracle.wls.exporter.LiveConfiguration;
 import com.oracle.wls.exporter.MessagesCall;
 import com.oracle.wls.exporter.WebClientFactory;
-import io.helidon.common.configurable.ThreadPoolSupplier;
-import io.helidon.webserver.Routing;
-import io.helidon.webserver.ServerRequest;
-import io.helidon.webserver.ServerResponse;
-import io.helidon.webserver.Service;
+import io.helidon.webserver.http.Handler;
+import io.helidon.webserver.http.ServerRequest;
+import io.helidon.webserver.http.ServerResponse;
+import io.helidon.webserver.http.HttpRules;
+import io.helidon.webserver.http.HttpService;
 
-class MetricsService implements Service {
+class MetricsService implements HttpService {
 
     private final WebClientFactory webClientFactory;
-    private final ExecutorService executorService;
 
     private final AuthenticatedHandler metricsHandler = new AuthenticatedHandler(ExporterCall::new);
     private final AuthenticatedHandler configurationHandler = new AuthenticatedHandler(ConfigurationPutCall::new);
@@ -36,37 +34,27 @@ class MetricsService implements Service {
         this.listenPort = configuration.getListenPort();
         this.webClientFactory = webClientFactory;
         LiveConfiguration.setServer(configuration.getWebLogicHost(), configuration.getWebLogicPort());
-
-        this.executorService = ThreadPoolSupplier.builder()
-                .threadNamePrefix("wls-exporter-sidecar-")
-                .corePoolSize(10)
-                .prestart(true)
-                .build()
-                .get();
     }
 
     @Override
-    public void update(Routing.Rules rules) {
-        rules
-              .get("/", mainHandler::dispatch)
-              .get("/metrics", metricsHandler::dispatch)
-              .get("/messages", messagesHandler::dispatch)
-              .put("/configuration", configurationHandler::dispatch);
+    public void routing(HttpRules rules) {
+        rules.get("/", mainHandler)
+            .get("/metrics", metricsHandler)
+            .get("/messages", messagesHandler)
+            .put("/configuration", configurationHandler);
     }
 
     int getListenPort() {
         return listenPort;
     }
 
-    abstract class Handler {
-        void dispatch(ServerRequest request, ServerResponse response) {
-            executorService.submit(() -> {
-                try {
-                    invoke(new HelidonInvocationContext(request, response));
-                } catch (IOException e) {
-                    reportServerFailure(response, e);
-                }
-            });
+    abstract class MyHandler implements Handler {
+        public void handle(ServerRequest request, ServerResponse response) {
+            try {
+                invoke(new HelidonInvocationContext(request, response));
+            } catch (IOException e) {
+                reportServerFailure(response, e);
+            }
         }
 
         void reportServerFailure(ServerResponse response, IOException e) {
@@ -76,7 +64,7 @@ void reportServerFailure(ServerResponse response, IOException e) {
         abstract void invoke(InvocationContext context) throws IOException;
     }
 
-    class AuthenticatedHandler extends Handler {
+    class AuthenticatedHandler extends MyHandler {
         private final BiFunction<WebClientFactory, InvocationContext, AuthenticatedCall> builder;
 
         AuthenticatedHandler(BiFunction<WebClientFactory, InvocationContext, AuthenticatedCall> builder) {
@@ -89,7 +77,7 @@ void invoke(InvocationContext context) throws IOException {
         }
     }
 
-    class MainHandler extends Handler {
+    class MainHandler extends MyHandler {
         void invoke(InvocationContext context) throws IOException {
             ConfigurationDisplay.displayConfiguration(context.getResponseStream());
             context.close();

wls-exporter-sidecar/src/main/resources/logging.properties

@@ -18,7 +18,7 @@
 # For more information see $JAVA_HOME/jre/lib/logging.properties
 
 ## Send messages to the console
-handlers=io.helidon.common.HelidonConsoleHandler
+handlers=io.helidon.logging.jul.HelidonConsoleHandler
 #
 ## HelidonConsoleHandler uses a SimpleFormatter subclass that replaces "!thread!" with the current thread
 java.util.logging.SimpleFormatter.format=%1$tY.%1$tm.%1$td %1$tH:%1$tM:%1$tS %4$s %3$s !thread!: %5$s%6$s%n