From 1d4163c203e5d0efc13788e0c5852f9ea6d7e464 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 28 May 2019 16:49:54 -0700 Subject: [PATCH] DATAGEODE-198 - Fix test failures. --- .../support/EmbeddedServiceConfigurationSupport.java | 9 +++++---- ...eGeodeSecurityManagerSecurityIntegrationTests.java | 8 +++++--- .../ApacheShiroIniSecurityIntegrationTests.java | 6 +++--- .../ApacheShiroRealmSecurityIntegrationTests.java | 7 ++++--- .../EnableSslConfigurationIntegrationTests.java | 11 ++++++----- .../annotation/EnableSslConfigurationUnitTests.java | 2 +- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java b/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java index 1c763082..8e9654d2 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/support/EmbeddedServiceConfigurationSupport.java @@ -67,7 +67,6 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota public static final Integer DEFAULT_PORT = 0; public static final String DEFAULT_HOST = "localhost"; - @SuppressWarnings("all") @Autowired(required = false) private AbstractCacheConfiguration cacheConfiguration; @@ -165,7 +164,9 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota } protected BeanDefinitionHolder newBeanDefinitionHolder(BeanDefinitionBuilder builder) { - return new BeanDefinitionHolder(builder.getBeanDefinition(), generateBeanName()); + + return new BeanDefinitionHolder(builder.getBeanDefinition(), + generateBeanName(builder.getRawBeanDefinition().getBeanClass().getSimpleName())); } protected String generateBeanName() { @@ -248,7 +249,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota } protected static class ClientGemFirePropertiesConfigurer extends AbstractGemFirePropertiesConfigurer - implements ClientCacheConfigurer { + implements ClientCacheConfigurer { protected ClientGemFirePropertiesConfigurer(Properties gemfireProperties) { super(gemfireProperties); @@ -261,7 +262,7 @@ public abstract class EmbeddedServiceConfigurationSupport extends AbstractAnnota } protected static class PeerGemFirePropertiesConfigurer extends AbstractGemFirePropertiesConfigurer - implements PeerCacheConfigurer { + implements PeerCacheConfigurer { protected PeerGemFirePropertiesConfigurer(Properties gemfireProperties) { super(gemfireProperties); diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java index 0aba7b76..01577b14 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheGeodeSecurityManagerSecurityIntegrationTests.java @@ -14,7 +14,6 @@ * limitations under the License. * */ - package org.springframework.data.gemfire.config.annotation; import static org.apache.geode.security.ResourcePermission.Operation; @@ -26,10 +25,12 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import org.apache.geode.security.AuthenticationFailedException; -import org.apache.geode.security.ResourcePermission; import org.junit.BeforeClass; import org.junit.runner.RunWith; + +import org.apache.geode.security.AuthenticationFailedException; +import org.apache.geode.security.ResourcePermission; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.test.context.ActiveProfiles; @@ -92,6 +93,7 @@ public class ApacheGeodeSecurityManagerSecurityIntegrationTests extends Abstract } } + @SuppressWarnings("unused") public static class TestGeodeSecurityManager implements org.apache.geode.security.SecurityManager { private final GeodeSecurityRepository securityRepository; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroIniSecurityIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroIniSecurityIntegrationTests.java index 500f6a69..5a58ff4a 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroIniSecurityIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroIniSecurityIntegrationTests.java @@ -14,13 +14,13 @@ * limitations under the License. * */ - package org.springframework.data.gemfire.config.annotation; import java.io.IOException; import org.junit.BeforeClass; import org.junit.runner.RunWith; + import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.test.context.ActiveProfiles; @@ -49,6 +49,6 @@ public class ApacheShiroIniSecurityIntegrationTests extends AbstractGeodeSecurit @Configuration @EnableSecurity(shiroIniResourcePath = "shiro.ini") @Profile(SHIRO_INI_CONFIGURATION_PROFILE) - public static class ApacheShiroIniConfiguration { - } + public static class ApacheShiroIniConfiguration { } + } diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java index 77f75ad9..17348576 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ApacheShiroRealmSecurityIntegrationTests.java @@ -14,15 +14,16 @@ * limitations under the License. * */ - package org.springframework.data.gemfire.config.annotation; import java.io.IOException; -import org.apache.geode.internal.security.shiro.GeodePermissionResolver; -import org.apache.shiro.realm.text.PropertiesRealm; import org.junit.BeforeClass; import org.junit.runner.RunWith; + +import org.apache.geode.internal.security.shiro.GeodePermissionResolver; +import org.apache.shiro.realm.text.PropertiesRealm; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; 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 b3470020..6b6d98cd 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 @@ -13,23 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.config.annotation; import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.LoaderHelper; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientRegionShortcut; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationUnitTests.java index 85ebf9f3..41ff6ed0 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/EnableSslConfigurationUnitTests.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.gemfire.config.annotation; import static org.assertj.core.api.Assertions.assertThat; @@ -23,6 +22,7 @@ import java.util.Properties; import org.junit.After; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MutablePropertySources;