From fe75f1da94b900ade7c50a4a2f0bc8733026d1c2 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Mon, 28 May 2018 21:42:53 -0700
Subject: [PATCH] Replace o.s.b.f.c.BeanPostProcessor with
 @EnableBeanFactoryLocator annotation.

---
 .../PeerSecurityAutoConfiguration.java        | 33 ++-----------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/PeerSecurityAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/PeerSecurityAutoConfiguration.java
index 1b6a3c78..af846e97 100644
--- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/PeerSecurityAutoConfiguration.java
+++ b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/PeerSecurityAutoConfiguration.java
@@ -16,19 +16,15 @@
 
 package org.springframework.boot.data.geode.autoconfigure;
 
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.gemfire.CacheFactoryBean;
 import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
 import org.springframework.data.gemfire.config.annotation.ApacheShiroSecurityConfiguration;
+import org.springframework.data.gemfire.config.annotation.EnableBeanFactoryLocator;
 import org.springframework.data.gemfire.config.annotation.EnableSecurity;
 import org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurityConfiguration;
-import org.springframework.lang.Nullable;
 
 /**
  * Spring Boot {@link EnableAutoConfiguration auto-configuration} enabling Apache Geode's Security functionality,
@@ -36,12 +32,12 @@ import org.springframework.lang.Nullable;
  *
  * @author John Blum
  * @see org.apache.geode.security.SecurityManager
- * @see org.springframework.beans.factory.config.BeanPostProcessor
  * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration
  * @see org.springframework.context.annotation.Configuration
  * @see org.springframework.data.gemfire.CacheFactoryBean
  * @see org.springframework.data.gemfire.client.ClientCacheFactoryBean
  * @see org.springframework.data.gemfire.config.annotation.ApacheShiroSecurityConfiguration
+ * @see org.springframework.data.gemfire.config.annotation.EnableBeanFactoryLocator
  * @see org.springframework.data.gemfire.config.annotation.EnableSecurity
  * @see org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurityConfiguration
  * @see org.springframework.data.gemfire.config.annotation.PeerCacheConfigurer
@@ -54,32 +50,9 @@ import org.springframework.lang.Nullable;
 	ApacheShiroSecurityConfiguration.class,
 	GeodeIntegratedSecurityConfiguration.class
 })
+@EnableBeanFactoryLocator
 @EnableSecurity(securityManagerClassName = "org.springframework.boot.data.geode.security.support.SecurityManagerProxy")
 @SuppressWarnings("unused")
 public class PeerSecurityAutoConfiguration {
 
-	@Bean
-	@SuppressWarnings("all")
-	BeanPostProcessor cacheFactoryBeanPostProcessor() {
-
-		return new BeanPostProcessor() {
-
-			@Nullable @Override
-			public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-
-				if (bean instanceof CacheFactoryBean) {
-					((CacheFactoryBean) bean).setUseBeanFactoryLocator(true);
-				}
-
-				return bean;
-			}
-		};
-	}
-
-	/*
-	PeerCacheConfigurer gemfireCacheUseBeanFactoryLocatorConfigurer() {
-		return (beanName, cacheFactoryBean) -> cacheFactoryBean.setUseBeanFactoryLocator(true);
-	}
-	*/
-
 }