From 1e6f0a0a7557c3443e769601f9904c75fc9020cc Mon Sep 17 00:00:00 2001 From: Solomon Hsu Date: Mon, 29 Apr 2024 21:45:55 +0800 Subject: [PATCH 1/5] Codec Update: SerializationCodec for Redis Fix Breaking change in redisson-3.19.0: Default codec updated to Kryo5Codec. Switched codec to SerializationCodec to resolve Redis failures. --- .../main/java/_package_/config/CacheConfiguration.java.ejs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/generators/micronaut-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs b/generators/micronaut-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs index 2ac612ad..0299c65f 100644 --- a/generators/micronaut-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs +++ b/generators/micronaut-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs @@ -68,6 +68,10 @@ public class CacheConfiguration { URI redisUri = URI.create(jHipsterProperties.getCache().getRedis().getServer()[0]); Config config = new Config(); + <%_ if (databaseTypeSql) { _%> + // Fix Hibernate lazy initialization https://github.com/jhipster/generator-jhipster/issues/22889 + config.setCodec(new org.redisson.codec.SerializationCodec()); + <%_ } _%> if (jHipsterProperties.getCache().getRedis().isCluster()) { ClusterServersConfig clusterServersConfig = config .useClusterServers() From b1d2eb500b3fb5595702c6f0bc9de7e2d0f70247 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 29 Apr 2024 11:05:50 -0300 Subject: [PATCH 2/5] enable mvn-jwt-redis-angular sample --- ...n-jwt-redis-angular.disabled.jdl => mvn-jwt-redis-angular.jdl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .blueprint/generate-sample/templates/samples/{mvn-jwt-redis-angular.disabled.jdl => mvn-jwt-redis-angular.jdl} (100%) diff --git a/.blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.disabled.jdl b/.blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.jdl similarity index 100% rename from .blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.disabled.jdl rename to .blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.jdl From 94267976c87355a9980116a74e203e52ad3d4192 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 29 Apr 2024 11:20:01 -0300 Subject: [PATCH 3/5] Update dependencies.mjs --- generators/micronaut-cache/internal/dependencies.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/micronaut-cache/internal/dependencies.mjs b/generators/micronaut-cache/internal/dependencies.mjs index 5611ad1c..bf664c4a 100644 --- a/generators/micronaut-cache/internal/dependencies.mjs +++ b/generators/micronaut-cache/internal/dependencies.mjs @@ -51,8 +51,8 @@ export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies) scope: 'test', }, { - groupId: 'org.redisson', - artifactId: 'redisson', + groupId: 'io.micronaut.redis', + artifactId: 'micronaut-redis-lettuce', }, ], }, From ffd698ff71cf76109ec1bdaa00ab1257ec6db187 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 29 Apr 2024 11:49:53 -0300 Subject: [PATCH 4/5] Update dependencies.mjs --- generators/micronaut-cache/internal/dependencies.mjs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generators/micronaut-cache/internal/dependencies.mjs b/generators/micronaut-cache/internal/dependencies.mjs index bf664c4a..aed0dcbd 100644 --- a/generators/micronaut-cache/internal/dependencies.mjs +++ b/generators/micronaut-cache/internal/dependencies.mjs @@ -51,8 +51,9 @@ export const getCacheProviderMavenDefinition = (cacheProvider, javaDependencies) scope: 'test', }, { - groupId: 'io.micronaut.redis', - artifactId: 'micronaut-redis-lettuce', + groupId: 'org.redisson', + artifactId: 'redisson', + version: javaDependencies.redisson, }, ], }, From 6f5af24b1a27ba5fe2cd19c37afb9ec917b7bb7d Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Mon, 29 Apr 2024 11:51:15 -0300 Subject: [PATCH 5/5] Update libs.versions.toml --- generators/micronaut/resources/gradle/libs.versions.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generators/micronaut/resources/gradle/libs.versions.toml b/generators/micronaut/resources/gradle/libs.versions.toml index 663736b5..d926edd5 100644 --- a/generators/micronaut/resources/gradle/libs.versions.toml +++ b/generators/micronaut/resources/gradle/libs.versions.toml @@ -15,5 +15,7 @@ logstash-logback-encoder = { module = 'net.logstash.logback:logstash-logback-enc micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version = '4.4.1' } +redisson = { module = 'org.redisson:redisson', version = '3.29.0' } + [plugins] micronaut-application = { id = 'io.micronaut.application', version = '4.3.8' }