From ea37fbacbefcb90563155e8ceee0ad38b4bbed07 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 28 Aug 2015 00:56:12 -0700 Subject: [PATCH] SGF-408 - Provide support in the SDG XML namespace to load a pre-defined data set using GemFire Snapshot Service for development and testing purposes. Repackaged all GemFire Snapshot Service support classes in Spring Data GemFire under org.springframework.data.gemfire.snapshot. Moved snapshot application events to ..snapshot.event. Moved the ComposableSnapshotFilter class to ..snapshot.filter. (cherry picked from commit 5bf3e8e8132c9cff0c3da33b271bfa4e049968c0) Signed-off-by: John Blum --- .../gemfire/config/SnapshotServiceParser.java | 4 +- .../ExportSnapshotException.java | 2 +- .../ImportSnapshotException.java | 2 +- .../SnapshotServiceFactoryBean.java | 57 ++++++++++--------- .../ExportSnapshotApplicationEvent.java | 10 ++-- .../ImportSnapshotApplicationEvent.java | 10 ++-- .../event}/SnapshotApplicationEvent.java | 11 ++-- .../filter}/ComposableSnapshotFilter.java | 12 ++-- .../config/spring-data-gemfire-1.7.xsd | 8 ++- ...riggeredImportsExportsIntegrationTest.java | 13 +++-- ...shotServiceFactoryBeanIntegrationTest.java | 6 +- .../SnapshotServiceFactoryBeanTest.java | 19 ++++--- ...hotServiceImportExportIntegrationTest.java | 4 +- .../event}/SnapshotApplicationEventTest.java | 6 +- .../filter}/ComposableSnapshotFilterTest.java | 10 ++-- ...dImportsExportsIntegrationTest-context.xml | 12 ++-- ...iceImportExportIntegrationTest-context.xml | 0 17 files changed, 102 insertions(+), 84 deletions(-) rename src/main/java/org/springframework/data/gemfire/{ => snapshot}/ExportSnapshotException.java (96%) rename src/main/java/org/springframework/data/gemfire/{ => snapshot}/ImportSnapshotException.java (96%) rename src/main/java/org/springframework/data/gemfire/{ => snapshot}/SnapshotServiceFactoryBean.java (91%) rename src/main/java/org/springframework/data/gemfire/{ => snapshot/event}/ExportSnapshotApplicationEvent.java (82%) rename src/main/java/org/springframework/data/gemfire/{ => snapshot/event}/ImportSnapshotApplicationEvent.java (82%) rename src/main/java/org/springframework/data/gemfire/{ => snapshot/event}/SnapshotApplicationEvent.java (92%) rename src/main/java/org/springframework/data/gemfire/{ => snapshot/filter}/ComposableSnapshotFilter.java (92%) rename src/test/java/org/springframework/data/gemfire/{ => snapshot}/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java (93%) rename src/test/java/org/springframework/data/gemfire/{ => snapshot}/SnapshotServiceFactoryBeanIntegrationTest.java (92%) rename src/test/java/org/springframework/data/gemfire/{ => snapshot}/SnapshotServiceFactoryBeanTest.java (98%) rename src/test/java/org/springframework/data/gemfire/{ => snapshot}/SnapshotServiceImportExportIntegrationTest.java (98%) rename src/test/java/org/springframework/data/gemfire/{ => snapshot/event}/SnapshotApplicationEventTest.java (96%) rename src/test/java/org/springframework/data/gemfire/{ => snapshot/filter}/ComposableSnapshotFilterTest.java (93%) rename src/test/resources/org/springframework/data/gemfire/{ => snapshot}/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml (77%) rename src/test/resources/org/springframework/data/gemfire/{ => snapshot}/SnapshotServiceImportExportIntegrationTest-context.xml (100%) diff --git a/src/main/java/org/springframework/data/gemfire/config/SnapshotServiceParser.java b/src/main/java/org/springframework/data/gemfire/config/SnapshotServiceParser.java index 9e51f543..cd0690ee 100644 --- a/src/main/java/org/springframework/data/gemfire/config/SnapshotServiceParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/SnapshotServiceParser.java @@ -21,7 +21,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.data.gemfire.SnapshotServiceFactoryBean; +import org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean; import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; @@ -33,7 +33,7 @@ import org.w3c.dom.Element; * @see org.springframework.beans.factory.support.BeanDefinitionBuilder * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser * @see org.springframework.beans.factory.xml.ParserContext - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean * @since 1.7.0 */ class SnapshotServiceParser extends AbstractSingleBeanDefinitionParser { diff --git a/src/main/java/org/springframework/data/gemfire/ExportSnapshotException.java b/src/main/java/org/springframework/data/gemfire/snapshot/ExportSnapshotException.java similarity index 96% rename from src/main/java/org/springframework/data/gemfire/ExportSnapshotException.java rename to src/main/java/org/springframework/data/gemfire/snapshot/ExportSnapshotException.java index 6be20a53..4eaf351c 100644 --- a/src/main/java/org/springframework/data/gemfire/ExportSnapshotException.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/ExportSnapshotException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot; /** * The ExportSnapshotException class is a RuntimeException indicating an error occurred while saving a snapshhot diff --git a/src/main/java/org/springframework/data/gemfire/ImportSnapshotException.java b/src/main/java/org/springframework/data/gemfire/snapshot/ImportSnapshotException.java similarity index 96% rename from src/main/java/org/springframework/data/gemfire/ImportSnapshotException.java rename to src/main/java/org/springframework/data/gemfire/snapshot/ImportSnapshotException.java index d74cacc7..63ca6c25 100644 --- a/src/main/java/org/springframework/data/gemfire/ImportSnapshotException.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/ImportSnapshotException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot; /** * The ImportSnapshotException class is a RuntimeException indicating an error occurred while loading GemFire Snapshots diff --git a/src/main/java/org/springframework/data/gemfire/SnapshotServiceFactoryBean.java b/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java similarity index 91% rename from src/main/java/org/springframework/data/gemfire/SnapshotServiceFactoryBean.java rename to src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java index 6707efc3..a0c54989 100644 --- a/src/main/java/org/springframework/data/gemfire/SnapshotServiceFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot; import static com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotServiceAdapter; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotServiceAdapter; import java.io.Closeable; import java.io.DataInputStream; @@ -38,6 +38,9 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationListener; +import org.springframework.data.gemfire.snapshot.event.ExportSnapshotApplicationEvent; +import org.springframework.data.gemfire.snapshot.event.ImportSnapshotApplicationEvent; +import org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent; import org.springframework.data.gemfire.util.CollectionUtils; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; @@ -61,7 +64,7 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotOptions; * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean * @see org.springframework.context.ApplicationListener - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotServiceAdapter + * @see SnapshotServiceFactoryBean.SnapshotServiceAdapter * @see com.gemstone.gemfire.cache.snapshot.CacheSnapshotService * @see com.gemstone.gemfire.cache.snapshot.RegionSnapshotService * @since 1.7.0 @@ -129,7 +132,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean[] exports) { this.exports = exports; @@ -139,7 +142,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean[] getExports() { return nullSafeArray(exports); @@ -150,7 +153,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean[] imports) { this.imports = imports; @@ -161,7 +164,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean[] getImports() { return nullSafeArray(imports); @@ -215,7 +218,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean getObject() throws Exception { @@ -226,9 +229,9 @@ public class SnapshotServiceFactoryBean implements FactoryBean getObjectType() { @@ -250,7 +253,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean implements FactoryBean wrap(CacheSnapshotService cacheSnapshotService) { @@ -300,8 +303,8 @@ public class SnapshotServiceFactoryBean implements FactoryBean wrap(RegionSnapshotService regionSnapshotService) { @@ -312,7 +315,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean implements FactoryBean event) { @@ -358,7 +361,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean implements FactoryBean implements FactoryBean the class type of the Cache Region key. * @param the class type of the Cache Region value. - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotServiceAdapter + * @see SnapshotServiceFactoryBean.SnapshotServiceAdapter */ protected static abstract class SnapshotServiceAdapterSupport implements SnapshotServiceAdapter { @@ -546,7 +549,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean { @@ -624,7 +627,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean extends SnapshotServiceAdapterSupport { diff --git a/src/main/java/org/springframework/data/gemfire/ExportSnapshotApplicationEvent.java b/src/main/java/org/springframework/data/gemfire/snapshot/event/ExportSnapshotApplicationEvent.java similarity index 82% rename from src/main/java/org/springframework/data/gemfire/ExportSnapshotApplicationEvent.java rename to src/main/java/org/springframework/data/gemfire/snapshot/event/ExportSnapshotApplicationEvent.java index 86c6a40f..58032810 100644 --- a/src/main/java/org/springframework/data/gemfire/ExportSnapshotApplicationEvent.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/event/ExportSnapshotApplicationEvent.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot.event; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata; /** * The ExportSnapshotApplicationEvent class is a Spring ApplicationEvent signaling a GemFire Cache or Region 'import' * snapshot event. * * @author John Blum - * @see org.springframework.data.gemfire.SnapshotApplicationEvent + * @see org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent * @since 1.7.0 */ @SuppressWarnings("unused") @@ -35,7 +35,7 @@ public class ExportSnapshotApplicationEvent extends SnapshotApplicationEve * * @param source the source of the ApplicationEvent. * @param snapshotMetadata an array of SnapshotMetadata containing details for each export. - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata * @see #ExportSnapshotApplicationEvent(Object, String, SnapshotMetadata[]) */ public ExportSnapshotApplicationEvent(Object source, SnapshotMetadata... snapshotMetadata) { @@ -49,7 +49,7 @@ public class ExportSnapshotApplicationEvent extends SnapshotApplicationEve * @param source the source of the ApplicationEvent. * @param regionPath absolute pathname of the Region. * @param snapshotMetadata an array of SnapshotMetadata containing details for each export. - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata */ public ExportSnapshotApplicationEvent(Object source, String regionPath, SnapshotMetadata... snapshotMetadata) { super(source, regionPath, snapshotMetadata); diff --git a/src/main/java/org/springframework/data/gemfire/ImportSnapshotApplicationEvent.java b/src/main/java/org/springframework/data/gemfire/snapshot/event/ImportSnapshotApplicationEvent.java similarity index 82% rename from src/main/java/org/springframework/data/gemfire/ImportSnapshotApplicationEvent.java rename to src/main/java/org/springframework/data/gemfire/snapshot/event/ImportSnapshotApplicationEvent.java index 67166361..6b4499a5 100644 --- a/src/main/java/org/springframework/data/gemfire/ImportSnapshotApplicationEvent.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/event/ImportSnapshotApplicationEvent.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot.event; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata; /** * The ImportSnapshotApplicationEvent class is a Spring ApplicationEvent signaling a GemFire Cache or Region 'export' * snapshot event. * * @author John Blum - * @see org.springframework.data.gemfire.SnapshotApplicationEvent + * @see org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent * @since 1.7.0 */ @SuppressWarnings("unused") @@ -35,7 +35,7 @@ public class ImportSnapshotApplicationEvent extends SnapshotApplicationEve * * @param source the source of the ApplicationEvent. * @param snapshotMetadata an array of SnapshotMetadata containing details for each import. - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata * @see #ImportSnapshotApplicationEvent(Object, String, SnapshotMetadata[]) */ public ImportSnapshotApplicationEvent(Object source, SnapshotMetadata... snapshotMetadata) { @@ -49,7 +49,7 @@ public class ImportSnapshotApplicationEvent extends SnapshotApplicationEve * @param source the source of the ApplicationEvent. * @param regionPath absolute pathname of the Region. * @param snapshotMetadata an array of SnapshotMetadata containing details for each import/export. - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata */ public ImportSnapshotApplicationEvent(Object source, String regionPath, SnapshotMetadata... snapshotMetadata) { super(source, regionPath, snapshotMetadata); diff --git a/src/main/java/org/springframework/data/gemfire/SnapshotApplicationEvent.java b/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java similarity index 92% rename from src/main/java/org/springframework/data/gemfire/SnapshotApplicationEvent.java rename to src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java index 71cd609c..0e2a316c 100644 --- a/src/main/java/org/springframework/data/gemfire/SnapshotApplicationEvent.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot.event; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata; import org.springframework.context.ApplicationEvent; +import org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; @@ -45,7 +46,7 @@ public abstract class SnapshotApplicationEvent extends ApplicationEvent { * * @param source the source of the ApplicationEvent. * @param snapshotMetadata an array of SnapshotMetadata containing details for each import/export. - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata + * @see SnapshotServiceFactoryBean.SnapshotMetadata * @see #SnapshotApplicationEvent(Object, String, SnapshotMetadata[]) */ public SnapshotApplicationEvent(Object source, SnapshotMetadata... snapshotMetadata) { @@ -59,7 +60,7 @@ public abstract class SnapshotApplicationEvent extends ApplicationEvent { * @param source the source of the ApplicationEvent. * @param regionPath absolute pathname of the Region. * @param snapshotMetadata an array of SnapshotMetadata containing details for each import/export. - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata + * @see SnapshotServiceFactoryBean.SnapshotMetadata */ public SnapshotApplicationEvent(Object source, String regionPath, SnapshotMetadata... snapshotMetadata) { super(source); @@ -81,7 +82,7 @@ public abstract class SnapshotApplicationEvent extends ApplicationEvent { * Gets the meta-data used to perform the GemFire Cache Region data snapshots. * * @return an array of SnapshotMetadata containing information necessary to perform the data export. - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata + * @see SnapshotServiceFactoryBean.SnapshotMetadata */ public SnapshotMetadata[] getSnapshotMetadata() { return snapshotMetadata; diff --git a/src/main/java/org/springframework/data/gemfire/ComposableSnapshotFilter.java b/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java similarity index 92% rename from src/main/java/org/springframework/data/gemfire/ComposableSnapshotFilter.java rename to src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java index 3a39c1a9..67a85c3e 100644 --- a/src/main/java/org/springframework/data/gemfire/ComposableSnapshotFilter.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot.filter; import java.util.Map; @@ -65,7 +65,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * @param operator the right operand in the boolean-based expression. * @param rightOperand the operator used to combine the resulting boolean expressions * from the evaluation of the operands. - * @see org.springframework.data.gemfire.ComposableSnapshotFilter.Operator + * @see ComposableSnapshotFilter.Operator * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter */ private ComposableSnapshotFilter(SnapshotFilter leftOperand, Operator operator, SnapshotFilter rightOperand) { @@ -89,7 +89,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * @param snapshotFilters the array of SnapshotFilters to compose into a logical boolean expression * using the Operator. * @return a SnapshotFilter implementation composed of the SnapshotFilters using the specified Operator. - * @see org.springframework.data.gemfire.ComposableSnapshotFilter.Operator + * @see ComposableSnapshotFilter.Operator * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter */ protected static SnapshotFilter compose(Operator operator, SnapshotFilter... snapshotFilters) { @@ -111,7 +111,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * @param snapshotFilters the array of SnapshotFilters to compose into a logical boolean expression * using the AND Operator. * @return a SnapshotFilter implementation composed of the SnapshotFilters using the AND Operator. - * @see org.springframework.data.gemfire.ComposableSnapshotFilter.Operator#AND + * @see ComposableSnapshotFilter.Operator#AND * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter */ public static SnapshotFilter and(SnapshotFilter... snapshotFilters) { @@ -126,7 +126,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * @param snapshotFilters the array of SnapshotFilters to compose into a logical boolean expression * using the OR Operator. * @return a SnapshotFilter implementation composed of the SnapshotFilters using the OR Operator. - * @see org.springframework.data.gemfire.ComposableSnapshotFilter.Operator#OR + * @see ComposableSnapshotFilter.Operator#OR * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter */ public static SnapshotFilter or(SnapshotFilter... snapshotFilters) { @@ -138,7 +138,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * * @param entry the Map.Entry to evaluate. * @return a boolean value indicating whether this composed SnapshotFilter accepts the Map Entry. - * @see org.springframework.data.gemfire.ComposableSnapshotFilter.Operator + * @see ComposableSnapshotFilter.Operator * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter#accept(Map.Entry) * @see java.util.Map.Entry */ diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.7.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.7.xsd index 77f95f8b..63ec107b 100644 --- a/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.7.xsd +++ b/src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-1.7.xsd @@ -219,7 +219,13 @@ ID of the GemFire [Cache|Region] SnapshotService bean in the Spring context. ]]> - + + + +Determines whether imports are suppressed on initialization of the GemFire Snapshot Service. + + + diff --git a/src/test/java/org/springframework/data/gemfire/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java similarity index 93% rename from src/test/java/org/springframework/data/gemfire/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java rename to src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java index 57413985..7e9f747c 100644 --- a/src/test/java/org/springframework/data/gemfire/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -35,6 +35,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.gemfire.repository.sample.Person; +import org.springframework.data.gemfire.snapshot.event.ExportSnapshotApplicationEvent; +import org.springframework.data.gemfire.snapshot.event.ImportSnapshotApplicationEvent; +import org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent; import org.springframework.data.gemfire.test.support.FileSystemUtils; import org.springframework.data.gemfire.test.support.ThreadUtils; import org.springframework.scheduling.annotation.Scheduled; @@ -56,9 +59,10 @@ import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; * @see org.junit.runner.RunWith * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see org.springframework.data.gemfire.ExportSnapshotApplicationEvent - * @see org.springframework.data.gemfire.ImportSnapshotApplicationEvent - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean + * @see org.springframework.data.gemfire.snapshot.event.ExportSnapshotApplicationEvent + * @see org.springframework.data.gemfire.snapshot.event.ImportSnapshotApplicationEvent + * @see org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean * @see org.springframework.data.gemfire.repository.sample.Person * @see com.gemstone.gemfire.cache.Region * @since 1.7.0 @@ -103,7 +107,6 @@ public class SnapshotApplicationEventTriggeredImportsExportsIntegrationTest { @AfterClass public static void tearDownAfterClass() { FileSystemUtils.deleteRecursive(snapshotsDirectory.getParentFile()); - snapshotsDirectory = null; } protected void assertPeople(Region targetRegion, Person... people) { diff --git a/src/test/java/org/springframework/data/gemfire/SnapshotServiceFactoryBeanIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java similarity index 92% rename from src/test/java/org/springframework/data/gemfire/SnapshotServiceFactoryBeanIntegrationTest.java rename to src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java index 037e421e..128571bb 100644 --- a/src/test/java/org/springframework/data/gemfire/SnapshotServiceFactoryBeanIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanIntegrationTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotServiceAdapterSupport; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotServiceAdapterSupport; import java.io.File; import java.util.ArrayList; @@ -37,7 +37,7 @@ import org.springframework.data.gemfire.test.support.FileSystemUtils; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotServiceAdapterSupport + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotServiceAdapterSupport * @since 1.7.0 */ public class SnapshotServiceFactoryBeanIntegrationTest { diff --git a/src/test/java/org/springframework/data/gemfire/SnapshotServiceFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/SnapshotServiceFactoryBeanTest.java rename to src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java index cf14f16e..9435d32f 100644 --- a/src/test/java/org/springframework/data/gemfire/SnapshotServiceFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot; import static com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat; import static org.hamcrest.CoreMatchers.equalTo; @@ -36,12 +36,12 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.ArchiveFileFilter; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.CacheSnapshotServiceAdapter; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.RegionSnapshotServiceAdapter; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotServiceAdapter; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotServiceAdapterSupport; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.ArchiveFileFilter; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.CacheSnapshotServiceAdapter; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.RegionSnapshotServiceAdapter; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotServiceAdapter; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotServiceAdapterSupport; import java.io.Closeable; import java.io.File; @@ -56,6 +56,9 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Matchers; import org.springframework.core.io.ClassPathResource; +import org.springframework.data.gemfire.snapshot.event.ExportSnapshotApplicationEvent; +import org.springframework.data.gemfire.snapshot.event.ImportSnapshotApplicationEvent; +import org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent; import org.springframework.data.gemfire.test.support.FileSystemUtils; import com.gemstone.gemfire.cache.Cache; @@ -73,7 +76,7 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotOptions; * @see org.junit.Rule * @see org.junit.Test * @see org.mockito.Mockito - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean * @see com.gemstone.gemfire.cache.snapshot.CacheSnapshotService * @see com.gemstone.gemfire.cache.snapshot.RegionSnapshotService * @since 1.7.0 diff --git a/src/test/java/org/springframework/data/gemfire/SnapshotServiceImportExportIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java similarity index 98% rename from src/test/java/org/springframework/data/gemfire/SnapshotServiceImportExportIntegrationTest.java rename to src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java index 7a1dd659..f6b0b3bc 100644 --- a/src/test/java/org/springframework/data/gemfire/SnapshotServiceImportExportIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -47,7 +47,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.junit.Test * @see org.springframework.context.ConfigurableApplicationContext * @see org.springframework.context.support.ClassPathXmlApplicationContext - * @see org.springframework.data.gemfire.SnapshotServiceFactoryBean + * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean * @see org.springframework.data.gemfire.repository.sample.Person * @see com.gemstone.gemfire.cache.Region * @since 1.7.0 diff --git a/src/test/java/org/springframework/data/gemfire/SnapshotApplicationEventTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java similarity index 96% rename from src/test/java/org/springframework/data/gemfire/SnapshotApplicationEventTest.java rename to src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java index 39b94b5d..04f54249 100644 --- a/src/test/java/org/springframework/data/gemfire/SnapshotApplicationEventTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot.event; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.springframework.data.gemfire.SnapshotServiceFactoryBean.SnapshotMetadata; +import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +47,7 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotOptions; * @see org.mockito.Mock * @see org.mockito.Mockito * @see org.mockito.runners.MockitoJUnitRunner - * @see org.springframework.data.gemfire.SnapshotApplicationEvent + * @see org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent * @since 1.7.0 */ @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/ComposableSnapshotFilterTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java similarity index 93% rename from src/test/java/org/springframework/data/gemfire/ComposableSnapshotFilterTest.java rename to src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java index ea6c1176..3d2512be 100644 --- a/src/test/java/org/springframework/data/gemfire/ComposableSnapshotFilterTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.gemfire; +package org.springframework.data.gemfire.snapshot.filter; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -26,12 +26,13 @@ import static org.junit.Assert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.springframework.data.gemfire.ComposableSnapshotFilter.Operator; +import static org.springframework.data.gemfire.snapshot.filter.ComposableSnapshotFilter.Operator; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; +import org.springframework.data.gemfire.TestUtils; import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; @@ -41,8 +42,9 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; * * @author John Blum * @see org.junit.Test - * @see org.springframework.data.gemfire.ComposableSnapshotFilter - * @see org.springframework.data.gemfire.ComposableSnapshotFilter.Operator + * @see org.mockito.Mockito + * @see org.springframework.data.gemfire.snapshot.filter.ComposableSnapshotFilter + * @see org.springframework.data.gemfire.snapshot.filter.ComposableSnapshotFilter.Operator * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter * @since 1.7.0 */ diff --git a/src/test/resources/org/springframework/data/gemfire/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml similarity index 77% rename from src/test/resources/org/springframework/data/gemfire/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml rename to src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml index a807e309..16c9dee7 100644 --- a/src/test/resources/org/springframework/data/gemfire/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest-context.xml @@ -29,18 +29,18 @@ - + - - + + - + @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/src/test/resources/org/springframework/data/gemfire/SnapshotServiceImportExportIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest-context.xml similarity index 100% rename from src/test/resources/org/springframework/data/gemfire/SnapshotServiceImportExportIntegrationTest-context.xml rename to src/test/resources/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest-context.xml