From 9a2476b39ff10c6e68bb358747c2357d6bdb9b88 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 fcd80344..1babab1a 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 @@ -992,7 +992,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 b771c4e8..d94772c8 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 @@ -217,7 +217,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); @@ -346,8 +348,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;