From 36795103e791faf5362e48bdddf67b7c1934cfcc Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 17 Jun 2020 20:07:28 -0700 Subject: [PATCH] Rename @EnableGemFireGarbageCollector annotation to @EnableGemFireResourceCollector. Rename all associated and appropriate uses of 'garbage' to 'resources'. Resolves gh-21. --- ...va => EnableGemFireResourceCollector.java} | 17 +- ...emFireResourceCollectorConfiguration.java} | 32 +-- ...ResourceCollectorApplicationListener.java} | 199 +++++++++--------- ...ourceCollectorConfigurationUnitTests.java} | 48 ++--- ...ollectorApplicationListenerUnitTests.java} | 84 ++++---- 5 files changed, 193 insertions(+), 187 deletions(-) rename spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/{EnableGemFireGarbageCollector.java => EnableGemFireResourceCollector.java} (77%) rename spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/{GemFireGarbageCollectorConfiguration.java => GemFireResourceCollectorConfiguration.java} (69%) rename spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/context/event/{GemFireGarbageCollectorApplicationListener.java => GemFireResourceCollectorApplicationListener.java} (65%) rename spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/annotation/{GemFireGarbageCollectorConfigurationUnitTests.java => GemFireResourceCollectorConfigurationUnitTests.java} (64%) rename spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/context/event/{GemFireGarbageCollectorApplicationListenerUnitTests.java => GemFireResourceCollectorApplicationListenerUnitTests.java} (69%) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/EnableGemFireGarbageCollector.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/EnableGemFireResourceCollector.java similarity index 77% rename from spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/EnableGemFireGarbageCollector.java rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/EnableGemFireResourceCollector.java index 122a555..9dda7f1 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/EnableGemFireGarbageCollector.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/EnableGemFireResourceCollector.java @@ -30,8 +30,9 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.event.AfterTestClassEvent; /** - * The {@link EnableGemFireGarbageCollector} annotation enables the cleanup of resources (e.g. files) left behind - * by Apache Geode (VMware GemFire) after the GemFire/Geode process shuts down, even in a test context. + * The {@link EnableGemFireResourceCollector} annotation enables the cleanup of resources (e.g. files) and other garbage + * left behind by Apache Geode (or VMware GemFire) after the GemFire/Geode process shuts down, especially in a test + * context to avoid conflicts between test runs. * * @author John Blum * @see java.lang.annotation.Documented @@ -46,17 +47,17 @@ import org.springframework.test.context.event.AfterTestClassEvent; @Retention(RetentionPolicy.RUNTIME) @Inherited @Documented -@Import(GemFireGarbageCollectorConfiguration.class) +@Import(GemFireResourceCollectorConfiguration.class) @SuppressWarnings("unused") -public @interface EnableGemFireGarbageCollector { +public @interface EnableGemFireResourceCollector { /** * Determines the Spring {@link ApplicationEvent ApplicationEvents} that trigger the framework to cleanup after * Apache Geode / VMware GemFire given the junk it leaves behind after a process (e.g. CacheServer, Locator, * Manager, etc) terminates. * - * @return an array of {@link ApplicationEvent ApplicationEvents} that trigger the GemFire/Geode garbage collection - * algorithm. + * @return an array of {@link ApplicationEvent ApplicationEvents} that trigger the GemFire/Geode resource + * and garbage collection algorithm. * @see org.springframework.context.ApplicationEvent * @see java.lang.Class */ @@ -65,10 +66,10 @@ public @interface EnableGemFireGarbageCollector { /** * Tries to cleanup all the {@link File Files} left behind by GemFire/Geode {@link DiskStore DiskStores}. * - * @return a boolean value indicating whether the GemFire Garbage Collector should cleanup all {@link File Files} + * @return a boolean value indicating whether the GemFire Resource Collector should cleanup all {@link File Files} * left behind by GemFire/Geode {@link DiskStore DiskStores}, whether for persistence or overflow; * defaults to {@literal false}. */ - boolean tryCleanDiskStoreFiles() default GemFireGarbageCollectorConfiguration.DEFAULT_CLEAN_DISK_STORE_FILES; + boolean tryCleanDiskStoreFiles() default GemFireResourceCollectorConfiguration.DEFAULT_CLEAN_DISK_STORE_FILES; } diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireGarbageCollectorConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireResourceCollectorConfiguration.java similarity index 69% rename from spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireGarbageCollectorConfiguration.java rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireResourceCollectorConfiguration.java index a1e8c99..5192796 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireGarbageCollectorConfiguration.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireResourceCollectorConfiguration.java @@ -25,14 +25,15 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; import org.springframework.core.type.AnnotationMetadata; import org.springframework.data.gemfire.config.annotation.support.AbstractAnnotationConfigSupport; -import org.springframework.data.gemfire.tests.integration.context.event.GemFireGarbageCollectorApplicationListener; +import org.springframework.data.gemfire.tests.integration.context.event.GemFireResourceCollectorApplicationListener; import org.springframework.data.gemfire.util.ArrayUtils; import org.springframework.lang.NonNull; import org.springframework.test.context.event.AfterTestClassEvent; /** - * Spring {@link Configuration} class used to register beans that collect garbage and other resources irresponsibly - * left behind by Apache Geode when its processes shutdown, even in a test context. + * Spring {@link Configuration} class used to register beans that collect resources and other garbage irresponsibly + * left behind by Apache Geode when its processes shutdown, particularly in a test context in order to avoid conflicts + * and interference between test runs. * * @author John Blum * @see java.lang.annotation.Annotation @@ -43,20 +44,19 @@ import org.springframework.test.context.event.AfterTestClassEvent; * @see org.springframework.context.annotation.ImportAware * @see org.springframework.core.type.AnnotationMetadata * @see org.springframework.data.gemfire.config.annotation.support.AbstractAnnotationConfigSupport - * @see org.springframework.data.gemfire.tests.integration.context.event.GemFireGarbageCollectorApplicationListener + * @see org.springframework.data.gemfire.tests.integration.context.event.GemFireResourceCollectorApplicationListener * @since 0.0.17 */ @Configuration @SuppressWarnings("unused") -public class GemFireGarbageCollectorConfiguration extends AbstractAnnotationConfigSupport implements ImportAware { +public class GemFireResourceCollectorConfiguration extends AbstractAnnotationConfigSupport implements ImportAware { public static final boolean DEFAULT_CLEAN_DISK_STORE_FILES = false; private boolean tryCleanDiskStoreFiles = DEFAULT_CLEAN_DISK_STORE_FILES; @SuppressWarnings("unchecked") - private Class[] gemfireGarbageCollectorEventTypes = - new Class[] { AfterTestClassEvent.class }; + private Class[] collectorEventTypes = new Class[] { AfterTestClassEvent.class }; @Override @SuppressWarnings("unchecked") @@ -65,24 +65,24 @@ public class GemFireGarbageCollectorConfiguration extends AbstractAnnotationConf Optional.of(importMetadata) .filter(this::isAnnotationPresent) .map(this::getAnnotationAttributes) - .ifPresent(enableGemFireGarbageCollectorAttributes -> { + .ifPresent(enableGemFireResourceCollectorAttributes -> { - this.gemfireGarbageCollectorEventTypes = (Class[]) - enableGemFireGarbageCollectorAttributes.getClassArray("collectOnEvents"); + this.collectorEventTypes = (Class[]) + enableGemFireResourceCollectorAttributes.getClassArray("collectOnEvents"); this.tryCleanDiskStoreFiles = - enableGemFireGarbageCollectorAttributes.getBoolean("tryCleanDiskStoreFiles"); + enableGemFireResourceCollectorAttributes.getBoolean("tryCleanDiskStoreFiles"); }); } @Override protected Class getAnnotationType() { - return EnableGemFireGarbageCollector.class; + return EnableGemFireResourceCollector.class; } @SuppressWarnings("unchecked") - protected @NonNull Class[] getGemFireGarbageCollectorEventTypes() { - return ArrayUtils.nullSafeArray(this.gemfireGarbageCollectorEventTypes, Class.class); + protected @NonNull Class[] getConfiguredCollectorEventTypes() { + return ArrayUtils.nullSafeArray(this.collectorEventTypes, Class.class); } protected boolean isTryCleanDiskStoreFiles() { @@ -90,8 +90,8 @@ public class GemFireGarbageCollectorConfiguration extends AbstractAnnotationConf } @Bean - ApplicationListener gemfireGarbageCollectorApplicationListener() { - return GemFireGarbageCollectorApplicationListener.create(getGemFireGarbageCollectorEventTypes()) + ApplicationListener gemfireResourceCollectorApplicationListener() { + return GemFireResourceCollectorApplicationListener.create(getConfiguredCollectorEventTypes()) .tryCleanDiskStoreFiles(isTryCleanDiskStoreFiles()); } } diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireGarbageCollectorApplicationListener.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireResourceCollectorApplicationListener.java similarity index 65% rename from spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireGarbageCollectorApplicationListener.java rename to spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireResourceCollectorApplicationListener.java index bcc9998..8cacd76 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireGarbageCollectorApplicationListener.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireResourceCollectorApplicationListener.java @@ -34,7 +34,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; -import org.springframework.data.gemfire.tests.integration.annotation.GemFireGarbageCollectorConfiguration; +import org.springframework.data.gemfire.tests.integration.annotation.GemFireResourceCollectorConfiguration; import org.springframework.data.gemfire.tests.util.FileSystemUtils; import org.springframework.data.gemfire.util.ArrayUtils; import org.springframework.data.gemfire.util.CollectionUtils; @@ -47,111 +47,114 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Spring {@link ApplicationListener} implementation used to listen for and trigger the GemFire/Geode garbage collection - * process. + * Spring {@link ApplicationListener} implementation used to listen for and trigger the GemFire/Geode + * resource collection algorithm. * * @author John Blum * @see java.io.File * @see java.io.FileFilter + * @see java.util.function.Predicate * @see org.apache.geode.cache.DiskStore * @see org.springframework.context.ApplicationContext * @see org.springframework.context.ApplicationContextAware * @see org.springframework.context.ApplicationEvent * @see org.springframework.context.ApplicationListener - * @see org.springframework.data.gemfire.tests.integration.annotation.GemFireGarbageCollectorConfiguration + * @see org.springframework.data.gemfire.tests.integration.annotation.GemFireResourceCollectorConfiguration * @see org.springframework.test.context.event.AfterTestClassEvent * @since 0.0.17 */ -public class GemFireGarbageCollectorApplicationListener +public class GemFireResourceCollectorApplicationListener implements ApplicationContextAware, ApplicationListener { protected static final File DEFAULT_SEARCH_DIRECTORY = FileSystemUtils.WORKING_DIRECTORY; /** - * Factory method used to construct a new instance of {@link GemFireGarbageCollectorApplicationListener} - * initialized with the {@link ApplicationEvent} objects that trigger the Gemfire/Geode garbage collection process. + * Factory method used to construct a new instance of {@link GemFireResourceCollectorApplicationListener} + * initialized with the {@link ApplicationEvent} objects that trigger the Gemfire/Geode + * resource collection algorithm. * * By default, the search will begin in the application working directory. * - * @param gemfireGarbageCollectorEventTypes array of {@link ApplicationEvent} objects triggering the GemFire/Geode - * garbage collection process. - * @return a new instance of {@link GemFireGarbageCollectorApplicationListener}. - * @see #GemFireGarbageCollectorApplicationListener(File, Iterable) + * @param gemfireResourceCollectorEventTypes array of {@link ApplicationEvent} objects triggering the GemFire/Geode + * resource collection algorithm. + * @return a new instance of {@link GemFireResourceCollectorApplicationListener}. + * @see #GemFireResourceCollectorApplicationListener(File, Iterable) * @see org.springframework.context.ApplicationEvent */ @SuppressWarnings("unchecked") - public static GemFireGarbageCollectorApplicationListener create( - @Nullable Class... gemfireGarbageCollectorEventTypes) { + public static GemFireResourceCollectorApplicationListener create( + @Nullable Class... gemfireResourceCollectorEventTypes) { return create(DEFAULT_SEARCH_DIRECTORY, - Arrays.asList(ArrayUtils.nullSafeArray(gemfireGarbageCollectorEventTypes, Class.class))); + Arrays.asList(ArrayUtils.nullSafeArray(gemfireResourceCollectorEventTypes, Class.class))); } /** - * Factory method used to construct a new instance of {@link GemFireGarbageCollectorApplicationListener} + * Factory method used to construct a new instance of {@link GemFireResourceCollectorApplicationListener} * initialized with the {@link File filesystem directory location} used to begin the search and collection of - * GemFire/Geode garbage along with the {@link ApplicationEvent} objects that trigger the Gemfire/Geode garbage - * collection process. + * GemFire/Geode resources along with the {@link ApplicationEvent} objects that trigger the Gemfire/Geode + * resource collection algorithm. * * @param searchDirectory {@link File} referring to the filesystem directory location to begin the search; * defaults to the application working directory if {@link File} is {@literal null}. - * @param gemfireGarbageCollectorEventTypes array of {@link ApplicationEvent} objects triggering the GemFire/Geode - * garbage collection process. - * @return a new instance of {@link GemFireGarbageCollectorApplicationListener}. - * @see #GemFireGarbageCollectorApplicationListener(File, Iterable) + * @param gemfireResourceCollectorEventTypes array of {@link ApplicationEvent} objects triggering the GemFire/Geode + * resource collection algorithm. + * @return a new instance of {@link GemFireResourceCollectorApplicationListener}. + * @see #GemFireResourceCollectorApplicationListener(File, Iterable) * @see org.springframework.context.ApplicationEvent * @see java.lang.Iterable * @see java.io.File */ @SuppressWarnings("unchecked") - public static GemFireGarbageCollectorApplicationListener create(@Nullable File searchDirectory, - @Nullable Class... gemfireGarbageCollectorEventTypes) { + public static GemFireResourceCollectorApplicationListener create(@Nullable File searchDirectory, + @Nullable Class... gemfireResourceCollectorEventTypes) { - return create(searchDirectory, Arrays.asList(ArrayUtils.nullSafeArray(gemfireGarbageCollectorEventTypes, Class.class))); + return create(searchDirectory, Arrays.asList(ArrayUtils.nullSafeArray(gemfireResourceCollectorEventTypes, Class.class))); } /** - * Factory method used to construct a new instance of {@link GemFireGarbageCollectorApplicationListener} - * initialized with the {@link ApplicationEvent} objects that trigger the Gemfire/Geode garbage collection process. + * Factory method used to construct a new instance of {@link GemFireResourceCollectorApplicationListener} + * initialized with the {@link ApplicationEvent} objects that trigger the Gemfire/Geode + * resource collection algorithm. * * By default, the search will begin in the application working directory. * - * @param gemfireGarbageCollectorEventTypes {@link Iterable} of {@link ApplicationEvent} objects triggering - * the GemFire/Geode garbage collection process. - * @return a new instance of {@link GemFireGarbageCollectorApplicationListener}. - * @see #GemFireGarbageCollectorApplicationListener(File, Iterable) + * @param gemfireResourceCollectorEventTypes {@link Iterable} of {@link ApplicationEvent} objects triggering + * the GemFire/Geode resource collection algorithm. + * @return a new instance of {@link GemFireResourceCollectorApplicationListener}. + * @see #GemFireResourceCollectorApplicationListener(File, Iterable) * @see org.springframework.context.ApplicationEvent * @see java.lang.Iterable */ - public static GemFireGarbageCollectorApplicationListener create( - @Nullable Iterable> gemfireGarbageCollectorEventTypes) { + public static GemFireResourceCollectorApplicationListener create( + @Nullable Iterable> gemfireResourceCollectorEventTypes) { - return new GemFireGarbageCollectorApplicationListener(gemfireGarbageCollectorEventTypes); + return new GemFireResourceCollectorApplicationListener(gemfireResourceCollectorEventTypes); } /** - * Factory method used to construct a new instance of {@link GemFireGarbageCollectorApplicationListener} + * Factory method used to construct a new instance of {@link GemFireResourceCollectorApplicationListener} * initialized with the {@link File filesystem directory location} used to begin the search and collection of - * GemFire/Geode garbage along with the {@link ApplicationEvent} objects that trigger the Gemfire/Geode garbage - * collection process. + * GemFire/Geode resources along with the {@link ApplicationEvent} objects that trigger the Gemfire/Geode + * resource collection algorithm. * * @param searchDirectory {@link File} referring to the filesystem directory location to begin the search; * defaults to the application working directory if {@link File} is {@literal null}. - * @param gemfireGarbageCollectorEventTypes {@link Iterable} of {@link ApplicationEvent} objects triggering - * the GemFire/Geode garbage collection process. - * @return a new instance of {@link GemFireGarbageCollectorApplicationListener}. - * @see #GemFireGarbageCollectorApplicationListener(File, Iterable) + * @param gemfireResourceCollectorEventTypes {@link Iterable} of {@link ApplicationEvent} objects triggering + * the GemFire/Geode resource collection algorithm. + * @return a new instance of {@link GemFireResourceCollectorApplicationListener}. + * @see #GemFireResourceCollectorApplicationListener(File, Iterable) * @see org.springframework.context.ApplicationEvent * @see java.lang.Iterable * @see java.io.File */ - public static GemFireGarbageCollectorApplicationListener create(File searchDirectory, - @Nullable Iterable> gemfireGarbageCollectorEventTypes) { + public static GemFireResourceCollectorApplicationListener create(File searchDirectory, + @Nullable Iterable> gemfireResourceCollectorEventTypes) { - return new GemFireGarbageCollectorApplicationListener(searchDirectory, gemfireGarbageCollectorEventTypes); + return new GemFireResourceCollectorApplicationListener(searchDirectory, gemfireResourceCollectorEventTypes); } - private boolean tryCleanDiskStoreFilesEnabled = GemFireGarbageCollectorConfiguration.DEFAULT_CLEAN_DISK_STORE_FILES; + private boolean tryCleanDiskStoreFilesEnabled = GemFireResourceCollectorConfiguration.DEFAULT_CLEAN_DISK_STORE_FILES; private ApplicationContext applicationContext; @@ -159,51 +162,53 @@ public class GemFireGarbageCollectorApplicationListener private final Logger logger = LoggerFactory.getLogger(getClass()); - private final Set> gemfireGarbageCollectorEventTypes; + private final Set> gemfireResourceCollectorEventTypes; /** - * Constructs a new instance of {@link GemFireGarbageCollectorApplicationListener} initialized with - * an {@link Iterable} of {@link ApplicationEvent} objects that trigger a GemFire/Geode garbage collection. + * Constructs a new instance of {@link GemFireResourceCollectorApplicationListener} initialized with + * an {@link Iterable} of {@link ApplicationEvent} objects triggering the GemFire/Geode + * resource collection algorithm. * * The search will begin in the application working directory. * - * @param gemfireGarbageCollectorEventTypes {@link Iterable} of {@link ApplicationEvent} objects that trigger - * GemFire/Geode garbage collection. + * @param gemfireResourceCollectorEventTypes {@link Iterable} of {@link ApplicationEvent} objects that trigger + * GemFire/Geode resource collection. * @see org.springframework.context.ApplicationEvent * @see java.lang.Iterable */ - public GemFireGarbageCollectorApplicationListener( - @Nullable Iterable> gemfireGarbageCollectorEventTypes) { + public GemFireResourceCollectorApplicationListener( + @Nullable Iterable> gemfireResourceCollectorEventTypes) { - this(FileSystemUtils.WORKING_DIRECTORY, gemfireGarbageCollectorEventTypes); + this(FileSystemUtils.WORKING_DIRECTORY, gemfireResourceCollectorEventTypes); } /** - * Constructs a new instance of {@link GemFireGarbageCollectorApplicationListener} initialized with - * a {@link File} referring to the directory to begin the search for GemFire/Geode garbage along with - * an {@link Iterable} of {@link ApplicationEvent} objects that trigger a GemFire/Geode garbage collection. + * Constructs a new instance of {@link GemFireResourceCollectorApplicationListener} initialized with + * a {@link File} referring to the directory to begin the search for GemFire/Geode resources along with + * an {@link Iterable} of {@link ApplicationEvent} objects triggering the GemFire/Geode resource collection + * algorithm. * - * @param searchDirectory {@link File} referring to the directory begin collecting GemFire/Geode garbage. - * @param gemfireGarbageCollectorEventTypes {@link Iterable} of {@link ApplicationEvent} objects that trigger - * GemFire/Geode garbage collection. + * @param searchDirectory {@link File} referring to the directory begin collecting GemFire/Geode resources. + * @param gemfireResourceCollectorEventTypes {@link Iterable} of {@link ApplicationEvent} objects that trigger + * GemFire/Geode resource collection. * @see org.springframework.context.ApplicationEvent * @see java.lang.Iterable */ - public GemFireGarbageCollectorApplicationListener(@Nullable File searchDirectory, - @Nullable Iterable> gemfireGarbageCollectorEventTypes) { + public GemFireResourceCollectorApplicationListener(@Nullable File searchDirectory, + @Nullable Iterable> gemfireResourceCollectorEventTypes) { this.searchDirectory = searchDirectory != null ? searchDirectory : DEFAULT_SEARCH_DIRECTORY; - Set> resolvedGemFireGarbageCollectorEventTypes = - StreamSupport.stream(CollectionUtils.nullSafeIterable(gemfireGarbageCollectorEventTypes).spliterator(), false) + Set> resolvedGemFireResourceCollectorEventTypes = + StreamSupport.stream(CollectionUtils.nullSafeIterable(gemfireResourceCollectorEventTypes).spliterator(), false) .filter(Objects::nonNull) .collect(Collectors.toSet()); - resolvedGemFireGarbageCollectorEventTypes = !resolvedGemFireGarbageCollectorEventTypes.isEmpty() - ? resolvedGemFireGarbageCollectorEventTypes + resolvedGemFireResourceCollectorEventTypes = !resolvedGemFireResourceCollectorEventTypes.isEmpty() + ? resolvedGemFireResourceCollectorEventTypes : Collections.singleton(AfterTestClassEvent.class); - this.gemfireGarbageCollectorEventTypes = Collections.unmodifiableSet(resolvedGemFireGarbageCollectorEventTypes); + this.gemfireResourceCollectorEventTypes = Collections.unmodifiableSet(resolvedGemFireResourceCollectorEventTypes); } /** @@ -232,33 +237,33 @@ public class GemFireGarbageCollectorApplicationListener /** * Returns a configured {@link Set} of {@link ApplicationEvent} {@link Class types} that trigger the GemFire/Geode - * garbage collection process. + * resource collection algorithm. * * @return a configured {@link Set} of {@link ApplicationEvent} {@link Class types} that trigger the GemFire/Geode - * garbage collection process. + * resource collection algorithm. * @see org.springframework.context.ApplicationEvent * @see java.util.Set */ - protected @NonNull Set> getConfiguredGemFireGarbageCollectorEventTypes() { - return this.gemfireGarbageCollectorEventTypes; + protected @NonNull Set> getConfiguredGemFireResourceCollectorEventTypes() { + return this.gemfireResourceCollectorEventTypes; } /** * Determines whether the given {@link ApplicationEvent} is a configured event for triggering the GemFire/Geode - * garbage collection process. + * resource collection algorithm. * * @param event {@link ApplicationEvent} to evaluate. * @return a boolean value determining whether the given {@link ApplicationEvent} is a configured event - * for triggering the GemFire/Geode garbage collection process. + * for triggering the GemFire/Geode resource collection algorithm. * @see org.springframework.context.ApplicationEvent - * @see #getConfiguredGemFireGarbageCollectorEventTypes() + * @see #getConfiguredGemFireResourceCollectorEventTypes() */ - protected boolean isGemFireGarbageCollectorEvent(@Nullable ApplicationEvent event) { + protected boolean isGemFireResourceCollectorEvent(@Nullable ApplicationEvent event) { - for (Class gemfireGarbageCollectorEventType - : getConfiguredGemFireGarbageCollectorEventTypes()) { + for (Class gemfireResourceCollectorEventType + : getConfiguredGemFireResourceCollectorEventTypes()) { - if (gemfireGarbageCollectorEventType.isInstance(event)) { + if (gemfireResourceCollectorEventType.isInstance(event)) { return true; } } @@ -268,7 +273,7 @@ public class GemFireGarbageCollectorApplicationListener /** * Returns the configured SLF4J {@link Logger} to log events and messages originating from this - * {@link ApplicationListener} during the GemFire/Geode garbage collection process. + * {@link ApplicationListener} during the GemFire/Geode resource collection algorithm. * * @return the configured SLF4 {@link Logger}. * @see org.slf4j.Logger @@ -279,10 +284,10 @@ public class GemFireGarbageCollectorApplicationListener /** * Returns the configured {@link File directory} referring to the filesystem location to begin the search for - * GemFire/Geode garbage. + * GemFire/Geode resources and other garbage. * * @return the configured {@link File directory} referring to the filesystem location to begin the search for - * GemFire/Geode garbage. + * GemFire/Geode resources and other garbage. * @see java.io.File */ protected @NonNull File getSearchDirectory() { @@ -290,12 +295,12 @@ public class GemFireGarbageCollectorApplicationListener } /** - * Determines whether this {@link ApplicationListener GemFire/Geode Garbage Collector} should try to cleanup all + * Determines whether this {@link ApplicationListener GemFire/Geode Resource Collector} should try to cleanup all * {@link DiskStore} {@link File Files} as well. * * {@link DiskStore} {@link File Files} are maintained in {@link DiskStore#getDiskDirs()}. * - * @return a boolean value indicating whether this {@link ApplicationListener GemFire/Geode Garbage Collector} + * @return a boolean value indicating whether this {@link ApplicationListener GemFire/Geode Resource Collector} * should try to cleanup all {@link DiskStore} {@link File Files}. */ protected boolean isTryCleanDiskStoreFilesEnabled() { @@ -304,18 +309,18 @@ public class GemFireGarbageCollectorApplicationListener /** * Handles a Spring Container {@link ApplicationEvent} by determining whether the event is a configured event - * for triggering the GemFire/Geode garbage collection. + * for triggering the GemFire/Geode resource collection. * * @param event {@link ApplicationEvent} to evaluate. - * @see #isGemFireGarbageCollectorEvent(ApplicationEvent) - * @see #collectGemFireGarbage(File) + * @see #isGemFireResourceCollectorEvent(ApplicationEvent) + * @see #collectGemFireResources(File) * @see org.springframework.context.ApplicationEvent */ @Override public void onApplicationEvent(@NonNull ApplicationEvent event) { - if (isGemFireGarbageCollectorEvent(event)) { - collectGemFireGarbage(getSearchDirectory()); + if (isGemFireResourceCollectorEvent(event)) { + collectGemFireResources(getSearchDirectory()); } if (isTryCleanDiskStoreFilesEnabled()) @@ -324,19 +329,19 @@ public class GemFireGarbageCollectorApplicationListener /** * A {@link File} referring to the filesystem directory location to begin the search for and collection of - * GemFire/Geode garbage. + * GemFire/Geode resources and other garbage. * * @param directory {@link File} referring to the filesystem directory location to begin the search - * and collection process; must not be {@literal null}. + * and resource collection process; must not be {@literal null}. * @throws IllegalArgumentException if {@link File} is {@literal null} or not a directory. * @see java.io.File */ - protected void collectGemFireGarbage(@NonNull File directory) { + protected void collectGemFireResources(@NonNull File directory) { Assert.isTrue(FileSystemUtils.isDirectory(directory), () -> String.format("File [%s] must be a directory", directory)); - for (File file : FileSystemUtils.safeListFiles(directory, GemFireGarbageFileFilter.INSTANCE)) { + for (File file : FileSystemUtils.safeListFiles(directory, GemFireResourceFileFilter.INSTANCE)) { if (FileSystemUtils.isDirectory(file)) { FileSystemUtils.deleteRecursive(file); } @@ -377,19 +382,19 @@ public class GemFireGarbageCollectorApplicationListener * Configures whether to try and cleanup all {@link File Files} generated from managed {@link DiskStore DiskStores}. * * @param enable boolean value dis/enabling {@link DiskStore} {@link File} cleanup. - * @return this {@link GemFireGarbageCollectorApplicationListener}. + * @return this {@link GemFireResourceCollectorApplicationListener}. */ - public GemFireGarbageCollectorApplicationListener tryCleanDiskStoreFiles(boolean enable) { + public GemFireResourceCollectorApplicationListener tryCleanDiskStoreFiles(boolean enable) { this.tryCleanDiskStoreFilesEnabled = enable; return this; } /** - * {@link FileFilter} implementation matching {@link File directories} or GemFire/Geode garbage. + * {@link FileFilter} implementation matching {@link File directories} or GemFire/Geode resources (e.g. files). */ - protected static class GemFireGarbageFileFilter implements FileFilter { + protected static class GemFireResourceFileFilter implements FileFilter { - protected static final GemFireGarbageFileFilter INSTANCE = new GemFireGarbageFileFilter(); + protected static final GemFireResourceFileFilter INSTANCE = new GemFireResourceFileFilter(); protected static final FileFilter DIRECTORY_FILE_FILTER = FileSystemUtils.DirectoryOnlyFilter.INSTANCE; @@ -439,10 +444,10 @@ public class GemFireGarbageCollectorApplicationListener @Override public boolean accept(File pathname) { - return getDirectoryFileFilter().accept(pathname) || isGemFireGarbage(pathname); + return getDirectoryFileFilter().accept(pathname) || isGemFireResource(pathname); } - protected boolean isGemFireGarbage(@Nullable File file) { + protected boolean isGemFireResource(@Nullable File file) { return Objects.nonNull(file) && isFileExtensionOrFileNameMatch(file); } diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireGarbageCollectorConfigurationUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireResourceCollectorConfigurationUnitTests.java similarity index 64% rename from spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireGarbageCollectorConfigurationUnitTests.java rename to spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireResourceCollectorConfigurationUnitTests.java index 560ed03..c2edb1a 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireGarbageCollectorConfigurationUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/annotation/GemFireResourceCollectorConfigurationUnitTests.java @@ -29,7 +29,7 @@ import java.util.Set; import org.junit.Test; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.data.gemfire.tests.integration.context.event.GemFireGarbageCollectorApplicationListener; +import org.springframework.data.gemfire.tests.integration.context.event.GemFireResourceCollectorApplicationListener; import org.springframework.data.gemfire.tests.support.MapBuilder; import org.springframework.data.gemfire.tests.util.ReflectionUtils; import org.springframework.test.context.event.AfterTestClassEvent; @@ -37,15 +37,15 @@ import org.springframework.test.context.event.AfterTestExecutionEvent; import org.springframework.test.context.event.AfterTestMethodEvent; /** - * Unit Tests for {@link GemFireGarbageCollectorConfiguration}. + * Unit Tests for {@link GemFireResourceCollectorConfiguration}. * * @author John Blum * @see org.junit.Test * @see org.mockito.Mockito - * @see org.springframework.data.gemfire.tests.integration.annotation.GemFireGarbageCollectorConfiguration + * @see GemFireResourceCollectorConfiguration * @since 0.0.17 */ -public class GemFireGarbageCollectorConfigurationUnitTests { +public class GemFireResourceCollectorConfigurationUnitTests { @Test public void setImportMetadataParsesConfiguration() { @@ -58,40 +58,40 @@ public class GemFireGarbageCollectorConfigurationUnitTests { AnnotationMetadata mockAnnotationMetadata = mock(AnnotationMetadata.class); doReturn(true).when(mockAnnotationMetadata) - .hasAnnotation(EnableGemFireGarbageCollector.class.getName()); + .hasAnnotation(EnableGemFireResourceCollector.class.getName()); doReturn(annotationAttributes).when(mockAnnotationMetadata) - .getAnnotationAttributes(EnableGemFireGarbageCollector.class.getName()); + .getAnnotationAttributes(EnableGemFireResourceCollector.class.getName()); - GemFireGarbageCollectorConfiguration configuration = new GemFireGarbageCollectorConfiguration(); + GemFireResourceCollectorConfiguration configuration = new GemFireResourceCollectorConfiguration(); - assertThat(configuration.getGemFireGarbageCollectorEventTypes()).containsExactly(AfterTestClassEvent.class); + assertThat(configuration.getConfiguredCollectorEventTypes()).containsExactly(AfterTestClassEvent.class); assertThat(configuration.isTryCleanDiskStoreFiles()).isFalse(); configuration.setImportMetadata(mockAnnotationMetadata); - assertThat(configuration.getGemFireGarbageCollectorEventTypes()) + assertThat(configuration.getConfiguredCollectorEventTypes()) .containsExactly(AfterTestMethodEvent.class, AfterTestExecutionEvent.class); assertThat(configuration.isTryCleanDiskStoreFiles()).isTrue(); verify(mockAnnotationMetadata, times(1)) - .hasAnnotation(eq(EnableGemFireGarbageCollector.class.getName())); + .hasAnnotation(eq(EnableGemFireResourceCollector.class.getName())); verify(mockAnnotationMetadata, times(1)) - .getAnnotationAttributes(eq(EnableGemFireGarbageCollector.class.getName())); + .getAnnotationAttributes(eq(EnableGemFireResourceCollector.class.getName())); } @Test - public void createsGemFireGarbageCollectorApplicationListenerWithDefaultConfiguration() + public void createsGemFireResourceCollectorApplicationListenerWithDefaultConfiguration() throws NoSuchFieldException { - GemFireGarbageCollectorConfiguration configuration = new GemFireGarbageCollectorConfiguration(); + GemFireResourceCollectorConfiguration configuration = new GemFireResourceCollectorConfiguration(); - assertThat(configuration.getGemFireGarbageCollectorEventTypes()).containsExactly(AfterTestClassEvent.class); + assertThat(configuration.getConfiguredCollectorEventTypes()).containsExactly(AfterTestClassEvent.class); assertThat(configuration.isTryCleanDiskStoreFiles()).isFalse(); - GemFireGarbageCollectorApplicationListener listener = - (GemFireGarbageCollectorApplicationListener) configuration.gemfireGarbageCollectorApplicationListener(); + GemFireResourceCollectorApplicationListener listener = + (GemFireResourceCollectorApplicationListener) configuration.gemfireResourceCollectorApplicationListener(); - assertThat(ReflectionUtils.>>getFieldValue(listener, "gemfireGarbageCollectorEventTypes")) + assertThat(ReflectionUtils.>>getFieldValue(listener, "gemfireResourceCollectorEventTypes")) .containsExactly(AfterTestClassEvent.class); assertThat(ReflectionUtils.getFieldValue(listener, "tryCleanDiskStoreFilesEnabled")) @@ -99,23 +99,23 @@ public class GemFireGarbageCollectorConfigurationUnitTests { } @Test - public void createsGemFireGarbageCollectorApplicationListenerWithCustomConfiguration() + public void createsGemFireResourceCollectorApplicationListenerWithCustomConfiguration() throws NoSuchFieldException { - GemFireGarbageCollectorConfiguration configuration = spy(new GemFireGarbageCollectorConfiguration()); + GemFireResourceCollectorConfiguration configuration = spy(new GemFireResourceCollectorConfiguration()); doReturn(new Class[] { AfterTestMethodEvent.class, AfterTestExecutionEvent.class }) - .when(configuration).getGemFireGarbageCollectorEventTypes(); + .when(configuration).getConfiguredCollectorEventTypes(); doReturn(true).when(configuration).isTryCleanDiskStoreFiles(); - assertThat(configuration.getGemFireGarbageCollectorEventTypes()) + assertThat(configuration.getConfiguredCollectorEventTypes()) .containsExactly(AfterTestMethodEvent.class, AfterTestExecutionEvent.class); assertThat(configuration.isTryCleanDiskStoreFiles()).isTrue(); - GemFireGarbageCollectorApplicationListener listener = - (GemFireGarbageCollectorApplicationListener) configuration.gemfireGarbageCollectorApplicationListener(); + GemFireResourceCollectorApplicationListener listener = + (GemFireResourceCollectorApplicationListener) configuration.gemfireResourceCollectorApplicationListener(); - assertThat(ReflectionUtils.>>getFieldValue(listener, "gemfireGarbageCollectorEventTypes")) + assertThat(ReflectionUtils.>>getFieldValue(listener, "gemfireResourceCollectorEventTypes")) .containsExactlyInAnyOrder(AfterTestMethodEvent.class, AfterTestExecutionEvent.class); assertThat(ReflectionUtils.getFieldValue(listener, "tryCleanDiskStoreFilesEnabled")) diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireGarbageCollectorApplicationListenerUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireResourceCollectorApplicationListenerUnitTests.java similarity index 69% rename from spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireGarbageCollectorApplicationListenerUnitTests.java rename to spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireResourceCollectorApplicationListenerUnitTests.java index 6f915eb..a98027b 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireGarbageCollectorApplicationListenerUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/integration/context/event/GemFireResourceCollectorApplicationListenerUnitTests.java @@ -32,14 +32,14 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEvent; -import org.springframework.data.gemfire.tests.integration.context.event.GemFireGarbageCollectorApplicationListener.GemFireGarbageFileFilter; +import org.springframework.data.gemfire.tests.integration.context.event.GemFireResourceCollectorApplicationListener.GemFireResourceFileFilter; import org.springframework.test.context.TestContext; import org.springframework.test.context.event.AfterTestClassEvent; import org.springframework.test.context.event.AfterTestExecutionEvent; import org.springframework.test.context.event.AfterTestMethodEvent; /** - * Unit Tests for {@link GemFireGarbageCollectorApplicationListener}. + * Unit Tests for {@link GemFireResourceCollectorApplicationListener}. * * @author John Blum * @see java.io.File @@ -47,11 +47,11 @@ import org.springframework.test.context.event.AfterTestMethodEvent; * @see org.mockito.Mockito * @see org.springframework.context.ApplicationContext * @see org.springframework.context.ApplicationEvent - * @see org.springframework.data.gemfire.tests.integration.context.event.GemFireGarbageCollectorApplicationListener + * @see GemFireResourceCollectorApplicationListener * @since 0.0.17 */ @SuppressWarnings("unchecked") -public class GemFireGarbageCollectorApplicationListenerUnitTests { +public class GemFireResourceCollectorApplicationListenerUnitTests { private static File mockDirectory(String pathname) { @@ -76,42 +76,42 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { } @Test - public void constructNewGemFireGarbageCollectorApplicationListener() { + public void constructNewGemFireResourceCollectorApplicationListener() { File searchDirectory = new File("/path/to/gemfire/junk"); Iterable> eventTypes = Collections.singleton(AfterTestMethodEvent.class); - GemFireGarbageCollectorApplicationListener listener = - new GemFireGarbageCollectorApplicationListener(searchDirectory, eventTypes); + GemFireResourceCollectorApplicationListener listener = + new GemFireResourceCollectorApplicationListener(searchDirectory, eventTypes); assertThat(listener).isNotNull(); assertThat(listener.getApplicationContext().orElse(null)).isNull(); - assertThat(listener.getConfiguredGemFireGarbageCollectorEventTypes()) + assertThat(listener.getConfiguredGemFireResourceCollectorEventTypes()) .containsExactly(AfterTestMethodEvent.class); assertThat(listener.getLogger()).isNotNull(); - assertThat(listener.getLogger().getName()).isEqualTo(GemFireGarbageCollectorApplicationListener.class.getName()); + assertThat(listener.getLogger().getName()).isEqualTo(GemFireResourceCollectorApplicationListener.class.getName()); assertThat(listener.isTryCleanDiskStoreFilesEnabled()).isFalse(); assertThat(listener.getSearchDirectory()).isEqualTo(searchDirectory); } @Test @SuppressWarnings("unchecked") - public void createNewGemFireGarbageCollectorApplicationListener() { + public void createNewGemFireResourceCollectorApplicationListener() { - GemFireGarbageCollectorApplicationListener listener = - GemFireGarbageCollectorApplicationListener.create(AfterTestExecutionEvent.class) + GemFireResourceCollectorApplicationListener listener = + GemFireResourceCollectorApplicationListener.create(AfterTestExecutionEvent.class) .tryCleanDiskStoreFiles(true); assertThat(listener).isNotNull(); assertThat(listener.getApplicationContext().orElse(null)).isNull(); - assertThat(listener.getConfiguredGemFireGarbageCollectorEventTypes()) + assertThat(listener.getConfiguredGemFireResourceCollectorEventTypes()) .containsExactly(AfterTestExecutionEvent.class); assertThat(listener.getLogger()).isNotNull(); - assertThat(listener.getLogger().getName()).isEqualTo(GemFireGarbageCollectorApplicationListener.class.getName()); + assertThat(listener.getLogger().getName()).isEqualTo(GemFireResourceCollectorApplicationListener.class.getName()); assertThat(listener.isTryCleanDiskStoreFilesEnabled()).isTrue(); assertThat(listener.getSearchDirectory()) - .isEqualTo(GemFireGarbageCollectorApplicationListener.DEFAULT_SEARCH_DIRECTORY); + .isEqualTo(GemFireResourceCollectorApplicationListener.DEFAULT_SEARCH_DIRECTORY); } @Test @@ -120,7 +120,7 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { ApplicationContext mockApplicationContext = mock(ApplicationContext.class); - GemFireGarbageCollectorApplicationListener listener = GemFireGarbageCollectorApplicationListener.create(); + GemFireResourceCollectorApplicationListener listener = GemFireResourceCollectorApplicationListener.create(); assertThat(listener).isNotNull(); assertThat(listener.getApplicationContext().orElse(null)).isNull(); @@ -135,22 +135,22 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { } @Test - public void onApplicationEventCallsCollectGemFireGarbageAndCollectGemFireDiskStoreFiles() { + public void onApplicationEventCallsCollectGemFireResourceAndCollectGemFireDiskStoreFiles() { ApplicationEvent mockApplicationEvent = mock(ApplicationEvent.class); - GemFireGarbageCollectorApplicationListener listener = spy(GemFireGarbageCollectorApplicationListener.create()); + GemFireResourceCollectorApplicationListener listener = spy(GemFireResourceCollectorApplicationListener.create()); - doReturn(true).when(listener).isGemFireGarbageCollectorEvent(any()); + doReturn(true).when(listener).isGemFireResourceCollectorEvent(any()); doReturn(true).when(listener).isTryCleanDiskStoreFilesEnabled(); doNothing().when(listener).collectGemFireDiskStoreFiles(); - doNothing().when(listener).collectGemFireGarbage(any()); + doNothing().when(listener).collectGemFireResources(any()); listener.onApplicationEvent(mockApplicationEvent); - verify(listener, times(1)).isGemFireGarbageCollectorEvent(eq(mockApplicationEvent)); + verify(listener, times(1)).isGemFireResourceCollectorEvent(eq(mockApplicationEvent)); verify(listener, times(1)) - .collectGemFireGarbage(eq(GemFireGarbageCollectorApplicationListener.DEFAULT_SEARCH_DIRECTORY)); + .collectGemFireResources(eq(GemFireResourceCollectorApplicationListener.DEFAULT_SEARCH_DIRECTORY)); verify(listener, times(1)).isTryCleanDiskStoreFilesEnabled(); verify(listener, times(1)).collectGemFireDiskStoreFiles(); } @@ -160,8 +160,8 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { AfterTestClassEvent mockEvent = mock(AfterTestClassEvent.class); - assertThat(GemFireGarbageCollectorApplicationListener.create() - .isGemFireGarbageCollectorEvent(mockEvent)).isTrue(); + assertThat(GemFireResourceCollectorApplicationListener.create() + .isGemFireResourceCollectorEvent(mockEvent)).isTrue(); } @Test @@ -169,8 +169,8 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { ApplicationEvent mockEvent = mock(AfterTestMethodEventSubType.class); - assertThat(GemFireGarbageCollectorApplicationListener.create(AfterTestMethodEvent.class) - .isGemFireGarbageCollectorEvent(mockEvent)).isTrue(); + assertThat(GemFireResourceCollectorApplicationListener.create(AfterTestMethodEvent.class) + .isGemFireResourceCollectorEvent(mockEvent)).isTrue(); } @Test @@ -178,19 +178,19 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { ApplicationEvent mockEvent = mock(AfterTestClassEvent.class); - assertThat(GemFireGarbageCollectorApplicationListener.create(AfterTestMethodEvent.class) - .isGemFireGarbageCollectorEvent(mockEvent)).isFalse(); + assertThat(GemFireResourceCollectorApplicationListener.create(AfterTestMethodEvent.class) + .isGemFireResourceCollectorEvent(mockEvent)).isFalse(); } @Test public void isGemFireCollectorEventWithNullIsNullSafeReturnsFalse() { - assertThat(GemFireGarbageCollectorApplicationListener.create().isGemFireGarbageCollectorEvent(null)).isFalse(); + assertThat(GemFireResourceCollectorApplicationListener.create().isGemFireResourceCollectorEvent(null)).isFalse(); } @Test - public void gemfireGarbageFileFilterAcceptsAllDirectories() { + public void gemfireResourceFileFilterAcceptsAllDirectories() { - GemFireGarbageFileFilter fileFilter = GemFireGarbageFileFilter.INSTANCE; + GemFireResourceFileFilter fileFilter = GemFireResourceFileFilter.INSTANCE; assertThat(fileFilter).isNotNull(); assertThat(fileFilter.accept(mockDirectory("GemFire"))).isTrue(); @@ -200,9 +200,9 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { } @Test - public void gemfireGarbageFileFilterAcceptsFilesWithMatchingExtension() { + public void gemfireResourceFileFilterAcceptsFilesWithMatchingExtension() { - GemFireGarbageFileFilter fileFilter = GemFireGarbageFileFilter.INSTANCE; + GemFireResourceFileFilter fileFilter = GemFireResourceFileFilter.INSTANCE; assertThat(fileFilter).isNotNull(); assertThat(fileFilter.accept(mockFile("gem.dat"))).isTrue(); @@ -219,9 +219,9 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { } @Test - public void gemfireGarbageFileFilterAcceptsFilesWithMatchingName() { + public void gemfireResourceFileFilterAcceptsFilesWithMatchingName() { - GemFireGarbageFileFilter fileFilter = GemFireGarbageFileFilter.INSTANCE; + GemFireResourceFileFilter fileFilter = GemFireResourceFileFilter.INSTANCE; assertThat(fileFilter).isNotNull(); assertThat(fileFilter.accept(mockFile("BACKUP123"))).isTrue(); @@ -237,9 +237,9 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { } @Test - public void gemfireGarbageFileFilterDeniesFilesWithNonMatchingExtension() { + public void gemfireResourceFileFilterDeniesFilesWithNonMatchingExtension() { - GemFireGarbageFileFilter fileFilter = GemFireGarbageFileFilter.INSTANCE; + GemFireResourceFileFilter fileFilter = GemFireResourceFileFilter.INSTANCE; assertThat(fileFilter).isNotNull(); assertThat(fileFilter.accept(mockFile("gem.data"))).isFalse(); @@ -252,9 +252,9 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { } @Test - public void gemfireGarbageFileFilterDeniesFilesWithNonMatchingName() { + public void gemfireResourceFileFilterDeniesFilesWithNonMatchingName() { - GemFireGarbageFileFilter fileFilter = GemFireGarbageFileFilter.INSTANCE; + GemFireResourceFileFilter fileFilter = GemFireResourceFileFilter.INSTANCE; assertThat(fileFilter).isNotNull(); assertThat(fileFilter.accept(mockFile("DAT.backup"))).isFalse(); @@ -263,10 +263,10 @@ public class GemFireGarbageCollectorApplicationListenerUnitTests { } @Test - public void gemfireGarbageFileFilterDeniesNullFiles() { + public void gemfireResourceFileFilterDeniesNullFiles() { - assertThat(GemFireGarbageFileFilter.INSTANCE).isNotNull(); - assertThat(GemFireGarbageFileFilter.INSTANCE.accept(null)).isFalse(); + assertThat(GemFireResourceFileFilter.INSTANCE).isNotNull(); + assertThat(GemFireResourceFileFilter.INSTANCE.accept(null)).isFalse(); } static class AfterTestMethodEventSubType extends AfterTestMethodEvent {