From c0f7469510ccab477e14affbb3a9453efbf52f8d Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 30 Mar 2022 15:57:25 -0700 Subject: [PATCH] Remove use of Java 17 language features in SDG 2.x line of development. --- .../support/AbstractAnnotationConfigSupport.java | 2 +- .../support/EmbeddedServiceConfigurationSupport.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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 576fdb53..8197aa13 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 @@ -1004,7 +1004,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..5d602072 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 @@ -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,8 @@ 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) bean).putAll(this.gemfireProperties); } return bean;