This is an automated email from the ASF dual-hosted git repository.

tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git


The following commit(s) were added to refs/heads/main by this push:
     new df592944c7 [incubator-kie-issues#1575] Upgrade quarkus to 3.15 (#6131)
df592944c7 is described below

commit df592944c7b13a7a2d227e956f7a59abdd4c4017
Author: Rishiraj Anand <[email protected]>
AuthorDate: Tue Jan 28 20:45:35 2025 +0530

    [incubator-kie-issues#1575] Upgrade quarkus to 3.15 (#6131)
    
    * Update quarkus to 3.15.1
    
    * Update quarkus to 3.15.2
    
    * Fixing infinispan upgrade test failure
    
    * fixing test failure with smallrye-reactive-messaging
    
    * Added More LegacyConfigRoot
    
    * Update quarkus version to latest 3.15.3 LTS
    
    * Updating quarkus.package.jar as per migration guide
---
 build-parent/pom.xml                               | 46 +++++++++++++++++-----
 drools-model/drools-mvel-parser/pom.xml            |  1 +
 .../drools-quarkus-deployment/pom.xml              |  5 ++-
 .../drools-quarkus-examples-multiunit/pom.xml      |  2 +-
 .../drools-quarkus-examples-reactive/pom.xml       | 10 ++++-
 .../src/main/resources/application.properties      |  2 +-
 .../ruleunit/examples/reactive/RuntimeTest.java    |  6 +++
 .../pom.xml                                        |  2 +-
 .../drools-quarkus-integration-test/pom.xml        |  2 +-
 .../drools-quarkus-quickstart-test/pom.xml         |  2 +-
 .../pom.xml                                        |  2 +-
 drools-quarkus-extension/drools-quarkus/pom.xml    |  3 ++
 .../drools-reliability-infinispan/pom.xml          |  4 +-
 .../infinispan/EmbeddedStorageManager.java         | 15 +++----
 .../drools-reliability-tests/pom.xml               |  4 +-
 .../test/EmbeddedStorageManagerTest.java           | 45 +++++----------------
 16 files changed, 83 insertions(+), 68 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index c59c7e400e..276700e2ac 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -67,14 +67,14 @@
     <version.com.miglayout>3.7.4</version.com.miglayout>
     <version.domino-slf4j-logger>1.0.1</version.domino-slf4j-logger>
     <version.com.google.protobuf>3.25.5</version.com.google.protobuf>
-    <version.com.h2database>2.2.220</version.com.h2database>
+    <version.com.h2database>2.3.232</version.com.h2database>
     
<version.com.networknt.json-schema-validator>1.0.86</version.com.networknt.json-schema-validator>
-    <version.com.sun.xml.bind>4.0.4</version.com.sun.xml.bind>
+    <version.com.sun.xml.bind>4.0.5</version.com.sun.xml.bind>
     <version.com.thoughtworks.xstream>1.4.21</version.com.thoughtworks.xstream>
     <version.guru.nidi>0.18.0</version.guru.nidi>
     <version.info.picocli>4.7.5</version.info.picocli>
     <version.io.micrometer>1.12.2</version.io.micrometer>
-    <version.io.quarkus>3.8.6</version.io.quarkus>
+    <version.io.quarkus>3.15.3</version.io.quarkus>
     <version.io.smallrye.openapi.core>3.10.0</version.io.smallrye.openapi.core>
     <version.it.unimi.dsi.fastutil>8.5.11</version.it.unimi.dsi.fastutil>
     <version.junit>4.13.1</version.junit>
@@ -86,7 +86,7 @@
     <version.org.apache.commons.lang3>3.14.0</version.org.apache.commons.lang3>
     <version.org.apache.commons.math3>3.4.1</version.org.apache.commons.math3>
     
<version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>
-    <version.org.apache.maven>3.8.6</version.org.apache.maven>
+    <version.org.apache.maven>3.9.6</version.org.apache.maven>
     
<version.org.apache.maven.resolver>1.7.3</version.org.apache.maven.resolver>
     <version.org.apache.maven.wagon>3.5.3</version.org.apache.maven.wagon>
     <version.org.apache.pdfbox>2.0.28</version.org.apache.pdfbox>
@@ -99,7 +99,8 @@
     <!--This needs to be in sync with JUnit-->
     <version.org.hamcrest>2.2</version.org.hamcrest>
     <version.org.hsqldb>2.3.0</version.org.hsqldb>
-    <version.org.infinispan>14.0.25.Final</version.org.infinispan>
+    <version.org.infinispan>15.0.11.Final</version.org.infinispan>
+    
<version.org.infinispan.protostream>5.0.8.Final</version.org.infinispan.protostream>
     <version.org.javassist>3.26.0-GA</version.org.javassist>
     
<version.org.jboss.narayana.tomcat>7.0.2.Final</version.org.jboss.narayana.tomcat>
     <version.org.jboss.logging>3.5.3.Final</version.org.jboss.logging>
@@ -186,15 +187,15 @@
     <!-- property for productisation to know the last released version -->
     
<latestReleasedVersionFromThisBranch>notYetReleased</latestReleasedVersionFromThisBranch>
 
-    <version.compiler.plugin>3.8.1</version.compiler.plugin>
+    <version.compiler.plugin>3.13.0</version.compiler.plugin>
     <version.shade.plugin>3.3.0</version.shade.plugin>
 
     <version.net.byte-buddy>1.14.11</version.net.byte-buddy>
 
-    <version.org.postgresql>42.7.2</version.org.postgresql>
+    <version.org.postgresql>42.7.4</version.org.postgresql>
 
     <version.ch.obermuhlner>2.0.1</version.ch.obermuhlner>
-    <version.io.smallrye.jandex>3.1.6</version.io.smallrye.jandex>
+    <version.io.smallrye.jandex>3.2.3</version.io.smallrye.jandex>
     <version.org.eclipse.yasson>3.0.3</version.org.eclipse.yasson>
 
     <version.com.github.javaparser>3.25.8</version.com.github.javaparser>
@@ -756,7 +757,32 @@
         <version>${version.org.javassist}</version>
       </dependency>
 
-
+      <!-- infinispan -->
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-core</artifactId>
+        <version>${version.org.infinispan}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-client-hotrod</artifactId>
+        <version>${version.org.infinispan}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-server-testdriver-core</artifactId>
+        <version>${version.org.infinispan}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan.protostream</groupId>
+        <artifactId>protostream</artifactId>
+        <version>${version.org.infinispan.protostream}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan.protostream</groupId>
+        <artifactId>protostream-processor</artifactId>
+        <version>${version.org.infinispan.protostream}</version>
+      </dependency>
       <!-- Do not add mockito-all as it is uberjar! -->
       <dependency>
         <groupId>org.mockito</groupId>
@@ -1168,7 +1194,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0-M2</version>
+          <version>3.3.0</version>
           <dependencies>
             <dependency>
               <groupId>de.is24.maven.enforcer.rules</groupId>
diff --git a/drools-model/drools-mvel-parser/pom.xml 
b/drools-model/drools-mvel-parser/pom.xml
index 5d0bf9a42c..af82bfcf44 100644
--- a/drools-model/drools-mvel-parser/pom.xml
+++ b/drools-model/drools-mvel-parser/pom.xml
@@ -87,6 +87,7 @@
             <arg>-parameters</arg>
           </compilerArgs>
         </configuration>
+
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml 
b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
index 0b46a52cb8..f5f1b17e89 100644
--- a/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-deployment/pom.xml
@@ -82,7 +82,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-reactive-spi-deployment</artifactId>
+            <artifactId>quarkus-rest-server-spi-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -135,6 +135,9 @@
                             <version>${version.io.quarkus}</version>
                         </path>
                     </annotationProcessorPaths>
+                    <compilerArgs>
+                        <arg>-AlegacyConfigRoot=true</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
diff --git 
a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
 
b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
index 191726b14c..6bce3217d9 100644
--- 
a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
+++ 
b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-multiunit/pom.xml
@@ -142,7 +142,7 @@
         </property>
       </activation>
       <properties>
-        <quarkus.package.type>native</quarkus.package.type>
+        <quarkus.native.enabled>true</quarkus.native.enabled>
       </properties>
       <build>
         <plugins>
diff --git 
a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
 
b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
index 7408ab126d..d659b48130 100644
--- 
a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
+++ 
b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
+      <artifactId>quarkus-messaging-kafka</artifactId>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
@@ -78,6 +78,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <!-- this is used implicitly by quarkus tests so let's make Maven aware 
       of it -->
     <dependency>
@@ -151,7 +157,7 @@
         </property>
       </activation>
       <properties>
-        <quarkus.package.type>native</quarkus.package.type>
+        <quarkus.native.enabled>true</quarkus.native.enabled>
       </properties>
       <build>
         <plugins>
diff --git 
a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/resources/application.properties
 
b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/resources/application.properties
index cada3a8d9b..ade9f10c53 100644
--- 
a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/resources/application.properties
+++ 
b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/main/resources/application.properties
@@ -18,7 +18,7 @@
 #
 
 # Packaging
-# quarkus.package.type=fast-jar
+# quarkus.package.jar.type=fast-jar
 
 # Maximum Java heap to be used during the native image generation
 quarkus.native.native-image-xmx=4g
diff --git 
a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/RuntimeTest.java
 
b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/RuntimeTest.java
index 9771b03d80..b16873e510 100644
--- 
a/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/RuntimeTest.java
+++ 
b/drools-quarkus-extension/drools-quarkus-examples/drools-quarkus-examples-reactive/src/test/java/org/drools/quarkus/ruleunit/examples/reactive/RuntimeTest.java
@@ -25,9 +25,14 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.smallrye.reactive.messaging.memory.InMemoryConnector;
 import io.smallrye.reactive.messaging.memory.InMemorySink;
 import io.smallrye.reactive.messaging.memory.InMemorySource;
+import org.eclipse.microprofile.reactive.messaging.Message;
 import org.eclipse.microprofile.reactive.messaging.spi.Connector;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
+import static org.awaitility.Awaitility.await;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @QuarkusTest
@@ -46,6 +51,7 @@ public class RuntimeTest {
         incomingEvents.send(new Event("temperature", 20));
         incomingEvents.send(new Event("temperature", 40));
 
+        await().<List<? extends 
Message<Alert>>>until(outgoingAlerts::received, t -> t.size() == 1);
         assertThat(outgoingAlerts.received().size()).isEqualTo(1);
         
assertThat(outgoingAlerts.received().get(0).getPayload().getSeverity()).isEqualTo("warning");
 
diff --git 
a/drools-quarkus-extension/drools-quarkus-integration-test-kmodule/pom.xml 
b/drools-quarkus-extension/drools-quarkus-integration-test-kmodule/pom.xml
index 026e9ccfcc..64cfdd756c 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test-kmodule/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test-kmodule/pom.xml
@@ -176,7 +176,7 @@
         </property>
       </activation>
       <properties>
-        <quarkus.package.type>native</quarkus.package.type>
+        <quarkus.native.enabled>true</quarkus.native.enabled>
       </properties>
       <build>
         <plugins>
diff --git a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml 
b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
index 1a4e3e1645..75f28f356e 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test/pom.xml
@@ -180,7 +180,7 @@
         </property>
       </activation>
       <properties>
-        <quarkus.package.type>native</quarkus.package.type>
+        <quarkus.native.enabled>true</quarkus.native.enabled>
       </properties>
       <build>
         <plugins>
diff --git a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml 
b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
index 6c98b8c015..2e4724e4da 100644
--- a/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-quickstart-test/pom.xml
@@ -168,7 +168,7 @@
         </property>
       </activation>
       <properties>
-        <quarkus.package.type>native</quarkus.package.type>
+        <quarkus.native.enabled>true</quarkus.native.enabled>
       </properties>
       <build>
         <plugins>
diff --git 
a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml 
b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
index eadb1faa02..4a23cfdaa1 100644
--- a/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-ruleunit-integration-test/pom.xml
@@ -175,7 +175,7 @@
         </property>
       </activation>
       <properties>
-        <quarkus.package.type>native</quarkus.package.type>
+        <quarkus.native.enabled>true</quarkus.native.enabled>
       </properties>
       <build>
         <plugins>
diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml 
b/drools-quarkus-extension/drools-quarkus/pom.xml
index 9c5057e3cc..fa208fac63 100644
--- a/drools-quarkus-extension/drools-quarkus/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus/pom.xml
@@ -143,6 +143,9 @@
                             <version>${version.io.quarkus}</version>
                         </path>
                     </annotationProcessorPaths>
+                    <compilerArgs>
+                        <arg>-AlegacyConfigRoot=true</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/drools-reliability/drools-reliability-infinispan/pom.xml 
b/drools-reliability/drools-reliability-infinispan/pom.xml
index 73d0600007..b63c8b2e97 100644
--- a/drools-reliability/drools-reliability-infinispan/pom.xml
+++ b/drools-reliability/drools-reliability-infinispan/pom.xml
@@ -52,7 +52,7 @@
   <dependencies>
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-core-jakarta</artifactId>
+      <artifactId>infinispan-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.infinispan.protostream</groupId>
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-client-hotrod-jakarta</artifactId>
+      <artifactId>infinispan-client-hotrod</artifactId>
     </dependency>
     <dependency>
       <groupId>org.drools</groupId>
diff --git 
a/drools-reliability/drools-reliability-infinispan/src/main/java/org/drools/reliability/infinispan/EmbeddedStorageManager.java
 
b/drools-reliability/drools-reliability-infinispan/src/main/java/org/drools/reliability/infinispan/EmbeddedStorageManager.java
index 6553836547..700fdd67eb 100644
--- 
a/drools-reliability/drools-reliability-infinispan/src/main/java/org/drools/reliability/infinispan/EmbeddedStorageManager.java
+++ 
b/drools-reliability/drools-reliability-infinispan/src/main/java/org/drools/reliability/infinispan/EmbeddedStorageManager.java
@@ -18,9 +18,6 @@
  */
 package org.drools.reliability.infinispan;
 
-import java.nio.file.Paths;
-import java.util.Set;
-
 import org.drools.core.common.ReteEvaluator;
 import org.drools.core.common.Storage;
 import org.drools.util.FileUtils;
@@ -36,11 +33,11 @@ import org.infinispan.manager.DefaultCacheManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Paths;
+import java.util.Set;
+
 import static org.drools.reliability.core.StorageManager.createStorageId;
-import static 
org.drools.reliability.infinispan.InfinispanStorageManagerFactory.DELIMITER;
-import static 
org.drools.reliability.infinispan.InfinispanStorageManagerFactory.INFINISPAN_STORAGE_DIRECTORY;
-import static 
org.drools.reliability.infinispan.InfinispanStorageManagerFactory.SESSION_STORAGE_PREFIX;
-import static 
org.drools.reliability.infinispan.InfinispanStorageManagerFactory.SHARED_STORAGE_PREFIX;
+import static 
org.drools.reliability.infinispan.InfinispanStorageManagerFactory.*;
 import static org.drools.util.Config.getConfig;
 
 public class EmbeddedStorageManager implements InfinispanStorageManager {
@@ -76,7 +73,6 @@ public class EmbeddedStorageManager implements 
InfinispanStorageManager {
 
         // Initialize the default Cache Manager.
         embeddedCacheManager = new DefaultCacheManager(global.build());
-
         // Create a distributed cache with synchronous replication.
         ConfigurationBuilder builder = new ConfigurationBuilder();
         builder.persistence().passivation(false)
@@ -113,7 +109,7 @@ public class EmbeddedStorageManager implements 
InfinispanStorageManager {
     @Override
     public void removeStorage(String storageName) {
         if (embeddedCacheManager.cacheExists(storageName)) {
-            embeddedCacheManager.removeCache(storageName);
+            embeddedCacheManager.administration().removeCache(storageName);
         }
     }
 
@@ -176,6 +172,7 @@ public class EmbeddedStorageManager implements 
InfinispanStorageManager {
             this.embeddedCacheManager.stop();
         }
         this.embeddedCacheManager = embeddedCacheManager;
+
     }
 
     // test purpose to remove GlobalState and FileStore
diff --git a/drools-reliability/drools-reliability-tests/pom.xml 
b/drools-reliability/drools-reliability-tests/pom.xml
index 907f780f23..da896f9715 100644
--- a/drools-reliability/drools-reliability-tests/pom.xml
+++ b/drools-reliability/drools-reliability-tests/pom.xml
@@ -35,7 +35,7 @@
 
   <properties>
     <java.module.name>org.drools.reliability.infinispan</java.module.name>
-    <version.testcontainers>1.17.2</version.testcontainers>
+    <version.testcontainers>1.20.1</version.testcontainers>
   </properties>
 
   <dependencyManagement>
@@ -123,7 +123,7 @@
 
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-server-testdriver-core-jakarta</artifactId>
+      <artifactId>infinispan-server-testdriver-core</artifactId>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git 
a/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/EmbeddedStorageManagerTest.java
 
b/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/EmbeddedStorageManagerTest.java
index d00568737e..60fd4949e7 100644
--- 
a/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/EmbeddedStorageManagerTest.java
+++ 
b/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/EmbeddedStorageManagerTest.java
@@ -21,16 +21,14 @@ package org.drools.reliability.test;
 import org.drools.reliability.core.StorageManagerFactory;
 import org.drools.reliability.core.TestableStorageManager;
 import org.drools.reliability.infinispan.InfinispanStorageManager;
+import org.infinispan.configuration.cache.CacheMode;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.manager.DefaultCacheManager;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static 
org.drools.reliability.core.StorageManagerFactory.SESSION_STORAGE_PREFIX;
 import static 
org.drools.reliability.infinispan.InfinispanStorageManagerFactory.INFINISPAN_STORAGE_ALLOWED_PACKAGES;
@@ -63,54 +61,29 @@ class EmbeddedStorageManagerTest {
     void removeAllSessionCaches_shouldLeaveNonSessionCache() {
         ((InfinispanStorageManager) 
StorageManagerFactory.get().getStorageManager()).setEmbeddedCacheManager(new 
FakeCacheManager());
 
-        
assertThat(StorageManagerFactory.get().getStorageManager().getStorageNames()).containsExactlyInAnyOrder(
-                SESSION_STORAGE_PREFIX + "0_" + "epDefault", 
SESSION_STORAGE_PREFIX + "1_" + "epDefault", "METADATA_0");
-
         
StorageManagerFactory.get().getStorageManager().removeAllSessionStorages();
 
-        
assertThat(StorageManagerFactory.get().getStorageManager().getStorageNames()).containsExactly("METADATA_0");
+        
assertThat(StorageManagerFactory.get().getStorageManager().getStorageNames()).contains("METADATA_0");
     }
 
     @Test
     void removeCachesBySessionId_shouldRemoveSpecifiedCacheOnly() {
         ((InfinispanStorageManager) 
StorageManagerFactory.get().getStorageManager()).setEmbeddedCacheManager(new 
FakeCacheManager());
 
-        
assertThat(StorageManagerFactory.get().getStorageManager().getStorageNames()).containsExactlyInAnyOrder(
-                SESSION_STORAGE_PREFIX + "0_" + "epDefault", 
SESSION_STORAGE_PREFIX + "1_" + "epDefault", "METADATA_0");
-
         
StorageManagerFactory.get().getStorageManager().removeStoragesBySessionId("1");
 
-        
assertThat(StorageManagerFactory.get().getStorageManager().getStorageNames()).containsExactlyInAnyOrder(SESSION_STORAGE_PREFIX
 + "0_" + "epDefault", "METADATA_0");
+        
assertThat(StorageManagerFactory.get().getStorageManager().getStorageNames()).contains(SESSION_STORAGE_PREFIX
 + "0_" + "epDefault", "METADATA_0");
     }
 
     public static class FakeCacheManager extends DefaultCacheManager {
-
-        private Map<String, Object> cacheMap = new ConcurrentHashMap<>();
-
         public FakeCacheManager() {
-            cacheMap.put(SESSION_STORAGE_PREFIX + "0_" + "epDefault", new 
Object());
-            cacheMap.put(SESSION_STORAGE_PREFIX + "1_" + "epDefault", new 
Object());
-            cacheMap.put("METADATA_0", new Object());
-        }
 
-        @Override
-        public Set<String> getCacheNames() {
-            return cacheMap.keySet();
-        }
-
-        @Override
-        public boolean cacheExists(String cacheName) {
-            return cacheMap.containsKey(cacheName);
-        }
-
-        @Override
-        public void removeCache(String cacheName) {
-            cacheMap.remove(cacheName);
-        }
+            ConfigurationBuilder builder = new ConfigurationBuilder();
+            builder.clustering().cacheMode(CacheMode.LOCAL);
 
-        @Override
-        public void stop() {
-            // do nothing
+            this.createCache(SESSION_STORAGE_PREFIX + "0_" + "epDefault", 
builder.build());
+            this.createCache(SESSION_STORAGE_PREFIX + "1_" + "epDefault", 
builder.build());
+            this.createCache("METADATA_0", builder.build());
         }
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to