From e45b9715b5a9c00e9273f477188d90716ecb8e53 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Fri, 24 Sep 2021 18:07:42 -0700
Subject: [PATCH] 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 gh-538.
---
 .../annotation/AbstractGeodeSecurityIntegrationTests.java     | 2 +-
 .../EnableContinuousQueriesConfigurationIntegrationTests.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java
index 1e3a834c..6cb9c105 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java
@@ -248,7 +248,7 @@ public abstract class AbstractGeodeSecurityIntegrationTests extends ForkingClien
 
 		CacheLoader<String, String> echoCacheLoader() {
 
-			return new CacheLoader<String, String>() {
+			return new CacheLoader<>() {
 
 				@Override
 				public String load(LoaderHelper<String, String> helper) throws CacheLoaderException {
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java
index 0751c92b..f7d3a764 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/annotation/EnableContinuousQueriesConfigurationIntegrationTests.java
@@ -163,7 +163,7 @@ public class EnableContinuousQueriesConfigurationIntegrationTests extends Forkin
 
 		private CacheListener<Long, TemperatureReading> temperatureReadingCounterListener() {
 
-			return new CacheListenerAdapter<Long, TemperatureReading>() {
+			return new CacheListenerAdapter<>() {
 
 				@Override
 				public void afterCreate(EntryEvent<Long, TemperatureReading> event) {
@@ -198,7 +198,7 @@ public class EnableContinuousQueriesConfigurationIntegrationTests extends Forkin
 
 		private CacheLoader<Long, TemperatureReading> temperatureReadingsLoader() {
 
-			return new CacheLoader<Long, TemperatureReading>() {
+			return new CacheLoader<>() {
 
 				@Override
 				public TemperatureReading load(LoaderHelper<Long, TemperatureReading> helper) throws CacheLoaderException {