adjusts to infinispan cache

jhipster · Nov 20, 2022 · a675bbc · a675bbc
1 parent d49b9df
commit a675bbc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/generators/base/generator-base.mjs b/generators/base/generator-base.mjs
@@ -2555,13 +2555,14 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.buildToolUnknown = !dest.buildToolGradle && !dest.buildToolMaven;
     dest.buildDir = this.getBuildDirectoryForBuildTool(dest.buildTool);
 
-    dest.cacheProviderNo = dest.cacheProvider === NO_CACHE;
+    dest.cacheProviderNo = !dest.cacheProvider || dest.cacheProvider === NO_CACHE;
     dest.cacheProviderCaffeine = dest.cacheProvider === CAFFEINE;
     dest.cacheProviderEhCache = dest.cacheProvider === EHCACHE;
     dest.cacheProviderHazelcast = dest.cacheProvider === HAZELCAST;
     dest.cacheProviderInfinispan = dest.cacheProvider === INFINISPAN;
     dest.cacheProviderMemcached = dest.cacheProvider === MEMCACHED;
     dest.cacheProviderRedis = dest.cacheProvider === REDIS;
+    dest.cacheProviderAny = !dest.cacheProviderNo;
 
     dest.devDatabaseTypeH2Disk = dest.devDatabaseType === H2_DISK;
     dest.devDatabaseTypeH2Memory = dest.devDatabaseType === H2_MEMORY;

diff --git a/generators/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs
@@ -312,7 +312,9 @@ if (SPRING_BOOT_VERSION.indexOf('M') > -1 || SPRING_BOOT_VERSION.indexOf('RC') >
 <%_ } _%>
 <%_ if (cacheProviderInfinispan) { _%>
     implementation "org.infinispan:infinispan-hibernate-cache-v60"
-    implementation "org.infinispan:infinispan-spring-boot-starter-embedded"
+    implementation group: "org.infinispan", name: "infinispan-spring-boot-starter-embedded", {
+        exclude group: "org.infinispan", module: "infinispan-core"
+    }
     implementation "org.infinispan:infinispan-core-jakarta"
     implementation "org.infinispan:infinispan-jcache"
     compileOnly "org.infinispan:infinispan-component-annotations"

diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs
@@ -290,6 +290,12 @@
         <dependency>
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-spring-boot-starter-embedded</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.infinispan</groupId>
+                    <artifactId>infinispan-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.infinispan</groupId>

diff --git a/generators/server/templates/src/main/resources/config/application.yml.ejs b/generators/server/templates/src/main/resources/config/application.yml.ejs
@@ -155,6 +155,10 @@ spring:
 <%_ } _%>
   application:
     name: <%= baseName %>
+<%_ if (cacheProviderInfinispan) { _%>
+  cache:
+    type: <%= cacheProvider %>
+<%_ } _%>
 <%_ if (serviceDiscoveryConsul || (applicationTypeGateway && reactive) || messageBrokerKafka) { _%>
   cloud:
   <%_ if (serviceDiscoveryConsul) { _%>