Skip to content

Commit 306d492

Browse files
committed
Refactor Apache Geode/Pivotal GemFire (PCC) peer Security (Auth) auto-configuration.
Switch from using the @EnableBeanFactoryLocator and @EnableSecurity annotations with the security-manager property set to the SecurityManagerProxy class to using the @EnableSecurityManagerProxy annotation.
1 parent a5f1650 commit 306d492

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* or implied. See the License for the specific language governing
1414
* permissions and limitations under the License.
1515
*/
16-
1716
package org.springframework.geode.boot.autoconfigure;
1817

1918
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -23,9 +22,8 @@
2322
import org.springframework.context.annotation.Import;
2423
import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
2524
import org.springframework.data.gemfire.config.annotation.ApacheShiroSecurityConfiguration;
26-
import org.springframework.data.gemfire.config.annotation.EnableBeanFactoryLocator;
27-
import org.springframework.data.gemfire.config.annotation.EnableSecurity;
2825
import org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurityConfiguration;
26+
import org.springframework.geode.config.annotation.EnableSecurityManagerProxy;
2927

3028
/**
3129
* Spring Boot {@link EnableAutoConfiguration auto-configuration} enabling Apache Geode's Security functionality,
@@ -39,10 +37,9 @@
3937
* @see org.springframework.data.gemfire.CacheFactoryBean
4038
* @see org.springframework.data.gemfire.client.ClientCacheFactoryBean
4139
* @see org.springframework.data.gemfire.config.annotation.ApacheShiroSecurityConfiguration
42-
* @see org.springframework.data.gemfire.config.annotation.EnableBeanFactoryLocator
43-
* @see org.springframework.data.gemfire.config.annotation.EnableSecurity
4440
* @see org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurityConfiguration
4541
* @see org.springframework.geode.boot.autoconfigure.HttpBasicAuthenticationSecurityConfiguration
42+
* @see org.springframework.geode.config.annotation.EnableSecurityManagerProxy
4643
* @see org.springframework.geode.security.support.SecurityManagerProxy
4744
* @since 1.0.0
4845
*/
@@ -53,8 +50,7 @@
5350
ApacheShiroSecurityConfiguration.class,
5451
GeodeIntegratedSecurityConfiguration.class
5552
})
56-
@EnableBeanFactoryLocator
57-
@EnableSecurity(securityManagerClassName = "org.springframework.geode.security.support.SecurityManagerProxy")
53+
@EnableSecurityManagerProxy
5854
@Import(HttpBasicAuthenticationSecurityConfiguration.class)
5955
@SuppressWarnings("unused")
6056
public class PeerSecurityAutoConfiguration {

0 commit comments

Comments
 (0)