Upgrade Micronaut Framework to 4.x

.github/workflows/cypress.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Run the server with Gradle
         env:

.github/workflows/gradle.yml

@@ -37,10 +37,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: Build with Gradle
       env:

app/build.gradle

@@ -20,11 +20,11 @@ buildscript {
     }
 }
 plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     id("jacoco")
-    id("com.gorylenko.gradle-git-properties") version "2.3.2"
-    id("io.micronaut.application") version "3.7.10"
-    id("io.micronaut.test-resources") version "3.7.10"
+    id("com.gorylenko.gradle-git-properties") version "2.4.1"
+    id("io.micronaut.application") version "4.2.1"
+    id("io.micronaut.test-resources") version "4.2.1"
 }
 
 version = "0.1"
@@ -40,29 +40,38 @@ dependencies {
     annotationProcessor("io.micronaut:micronaut-http-validation")
     annotationProcessor("io.micronaut.openapi:micronaut-openapi")
     annotationProcessor("io.micronaut.security:micronaut-security-annotations")
+    annotationProcessor("io.micronaut.serde:micronaut-serde-processor")
     annotationProcessor("io.micronaut:micronaut-graal")
-    implementation("io.micronaut:micronaut-http-client")
+    annotationProcessor("io.micronaut.validation:micronaut-validation-processor")
+    compileOnly("io.micronaut:micronaut-jackson-databind")
     implementation("io.micronaut:micronaut-jackson-databind")
+    implementation("io.micronaut.serde:micronaut-serde-jackson")
+    implementation("io.micronaut:micronaut-http-client")
     implementation("io.micronaut:micronaut-management")
     implementation("io.micronaut.data:micronaut-data-hibernate-jpa")
     implementation("io.micronaut.problem:micronaut-problem-json")
     implementation("io.micronaut.security:micronaut-security-jwt")
     implementation("io.micronaut.security:micronaut-security-oauth2")
     implementation("io.micronaut.sql:micronaut-jdbc-hikari")
     implementation("io.swagger.core.v3:swagger-annotations")
-    implementation("jakarta.annotation:jakarta.annotation-api")
+    implementation("io.micronaut:micronaut-websocket")
+    implementation("jakarta.persistence:jakarta.persistence-api:3.1.0")
+    implementation("io.micronaut.validation:micronaut-validation")
     runtimeOnly("ch.qos.logback:logback-classic")
-    implementation("io.micronaut:micronaut-validation")
+
 
     implementation("org.bouncycastle:bcprov-jdk18on:1.74")
     implementation("org.bouncycastle:bcpkix-jdk18on:1.74")
-    implementation("org.bouncycastle:bcmail-jdk18on:1.74")
+//    implementation("org.bouncycastle:bcmail-jdk18on:1.74")
+    implementation("org.bouncycastle:bcjmail-jdk18on:1.72")
     implementation("io.micronaut.email:micronaut-email-javamail")
+    implementation("jakarta.xml.bind:jakarta.xml.bind-api:4.0.1")
 
     implementation("io.micronaut.views:micronaut-views-freemarker")
 
     implementation("io.micronaut.gcp:micronaut-gcp-secret-manager")
     implementation("com.google.cloud:google-cloud-secretmanager:2.12.0")
+    runtimeOnly("org.yaml:snakeyaml")
 //    nativeImageCompileOnly("com.google.cloud:native-image-support")
 
     String databaseSelection = System.getenv("DPM_DATABASE_DEPENDENCY")
@@ -85,8 +94,8 @@ application {
     mainClass.set("io.unityfoundation.dds.permissions.manager.RunApplication")
 }
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
-    targetCompatibility = JavaVersion.toVersion("11")
+    sourceCompatibility = JavaVersion.toVersion("17")
+    targetCompatibility = JavaVersion.toVersion("17")
 }
 
 graalvmNative.toolchainDetection = false

app/gradle.properties

@@ -11,4 +11,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-micronautVersion=3.10.1
+micronautVersion=4.2.2

app/micronaut-cli.yml

@@ -16,4 +16,4 @@ defaultPackage: io.unityfoundation.dds.permissions.manager
 testFramework: junit
 sourceLanguage: java
 buildTool: gradle
-features: [annotation-api, app-name, data, data-jpa, gradle, h2, http-client, jackson-databind, java, java-application, jdbc-tomcat, junit, logback, management, micronaut-build, netty-server, openapi, problem-json, readme, security-annotations, security-jwt, security-oauth2, shade, yaml]
+features: [annotation-api, app-name, data, data-jpa, gradle, h2, http-client, jackson-databind, java, java-application, jdbc-tomcat, junit, logback, management, micronaut-build, micronaut-http-validation, netty-server, openapi, problem-json, readme, security-annotations, security-jwt, security-oauth2, shade, yaml]

app/src/main/java/io/unityfoundation/dds/permissions/manager/ActionController.java

@@ -28,9 +28,8 @@
 import io.unityfoundation.dds.permissions.manager.model.action.dto.ActionDTO;
 import io.unityfoundation.dds.permissions.manager.model.action.dto.CreateActionDTO;
 import io.unityfoundation.dds.permissions.manager.model.action.dto.UpdateActionDTO;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 
 @Controller("/api/actions")

app/src/main/java/io/unityfoundation/dds/permissions/manager/ActionIntervalController.java

@@ -23,12 +23,11 @@
 import io.micronaut.security.annotation.Secured;
 import io.micronaut.security.rules.SecurityRule;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import io.unityfoundation.dds.permissions.manager.model.actioninterval.dto.CreateActionIntervalDTO;
-import io.unityfoundation.dds.permissions.manager.model.actioninterval.dto.ActionIntervalDTO;
 import io.unityfoundation.dds.permissions.manager.model.actioninterval.ActionIntervalService;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import io.unityfoundation.dds.permissions.manager.model.actioninterval.dto.ActionIntervalDTO;
+import io.unityfoundation.dds.permissions.manager.model.actioninterval.dto.CreateActionIntervalDTO;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 
 @Controller("/api/action_intervals")

app/src/main/java/io/unityfoundation/dds/permissions/manager/AdminController.java

@@ -34,8 +34,7 @@
 import io.unityfoundation.dds.permissions.manager.model.user.AdminDTO;
 import io.unityfoundation.dds.permissions.manager.model.user.UserService;
 import io.unityfoundation.dds.permissions.manager.security.UserIsAdmin;
-
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @UserIsAdmin
 @Controller("/api/admins")

app/src/main/java/io/unityfoundation/dds/permissions/manager/ApplicationController.java

@@ -33,11 +33,11 @@
 import io.unityfoundation.dds.permissions.manager.exception.DPMException;
 import io.unityfoundation.dds.permissions.manager.model.application.ApplicationDTO;
 import io.unityfoundation.dds.permissions.manager.model.application.ApplicationService;
+import jakarta.mail.MessagingException;
+import jakarta.validation.Valid;
 import org.bouncycastle.mail.smime.SMIMEException;
 import org.bouncycastle.operator.OperatorCreationException;
 
-import javax.mail.MessagingException;
-import javax.validation.Valid;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;

app/src/main/java/io/unityfoundation/dds/permissions/manager/ApplicationGrantController.java

@@ -23,17 +23,16 @@
 import io.micronaut.security.annotation.Secured;
 import io.micronaut.security.rules.SecurityRule;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import io.unityfoundation.dds.permissions.manager.model.applicationgrant.dto.DetailedGrantDTO;
-import io.unityfoundation.dds.permissions.manager.model.applicationgrant.dto.GrantDTO;
 import io.unityfoundation.dds.permissions.manager.model.applicationgrant.ApplicationGrantService;
 import io.unityfoundation.dds.permissions.manager.model.applicationgrant.dto.CreateGrantDTO;
+import io.unityfoundation.dds.permissions.manager.model.applicationgrant.dto.DetailedGrantDTO;
+import io.unityfoundation.dds.permissions.manager.model.applicationgrant.dto.GrantDTO;
 import io.unityfoundation.dds.permissions.manager.model.applicationgrant.dto.UpdateGrantDTO;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import org.reactivestreams.Publisher;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 import static io.unityfoundation.dds.permissions.manager.model.applicationpermission.ApplicationPermissionService.APPLICATION_GRANT_TOKEN;
 
 @Controller("/api/application_grants")

app/src/main/java/io/unityfoundation/dds/permissions/manager/ApplicationPermissionController.java

@@ -22,14 +22,13 @@
 import io.micronaut.security.annotation.Secured;
 import io.micronaut.security.rules.SecurityRule;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.unityfoundation.dds.permissions.manager.model.applicationpermission.AccessPermissionBodyDTO;
 import io.unityfoundation.dds.permissions.manager.model.applicationpermission.AccessPermissionDTO;
 import io.unityfoundation.dds.permissions.manager.model.applicationpermission.ApplicationPermissionService;
-import io.unityfoundation.dds.permissions.manager.model.applicationpermission.AccessPermissionBodyDTO;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import org.reactivestreams.Publisher;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-
 import static io.unityfoundation.dds.permissions.manager.model.applicationpermission.ApplicationPermissionService.APPLICATION_GRANT_TOKEN;
 
 @Controller("/api/application_permissions")

app/src/main/java/io/unityfoundation/dds/permissions/manager/Bootstrap.java

@@ -19,29 +19,26 @@
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.runtime.event.annotation.EventListener;
 import io.micronaut.runtime.server.event.ServerStartupEvent;
+import io.unityfoundation.dds.permissions.manager.model.actioninterval.ActionInterval;
 import io.unityfoundation.dds.permissions.manager.model.application.Application;
+import io.unityfoundation.dds.permissions.manager.model.applicationgrant.ApplicationGrant;
+import io.unityfoundation.dds.permissions.manager.model.grantduration.GrantDuration;
 import io.unityfoundation.dds.permissions.manager.model.group.Group;
 import io.unityfoundation.dds.permissions.manager.model.group.GroupRepository;
 import io.unityfoundation.dds.permissions.manager.model.groupuser.GroupUser;
 import io.unityfoundation.dds.permissions.manager.model.groupuser.GroupUserRepository;
 import io.unityfoundation.dds.permissions.manager.model.topic.Topic;
-import io.unityfoundation.dds.permissions.manager.model.topicset.TopicSet;
-import io.unityfoundation.dds.permissions.manager.model.actioninterval.ActionInterval;
-import io.unityfoundation.dds.permissions.manager.model.grantduration.GrantDuration;
 import io.unityfoundation.dds.permissions.manager.model.topic.TopicKind;
-import io.unityfoundation.dds.permissions.manager.model.applicationgrant.ApplicationGrant;
+import io.unityfoundation.dds.permissions.manager.model.topicset.TopicSet;
 import io.unityfoundation.dds.permissions.manager.model.user.User;
 import io.unityfoundation.dds.permissions.manager.model.user.UserRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 @Requires(property = "dpm.bootstrap.data.enabled", value = StringUtils.TRUE)
 @ConfigurationProperties("dpm.bootstrap")

app/src/main/java/io/unityfoundation/dds/permissions/manager/GrantDurationController.java

@@ -26,9 +26,8 @@
 import io.unityfoundation.dds.permissions.manager.model.grantduration.GrantDurationService;
 import io.unityfoundation.dds.permissions.manager.model.grantduration.dto.CreateGrantDurationDTO;
 import io.unityfoundation.dds.permissions.manager.model.grantduration.dto.GrantDurationDTO;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 
 @Controller("/api/grant_durations")

app/src/main/java/io/unityfoundation/dds/permissions/manager/GroupController.java

@@ -32,8 +32,7 @@
 import io.unityfoundation.dds.permissions.manager.exception.DPMErrorResponse;
 import io.unityfoundation.dds.permissions.manager.model.group.*;
 import io.unityfoundation.dds.permissions.manager.security.UserIsAdmin;
-
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Controller("/api/groups")
 @Secured(SecurityRule.IS_AUTHENTICATED)

app/src/main/java/io/unityfoundation/dds/permissions/manager/GroupMembershipController.java

@@ -32,8 +32,8 @@
 import io.unityfoundation.dds.permissions.manager.model.groupuser.GroupUserDTO;
 import io.unityfoundation.dds.permissions.manager.model.groupuser.GroupUserResponseDTO;
 import io.unityfoundation.dds.permissions.manager.model.groupuser.GroupUserService;
+import jakarta.validation.Valid;
 
-import javax.validation.Valid;
 import java.util.Map;
 
 @Controller("/api/group_membership")

app/src/main/java/io/unityfoundation/dds/permissions/manager/RunApplication.java

@@ -13,11 +13,6 @@
 // limitations under the License.
 package io.unityfoundation.dds.permissions.manager;
 
-import io.micronaut.context.ApplicationContextBuilder;
-import io.micronaut.context.ApplicationContextConfigurer;
-import io.micronaut.context.annotation.ContextConfigurer;
-import io.micronaut.context.env.Environment;
-import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.annotation.TypeHint;
 import io.micronaut.runtime.Micronaut;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;

app/src/main/java/io/unityfoundation/dds/permissions/manager/TopicController.java

@@ -32,8 +32,7 @@
 import io.unityfoundation.dds.permissions.manager.model.topic.TopicDTO;
 import io.unityfoundation.dds.permissions.manager.model.topic.TopicKind;
 import io.unityfoundation.dds.permissions.manager.model.topic.TopicService;
-
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Controller("/api/topics")
 @Secured(SecurityRule.IS_AUTHENTICATED)

app/src/main/java/io/unityfoundation/dds/permissions/manager/TopicSetController.java

@@ -27,9 +27,8 @@
 import io.unityfoundation.dds.permissions.manager.model.topicset.dto.CreateTopicSetDTO;
 import io.unityfoundation.dds.permissions.manager.model.topicset.dto.TopicSetDTO;
 import io.unityfoundation.dds.permissions.manager.model.topicset.dto.UpdateTopicSetDTO;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 
 @Controller("/api/topic-sets")

app/src/main/java/io/unityfoundation/dds/permissions/manager/UniversalSearchController.java

@@ -14,7 +14,9 @@
 package io.unityfoundation.dds.permissions.manager;
 
 import io.micronaut.data.model.Page;
-import io.micronaut.http.annotation.*;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.RequestBean;
 import io.micronaut.scheduling.TaskExecutors;
 import io.micronaut.scheduling.annotation.ExecuteOn;
 import io.micronaut.security.annotation.Secured;
@@ -23,8 +25,7 @@
 import io.unityfoundation.dds.permissions.manager.search.SearchResponseDTO;
 import io.unityfoundation.dds.permissions.manager.search.UniversalSearchParams;
 import io.unityfoundation.dds.permissions.manager.search.UniversalSearchService;
-
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Controller("/api/search")
 @Secured(SecurityRule.IS_AUTHENTICATED)

app/src/main/java/io/unityfoundation/dds/permissions/manager/exception/DPMErrorResponse.java

@@ -13,9 +13,9 @@
 // limitations under the License.
 package io.unityfoundation.dds.permissions.manager.exception;
 
-import io.micronaut.core.annotation.Introspected;
+import io.micronaut.serde.annotation.Serdeable;
 
-@Introspected
+@Serdeable
 public class DPMErrorResponse {
 
     private String id;

app/src/main/java/io/unityfoundation/dds/permissions/manager/exception/DTOConstraintViolationExceptionHandler.java

@@ -23,13 +23,13 @@
 import io.unityfoundation.dds.permissions.manager.ResponseStatusCodes;
 import io.unityfoundation.dds.permissions.manager.security.PassphraseGenerator;
 import jakarta.inject.Singleton;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.constraints.*;
+import jakarta.validation.metadata.ConstraintDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.constraints.*;
-import javax.validation.metadata.ConstraintDescriptor;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

app/src/main/java/io/unityfoundation/dds/permissions/manager/model/action/Action.java

@@ -19,12 +19,11 @@
 import io.micronaut.data.annotation.DateUpdated;
 import io.unityfoundation.dds.permissions.manager.model.actioninterval.ActionInterval;
 import io.unityfoundation.dds.permissions.manager.model.applicationgrant.ApplicationGrant;
-import io.unityfoundation.dds.permissions.manager.model.topic.Topic;
 import io.unityfoundation.dds.permissions.manager.model.topicset.TopicSet;
+import jakarta.persistence.*;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
-import javax.persistence.*;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.HashSet;

app/src/main/java/io/unityfoundation/dds/permissions/manager/model/action/ActionPartition.java

@@ -13,7 +13,7 @@
 // limitations under the License.
 package io.unityfoundation.dds.permissions.manager.model.action;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "permissions_action_partition")

app/src/main/java/io/unityfoundation/dds/permissions/manager/model/action/ActionService.java

@@ -38,10 +38,13 @@
 import io.unityfoundation.dds.permissions.manager.model.user.User;
 import io.unityfoundation.dds.permissions.manager.security.SecurityUtil;
 import jakarta.inject.Singleton;
+import jakarta.transaction.Transactional;
+import jakarta.validation.constraints.NotNull;
 
-import javax.transaction.Transactional;
-import javax.validation.constraints.NotNull;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;