Upgrade micronaut 2 to 3

generators/constants.cjs

@@ -18,7 +18,7 @@
  */
 
 module.exports = {
-  GRADLE_VERSION: '6.8.1',
+  GRADLE_VERSION: '7.4.2',
   DOCKER_REDIS: 'redis:6.0.10',
   sqlDb: {
     h2Disk: {
@@ -43,19 +43,19 @@ module.exports = {
     },
   },
   versions: {
-    micronaut: '2.4.4',
-    micronautData: '2.3.1',
+    micronaut: '3.6.0',
+    micronautData: '3.7.2',
     micronautOpenApi: '2.3.1',
-
+    rxJava3: '2.3.0',
     hibernate: '5.4.24.Final',
-    jackson: '2.12.2',
+    jackson: '2.13.3',
     javassist: '3.27.0-GA', // Should match Hibernate deps
     javaxMail: '1.6.2',
     jbcrypt: '0.4',
     jhipsterDeps: '3.8.0',
     liquibase: '4.2.2',
     liquibaseHibernate5: '4.1.1',
-    logback: '1.2.3',
+    logback: '1.2.11',
     mapstruct: '1.3.1.Final',
     swaggerAnnotations: '2.1.6',
     mockito: '3.6.28',

generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs

@@ -40,7 +40,7 @@ import io.micronaut.data.model.Page;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.transaction.annotation.ReadOnly;
 import org.springframework.data.jpa.domain.Specification;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import javax.transaction.Transactional;
 
 import io.github.jhipster.service.QueryService;

generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs

@@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory;
 import io.micronaut.data.model.Page;
 import io.micronaut.data.model.Pageable;
 <%_ } _%>
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 <%_ if (databaseType === 'sql') { _%>
 import javax.transaction.Transactional;
 import io.micronaut.transaction.annotation.ReadOnly;

generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs

@@ -74,7 +74,7 @@ import io.micronaut.core.type.Argument;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.HttpStatus;
-import io.micronaut.http.client.RxHttpClient;
+import io.micronaut.rxjava3.http.client.Rx3HttpClient;
 import io.micronaut.http.client.annotation.Client;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
@@ -91,7 +91,7 @@ import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 <%_ } _%>
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 <%_ if (databaseType === 'sql' && !reactive) { _%>
 import javax.persistence.EntityManager;
 <%_ } _%>
@@ -343,7 +343,7 @@ public class <%= entityClass %>ResourceIT <% if (databaseType === 'cassandra') {
     <%_ } _%>
 
     @Inject @Client("/")
-    RxHttpClient client;
+    Rx3HttpClient client;
 
     private <%= asEntity(entityClass) %> <%= asEntity(entityInstance) %>;
 

generators/heroku/templates/SSLEnforcingHostResolver.java.ejs

@@ -10,8 +10,8 @@ import io.micronaut.http.server.HttpServerConfiguration;
 import io.micronaut.http.server.util.DefaultHttpHostResolver;
 import io.micronaut.runtime.server.EmbeddedServer;
 
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 @Replaces(DefaultHttpHostResolver.class)
 @Singleton

generators/server/templates/build.gradle.ejs

@@ -559,6 +559,10 @@ dependencies {
     <%_ if (messageBroker === 'kafka') { _%>
     testImplementation "org.testcontainers:kafka"
     <%_ } _%>
+
+    implementation("io.micronaut.rxjava3:micronaut-rxjava3:$rxJava3Version")
+    implementation("io.micronaut.rxjava3:micronaut-rxjava3-http-client:$rxJava3Version")
+
     //jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 }
 

generators/server/templates/gradle.properties.ejs

@@ -65,8 +65,8 @@ jaxb_runtime_version=2.3.2
 <%_ } _%>
 
 # gradle plugin version
-micronaut_plugin_version=1.4.5
-git_properties_plugin_version=2.2.2
+micronaut_plugin_version=3.5.1
+git_properties_plugin_version=3.4.0
 <%_ if (!skipClient) { _%>
 gradle_node_plugin_version=2.2.4
 <%_ } _%>
@@ -78,7 +78,10 @@ sonarqube_plugin_version=2.8
 <%_ if (enableSwaggerCodegen) { _%>
 openapi_plugin_version=4.3.1
 <%_ } _%>
-shadow_plugin_version=6.1.0
+shadow_plugin_version=7.1.2
+
+#rxjava3 dependencies
+rxJava3Version=<%=versions.rxJava3%>
 
 # jhipster-needle-gradle-property - JHipster will add additional properties here
 

generators/server/templates/src/main/java/package/config/ActiveProfilesInfoSource.java.ejs

@@ -6,7 +6,7 @@ import io.micronaut.core.async.publisher.Publishers;
 import io.micronaut.management.endpoint.info.InfoSource;
 import org.reactivestreams.Publisher;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.HashMap;
 
 @Singleton

generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs

@@ -41,7 +41,7 @@ import javax.cache.configuration.MutableConfiguration;
 import javax.cache.expiry.CreatedExpiryPolicy;
 import javax.cache.expiry.Duration;
 <%_ } _%>
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 <%_ if (cacheProvider === 'redis') { _%>
 import java.util.concurrent.TimeUnit;
 <%_ } _%>

generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs

@@ -6,7 +6,7 @@ import io.micronaut.context.annotation.Factory;
 import org.zalando.problem.ProblemModule;
 import org.zalando.problem.violations.ConstraintViolationProblemModule;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Factory
 public class JacksonConfiguration {

generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs

@@ -38,7 +38,7 @@ import net.logstash.logback.stacktrace.ShortenedThrowableConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Context

generators/server/templates/src/main/java/package/config/MessagesBundleMessageSource.java.ejs

@@ -2,7 +2,7 @@ package <%= packageName %>.config;
 
 import io.micronaut.context.i18n.ResourceBundleMessageSource;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MessagesBundleMessageSource extends ResourceBundleMessageSource {

generators/server/templates/src/main/java/package/security/BcryptPasswordEncoder.java.ejs

@@ -2,7 +2,7 @@ package <%=packageName%>.security;
 
 import org.mindrot.jbcrypt.BCrypt;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import javax.validation.constraints.NotBlank;
 
 @Singleton

generators/server/templates/src/main/java/package/security/DatabaseAuthenticationProvider.java.ejs

@@ -3,19 +3,18 @@ package <%=packageName%>.security;
 import <%=packageName%>.domain.Authority;
 import <%=packageName%>.domain.User;
 import <%=packageName%>.repository.UserRepository;
-import edu.umd.cs.findbugs.annotations.Nullable;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.security.authentication.AuthenticationProvider;
 import io.micronaut.security.authentication.AuthenticationRequest;
 import io.micronaut.security.authentication.AuthenticationResponse;
-import io.micronaut.security.authentication.UserDetails;
 import io.micronaut.validation.validator.constraints.EmailValidator;
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 import org.reactivestreams.Publisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
@@ -60,6 +59,6 @@ public class DatabaseAuthenticationProvider implements AuthenticationProvider {
             .map(Authority::getName)
             .collect(Collectors.toList());
 
-        return new UserDetails(user.getLogin(), grantedAuthorities);
+        return AuthenticationResponse.success(user.getLogin(), grantedAuthorities);
     }
 }

generators/server/templates/src/main/java/package/security/JHipsterEndSessionEndpoint.java.ejs

@@ -10,14 +10,14 @@ import io.micronaut.security.oauth2.client.OpenIdProviderMetadata;
 import io.micronaut.security.oauth2.configuration.OauthClientConfiguration;
 import io.micronaut.security.oauth2.endpoint.endsession.request.AbstractEndSessionRequest;
 import io.micronaut.security.oauth2.endpoint.endsession.response.EndSessionCallbackUrlBuilder;
-import io.micronaut.security.oauth2.endpoint.token.response.OpenIdUserDetailsMapper;
+import io.micronaut.security.oauth2.endpoint.token.response.OpenIdAuthenticationMapper;
 import io.micronaut.security.oauth2.configuration.endpoints.EndSessionConfiguration;
 import io.micronaut.security.oauth2.endpoint.endsession.request.EndSessionEndpoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
 import java.net.URI;
 
 import java.util.HashMap;
@@ -75,8 +75,8 @@ public class JHipsterEndSessionEndpoint extends AbstractEndSessionRequest {
 
     private Optional<String> parseIdToken(Authentication authentication) {
         Map<String, Object> attributes = authentication.getAttributes();
-        if (attributes.containsKey(OpenIdUserDetailsMapper.OPENID_TOKEN_KEY)) {
-            return Optional.of(attributes.get(OpenIdUserDetailsMapper.OPENID_TOKEN_KEY).toString());
+        if (attributes.containsKey(OpenIdAuthenticationMapper.OPENID_TOKEN_KEY)) {
+            return Optional.of(attributes.get(OpenIdAuthenticationMapper.OPENID_TOKEN_KEY).toString());
         }
         return Optional.empty();
     }

generators/server/templates/src/main/java/package/security/JHipsterOpenIdUserDetailsMapper.java.ejs

@@ -8,17 +8,16 @@ import com.nimbusds.jwt.JWT;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.JWTParser;
 import io.micronaut.context.annotation.Requires;
-import io.micronaut.security.authentication.UserDetails;
 import io.micronaut.security.config.AuthenticationModeConfiguration;
 import io.micronaut.security.oauth2.configuration.OpenIdAdditionalClaimsConfiguration;
-import io.micronaut.security.oauth2.endpoint.token.response.DefaultOpenIdUserDetailsMapper;
+import io.micronaut.security.oauth2.endpoint.token.response.DefaultOpenIdAuthenticationMapper;
 import io.micronaut.security.oauth2.endpoint.token.response.OpenIdClaims;
 import io.micronaut.security.oauth2.endpoint.token.response.OpenIdTokenResponse;
-import io.micronaut.security.oauth2.endpoint.token.response.OpenIdUserDetailsMapper;
+import io.micronaut.security.oauth2.endpoint.token.response.OpenIdAuthenticationMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.text.ParseException;
 import java.util.List;
 import java.util.ArrayList;
@@ -30,7 +29,7 @@ import java.util.stream.Collectors;
 @Singleton
 @Requires(classes = JWTParser.class)
 @Named("oidc")
-public class JHipsterOpenIdUserDetailsMapper extends DefaultOpenIdUserDetailsMapper {
+public class JHipsterOpenIdUserDetailsMapper extends DefaultOpenIdAuthenticationMapper {
     private static final Logger LOG = LoggerFactory.getLogger(JHipsterOpenIdUserDetailsMapper.class);
     public static final String GROUPS_CLAIM = "groups";
     public static final String ROLES_CLAIM = "roles";
@@ -107,7 +106,7 @@ public class JHipsterOpenIdUserDetailsMapper extends DefaultOpenIdUserDetailsMap
     protected Map<String, Object> buildAttributes(String providerName, OpenIdTokenResponse tokenResponse, OpenIdClaims openIdClaims) {
         Map<String, Object> claims = super.buildAttributes(providerName, tokenResponse, openIdClaims);
 
-        claims.put(OpenIdUserDetailsMapper.OPENID_TOKEN_KEY, tokenResponse.getIdToken());
+        claims.put(OpenIdAuthenticationMapper.OPENID_TOKEN_KEY, tokenResponse.getIdToken());
 
         return claims;
     }

generators/server/templates/src/main/java/package/security/Logout.java.ejs

@@ -1,6 +1,6 @@
 package <%=packageName%>.security;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.annotation.Introspected;
 
 import javax.validation.constraints.NotBlank;

generators/server/templates/src/main/java/package/service/MailSenderFactory.java.ejs

@@ -5,7 +5,7 @@ import io.micronaut.context.annotation.Value;
 import org.simplejavamail.api.mailer.Mailer;
 import org.simplejavamail.mailer.MailerBuilder;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Factory
 public class MailSenderFactory {

generators/server/templates/src/main/java/package/service/MailService.java.ejs

@@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import javax.mail.internet.MimeMessage;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;

generators/server/templates/src/main/java/package/service/UserService.java.ejs

@@ -26,7 +26,7 @@ import io.micronaut.transaction.annotation.ReadOnly;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import javax.transaction.Transactional;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;

generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs

@@ -4,7 +4,7 @@ import <%=packageName%>.domain.Authority;
 import <%=packageName%>.domain.User;
 import <%=packageName%>.service.dto.UserDTO;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.*;
 import java.util.stream.Collectors;
 

generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs

@@ -7,7 +7,7 @@ import io.micronaut.http.server.types.files.StreamedFile;
 import io.micronaut.security.annotation.Secured;
 import io.micronaut.security.rules.SecurityRule;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Optional;
 
 @Controller

generators/server/templates/src/main/java/package/web/rest/errors/handlers/AbstractThrowableProblemHandler.java.ejs

@@ -3,7 +3,7 @@ package <%=packageName%>.web.rest.errors.handlers;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.server.exceptions.ExceptionHandler;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.zalando.problem.AbstractThrowableProblem;
 
 @Singleton

generators/server/templates/src/main/java/package/web/rest/errors/handlers/ConstraintViolationExceptionHandler.java.ejs

@@ -8,11 +8,11 @@ import io.micronaut.http.HttpResponse;
 import io.micronaut.http.hateoas.JsonError;
 import io.micronaut.http.server.exceptions.ExceptionHandler;
 import io.micronaut.validation.exceptions.ConstraintExceptionHandler;
-import io.micronaut.validation.exceptions.ValidationExceptionHandler;
+
 import org.zalando.problem.Problem;
 import org.zalando.problem.Status;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.ElementKind;

generators/server/templates/src/main/java/package/web/rest/errors/handlers/ProblemRejectionHandler.java.ejs

@@ -9,7 +9,7 @@ import io.micronaut.security.authentication.DefaultAuthorizationExceptionHandler
 import org.zalando.problem.Problem;
 import org.zalando.problem.Status;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Replaces(DefaultAuthorizationExceptionHandler.class)

generators/server/templates/src/main/java/package/web/rest/errors/handlers/UnsatisfiedRouteExceptionHandler.java.ejs

@@ -6,12 +6,12 @@ import io.micronaut.context.annotation.Replaces;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.server.exceptions.ExceptionHandler;
-import io.micronaut.http.server.netty.converters.UnsatisfiedRouteHandler;
+import io.micronaut.http.server.exceptions.UnsatisfiedRouteHandler;
 import io.micronaut.web.router.exceptions.UnsatisfiedRouteException;
 import org.zalando.problem.Problem;
 import org.zalando.problem.Status;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Replaces(UnsatisfiedRouteHandler.class)
 @Singleton

generators/server/templates/src/main/resources/application-dev.yml.ejs

@@ -103,7 +103,7 @@ logger:
 
 micronaut:
   server:
-    port: <%= serverPort %>
+    port: 8080  
     cors:
       # CORS is only enabled by default with the "dev" profile, so BrowserSync can access the API
       enabled: true

generators/server/templates/src/main/resources/application-prod.yml.ejs

@@ -129,7 +129,7 @@ thymeleaf:
 # ===================================================================
 micronaut:
   server:
-    port: <%= serverPort %>
+    port: 8080  
   security:
     token:
       jwt: