From eb9f44606e9c9f2bf8788e63a9cbb73503d2fa83 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 27 Oct 2021 15:38:40 -0700 Subject: [PATCH] Rename GeodeContextCustomizer and GeodeContextCustomizerFactory classes to DependencyOfAnnotationContextCustomizer and DependencyOfAnnotationContextCustomizerFactory, respectively. Move classes to the org.springframework.data.gemfire.tests.extensions.sppring.test.context package. --- .../DependencyOfAnnotationContextCustomizer.java} | 4 ++-- ...ependencyOfAnnotationContextCustomizerFactory.java} | 10 +++++----- .../src/main/resources/META-INF/spring.factories | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/{integration/test/context/GeodeContextCustomizer.java => extensions/spring/test/context/DependencyOfAnnotationContextCustomizer.java} (92%) rename spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/{integration/test/context/GeodeContextCustomizerFactory.java => extensions/spring/test/context/DependencyOfAnnotationContextCustomizerFactory.java} (80%) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/test/context/GeodeContextCustomizer.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/test/context/DependencyOfAnnotationContextCustomizer.java similarity index 92% rename from spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/test/context/GeodeContextCustomizer.java rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/test/context/DependencyOfAnnotationContextCustomizer.java index bc39bc8..8e4cbe4 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/test/context/GeodeContextCustomizer.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/test/context/DependencyOfAnnotationContextCustomizer.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.springframework.data.gemfire.tests.integration.test.context; +package org.springframework.data.gemfire.tests.extensions.spring.test.context; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ConfigurableApplicationContext; @@ -33,7 +33,7 @@ import org.springframework.test.context.MergedContextConfiguration; * @see org.springframework.test.context.ContextCustomizer * @since 0.0.23 */ -public class GeodeContextCustomizer implements ContextCustomizer { +public class DependencyOfAnnotationContextCustomizer implements ContextCustomizer { /** * @inheritDoc diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/test/context/GeodeContextCustomizerFactory.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/test/context/DependencyOfAnnotationContextCustomizerFactory.java similarity index 80% rename from spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/test/context/GeodeContextCustomizerFactory.java rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/test/context/DependencyOfAnnotationContextCustomizerFactory.java index 40a98d1..db77977 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/test/context/GeodeContextCustomizerFactory.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/test/context/DependencyOfAnnotationContextCustomizerFactory.java @@ -13,7 +13,7 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.springframework.data.gemfire.tests.integration.test.context; +package org.springframework.data.gemfire.tests.extensions.spring.test.context; import java.util.List; @@ -25,18 +25,18 @@ import org.springframework.test.context.ContextCustomizerFactory; import org.springframework.test.context.TestContext; /** - * Spring {@link ContextCustomizerFactory} implementation to create a {@link GeodeContextCustomizer} + * Spring {@link ContextCustomizerFactory} implementation to create a {@link DependencyOfAnnotationContextCustomizer} * used to customize the Spring {@link ConfigurableApplicationContext} created by * the Spring {@link TestContext} framework. * * @author John Blum * @see org.springframework.context.ConfigurableApplicationContext - * @see org.springframework.data.gemfire.tests.integration.test.context.GeodeContextCustomizer + * @see org.springframework.data.gemfire.tests.extensions.spring.test.context.DependencyOfAnnotationContextCustomizer * @see org.springframework.test.context.ContextCustomizer * @see org.springframework.test.context.ContextCustomizerFactory * @since 0.0.23 */ -public class GeodeContextCustomizerFactory implements ContextCustomizerFactory { +public class DependencyOfAnnotationContextCustomizerFactory implements ContextCustomizerFactory { /** * @inheritDoc @@ -45,6 +45,6 @@ public class GeodeContextCustomizerFactory implements ContextCustomizerFactory { public @NonNull ContextCustomizer createContextCustomizer(@NonNull Class testClass, @NonNull List configAttributes) { - return new GeodeContextCustomizer(); + return new DependencyOfAnnotationContextCustomizer(); } } diff --git a/spring-data-geode-test/src/main/resources/META-INF/spring.factories b/spring-data-geode-test/src/main/resources/META-INF/spring.factories index 845f4ff..c6d543a 100644 --- a/spring-data-geode-test/src/main/resources/META-INF/spring.factories +++ b/spring-data-geode-test/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ # Spring Test for Apache Geode (STDG) framework configuration for the Spring TestContext Framework. org.springframework.test.context.ContextCustomizerFactory=\ - org.springframework.data.gemfire.tests.integration.test.context.GeodeContextCustomizerFactory + org.springframework.data.gemfire.tests.extensions.spring.test.context.DependencyOfAnnotationContextCustomizerFactory