From 32bbef0d89e1c5edfff3fd6e89043b8908b869ac Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 25 May 2018 12:31:04 -0700 Subject: [PATCH] DATAGEODE-109 - Edit Javadoc. Optimize imports. --- .../data/gemfire/client/ClientRegionFactoryBean.java | 1 - .../AutoConfiguredAuthenticationConfiguration.java | 3 --- .../annotation/support/AbstractAuthInitialize.java | 10 +++------- .../AutoConfiguredAuthenticationInitializer.java | 8 +++++--- .../EnableSslConfigurationIntegrationTests.java | 1 - 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java index c4f8132f..108bef32 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java @@ -47,7 +47,6 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.data.gemfire.ConfigurableRegionFactoryBean; import org.springframework.data.gemfire.DataPolicyConverter; import org.springframework.data.gemfire.GemfireUtils; -import org.springframework.data.gemfire.ResolvableRegionFactoryBean; import org.springframework.data.gemfire.config.annotation.RegionConfigurer; import org.springframework.data.gemfire.config.xml.GemfireConstants; import org.springframework.data.gemfire.eviction.EvictingRegionFactoryBean; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java index 8cba66fe..1c56e1d1 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/AutoConfiguredAuthenticationConfiguration.java @@ -73,7 +73,6 @@ public class AutoConfiguredAuthenticationConfiguration { return (beanName, beanFactory) -> setAuthenticationCredentials(beanFactory.getProperties(), environment); } - /* (non-Javadoc) */ private void setAuthenticationCredentials(Properties gemfireProperties, Environment environment) { Optional.ofNullable(gemfireProperties) @@ -84,7 +83,6 @@ public class AutoConfiguredAuthenticationConfiguration { }); } - /* (non-Javadoc) */ private static boolean isMatch(Environment environment) { return Optional.ofNullable(environment) @@ -96,7 +94,6 @@ public class AutoConfiguredAuthenticationConfiguration { public static class AutoConfiguredAuthenticationCondition implements Condition { @Override - @SuppressWarnings("all") public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) { return isMatch(conditionContext.getEnvironment()); } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java index e185cded..d0984a13 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AbstractAuthInitialize.java @@ -67,17 +67,14 @@ public abstract class AbstractAuthInitialize extends WiringDeclarableSupport return Optional.ofNullable(this.environment); } - /* (non-Javadoc */ @Override @SuppressWarnings("deprecation") public final void init(LogWriter logWriter, LogWriter logWriter1) throws AuthenticationFailedException { doInit(); } - protected void doInit() { - } + protected void doInit() { } - /* (non-Javadoc */ @Override public final Properties getCredentials(Properties properties, DistributedMember distributedMember, boolean isPeer) throws AuthenticationFailedException { @@ -87,8 +84,7 @@ public abstract class AbstractAuthInitialize extends WiringDeclarableSupport protected abstract Properties doGetCredentials(Properties properties); - /* (non-Javadoc */ @Override - public void close() { - } + public void close() { } + } diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java index beda2920..017ffe0e 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/AutoConfiguredAuthenticationInitializer.java @@ -18,13 +18,16 @@ package org.springframework.data.gemfire.config.annotation.support; import java.util.Properties; +import org.apache.geode.security.AuthInitialize; import org.apache.shiro.util.StringUtils; /** - * The AutoConfiguredAuthenticationInitializer class... + * The {@link AutoConfiguredAuthenticationInitializer} class is an {@link AuthInitialize} implementation, + * which auto-configures security, and specifically authentication, for Apache Geode/Pivotal GemFire. * * @author John Blum - * @since 1.0.0 + * @see org.apache.geode.security.AuthInitialize + * @since 2.0.0 */ @SuppressWarnings("unused") public class AutoConfiguredAuthenticationInitializer extends AbstractAuthInitialize { @@ -53,7 +56,6 @@ public class AutoConfiguredAuthenticationInitializer extends AbstractAuthInitial return authenticationInitializer; } - /* (non-Javadoc) */ @Override protected Properties doGetCredentials(Properties properties) { diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java index a4262fb8..f490f8a2 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationIntegrationTests.java @@ -62,7 +62,6 @@ public class EnableSslConfigurationIntegrationTests extends ClientServerIntegrat @Resource(name = "Echo") private Region echo; - @BeforeClass public static void setupGemFireServer() throws Exception {