Upgrade to wildfly-clustering 5.0.x and Spring Session 3.4.x.

wildfly-clustering · Dec 31, 2024 · a32e9a0 · a32e9a0
1 parent 8d1ccbe
commit a32e9a0
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 103 deletions.
diff --git a/...anSessionManagementArgumentsProvider.java → ...anSessionManagementArgumentsProvider.java b/...anSessionManagementArgumentsProvider.java → ...anSessionManagementArgumentsProvider.java
@@ -19,13 +19,9 @@
 /**
  * @author Paul Ferraro
  */
-public class AbstractInfinispanSessionManagementArgumentsProvider implements ArgumentsProvider {
+public class InfinispanSessionManagementArgumentsProvider implements ArgumentsProvider {
 
-	private final Set<String> templates;
-
-	AbstractInfinispanSessionManagementArgumentsProvider(Set<String> templates) {
-		this.templates = templates;
-	}
+	private final Set<String> templates = Set.of("dist-non-tx", "dist-tx", "repl-non-tx", "repl-tx");
 
 	@Override
 	public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {

diff --git a/...spring/context/infinispan/embedded/NonTxInfinispanSessionManagementArgumentsProvider.java b/...spring/context/infinispan/embedded/NonTxInfinispanSessionManagementArgumentsProvider.java
diff --git a/...ng/spring/context/infinispan/embedded/TxInfinispanSessionManagementArgumentsProvider.java b/...ng/spring/context/infinispan/embedded/TxInfinispanSessionManagementArgumentsProvider.java
diff --git a/context/infinispan/embedded/src/test/resources/infinispan.xml b/context/infinispan/embedded/src/test/resources/infinispan.xml
@@ -4,20 +4,18 @@
 	SPDX-License-Identifier: Apache-2.0
 -->
 <infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="urn:infinispan:config:14.0 https://infinispan.org/schemas/infinispan-config-14.0.xsd"
-		xmlns="urn:infinispan:config:14.0">
+		xsi:schemaLocation="urn:infinispan:config:15.0 https://infinispan.org/schemas/infinispan-config-15.0.xsd"
+		xmlns="urn:infinispan:config:15.0">
 
-	<cache-container name="default" default-cache="dist">
+	<cache-container name="default" default-cache="dist-tx">
 		<transport/>
-		<distributed-cache-configuration name="dist">
-		</distributed-cache-configuration>
+		<distributed-cache-configuration name="dist-non-tx"/>
 		<distributed-cache-configuration name="dist-tx">
 			<transaction mode="BATCH" locking="PESSIMISTIC"/>
 		</distributed-cache-configuration>
-		<replicated-cache-configuration name="repl">
-		</replicated-cache-configuration>
+		<replicated-cache-configuration name="repl-non-tx"/>
 		<replicated-cache-configuration name="repl-tx">
 			<transaction mode="BATCH" locking="PESSIMISTIC"/>
 		</replicated-cache-configuration>
 	</cache-container>
-</infinispan>
+</infinispan>
diff --git a/pom.xml b/pom.xml
@@ -27,8 +27,7 @@
 
 	<properties>
 		<jdk.runtime.args>--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jdk.runtime.args>
-		<maven.compiler.target>17</maven.compiler.target>
-		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.release>17</maven.compiler.release>
 		<maven.repository.url>https://repository.jboss.org/nexus/content/groups/public/</maven.repository.url>
 
 		<!-- Provided dependency versions -->
@@ -37,16 +36,17 @@
 		<version.org.kohsuke.metainf-services>1.11</version.org.kohsuke.metainf-services>
 
 		<!-- Runtime dependency versions -->
-		<version.io.projectreactor>2024.0.0</version.io.projectreactor>
-		<version.org.springframework>6.1.5</version.org.springframework>
-		<version.org.springframework.security>6.3.4</version.org.springframework.security>
-		<version.org.springframework.session>3.3.3</version.org.springframework.session>
+		<version.io.projectreactor>2024.0.1</version.io.projectreactor>
+		<version.org.springframework>6.2.1</version.org.springframework>
+		<version.org.springframework.security>6.4.2</version.org.springframework.security>
+		<version.org.springframework.session>3.4.1</version.org.springframework.session>
 		<version.org.infinispan>15.0.11.Final</version.org.infinispan>
 		<version.org.jboss.marshalling>2.2.1.Final</version.org.jboss.marshalling>
-		<version.org.wildfly.clustering>4.0.0.Final</version.org.wildfly.clustering>
+		<version.org.wildfly.clustering>5.0.6.Final</version.org.wildfly.clustering>
 
 		<!-- Test dependency versions -->
 		<version.org.apache.tomcat>10.1.34</version.org.apache.tomcat>
+		<version.org.assertj>3.27.0</version.org.assertj>
 		<version.org.jboss.arquillian>1.9.1.Final</version.org.jboss.arquillian>
 		<version.org.jboss.arquillian.container.tomcat>1.1.0.Final</version.org.jboss.arquillian.container.tomcat>
 		<version.org.jboss.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap>
@@ -80,6 +80,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.assertj</groupId>
+				<artifactId>assertj-bom</artifactId>
+				<version>${version.org.assertj}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.infinispan</groupId>
 				<artifactId>infinispan-bom</artifactId>
@@ -180,6 +187,11 @@
 	</dependencyManagement>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
@@ -190,6 +202,11 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-subclass</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...TxBeanInfinispanSessionManagerITCase.java → ...d/BeanInfinispanSessionManagerITCase.java b/...TxBeanInfinispanSessionManagerITCase.java → ...d/BeanInfinispanSessionManagerITCase.java
@@ -10,17 +10,17 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.wildfly.clustering.spring.context.PropertiesAsset;
+import org.wildfly.clustering.spring.context.infinispan.embedded.InfinispanSessionManagementArgumentsProvider;
 import org.wildfly.clustering.spring.context.infinispan.embedded.InfinispanSessionManagementParameters;
-import org.wildfly.clustering.spring.context.infinispan.embedded.NonTxInfinispanSessionManagementArgumentsProvider;
 import org.wildfly.clustering.spring.session.context.xml.XmlContextLoaderListener;
 
 /**
  * @author Paul Ferraro
  */
-public class NonTxBeanInfinispanSessionManagerITCase extends AbstractInfinispanSessionManagerITCase {
+public class BeanInfinispanSessionManagerITCase extends AbstractInfinispanSessionManagerITCase {
 
 	@ParameterizedTest(name = ParameterizedTest.ARGUMENTS_PLACEHOLDER)
-	@ArgumentsSource(NonTxInfinispanSessionManagementArgumentsProvider.class)
+	@ArgumentsSource(InfinispanSessionManagementArgumentsProvider.class)
 	public void test(InfinispanSessionManagementParameters parameters) {
 		Properties properties = new Properties();
 		properties.setProperty("session.granularity", parameters.getSessionPersistenceGranularity().name());

diff --git a/...y/clustering/spring/session/infinispan/embedded/TxBeanInfinispanSessionManagerITCase.java b/...y/clustering/spring/session/infinispan/embedded/TxBeanInfinispanSessionManagerITCase.java
diff --git a/...dfly/clustering/spring/web/infinispan/embedded/BeanInfinispanWebSessionManagerITCase.java b/...dfly/clustering/spring/web/infinispan/embedded/BeanInfinispanWebSessionManagerITCase.java
@@ -10,8 +10,8 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.wildfly.clustering.spring.context.PropertiesAsset;
+import org.wildfly.clustering.spring.context.infinispan.embedded.InfinispanSessionManagementArgumentsProvider;
 import org.wildfly.clustering.spring.context.infinispan.embedded.InfinispanSessionManagementParameters;
-import org.wildfly.clustering.spring.context.infinispan.embedded.NonTxInfinispanSessionManagementArgumentsProvider;
 import org.wildfly.clustering.spring.web.context.xml.XmlContextLoaderListener;
 
 /**
@@ -22,7 +22,7 @@
 public class BeanInfinispanWebSessionManagerITCase extends AbstractInfinispanWebSessionManagerITCase {
 
 	@ParameterizedTest(name = ParameterizedTest.ARGUMENTS_PLACEHOLDER)
-	@ArgumentsSource(NonTxInfinispanSessionManagementArgumentsProvider.class)
+	@ArgumentsSource(InfinispanSessionManagementArgumentsProvider.class)
 	public void test(InfinispanSessionManagementParameters parameters) throws Exception {
 		Properties properties = new Properties();
 		properties.setProperty("session.granularity", parameters.getSessionPersistenceGranularity().name());