From c73fb1e30b973c509eee50d6604410ac1654183e Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 14 Sep 2022 15:11:50 -0700 Subject: [PATCH] Remove Java 17 language features. Resolves #623. --- .../function/ListRegionsOnServerFunction.java | 3 --- .../gemfire/config/annotation/PdxConfiguration.java | 4 ++-- .../support/AbstractAnnotationConfigSupport.java | 2 +- .../EmbeddedServiceConfigurationSupport.java | 13 +++++++++---- ...tinuousQueriesConfigurationIntegrationTests.java | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java index 53e55e71..39cee67b 100644 --- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java +++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java @@ -16,7 +16,6 @@ */ package org.springframework.data.gemfire.client.function; -import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -35,12 +34,10 @@ import org.springframework.lang.NonNull; * * @author David Turanski * @author John Blum - * @see java.io.Serial * @see org.apache.geode.cache.execute.Function */ public class ListRegionsOnServerFunction implements Function { - @Serial private static final long serialVersionUID = 867530169L; public static final String ID = ListRegionsOnServerFunction.class.getName(); diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java index 21ddd673..605e1566 100644 --- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java +++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java @@ -265,8 +265,8 @@ public class PdxConfiguration extends AbstractAnnotationConfigSupport implements .map(beanName -> beanFactory.getBean(beanName, PdxSerializer.class)) .orElseGet(this::newPdxSerializer); - if (serializer instanceof MappingPdxSerializer mappingSerializer) { - mappingSerializer.setIncludeTypeFilters(buildIncludeTypeFilters()); + if (serializer instanceof MappingPdxSerializer) { + ((MappingPdxSerializer) serializer).setIncludeTypeFilters(buildIncludeTypeFilters()); } return serializer; diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java index 94a27a11..0dd39c19 100644 --- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java +++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java @@ -1000,7 +1000,7 @@ public abstract class AbstractAnnotationConfigSupport .map(BeanDefinition::getBeanClassName) .filter(StringUtils::hasText); - boolean beanClassNameNotPresent = beanClassName.isEmpty(); + boolean beanClassNameNotPresent = !beanClassName.isPresent(); if (beanClassNameNotPresent) { beanClassName = optionalBeanDefinition diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java index 80abbeb4..5ceaa4a7 100644 --- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java +++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java @@ -49,7 +49,7 @@ import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** - * An abstract base class supporting the configuration of Apache Geode embedded services. + * Abstract base class supporting the configuration of Apache Geode embedded services. * * @author John Blum * @see java.util.Map @@ -225,7 +225,9 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota BeanFactory beanFactory = getBeanFactory(); - if (beanFactory instanceof AutowireCapableBeanFactory autowiringBeanFactory) { + if (beanFactory instanceof AutowireCapableBeanFactory) { + + AutowireCapableBeanFactory autowiringBeanFactory = (AutowireCapableBeanFactory) beanFactory; NamedBeanHolder beanHolder = autowiringBeanFactory.resolveNamedBean(beanType); @@ -349,8 +351,11 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof Properties gemfirePropertiesBean && GEMFIRE_PROPERTIES_BEAN_NAME.equals(beanName)) { - gemfirePropertiesBean.putAll(this.gemfireProperties); + if (bean instanceof Properties && GEMFIRE_PROPERTIES_BEAN_NAME.equals(beanName)) { + + Properties gemfireProperties = (Properties) bean; + + gemfireProperties.putAll(this.gemfireProperties); } return bean; 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 b9706cc4..46c0f959 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 @@ -136,7 +136,7 @@ public class EnableContinuousQueriesConfigurationIntegrationTests extends Forkin } } - @ClientCacheApplication(logLevel = "error", subscriptionEnabled = true) + @ClientCacheApplication(subscriptionEnabled = true) static class GeodeClientConfiguration { @Bean @@ -163,7 +163,7 @@ public class EnableContinuousQueriesConfigurationIntegrationTests extends Forkin private CacheListener temperatureReadingCounterListener() { - return new CacheListenerAdapter<>() { + return new CacheListenerAdapter() { @Override public void afterCreate(EntryEvent event) { @@ -198,7 +198,7 @@ public class EnableContinuousQueriesConfigurationIntegrationTests extends Forkin private CacheLoader temperatureReadingsLoader() { - return new CacheLoader<>() { + return new CacheLoader() { @Override public TemperatureReading load(LoaderHelper helper) throws CacheLoaderException {