Skip to content
This repository was archived by the owner on Oct 22, 2025. It is now read-only.

Commit c0f7469

Browse files
committed
Remove use of Java 17 language features in SDG 2.x line of development.
1 parent a6f8cc3 commit c0f7469

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAnnotationConfigSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ protected Optional<String> resolveBeanClassName(@Nullable BeanDefinition beanDef
10041004
.map(BeanDefinition::getBeanClassName)
10051005
.filter(StringUtils::hasText);
10061006

1007-
boolean beanClassNameNotPresent = beanClassName.isEmpty();
1007+
boolean beanClassNameNotPresent = !beanClassName.isPresent();
10081008

10091009
if (beanClassNameNotPresent) {
10101010
beanClassName = optionalBeanDefinition

spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ protected <T> T resolveBean(Class<T> beanType) {
225225

226226
BeanFactory beanFactory = getBeanFactory();
227227

228-
if (beanFactory instanceof AutowireCapableBeanFactory autowiringBeanFactory) {
228+
if (beanFactory instanceof AutowireCapableBeanFactory) {
229+
230+
AutowireCapableBeanFactory autowiringBeanFactory = (AutowireCapableBeanFactory) beanFactory;
229231

230232
NamedBeanHolder<T> beanHolder = autowiringBeanFactory.resolveNamedBean(beanType);
231233

@@ -349,8 +351,8 @@ protected GemFirePropertiesBeanPostProcessor(@NonNull Properties gemfireProperti
349351
@Override
350352
public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
351353

352-
if (bean instanceof Properties gemfirePropertiesBean && GEMFIRE_PROPERTIES_BEAN_NAME.equals(beanName)) {
353-
gemfirePropertiesBean.putAll(this.gemfireProperties);
354+
if (bean instanceof Properties && GEMFIRE_PROPERTIES_BEAN_NAME.equals(beanName)) {
355+
((Properties) bean).putAll(this.gemfireProperties);
354356
}
355357

356358
return bean;

0 commit comments

Comments
 (0)