Adapt to API and functional changes in Spring Framework 6 to fix tests.

These changes are also possibly applicable to SDG on Spring Framework 5 and are a candidate for backporting. Resolves spring-projectsgh-538.
jxblum · Sep 25, 2021 · 02e1a14 · 02e1a14
1 parent a460b42
commit 02e1a14
Show file tree

Hide file tree

Showing 86 changed files with 614 additions and 447 deletions.
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/AutoRegionLookupDao.java
@@ -17,11 +17,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import javax.annotation.Resource;
-
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.dao.support.DaoSupport;
 import org.springframework.stereotype.Repository;
@@ -46,16 +46,20 @@
 @SuppressWarnings("unused")
 public class AutoRegionLookupDao extends DaoSupport {
 
-	@Resource(name = "NativePartitionedRegion")
+	@Autowired
+	@Qualifier("NativePartitionedRegion")
 	private Region<?, ?> nativePartitionedRegion;
 
-	@Resource(name = "NativeReplicateParent")
+	@Autowired
+	@Qualifier("NativeReplicateParent")
 	private Region<?, ?> nativeReplicateParent;
 
-	@Resource(name = "/NativeReplicateParent/NativeReplicateChild")
+	@Autowired
+	@Qualifier("/NativeReplicateParent/NativeReplicateChild")
 	private Region<?, ?> nativeReplicateChild;
 
-	@Resource(name = "/NativeReplicateParent/NativeReplicateChild/NativeReplicateGrandchild")
+	@Autowired
+	@Qualifier("/NativeReplicateParent/NativeReplicateChild/NativeReplicateGrandchild")
 	private Region<?, ?> nativeReplicateGrandchild;
 
 	protected static void assertRegionMetaData(Region<?, ?> region, String expectedName, DataPolicy expectedDataPolicy) {

diff --git a/...java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java b/...java/org/springframework/data/gemfire/AutoRegionLookupWithAutowiringIntegrationTests.java
@@ -17,15 +17,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import javax.annotation.Resource;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
 import org.springframework.stereotype.Component;
 import org.springframework.test.context.ContextConfiguration;
@@ -87,16 +86,20 @@ public void testAutowiredNativeRegions() {
 	@Component
 	public static final class TestComponent {
 
-		@Resource(name = "NativePartitionedRegion")
+		@Autowired
+		@Qualifier("NativePartitionedRegion")
 		Region<?, ?> nativePartitionedRegion;
 
-		@Resource(name = "NativeReplicateParent")
+		@Autowired
+		@Qualifier("NativeReplicateParent")
 		Region<?, ?> nativeReplicateParent;
 
-		@Resource(name = "/NativeReplicateParent/NativeReplicateChild")
+		@Autowired
+		@Qualifier("/NativeReplicateParent/NativeReplicateChild")
 		Region<?, ?> nativeReplicateChild;
 
-		@Resource(name = "/NativeReplicateParent/NativeReplicateChild/NativeReplicateGrandchild")
+		@Autowired
+		@Qualifier("/NativeReplicateParent/NativeReplicateChild/NativeReplicateGrandchild")
 		Region<?, ?> nativeReplicateGrandchild;
 
 	}

diff --git a/...ata-geode/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTests.java b/...ata-geode/src/test/java/org/springframework/data/gemfire/CacheServerIntegrationTests.java
@@ -19,15 +19,14 @@
 
 import java.io.File;
 
-import javax.annotation.Resource;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.geode.cache.server.CacheServer;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -64,7 +63,7 @@ private static void deleteRecursive(final File path) {
 		path.delete();
 	}
 
-	@Resource(name = "testCacheServer")
+	@Autowired
 	private CacheServer cacheServer;
 
 	@BeforeClass

diff --git a/...eode/src/test/java/org/springframework/data/gemfire/CollocatedRegionIntegrationTests.java b/...eode/src/test/java/org/springframework/data/gemfire/CollocatedRegionIntegrationTests.java
@@ -17,16 +17,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import javax.annotation.Resource;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.geode.cache.Region;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
-import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer;
-import org.springframework.test.context.ContextConfiguration;
+import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
@@ -43,15 +42,16 @@
  * @since 1.3.3
  */
 @RunWith(SpringRunner.class)
-@ContextConfiguration(value = "colocated-region.xml",
-	initializers = GemFireMockObjectsApplicationContextInitializer.class)
+@GemFireUnitTest
 @SuppressWarnings("unused")
 public class CollocatedRegionIntegrationTests extends IntegrationTestsSupport {
 
-	@Resource(name = "colocatedRegion")
+	@Autowired
+	@Qualifier("colocatedRegion")
 	private Region<?, ?> colocatedRegion;
 
-	@Resource(name = "sourceRegion")
+	@Autowired
+	@Qualifier("sourceRegion")
 	private Region<?, ?> sourceRegion;
 
 	protected static void assertRegionExists(String expectedRegionName, Region<?, ?> region) {

diff --git a/.../springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTests.java b/.../springframework/data/gemfire/DiskStoreBeanUsingPropertyPlaceholdersIntegrationTests.java
@@ -19,17 +19,16 @@
 
 import java.util.Map;
 
-import javax.annotation.Resource;
-
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.apache.geode.cache.DiskStore;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
-import org.springframework.data.gemfire.tests.mock.context.GemFireMockObjectsApplicationContextInitializer;
-import org.springframework.test.context.ContextConfiguration;
+import org.springframework.data.gemfire.tests.unit.annotation.GemFireUnitTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**
@@ -48,18 +47,28 @@
  * @since 1.3.4
  */
 @RunWith(SpringRunner.class)
-@ContextConfiguration(locations = "diskstore-using-propertyplaceholders-config.xml",
-	initializers = GemFireMockObjectsApplicationContextInitializer.class)
+@GemFireUnitTest
 @SuppressWarnings("unused")
 public class DiskStoreBeanUsingPropertyPlaceholdersIntegrationTests extends IntegrationTestsSupport {
 
 	@Autowired
 	private DiskStore testDataStore;
 
-	@Resource(name="diskStoreConfiguration")
-	private Map<String, Object> diskStoreConfiguration;
+	@Autowired
+	@Qualifier("diskStoreConfiguration")
+	private Map<Object, Object> diskStoreConfiguration;
+
+	@Before
+	public void assertDiskStoreConfiguration() {
+
+		//System.err.printf("Map of Type [%s]%n", ObjectUtils.nullSafeClassName(this.diskStoreConfiguration));
+		//System.err.printf("Map with Contents [%s]%n", this.diskStoreConfiguration);
+		assertThat(this.diskStoreConfiguration).isNotNull();
+		assertThat(String.valueOf(this.diskStoreConfiguration.get("allowForceCompaction"))).isEqualTo("false");
+		assertThat(String.valueOf(this.diskStoreConfiguration.get("writeBufferSize"))).isEqualTo("65536");
+	}
 
-	private Object getExpectedValue(final String propertyPlaceholderName) {
+	private Object getExpectedValue(String propertyPlaceholderName) {
 		return this.diskStoreConfiguration.get(propertyPlaceholderName);
 	}
 

diff --git a/...geode/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java b/...geode/src/test/java/org/springframework/data/gemfire/GemfireTemplateIntegrationTests.java
@@ -27,8 +27,6 @@
 import java.util.Objects;
 import java.util.Properties;
 
-import javax.annotation.Resource;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,6 +36,7 @@
 import org.apache.geode.cache.query.SelectResults;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -91,7 +90,8 @@ public class GemfireTemplateIntegrationTests extends IntegrationTestsSupport {
 	@Autowired
 	private GemfireTemplate usersTemplate;
 
-	@Resource(name = "Users")
+	@Autowired
+	@Qualifier("Users")
 	private Region<String, User> users;
 
 	private static User newUser(String username) {
@@ -453,12 +453,11 @@ CacheFactoryBean gemfireCache() {
 		}
 
 		@Bean(name = "Users")
-		LocalRegionFactoryBean<Object, Object> usersRegion(GemFireCache gemfireCache) {
+		LocalRegionFactoryBean<String, User> usersRegion(GemFireCache gemfireCache) {
 
-			LocalRegionFactoryBean<Object, Object> usersRegion = new LocalRegionFactoryBean<>();
+			LocalRegionFactoryBean<String, User> usersRegion = new LocalRegionFactoryBean<>();
 
 			usersRegion.setCache(gemfireCache);
-			usersRegion.setClose(false);
 			usersRegion.setPersistent(false);
 
 			return usersRegion;

diff --git a/...data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java b/...data/gemfire/GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationTests.java
@@ -23,9 +23,6 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -51,6 +48,7 @@
 import org.springframework.data.gemfire.support.ConnectionEndpoint;
 import org.springframework.data.gemfire.support.ConnectionEndpointList;
 import org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport;
+import org.springframework.data.gemfire.tests.objects.geode.cache.RegionDataInitializingPostProcessor;
 import org.springframework.data.gemfire.tests.process.ProcessWrapper;
 import org.springframework.data.gemfire.util.PropertiesBuilder;
 import org.springframework.test.context.ContextConfiguration;
@@ -331,23 +329,6 @@ public static void main(String[] args) {
 			runSpringApplication(GemFireCacheServerOneConfiguration.class, args);
 		}
 
-		@Resource(name = "Cats")
-		private org.apache.geode.cache.Region<String, Cat> cats;
-
-		private Cat save(Cat cat) {
-			cats.put(cat.getName(), cat);
-			return cat;
-		}
-
-		@PostConstruct
-		public void postConstruct() {
-			save(Cat.newCat("Grey"));
-			save(Cat.newCat("Patchit"));
-			save(Cat.newCat("Tyger"));
-			save(Cat.newCat("Molly"));
-			save(Cat.newCat("Sammy"));
-		}
-
 		@Override
 		String groups() {
 			return "serverOne";
@@ -359,15 +340,27 @@ String startLocator(int locatorPort) {
 		}
 
 		@Bean(name = "Cats")
-		LocalRegionFactoryBean catsRegion(GemFireCache gemfireCache) {
+		LocalRegionFactoryBean<String, Cat> catsRegion(GemFireCache gemfireCache) {
 
-			LocalRegionFactoryBean catsRegion = new LocalRegionFactoryBean();
+			LocalRegionFactoryBean<String, Cat> catsRegion = new LocalRegionFactoryBean();
 
 			catsRegion.setCache(gemfireCache);
 			catsRegion.setPersistent(false);
 
 			return catsRegion;
 		}
+
+		@Bean
+		RegionDataInitializingPostProcessor<Cat> catsRegionDataInitializer() {
+
+			return RegionDataInitializingPostProcessor.<Cat>withRegion("Cats")
+				.useAsEntityIdentifier(Cat::getName)
+				.store(Cat.newCat("Grey"))
+				.store(Cat.newCat("Patchit"))
+				.store(Cat.newCat("Tyger"))
+				.store(Cat.newCat("Molly"))
+				.store(Cat.newCat("Sammy"));
+		}
 	}
 
 	@Configuration
@@ -378,20 +371,6 @@ public static void main(String[] args) {
 			runSpringApplication(GemFireCacheServerTwoConfiguration.class, args);
 		}
 
-		@Resource(name = "Dogs")
-		private org.apache.geode.cache.Region<String, Dog> dogs;
-
-		private Dog save(Dog dog) {
-			dogs.put(dog.getName(), dog);
-			return dog;
-		}
-
-		@PostConstruct
-		public void postConstruct() {
-			save(Dog.newDog("Spuds"));
-			save(Dog.newDog("Maha"));
-		}
-
 		@Override
 		String groups() {
 			return "serverTwo";
@@ -407,5 +386,14 @@ LocalRegionFactoryBean<String, Dog> dogsRegion(GemFireCache gemfireCache) {
 
 			return dogsRegion;
 		}
+
+		@Bean
+		RegionDataInitializingPostProcessor<Dog> dogsRegionDataInitializer() {
+
+			return RegionDataInitializingPostProcessor.<Dog>withRegion("Dogs")
+				.useAsEntityIdentifier(Dog::getName)
+				.store(Dog.newDog("Spuds"))
+				.store(Dog.newDog("Maha"));
+		}
 	}
 }
diff --git a/.../java/org/springframework/data/gemfire/LookupPartitionRegionMutationIntegrationTests.java b/.../java/org/springframework/data/gemfire/LookupPartitionRegionMutationIntegrationTests.java
@@ -25,8 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -51,6 +49,8 @@
 import org.apache.geode.cache.util.CacheListenerAdapter;
 
 import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -74,7 +74,8 @@
 @SuppressWarnings("unused")
 public class LookupPartitionRegionMutationIntegrationTests extends IntegrationTestsSupport {
 
-	@Resource(name = "Example")
+	@Autowired
+	@Qualifier("Example")
 	private Region<?, ?> example;
 
 	private void assertCacheListeners(CacheListener<?, ?>[] cacheListeners,