From a6f8cc3961c8dda569d31ec06c7df8fd68fd7a20 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 30 Mar 2022 15:23:23 -0700 Subject: [PATCH] Rewview and refactor the EmbeddedServiceConfigurationSupport class. Make use of Java 17 language features. Edit Javadoc. --- .../support/EmbeddedServiceConfigurationSupport.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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 494d9688..80abbeb4 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,8 +49,7 @@ import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** - * The {@link EmbeddedServiceConfigurationSupport} class is an abstract base class supporting - * the configuration of Pivotal GemFire and Apache Geode embedded services. + * An abstract base class supporting the configuration of Apache Geode embedded services. * * @author John Blum * @see java.util.Map @@ -226,9 +225,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota BeanFactory beanFactory = getBeanFactory(); - if (beanFactory instanceof AutowireCapableBeanFactory) { - - AutowireCapableBeanFactory autowiringBeanFactory = (AutowireCapableBeanFactory) beanFactory; + if (beanFactory instanceof AutowireCapableBeanFactory autowiringBeanFactory) { NamedBeanHolder beanHolder = autowiringBeanFactory.resolveNamedBean(beanType); @@ -352,10 +349,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof Properties && GEMFIRE_PROPERTIES_BEAN_NAME.equals(beanName)) { - - Properties gemfirePropertiesBean = (Properties) bean; - + if (bean instanceof Properties gemfirePropertiesBean && GEMFIRE_PROPERTIES_BEAN_NAME.equals(beanName)) { gemfirePropertiesBean.putAll(this.gemfireProperties); }