Repository: geode Updated Branches: refs/heads/feature/GEODE-2632-21 6f7f51cce -> b819934c8
fix spotless format Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b819934c Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b819934c Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b819934c Branch: refs/heads/feature/GEODE-2632-21 Commit: b819934c894448232b3aeaa022a831f0596684bd Parents: 6f7f51c Author: Kirk Lund <[email protected]> Authored: Tue Jun 6 12:09:41 2017 -0700 Committer: Kirk Lund <[email protected]> Committed: Tue Jun 6 12:09:41 2017 -0700 ---------------------------------------------------------------------- .../geode/internal/security/CustomSecurityService.java | 6 +++--- .../geode/internal/security/SecurityServiceFactory.java | 9 ++++----- .../geode/internal/security/SecurityServiceFactoryTest.java | 8 +++++--- .../geode/security/CacheFactoryWithSecurityObjectTest.java | 7 ++++--- 4 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/b819934c/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java index 038f04b..e7e9338 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/CustomSecurityService.java @@ -245,7 +245,7 @@ public class CustomSecurityService implements SecurityService { @Override public void authorize(final String resource, final String operation, String regionName, - final String key) { + final String key) { regionName = StringUtils.stripStart(regionName, "/"); authorize(new ResourcePermission(resource, operation, regionName, key)); } @@ -285,13 +285,13 @@ public class CustomSecurityService implements SecurityService { @Override public Object postProcess(final String regionPath, final Object key, final Object value, - final boolean valueIsSerialized) { + final boolean valueIsSerialized) { return postProcess(null, regionPath, key, value, valueIsSerialized); } @Override public Object postProcess(Object principal, final String regionPath, final Object key, - final Object value, final boolean valueIsSerialized) { + final Object value, final boolean valueIsSerialized) { if (!needPostProcess()) { return value; } http://git-wip-us.apache.org/repos/asf/geode/blob/b819934c/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java index 25f32a8..1493a3e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityServiceFactory.java @@ -55,10 +55,8 @@ public class SecurityServiceFactory { SecurityManager securityManager, PostProcessor postProcessor) { Properties securityConfig = getSecurityConfig(distributionConfig); - securityManager = - getSecurityManager(securityManager, securityConfig); - postProcessor = - getPostProcessor(postProcessor, securityConfig); + securityManager = getSecurityManager(securityManager, securityConfig); + postProcessor = getPostProcessor(postProcessor, securityConfig); SecurityService securityService = create(securityConfig, securityManager, postProcessor); initialize(securityService, distributionConfig); @@ -98,7 +96,8 @@ public class SecurityServiceFactory { return SecurityServiceType.CUSTOM; } - boolean hasSecurityManager = securityManager != null || hasProperty(securityConfig, SECURITY_MANAGER); + boolean hasSecurityManager = + securityManager != null || hasProperty(securityConfig, SECURITY_MANAGER); if (hasSecurityManager) { return SecurityServiceType.ENABLED; } http://git-wip-us.apache.org/repos/asf/geode/blob/b819934c/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java index e977957..e3d254d 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/security/SecurityServiceFactoryTest.java @@ -265,13 +265,15 @@ public class SecurityServiceFactoryTest { } @Test - public void create_securityManagerAndPostProcessor_createsEnabledSecurityService() throws Exception { + public void create_securityManagerAndPostProcessor_createsEnabledSecurityService() + throws Exception { Properties securityConfig = new Properties(); SecurityManager mockSecurityManager = mock(SecurityManager.class); PostProcessor mockPostProcessor = mock(PostProcessor.class); - assertThat(SecurityServiceFactory.create(securityConfig, mockSecurityManager, mockPostProcessor)) - .isInstanceOf(EnabledSecurityService.class); + assertThat( + SecurityServiceFactory.create(securityConfig, mockSecurityManager, mockPostProcessor)) + .isInstanceOf(EnabledSecurityService.class); } } http://git-wip-us.apache.org/repos/asf/geode/blob/b819934c/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java b/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java index 17ac1bd..cdb90f1 100644 --- a/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java +++ b/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java @@ -73,7 +73,8 @@ public class CacheFactoryWithSecurityObjectTest { @Test public void testCreateCacheWithSecurityManagerAndPostProcessor() throws Exception { this.cache = (InternalCache) new CacheFactory(this.properties) - .setSecurityManager(this.simpleSecurityManager).setPostProcessor(new TestPostProcessor()).create(); + .setSecurityManager(this.simpleSecurityManager).setPostProcessor(new TestPostProcessor()) + .create(); SecurityService securityService = this.cache.getSecurityService(); assertTrue(securityService.isIntegratedSecurity()); assertTrue(securityService.isClientSecurityRequired()); @@ -84,8 +85,8 @@ public class CacheFactoryWithSecurityObjectTest { } /** - * This test seems to be misleading. Nothing is overridden here. SecurityManager - * is preferred over SECURITY_CLIENT_AUTHENTICATOR. + * This test seems to be misleading. Nothing is overridden here. SecurityManager is preferred over + * SECURITY_CLIENT_AUTHENTICATOR. */ @Test public void testOverride() throws Exception {
