Merge pull request #1717 from objectcomputing/feature-1557/micronaut-3-upgrade

Feature 1557/micronaut 3 upgrade

Author: mkimberlin

server/build.gradle

@@ -1,8 +1,13 @@
 plugins {
     id("com.github.johnrengelman.shadow") version "7.0.0"
-    id("io.micronaut.application") version "1.5.3"
+    id("io.micronaut.application") version "2.0.3"
     id "idea"
     id "jacoco"
+    id("org.openrewrite.rewrite") version "5.20.0"
+}
+
+rewrite {
+    activeRecipe("org.openrewrite.java.micronaut.Micronaut2to3Migration")
 }
 
 version "0.5.8"
@@ -33,11 +38,11 @@ dependencies {
     annotationProcessor("io.micronaut.security:micronaut-security-annotations")
     implementation("io.micronaut:micronaut-http-client")
     implementation("io.micronaut:micronaut-management")
-    implementation("io.micronaut:micronaut-runtime")
+    implementation('io.micronaut:micronaut-runtime:3.4.3')
     implementation("io.micronaut.cache:micronaut-cache-ehcache")
     implementation("io.micronaut.data:micronaut-data-jdbc")
     implementation("io.micronaut.flyway:micronaut-flyway")
-    implementation("io.micronaut.security:micronaut-security")
+    implementation("io.micronaut.security:micronaut-security:2.5.0")
     implementation("io.micronaut.security:micronaut-security-jwt")
     implementation("io.micronaut.security:micronaut-security-oauth2")
     implementation("io.micronaut.sql:micronaut-jdbc-hikari")
@@ -89,6 +94,10 @@ dependencies {
     //}
     //implementation  'org.postgresql:postgresql:42.2.12'
     implementation 'com.google.cloud.sql:postgres-socket-factory:1.0.15'
+
+    implementation("io.micronaut.reactor:micronaut-reactor")
+    implementation('io.projectreactor.addons:reactor-adapter:3.4.8')
+    testImplementation 'io.projectreactor:reactor-test:3.4.18'
     //implementation "io.micronaut.sql:micronaut-jdbc-hikari"
     //implementation 'io.micronaut.flyway:micronaut-flyway'
     //implementation("io.swagger.core.v3:swagger-annotations")
@@ -126,6 +135,8 @@ dependencies {
     //testImplementation("org.testcontainers:postgresql")
 
     publicResources project(':web-ui')
+
+    rewrite('org.openrewrite.recipe:rewrite-micronaut:1.10.0')
 }
 
 jacocoTestReport {

server/gradle.properties

@@ -1,4 +1,4 @@
-micronautVersion=2.5.7
+micronautVersion=3.4.3
 #micronautDataVersion=1.0.2
 #micronautSecurityVersion=2.0.0
 seleniumVersion=3.141.59

server/micronaut-cli.yml

@@ -2,4 +2,5 @@ profile: service
 defaultPackage: com.objectcomputing
 ---
 testFramework: junit
-sourceLanguage: java
+sourceLanguage: java
+features: [annotation-api, app-name, gradle, http-client, jackson-databind, java, java-application, junit, logback, micronaut-build, netty-server, openrewrite, readme, shade, yaml]

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/AlreadyExistsHandler.java

@@ -10,7 +10,7 @@
 import io.micronaut.http.hateoas.Link;
 import io.micronaut.http.server.exceptions.ExceptionHandler;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Produces
 @Singleton

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/ArgumentsHandler.java

@@ -9,7 +9,7 @@
 import io.micronaut.http.hateoas.Link;
 import io.micronaut.http.server.exceptions.ExceptionHandler;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Produces
 @Singleton

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/NotFoundHandler.java

@@ -9,7 +9,7 @@
 import io.micronaut.http.hateoas.Link;
 import io.micronaut.http.server.exceptions.ExceptionHandler;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Produces
 @Singleton

server/src/main/java/com/objectcomputing/checkins/exceptions/handlers/PermissionsHandler.java

@@ -10,7 +10,7 @@
 import io.micronaut.http.hateoas.Link;
 import io.micronaut.http.server.exceptions.ExceptionHandler;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Produces
 @Singleton

server/src/main/java/com/objectcomputing/checkins/gcp/postgres/GoogleCloudDatabaseSetup.java

@@ -7,7 +7,7 @@
 import io.micronaut.context.event.BeanCreatedEvent;
 import io.micronaut.context.event.BeanCreatedEventListener;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Requires(env = Environment.GOOGLE_COMPUTE)

server/src/main/java/com/objectcomputing/checkins/logging/RequestLoggingInterceptor.java

@@ -6,12 +6,13 @@
 import io.micronaut.http.filter.HttpServerFilter;
 import io.micronaut.http.filter.ServerFilterChain;
 import io.micronaut.inject.ExecutableMethod;
-import io.micronaut.security.authentication.AuthenticationUserDetailsAdapter;
+import io.micronaut.security.authentication.Authentication;
 import io.micronaut.web.router.MethodBasedRoute;
-import io.reactivex.Flowable;
 import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.util.Optional;
 
@@ -24,7 +25,7 @@ public class RequestLoggingInterceptor implements HttpServerFilter {
     public boolean intercept(HttpRequest request) {
         String requestVerb = request.getMethodName();
         String username = "not authenticated";
-        Optional<AuthenticationUserDetailsAdapter> auth = request.getAttribute("micronaut.AUTHENTICATION", AuthenticationUserDetailsAdapter.class);
+        Optional<Authentication> auth = request.getAttribute("micronaut.AUTHENTICATION", Authentication.class);
         if (auth.isEmpty()) {
            return false; //Seems to fire twice per request. First time without auth, so we just skip that one.
         }
@@ -47,7 +48,7 @@ else if (!auth.get().getName().isBlank()){
 
     @Override
     public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
-        return Flowable.fromCallable(() -> intercept(request))
-                .switchMap(bool -> chain.proceed(request));
+        Mono<Boolean> interceptMono = Mono.fromCallable(() -> intercept(request));
+        return Flux.from(interceptMono).switchMap(bool -> chain.proceed(request));
     }
 }

server/src/main/java/com/objectcomputing/checkins/notifications/email/MailJetConfig.java

@@ -7,7 +7,7 @@
 import io.micronaut.context.annotation.Bean;
 import io.micronaut.context.annotation.Factory;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Factory
 public class MailJetConfig {
@@ -17,7 +17,13 @@ public class MailJetConfig {
 
     @Bean
     MailjetClient getClient() {
-        return new MailjetClient(System.getenv("MJ_APIKEY_PUBLIC"), System.getenv("MJ_APIKEY_PRIVATE"), new ClientOptions("v3.1"));
+        return new MailjetClient(
+                ClientOptions
+                        .builder()
+                        .apiKey(System.getenv("MJ_APIKEY_PUBLIC"))
+                        .apiSecretKey(System.getenv("MJ_APIKEY_PRIVATE"))
+                        .build()
+        );
     }
 
     @Bean