Upgrade to Micronaut 4.1.2 (#323)

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
-    id("io.micronaut.application") version "3.7.10"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.micronaut.application") version "4.0.3"
     id("jacoco")
     id("org.sonarqube") version "4.3.1.3277"
     id("pl.allegro.tech.build.axion-release") version "1.15.4"
@@ -18,17 +18,19 @@ dependencies {
     annotationProcessor("io.micronaut:micronaut-http-validation")
     annotationProcessor("io.micronaut.openapi:micronaut-openapi")
     annotationProcessor("io.micronaut.security:micronaut-security-annotations")
+    annotationProcessor("io.micronaut.validation:micronaut-validation-processor")
 
     implementation("io.micronaut:micronaut-http-client")
     implementation("io.micronaut:micronaut-jackson-databind")
     implementation("io.micronaut.kafka:micronaut-kafka")
+    implementation("io.micronaut.reactor:micronaut-reactor")
     implementation("io.micronaut.security:micronaut-security")
     implementation("io.micronaut.security:micronaut-security-jwt")
     implementation("io.micronaut.security:micronaut-security-ldap")
+    implementation("io.micronaut.openapi:micronaut-openapi")
     implementation("io.swagger.core.v3:swagger-annotations")
     implementation("jakarta.annotation:jakarta.annotation-api")
-    implementation("io.micronaut.openapi:micronaut-openapi")
-    implementation("io.micronaut.reactor:micronaut-reactor")
+    implementation("jakarta.validation:jakarta.validation-api")
 
     compileOnly("org.projectlombok:lombok")
     compileOnly("com.google.code.findbugs:jsr305") // https://github.com/micronaut-projects/micronaut-core/pull/5691
@@ -107,14 +109,14 @@ sonarqube {
 jacocoTestReport {
     dependsOn test
     reports {
-        html.enabled true
-        xml.enabled true
+        html.required = true
+        xml.required = true
     }
 }
 
 test {
     reports {
-        html.enabled false
+        html.required = false
     }
 }
 

gradle.properties

@@ -1 +1 @@
-micronautVersion=3.9.2
+micronautVersion=4.1.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

micronaut-cli.yml

@@ -3,4 +3,4 @@ defaultPackage: com.michelin.ns4kafka
 testFramework: junit
 sourceLanguage: java
 buildTool: gradle
-features: [annotation-api, app-name, gradle, http-client, java, java-application, junit, kafka, logback, netty-server, openapi, reactor, reactor-http-client, readme, security, security-annotations, security-jwt, security-ldap, shade, yaml]
+features: [annotation-api, app-name, gradle, http-client, jackson-databind, java, java-application, junit, kafka, logback, lombok, micronaut-aot, micronaut-build, micronaut-http-validation, mockito, netty-server, openapi, reactor, reactor-http-client, readme, security, security-annotations, security-jwt, security-ldap, shade, testcontainers, validation]

src/main/java/com/michelin/ns4kafka/controllers/AkhqClaimProviderController.java

@@ -16,8 +16,8 @@
 import lombok.Data;
 import lombok.Getter;
 
-import javax.annotation.security.RolesAllowed;
-import javax.validation.Valid;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.Valid;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

src/main/java/com/michelin/ns4kafka/controllers/ApiResourcesController.java

@@ -15,7 +15,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.annotation.security.RolesAllowed;
+import jakarta.annotation.security.RolesAllowed;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/com/michelin/ns4kafka/controllers/ConnectorController.java

@@ -19,7 +19,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;

src/main/java/com/michelin/ns4kafka/controllers/ConsumerGroupController.java

@@ -15,7 +15,7 @@
 import jakarta.inject.Inject;
 import org.apache.kafka.common.TopicPartition;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;

src/main/java/com/michelin/ns4kafka/controllers/ExceptionHandlerController.java

@@ -14,10 +14,10 @@
 import io.micronaut.security.authentication.AuthorizationException;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.ElementKind;
-import javax.validation.Path;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
 import java.util.Iterator;
 import java.util.List;
 

src/main/java/com/michelin/ns4kafka/controllers/NamespaceController.java

@@ -11,8 +11,8 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
-import javax.annotation.security.RolesAllowed;
-import javax.validation.Valid;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;

src/main/java/com/michelin/ns4kafka/controllers/RoleBindingController.java

@@ -14,7 +14,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;

src/main/java/com/michelin/ns4kafka/controllers/SchemaController.java

@@ -19,7 +19,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;

src/main/java/com/michelin/ns4kafka/controllers/StreamController.java

@@ -12,7 +12,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;

src/main/java/com/michelin/ns4kafka/controllers/acl/AclController.java

@@ -15,7 +15,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.Comparator;
 import java.util.Date;

src/main/java/com/michelin/ns4kafka/controllers/acl/AclNonNamespacedController.java

@@ -9,7 +9,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
-import javax.annotation.security.RolesAllowed;
+import jakarta.annotation.security.RolesAllowed;
 import java.util.List;
 
 @Tag(name = "ACLs", description = "Manage the ACLs.")

src/main/java/com/michelin/ns4kafka/controllers/connect/ConnectClusterController.java

@@ -19,7 +19,7 @@
 import jakarta.inject.Inject;
 import reactor.core.publisher.Mono;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Date;

src/main/java/com/michelin/ns4kafka/controllers/connect/ConnectClusterNonNamespacedController.java

@@ -13,7 +13,7 @@
 import jakarta.inject.Inject;
 import reactor.core.publisher.Flux;
 
-import javax.annotation.security.RolesAllowed;
+import jakarta.annotation.security.RolesAllowed;
 
 @Tag(name = "Connect Clusters", description = "Manage the Kafka Connect clusters.")
 @Controller(value = "/api/connect-clusters")

src/main/java/com/michelin/ns4kafka/controllers/quota/ResourceQuotaController.java

@@ -15,7 +15,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;

src/main/java/com/michelin/ns4kafka/controllers/quota/ResourceQuotaNonNamespacedController.java

@@ -9,7 +9,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
-import javax.annotation.security.RolesAllowed;
+import jakarta.annotation.security.RolesAllowed;
 import java.util.List;
 
 @Tag(name = "Quotas", description = "Manage the resource quotas.")

src/main/java/com/michelin/ns4kafka/controllers/topic/TopicController.java

@@ -15,7 +15,7 @@
 import jakarta.inject.Inject;
 import org.apache.kafka.common.TopicPartition;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ExecutionException;

src/main/java/com/michelin/ns4kafka/controllers/topic/TopicNonNamespacedController.java

@@ -9,7 +9,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.inject.Inject;
 
-import javax.annotation.security.RolesAllowed;
+import jakarta.annotation.security.RolesAllowed;
 import java.util.List;
 
 @Tag(name = "Topics", description = "Manage the topics.")

src/main/java/com/michelin/ns4kafka/models/AccessControlEntry.java

@@ -3,9 +3,9 @@
 import io.micronaut.core.annotation.Introspected;
 import lombok.*;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 @Introspected
 @Builder
@@ -24,11 +24,11 @@ public class AccessControlEntry {
     @NotNull
     private AccessControlEntrySpec spec;
 
-    @Introspected
+    @Data
     @Builder
-    @AllArgsConstructor
+    @Introspected
     @NoArgsConstructor
-    @Data
+    @AllArgsConstructor
     public static class AccessControlEntrySpec {
         @NotNull
         protected ResourceType resourceType;

src/main/java/com/michelin/ns4kafka/models/DeleteRecordsResponse.java

@@ -3,8 +3,8 @@
 import io.micronaut.core.annotation.Introspected;
 import lombok.*;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Getter
 @Builder
@@ -23,12 +23,12 @@ public class DeleteRecordsResponse {
     @NotNull
     private DeleteRecordsResponseSpec spec;
 
-    @Introspected
+    @Getter
     @Builder
+    @ToString
+    @Introspected
     @AllArgsConstructor
     @NoArgsConstructor
-    @Getter
-    @ToString
     public static class DeleteRecordsResponseSpec {
         private String topic;
         private int partition;

src/main/java/com/michelin/ns4kafka/models/KafkaStream.java

@@ -3,8 +3,8 @@
 import io.micronaut.core.annotation.Introspected;
 import lombok.*;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Data
 @Builder