From 0f0468e68d9b21231c2c8c490db61d20779bc43b Mon Sep 17 00:00:00 2001 From: John Blum Date: Sat, 8 Oct 2016 01:41:48 -0700 Subject: [PATCH] SGF-558 - Rename Geode package imports from com.gemstone.gemfire to org.apache.geode. Upgrade Apache Geode to 1.1.0-incubating-SNAPSHOT. --- build.gradle | 2 +- gradle.properties | 4 +- pom.xml | 6 +- .../samples/helloworld/CacheLogger.java | 6 +- .../samples/helloworld/CommandProcessor.java | 10 +- .../samples/helloworld/HelloWorld.java | 8 +- .../data/gemfire/CacheFactoryBean.java | 74 +++--- .../ClientRegionShortcutConverter.java | 7 +- .../data/gemfire/DataPolicyConverter.java | 5 +- .../data/gemfire/DeclarableSupport.java | 15 +- .../data/gemfire/DiskStoreFactoryBean.java | 7 +- .../data/gemfire/EvictionActionConverter.java | 7 +- .../data/gemfire/EvictionActionType.java | 10 +- .../EvictionAttributesFactoryBean.java | 23 +- .../data/gemfire/EvictionPolicyType.java | 14 +- .../gemfire/ExpirationActionConverter.java | 5 +- .../data/gemfire/ExpirationActionType.java | 12 +- .../ExpirationAttributesFactoryBean.java | 15 +- .../FixedPartitionAttributesFactoryBean.java | 9 +- .../gemfire/FunctionServiceFactoryBean.java | 9 +- .../data/gemfire/GemfireAccessor.java | 13 +- .../gemfire/GemfireBeanFactoryLocator.java | 12 +- .../data/gemfire/GemfireCacheUtils.java | 113 +++++---- .../data/gemfire/GemfireCallback.java | 16 +- .../gemfire/GemfireCancellationException.java | 5 +- .../data/gemfire/GemfireIndexException.java | 23 +- .../data/gemfire/GemfireOperations.java | 15 +- .../data/gemfire/GemfireQueryException.java | 11 +- .../data/gemfire/GemfireSystemException.java | 7 +- .../data/gemfire/GemfireTemplate.java | 43 ++-- .../gemfire/GemfireTransactionManager.java | 43 ++-- .../data/gemfire/GemfireUtils.java | 17 +- .../data/gemfire/IndexFactoryBean.java | 27 +- .../gemfire/IndexMaintenancePolicyType.java | 14 +- .../data/gemfire/IndexType.java | 24 +- .../data/gemfire/InterestPolicyConverter.java | 5 +- .../data/gemfire/InterestPolicyType.java | 12 +- .../gemfire/LazyWiringDeclarableSupport.java | 5 +- .../data/gemfire/LocalRegionFactoryBean.java | 15 +- .../data/gemfire/LookupRegionFactoryBean.java | 23 +- .../PartitionAttributesFactoryBean.java | 15 +- .../gemfire/PartitionedRegionFactoryBean.java | 5 +- .../gemfire/RegionAttributesFactoryBean.java | 9 +- .../data/gemfire/RegionFactoryBean.java | 93 ++++--- .../data/gemfire/RegionLookupFactoryBean.java | 21 +- .../data/gemfire/RegionShortcutConverter.java | 7 +- .../gemfire/ReplicatedRegionFactoryBean.java | 5 +- .../data/gemfire/ScopeConverter.java | 7 +- .../data/gemfire/ScopeType.java | 13 +- .../data/gemfire/SubRegionFactoryBean.java | 13 +- .../SubscriptionAttributesFactoryBean.java | 21 +- .../data/gemfire/WiringDeclarableSupport.java | 7 +- .../client/ClientCacheFactoryBean.java | 59 +++-- .../client/ClientRegionFactoryBean.java | 59 +++-- .../GemfireDataSourcePostProcessor.java | 33 ++- .../data/gemfire/client/Interest.java | 23 +- .../client/InterestResultPolicyConverter.java | 7 +- .../client/InterestResultPolicyType.java | 4 +- .../data/gemfire/client/PoolAdapter.java | 6 +- .../data/gemfire/client/PoolFactoryBean.java | 35 ++- .../DefaultableDelegatingPoolAdapter.java | 7 +- .../client/support/DelegatingPoolAdapter.java | 6 +- .../support/FactoryDefaultsPoolAdapter.java | 11 +- .../AbstractCacheConfiguration.java | 29 ++- .../AddCacheServerConfiguration.java | 2 +- .../annotation/AddPoolConfiguration.java | 6 +- .../annotation/CacheServerApplication.java | 43 ++-- .../annotation/CacheServerConfiguration.java | 15 +- .../annotation/ClientCacheApplication.java | 57 +++-- .../annotation/ClientCacheConfiguration.java | 12 +- .../gemfire/config/annotation/EnableAuth.java | 13 +- .../annotation/EnableAutoRegionLookup.java | 8 +- .../config/annotation/EnableCacheServer.java | 29 ++- .../config/annotation/EnableCacheServers.java | 4 +- .../config/annotation/EnableOffHeap.java | 2 +- .../gemfire/config/annotation/EnablePdx.java | 2 +- .../gemfire/config/annotation/EnablePool.java | 51 ++-- .../config/annotation/EnablePools.java | 4 +- .../annotation/OffHeapConfiguration.java | 3 +- .../annotation/PeerCacheApplication.java | 11 +- .../annotation/PeerCacheConfiguration.java | 8 +- .../AutoRegionLookupBeanPostProcessor.java | 9 +- ...entRegionPoolBeanFactoryPostProcessor.java | 6 +- .../CustomEditorBeanFactoryPostProcessor.java | 13 +- .../DefinedIndexesApplicationListener.java | 13 +- .../DiskStoreDirectoryBeanPostProcessor.java | 6 +- ...iskStoreAwareBeanFactoryPostProcessor.java | 13 +- .../config/xml/AbstractRegionParser.java | 6 +- .../data/gemfire/config/xml/CacheParser.java | 3 +- .../config/xml/LookupRegionParser.java | 5 +- .../data/gemfire/config/xml/ParsingUtils.java | 7 +- .../function/BatchingResultSender.java | 65 +++-- .../DefaultFunctionArgumentResolver.java | 10 +- .../function/FunctionArgumentResolver.java | 10 +- ...ctionContextInjectingArgumentResolver.java | 19 +- .../function/GemfireFunctionUtils.java | 9 +- .../function/PdxFunctionArgumentResolver.java | 17 +- .../gemfire/function/PojoFunctionWrapper.java | 21 +- .../execution/AbstractFunctionExecution.java | 19 +- .../execution/AbstractFunctionTemplate.java | 17 +- .../AllMembersFunctionExecution.java | 12 +- .../DefaultMemberFunctionExecution.java | 12 +- .../DistributedMemberFunctionExecution.java | 21 +- .../DistributedMembersFunctionExecution.java | 20 +- .../execution/GemfireFunctionCallback.java | 8 +- .../execution/GemfireFunctionOperations.java | 16 +- .../GemfireOnMemberFunctionTemplate.java | 22 +- .../GemfireOnMembersFunctionTemplate.java | 12 +- .../GemfireOnRegionFunctionTemplate.java | 13 +- .../execution/GemfireOnRegionOperations.java | 8 +- .../GemfireOnServerFunctionTemplate.java | 14 +- .../GemfireOnServersFunctionTemplate.java | 20 +- .../GroupMemberFunctionExecution.java | 21 +- .../GroupMembersFunctionExecution.java | 21 +- .../PoolServerFunctionExecution.java | 29 ++- .../PoolServersFunctionExecution.java | 17 +- .../execution/RegionFunctionExecution.java | 23 +- .../execution/ServerFunctionExecution.java | 15 +- .../execution/ServersFunctionExecution.java | 19 +- .../listener/ContinuousQueryDefinition.java | 5 +- .../listener/ContinuousQueryListener.java | 6 +- .../ContinuousQueryListenerContainer.java | 39 ++- .../ContinuousQueryListenerAdapter.java | 17 +- .../mapping/GemfirePropertyValueProvider.java | 11 +- .../gemfire/mapping/MappingPdxSerializer.java | 15 +- .../mapping/PdxReaderPropertyAccessor.java | 17 +- .../data/gemfire/mapping/Region.java | 4 +- .../data/gemfire/mapping/Regions.java | 3 +- .../repository/cdi/GemfireRepositoryBean.java | 6 +- .../cdi/GemfireRepositoryExtension.java | 4 +- .../query/GemfireEntityInformation.java | 7 +- .../repository/query/QueryBuilder.java | 4 +- .../gemfire/repository/query/QueryString.java | 5 +- .../StringBasedGemfireRepositoryQuery.java | 5 +- .../support/GemfireRepositoryFactory.java | 3 +- .../support/GemfireRepositoryFactoryBean.java | 17 +- .../support/SimpleGemfireRepository.java | 27 +- .../AsmInstantiatorGenerator.java | 23 +- .../gemfire/serialization/EnumSerializer.java | 10 +- .../InstantiatorFactoryBean.java | 21 +- .../serialization/InstantiatorGenerator.java | 8 +- .../serialization/WiringInstantiator.java | 21 +- .../server/CacheServerFactoryBean.java | 11 +- .../server/SubscriptionEvictionPolicy.java | 8 +- .../data/gemfire/server/package-info.java | 4 +- .../snapshot/SnapshotServiceFactoryBean.java | 32 ++- .../event/SnapshotApplicationEvent.java | 9 +- .../filter/ComposableSnapshotFilter.java | 14 +- .../support/AnnotationBasedExpiration.java | 35 ++- .../support/CallableCacheLoaderAdapter.java | 35 ++- .../support/ClientRegionShortcutWrapper.java | 5 +- .../data/gemfire/support/GemfireCache.java | 25 +- .../gemfire/support/GemfireCacheManager.java | 25 +- .../gemfire/support/GemfireDaoSupport.java | 19 +- .../gemfire/support/JSONRegionAdvice.java | 41 +-- .../support/ListRegionsOnServerFunction.java | 28 +-- .../support/RegionShortcutWrapper.java | 5 +- ...SpringContextBootstrappingInitializer.java | 5 +- .../SpringServerLauncherCacheProvider.java | 15 +- .../data/gemfire/util/CacheUtils.java | 33 ++- .../gemfire/util/DistributedSystemUtils.java | 27 +- .../wan/AbstractWANComponentFactoryBean.java | 3 +- .../wan/AsyncEventQueueFactoryBean.java | 21 +- .../wan/GatewayReceiverFactoryBean.java | 17 +- .../gemfire/wan/GatewaySenderFactoryBean.java | 23 +- .../gemfire/wan/GatewaySenderWrapper.java | 13 +- .../gemfire/wan/OrderPolicyConverter.java | 7 +- .../data/gemfire/wan/OrderPolicyType.java | 12 +- ...e.distributed.ServerLauncherCacheProvider} | 0 .../data/gemfire/AutoRegionLookupDao.java | 7 +- ...nLookupWithAutowiringIntegrationTests.java | 5 +- .../CacheAutoReconnectIntegrationTests.java | 3 +- ...heClusterConfigurationIntegrationTest.java | 7 +- .../data/gemfire/CacheFactoryBeanTest.java | 29 ++- .../data/gemfire/CacheIntegrationTest.java | 9 +- .../gemfire/CacheServerIntegrationTest.java | 4 +- .../ClientRegionShortcutConverterTest.java | 7 +- .../ColocatedRegionIntegrationTest.java | 3 +- .../data/gemfire/DataPolicyConverterTest.java | 3 +- .../data/gemfire/DeclarableSupportTest.java | 7 +- ...ngPropertyPlaceholdersIntegrationTest.java | 6 +- .../EvictionActionConverterUnitTests.java | 5 +- .../data/gemfire/EvictionActionTypeTest.java | 5 +- .../EvictionAttributesFactoryBeanTest.java | 11 +- .../data/gemfire/EvictionPolicyTypeTest.java | 5 +- .../ExpirationActionConverterUnitTests.java | 3 +- .../gemfire/ExpirationActionTypeTest.java | 5 +- .../ExpirationAttributesFactoryBeanTest.java | 5 +- .../GemfireTemplateIntegrationTests.java | 7 +- ...ledClientCacheRegionsIntegrationTests.java | 15 +- .../gemfire/GemfireTemplateUnitTests.java | 21 +- .../data/gemfire/GemfireUtilsTest.java | 7 +- .../gemfire/GenericRegionFactoryBeanTest.java | 13 +- .../IndexConflictsIntegrationTest.java | 7 +- .../data/gemfire/IndexFactoryBeanTest.java | 29 ++- .../IndexMaintenancePolicyTypeTest.java | 5 +- .../data/gemfire/IndexTypeTest.java | 16 +- .../springframework/data/gemfire/Init.java | 7 +- .../InterestPolicyConverterUnitTests.java | 5 +- .../data/gemfire/InterestPolicyTypeTest.java | 5 +- ...leSupportFunctionBasedIntegrationTest.java | 7 +- ...iringDeclarableSupportIntegrationTest.java | 1 + .../gemfire/LocalRegionFactoryBeanTest.java | 9 +- .../gemfire/LookupRegionFactoryBeanTest.java | 33 ++- .../LookupRegionMutationIntegrationTest.java | 40 +-- .../data/gemfire/LookupSubRegionTest.java | 5 +- .../PartitionAttributesFactoryBeanTest.java | 5 +- .../PartitionedRegionFactoryBeanTest.java | 9 +- .../gemfire/PdxDiskStoreIntegrationTest.java | 4 +- ...ionDataPolicyShortcutsIntegrationTest.java | 11 +- .../data/gemfire/RegionFactoryBeanTest.java | 44 ++-- .../gemfire/RegionLookupIntegrationTests.java | 11 +- .../gemfire/RegionShortcutConverterTest.java | 5 +- .../ReplicatedRegionFactoryBeanTest.java | 9 +- .../data/gemfire/ScopeConverterUnitTests.java | 5 +- .../data/gemfire/ScopeTypeTest.java | 5 +- .../data/gemfire/SimpleCacheListener.java | 2 +- .../data/gemfire/SimpleCacheLoader.java | 6 +- .../data/gemfire/SimpleCacheWriter.java | 2 +- .../data/gemfire/SimpleObjectSizer.java | 2 +- .../data/gemfire/SimplePartitionResolver.java | 4 +- .../gemfire/SubRegionIntegrationTest.java | 25 +- .../data/gemfire/SubRegionTest.java | 7 +- ...SubscriptionAttributesFactoryBeanTest.java | 5 +- .../data/gemfire/TxIntegrationTest.java | 3 +- .../data/gemfire/UserObject.java | 10 +- .../client/ClientCacheFactoryBeanTest.java | 19 +- .../client/ClientCacheIndexingTest.java | 19 +- .../gemfire/client/ClientCachePoolTests.java | 9 +- .../client/ClientCacheSecurityTest.java | 10 +- .../data/gemfire/client/ClientCacheTest.java | 5 +- .../ClientCacheVariableLocatorsTest.java | 10 +- .../ClientCacheVariableServersTest.java | 10 +- .../client/ClientRegionFactoryBeanTest.java | 23 +- ...ClientRegionWithCacheLoaderWriterTest.java | 22 +- .../gemfire/client/ClientSubRegionTest.java | 5 +- .../DurableClientCacheIntegrationTest.java | 24 +- .../GemFireDataSourceIntegrationTest.java | 10 +- .../gemfire/client/GemFireDataSourceTest.java | 15 +- ...onfiguredGemFireServerIntegrationTest.java | 8 +- .../GemFireDataSourceWithLocalRegionTest.java | 29 ++- .../GemfireDataSourcePostProcessorTest.java | 27 +- ...nterestResultPolicyConverterUnitTests.java | 5 +- .../client/InterestResultPolicyTypeTest.java | 5 +- .../data/gemfire/client/InterestTest.java | 3 +- .../LocalOnlyClientCacheIntegrationTest.java | 12 +- .../client/MultipleClientCacheTest.java | 11 +- .../gemfire/client/PoolFactoryBeanTest.java | 15 +- ...AndServersExpressionsIntegrationTests.java | 5 +- .../gemfire/client/RegionIntegrationTest.java | 23 +- ...aConfiguredClientCacheIntegrationTest.java | 3 +- .../DefaultableDelegatingPoolAdapterTest.java | 5 +- .../support/DelegatingPoolAdapterTest.java | 11 +- .../FactoryDefaultsPoolAdapterTest.java | 7 +- .../config/AsyncEventQueueNamespaceTest.java | 11 +- .../AbstractCacheConfigurationUnitTests.java | 3 +- ...erverCacheApplicationIntegrationTests.java | 19 +- .../PeerCacheApplicationIntegrationTests.java | 13 +- ...egionLookupBeanPostProcessorUnitTests.java | 5 +- ...itorBeanFactoryPostProcessorUnitTests.java | 13 +- ...edIndexesApplicationListenerUnitTests.java | 5 +- .../DefinedIndexesIntegrationTests.java | 21 +- ...toryBeanPostProcessorIntegrationTests.java | 3 +- ...wareBeanFactoryPostProcessorUnitTests.java | 15 +- .../config/xml/CacheNamespaceTest.java | 9 +- .../config/xml/CacheServerNamespaceTest.java | 9 +- .../config/xml/CacheSubscriptionTest.java | 7 +- .../xml/CacheUsingPdxNamespaceTest.java | 3 +- .../config/xml/ClientCacheNamespaceTest.java | 3 +- .../config/xml/ClientRegionNamespaceTest.java | 33 ++- ...usQueryListenerContainerNamespaceTest.java | 13 +- ...DiskStoreAndEvictionRegionParsingTest.java | 31 ++- .../config/xml/DiskStoreNamespaceTest.java | 3 +- .../xml/DynamicRegionNamespaceTest.java | 5 +- .../xml/FunctionServiceNamespaceTest.java | 7 +- ...GatewayReceiverAutoStartNamespaceTest.java | 5 +- ...ewayReceiverDefaultStartNamespaceTest.java | 5 +- ...tewayReceiverManualStartNamespaceTest.java | 5 +- .../xml/GemfireV7GatewayNamespaceTest.java | 27 +- .../xml/GemfireV8GatewayNamespaceTest.java | 11 +- .../config/xml/IndexNamespaceTest.java | 9 +- .../JndiBindingsPropertyPlaceholderTest.java | 3 +- .../gemfire/config/xml/JndiBindingsTest.java | 5 +- .../config/xml/LocalRegionNamespaceTest.java | 15 +- ...WithEvictionPolicyActionNamespaceTest.java | 9 +- .../config/xml/MembershipAttributesTest.java | 11 +- .../gemfire/config/xml/MultipleCacheTest.java | 5 +- .../xml/PartitionedRegionNamespaceTest.java | 19 +- .../gemfire/config/xml/PoolNamespaceTest.java | 5 +- ...gionDefinitionUsingBeansNamespaceTest.java | 13 +- ...RegionEvictionAttributesNamespaceTest.java | 11 +- ...gionExpirationAttributesNamespaceTest.java | 17 +- ...onSubscriptionAttributesNamespaceTest.java | 7 +- ...oreAndPersistenceEvictionSettingsTest.java | 7 +- .../xml/ReplicatedRegionNamespaceTest.java | 15 +- .../config/xml/SubRegionNamespaceTest.java | 7 +- .../xml/SubRegionSubElementNamespaceTest.java | 13 +- .../TemplateClientRegionNamespaceTest.java | 33 ++- ...ersistentPartitionRegionNamespaceTest.java | 17 +- .../xml/TemplateRegionsNamespaceTests.java | 59 +++-- .../config/xml/TxEventHandlersTest.java | 11 +- .../data/gemfire/fork/CacheServerProcess.java | 15 +- .../fork/FunctionCacheServerProcess.java | 69 +++-- .../fork/GemFireBasedServerProcess.java | 7 +- .../data/gemfire/fork/LocatorProcess.java | 11 +- .../function/BatchingResultSenderTest.java | 61 +++-- ...nctionExecutionWithPdxIntegrationTest.java | 23 +- ...owingFunctionExecutionIntegrationTest.java | 7 +- .../FunctionArgumentResolverTest.java | 15 +- .../PdxFunctionArgumentResolverTest.java | 33 ++- .../config/AnnotationDrivenFunctionsTest.java | 11 +- .../FunctionExecutionClientCacheTests.java | 29 ++- .../FunctionExecutionIntegrationTests.java | 9 +- ...uredFunctionExecutionIntegrationTests.java | 9 +- .../AbstractFunctionExecutionTest.java | 11 +- .../AbstractFunctionTemplateTest.java | 9 +- .../execution/FunctionExecutionTests.java | 37 ++- .../execution/FunctionIntegrationTests.java | 10 +- .../GemfireFunctionTemplateTests.java | 39 ++- .../ApplicationDomainFunctionExecutions.java | 5 +- .../ContinuousQueryListenerContainerTest.java | 9 +- .../data/gemfire/listener/GemfireMDP.java | 8 +- .../listener/ListenerContainerTests.java | 9 +- .../listener/ThrowableEventListener.java | 10 +- .../adapter/ContainerXmlSetupTest.java | 7 +- .../adapter/QueryListenerAdapterTest.java | 7 +- .../MappingPdxSerializerIntegrationTest.java | 37 ++- .../MappingPdxSerializerUnitTests.java | 13 +- .../PdxReaderPropertyAccessorUnitTests.java | 5 +- .../data/gemfire/mapping/RegionsTest.java | 3 +- .../data/gemfire/process/ProcessWrapper.java | 1 - ...oryFactoryInformationIntegrationTests.java | 5 +- .../cdi/CdiExtensionIntegrationTest.java | 5 +- .../cdi/GemfireCacheRegionProducer.java | 19 +- .../cdi/GemfireRepositoryBeanTest.java | 6 +- .../cdi/GemfireRepositoryExtensionTest.java | 4 +- .../repository/cdi/RepositoryClient.java | 1 + ...eRepositoriesRegistrarIntegrationTest.java | 7 +- .../query/QueryStringUnitTests.java | 3 +- ...StringBasedGemfireRepositoryQueryTest.java | 5 +- .../sample/AlgorithmRepositoryTest.java | 3 +- .../gemfire/repository/sample/Person.java | 8 +- .../repository/sample/PersonRepository.java | 1 - .../PersonRepositoryIntegrationTests.java | 5 +- .../repository/sample/RegionPopulator.java | 15 +- .../SubRegionRepositoryIntegrationTest.java | 6 +- .../UserRepositoryQueriesIntegrationTest.java | 4 +- ...nsionsInUserRepositoryIntegrationTest.java | 6 +- ...fireRepositoryFactoryIntegrationTests.java | 7 +- .../GemfireRepositoryFactoryBeanTest.java | 29 +-- ...fireRepositoryFactoryIntegrationTests.java | 7 +- .../GemfireRepositoryFactoryUnitTests.java | 5 +- ...mpleGemfireRepositoryIntegrationTests.java | 11 +- ...epositoryTransactionalIntegrationTest.java | 4 +- .../SimpleGemfireRepositoryUnitTest.java | 11 +- .../AsmInstantiatorFactoryTest.java | 7 +- .../serialization/WiringInstantiatorTest.java | 7 +- .../server/CacheServerFactoryBeanTest.java | 11 +- .../SubscriptionEvictionPolicyTest.java | 3 +- ...riggeredImportsExportsIntegrationTest.java | 8 +- .../SnapshotServiceFactoryBeanTest.java | 19 +- ...hotServiceImportExportIntegrationTest.java | 5 +- .../event/SnapshotApplicationEventTest.java | 5 +- .../filter/ComposableSnapshotFilterTest.java | 5 +- .../AbstractRegionFactoryBeanTest.java | 3 +- ...xpirationConfigurationIntegrationTest.java | 15 +- .../AnnotationBasedExpirationTest.java | 7 +- .../CachingWithGemFireIntegrationTest.java | 4 +- .../CallableCacheLoaderAdapterTest.java | 15 +- .../ClientRegionShortcutWrapperTest.java | 5 +- ...undCachePutCacheEvictIntegrationTests.java | 7 +- .../support/GemfireCacheIntegrationTests.java | 9 +- .../support/GemfireCacheManagerUnitTests.java | 5 +- .../support/GemfireCacheUnitTests.java | 5 +- ...rePersistenceExceptionTranslationTest.java | 29 ++- .../gemfire/support/JSONRegionAdviceTest.java | 17 +- .../ListRegionsOnServerFunctionTest.java | 9 +- .../support/RegionShortcutWrapperTest.java | 5 +- ...otstrappingInitializerIntegrationTest.java | 24 +- ...rLauncherCacheProviderIntegrationTest.java | 15 +- ...SpringServerLauncherCacheProviderTest.java | 13 +- .../gemfire/test/MockCacheFactoryBean.java | 9 +- .../test/MockClientCacheFactoryBean.java | 9 +- .../gemfire/test/MockClientRegionFactory.java | 21 +- .../data/gemfire/test/MockRegionFactory.java | 49 ++-- .../gemfire/test/MockRegionFactoryTest.java | 13 +- .../test/StubAsyncEventQueueFactory.java | 14 +- .../data/gemfire/test/StubCache.java | 238 +++++++++--------- .../data/gemfire/test/StubCacheServer.java | 102 ++++---- .../test/StubCacheTransactionManager.java | 54 ++-- .../data/gemfire/test/StubDiskStore.java | 34 +-- .../test/StubGatewayReceiverFactory.java | 40 ++- .../test/StubGatewaySenderFactory.java | 15 +- .../gemfire/test/StubResourceManager.java | 6 +- .../ClientServerIntegrationTestsSupport.java | 4 +- .../test/support/DataSourceAdapter.java | 1 + .../wan/AsyncEventQueueFactoryBeanTest.java | 19 +- ...EventQueueWithListenerIntegrationTest.java | 18 +- ...tQueueAndGatewaySenderIntegrationTest.java | 18 +- .../wan/GatewayReceiverFactoryBeanTest.java | 9 +- .../wan/GatewaySenderFactoryBeanTest.java | 13 +- ...alGatewayReceiverStartIntegrationTest.java | 4 +- .../wan/OrderPolicyConverterUnitTests.java | 5 +- .../data/gemfire/wan/OrderPolicyTypeTest.java | 5 +- src/test/resources/cache-with-declarable.xml | 6 +- .../AsyncEventQueueNamespaceTest-context.xml | 4 + .../xml/ClientCacheNamespaceTest-context.xml | 2 +- ...irationAttributesNamespaceTest-context.xml | 4 +- ...irationAttributesNamespaceTest-context.xml | 6 +- .../gemfire/config/xml/cache-using-pdx-ns.xml | 2 +- .../data/gemfire/pdxdiskstore-config.xml | 2 +- ...onConfigurationIntegrationTest-context.xml | 6 +- template.mf | 2 +- 413 files changed, 2826 insertions(+), 3118 deletions(-) rename src/main/resources/META-INF/services/{com.gemstone.gemfire.distributed.ServerLauncherCacheProvider => org.apache.geode.distributed.ServerLauncherCacheProvider} (100%) diff --git a/build.gradle b/build.gradle index 0890a4e3..60a8d1e1 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,7 @@ tasks.withType(Test).all { repositories { maven { url "https://repo.spring.io/libs-release" } maven { url "https://repo.spring.io/plugins-release"} -// maven { url "https://repository.apache.org/content/repositories/snapshots" } + maven { url "https://repository.apache.org/content/repositories/snapshots" } } dependencies { diff --git a/gradle.properties b/gradle.properties index cdcbb76e..44e211da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ antlrVersion=2.7.7 aspectjVersion=1.8.9 assertjVersion=2.5.0 cdiVersion=1.0 -gemfireVersion=1.0.0-incubating.M3 +gemfireVersion=1.1.0-incubating-SNAPSHOT googleCodeFindbugsVersion=2.0.2 hamcrestVersion=1.3 jacksonVersion=2.7.6 @@ -19,4 +19,4 @@ springVersion=4.3.3.RELEASE springDataBuildVersion=1.8.4.RELEASE springDataCommonsVersion=1.12.4.RELEASE springShellVersion=1.1.0.RELEASE -version=1.0.0.APACHE-GEODE-INCUBATING-M3 +version=1.0.0.APACHE-GEODE-INCUBATING-SNAPSHOT diff --git a/pom.xml b/pom.xml index b747a98f..ccf4012e 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-data-geode - 1.0.0.APACHE-GEODE-INCUBATING-M3 + 1.0.0.APACHE-GEODE-INCUBATING-SNAPSHOT Spring Data Geode @@ -21,7 +21,7 @@ SGF 2.7.7 2.5.0 - 1.0.0-incubating.M3 + 1.1.0-incubating-SNAPSHOT 2.0.2 1.01 2.5 @@ -35,12 +35,10 @@ spring-libs-release https://repo.spring.io/libs-release - diff --git a/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/CacheLogger.java b/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/CacheLogger.java index 0790ba5f..6528e6ef 100644 --- a/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/CacheLogger.java +++ b/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/CacheLogger.java @@ -19,12 +19,12 @@ package org.springframework.data.gemfire.samples.helloworld; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.util.CacheListenerAdapter; /** * Listener that logs entry operations to the configured logger. - * + * * @author Costin Leau */ public class CacheLogger extends CacheListenerAdapter { diff --git a/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/CommandProcessor.java b/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/CommandProcessor.java index 7d0d5227..26830685 100644 --- a/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/CommandProcessor.java +++ b/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/CommandProcessor.java @@ -34,13 +34,13 @@ import org.springframework.data.gemfire.GemfireCallback; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.stereotype.Component; -import com.gemstone.gemfire.GemFireCheckedException; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.cache.Region; +import org.apache.geode.GemFireCheckedException; +import org.apache.geode.GemFireException; +import org.apache.geode.cache.Region; /** * Entity processing and interpreting shell commands. - * + * * @author Costin Leau */ @Component @@ -205,4 +205,4 @@ public class CommandProcessor { } }); } -} \ No newline at end of file +} diff --git a/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/HelloWorld.java b/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/HelloWorld.java index aea6598a..e51d8f59 100644 --- a/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/HelloWorld.java +++ b/samples/hello-world/src/main/java/org/springframework/data/gemfire/samples/helloworld/HelloWorld.java @@ -24,11 +24,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.stereotype.Component; -import com.gemstone.gemfire.cache.Region; +import org.apache.geode.cache.Region; /** - * Main bean for interacting with the cache from the console. - * + * Main bean for interacting with the cache from the console. + * * @author Costin Leau */ @Component @@ -64,4 +64,4 @@ public class HelloWorld { throw new IllegalStateException("Cannot greet world", ex); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java index bf78725e..9fadf499 100644 --- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java @@ -23,25 +23,24 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import com.gemstone.gemfire.GemFireCheckedException; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DynamicRegionFactory; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.TransactionListener; -import com.gemstone.gemfire.cache.TransactionWriter; -import com.gemstone.gemfire.cache.util.GatewayConflictResolver; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.internal.datasource.ConfigProperty; -import com.gemstone.gemfire.internal.jndi.JNDIInvoker; -import com.gemstone.gemfire.pdx.PdxSerializable; -import com.gemstone.gemfire.pdx.PdxSerializer; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.GemFireCheckedException; +import org.apache.geode.GemFireException; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.DynamicRegionFactory; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.TransactionListener; +import org.apache.geode.cache.TransactionWriter; +import org.apache.geode.cache.util.GatewayConflictResolver; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.internal.datasource.ConfigProperty; +import org.apache.geode.internal.jndi.JNDIInvoker; +import org.apache.geode.pdx.PdxSerializable; +import org.apache.geode.pdx.PdxSerializer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; @@ -79,11 +78,11 @@ import org.springframework.util.ObjectUtils; * @see org.springframework.beans.factory.DisposableBean * @see org.springframework.context.Phased * @see org.springframework.dao.support.PersistenceExceptionTranslator - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.CacheFactory - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.distributed.DistributedMember - * @see com.gemstone.gemfire.distributed.DistributedSystem + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.CacheFactory + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.distributed.DistributedMember + * @see org.apache.geode.distributed.DistributedSystem */ @SuppressWarnings("unused") public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, BeanNameAware, FactoryBean, @@ -177,6 +176,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, } /* (non-Javadoc) */ + @SuppressWarnings("deprecation") Cache init() throws Exception { initBeanFactoryLocator(); @@ -231,7 +231,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * if an existing Cache could not be found, then this method proceeds in attempting to create a new Cache instance. * * @return the resolved GemFire Cache instance. - * @see com.gemstone.gemfire.cache.Cache + * @see org.apache.geode.cache.Cache * @see #fetchCache() * @see #createFactory(java.util.Properties) * @see #prepareFactory(Object) @@ -254,9 +254,9 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * * @param parameterized Class type extension of GemFireCache. * @return the existing GemFire Cache instance if available. - * @throws com.gemstone.gemfire.cache.CacheClosedException if an existing GemFire Cache instance does not exist. - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.CacheFactory#getAnyInstance() + * @throws org.apache.geode.cache.CacheClosedException if an existing GemFire Cache instance does not exist. + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.CacheFactory#getAnyInstance() */ @SuppressWarnings("unchecked") protected T fetchCache() { @@ -280,7 +280,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * @param gemfireProperties a Properties object containing GemFire System properties. * @return an instance of a GemFire factory used to create a GemFire cache instance. * @see java.util.Properties - * @see com.gemstone.gemfire.cache.CacheFactory + * @see org.apache.geode.cache.CacheFactory */ protected Object createFactory(Properties gemfireProperties) { return new CacheFactory(gemfireProperties); @@ -302,7 +302,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * Initialize the PDX settings on the {@link CacheFactory}. * * @param cacheFactory the GemFire {@link CacheFactory} used to configure and create a GemFire {@link Cache}. - * @see com.gemstone.gemfire.cache.CacheFactory + * @see org.apache.geode.cache.CacheFactory */ CacheFactory initializePdx(CacheFactory cacheFactory) { if (isPdxOptionsSpecified()) { @@ -346,8 +346,8 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * @param parameterized Class type extension of GemFireCache. * @param factory the appropriate GemFire factory used to create a cache instance. * @return an instance of the GemFire cache. - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.CacheFactory#create() + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.CacheFactory#create() */ @SuppressWarnings("unchecked") protected T createCache(Object factory) { @@ -362,11 +362,11 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * @param cache the GemFire Cache instance to process. * @return the GemFire Cache instance after processing. * @throws IOException if the cache.xml Resource could not be loaded and applied to the Cache instance. - * @see com.gemstone.gemfire.cache.Cache#loadCacheXml(java.io.InputStream) + * @see org.apache.geode.cache.Cache#loadCacheXml(java.io.InputStream) * @see #getCacheXml() - * @see #setHeapPercentages(com.gemstone.gemfire.cache.GemFireCache) - * @see #registerTransactionListeners(com.gemstone.gemfire.cache.GemFireCache) - * @see #registerTransactionWriter(com.gemstone.gemfire.cache.GemFireCache) + * @see #setHeapPercentages(org.apache.geode.cache.GemFireCache) + * @see #registerTransactionListeners(org.apache.geode.cache.GemFireCache) + * @see #registerTransactionWriter(org.apache.geode.cache.GemFireCache) * @see #registerJndiDataSources() */ protected T postProcess(T cache) throws IOException { @@ -766,7 +766,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * Requires GemFire 7.0 or higher * @param gatewayConflictResolver defined as Object in the signature for backward * compatibility with Gemfire 6 compatibility. This must be an instance of - * {@link com.gemstone.gemfire.cache.util.GatewayConflictResolver} + * {@link org.apache.geode.cache.util.GatewayConflictResolver} */ public void setGatewayConflictResolver(Object gatewayConflictResolver) { this.gatewayConflictResolver = gatewayConflictResolver; @@ -950,7 +950,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * the transaction is processed (committed, rolled back). * * @param transactionListeners the list of GemFire TransactionListeners listening for transaction events. - * @see com.gemstone.gemfire.cache.TransactionListener + * @see org.apache.geode.cache.TransactionListener */ public void setTransactionListeners(List transactionListeners) { this.transactionListeners = transactionListeners; @@ -968,7 +968,7 @@ public class CacheFactoryBean implements BeanClassLoaderAware, BeanFactoryAware, * the transaction or update an external DB before the commit. * * @param transactionWriter the GemFire TransactionWriter callback receiving transaction events. - * @see com.gemstone.gemfire.cache.TransactionWriter + * @see org.apache.geode.cache.TransactionWriter */ public void setTransactionWriter(TransactionWriter transactionWriter) { this.transactionWriter = transactionWriter; diff --git a/src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java b/src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java index c120a988..68f3d4a9 100644 --- a/src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java +++ b/src/main/java/org/springframework/data/gemfire/ClientRegionShortcutConverter.java @@ -16,17 +16,16 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.client.ClientRegionShortcut; import org.springframework.core.convert.converter.Converter; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; - /** * The ClientRegionShortcutConverter class is a Spring Converter implementation converting String value Client Region * Shortcut representations into actual GemFire ClientRegionShortcut enumerated values. * * @author John Blum * @see org.springframework.core.convert.converter.Converter - * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut + * @see org.apache.geode.cache.client.ClientRegionShortcut * @since 1.3.4 */ @SuppressWarnings("unused") @@ -53,7 +52,7 @@ public class ClientRegionShortcutConverter implements Converter { diff --git a/src/main/java/org/springframework/data/gemfire/DeclarableSupport.java b/src/main/java/org/springframework/data/gemfire/DeclarableSupport.java index 4c8a1688..8781043c 100644 --- a/src/main/java/org/springframework/data/gemfire/DeclarableSupport.java +++ b/src/main/java/org/springframework/data/gemfire/DeclarableSupport.java @@ -18,26 +18,25 @@ package org.springframework.data.gemfire; import java.util.Properties; +import org.apache.geode.cache.CacheCallback; +import org.apache.geode.cache.Declarable; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.access.BeanFactoryReference; -import com.gemstone.gemfire.cache.CacheCallback; -import com.gemstone.gemfire.cache.Declarable; - /** * Convenience class for Spring-aware GemFire Declarable components. Provides a reference to the current * Spring ApplicationContext, e.g. for Spring bean lookup or resource loading. - * + * * Note that in most cases, one can just declare the same components as Spring beans, through {@link RegionFactoryBean} * which gives access to the full Spring container capabilities and does not enforce the {@link Declarable} interface * to be implemented. - * + * * @author Costin Leau * @author John Blum * @see org.springframework.beans.factory.BeanFactory * @see org.springframework.beans.factory.access.BeanFactoryReference - * @see com.gemstone.gemfire.cache.CacheCallback - * @see com.gemstone.gemfire.cache.Declarable + * @see org.apache.geode.cache.CacheCallback + * @see org.apache.geode.cache.Declarable */ @SuppressWarnings("unused") public abstract class DeclarableSupport implements CacheCallback, Declarable { @@ -89,7 +88,7 @@ public abstract class DeclarableSupport implements CacheCallback, Declarable { * Initialize this Declarable object with the given Properties. * * @param props the Properties (parameters) used to initialize this Declarable. - * @see com.gemstone.gemfire.cache.Declarable#init(java.util.Properties) + * @see org.apache.geode.cache.Declarable#init(java.util.Properties) * @see java.util.Properties * @see #init(Properties) */ diff --git a/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java b/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java index 112c4889..b752db35 100644 --- a/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/DiskStoreFactoryBean.java @@ -19,6 +19,9 @@ package org.springframework.data.gemfire; import java.io.File; import java.util.List; +import org.apache.geode.cache.DiskStore; +import org.apache.geode.cache.DiskStoreFactory; +import org.apache.geode.cache.GemFireCache; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; @@ -26,10 +29,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.GemFireCache; - /** * FactoryBean for creating a GemFire DiskStore. * diff --git a/src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java b/src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java index 8fadd2fd..2fe2faa4 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java +++ b/src/main/java/org/springframework/data/gemfire/EvictionActionConverter.java @@ -16,10 +16,9 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.EvictionAction; import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; -import com.gemstone.gemfire.cache.EvictionAction; - /** * The EvictionActionConverter class is a Spring Converter and JavaBeans PropertyEditor that converts * an Object value into an instance of GemFire EvictionAction. @@ -27,7 +26,7 @@ import com.gemstone.gemfire.cache.EvictionAction; * @author John Blum * @see org.springframework.data.gemfire.EvictionActionType * @see org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport - * @see com.gemstone.gemfire.cache.EvictionAction + * @see org.apache.geode.cache.EvictionAction * @since 1.6.0 */ @SuppressWarnings("unused") @@ -40,7 +39,7 @@ public class EvictionActionConverter extends AbstractPropertyEditorConverterSupp * @return the GemFire EvictionAction value matching the given String. * @throws java.lang.IllegalArgumentException if the String could not be converted into * an instance of GemFire EvictionAction. - * @see com.gemstone.gemfire.cache.EvictionAction + * @see org.apache.geode.cache.EvictionAction */ @Override public EvictionAction convert(final String source) { diff --git a/src/main/java/org/springframework/data/gemfire/EvictionActionType.java b/src/main/java/org/springframework/data/gemfire/EvictionActionType.java index eddd6dff..f8b8993f 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionActionType.java +++ b/src/main/java/org/springframework/data/gemfire/EvictionActionType.java @@ -16,13 +16,13 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.EvictionAction; +import org.apache.geode.cache.EvictionAction; /** * The EvictionActionType enum is an enumeration of all the GemFire EvictionAction values. * * @author John Blum - * @see com.gemstone.gemfire.cache.EvictionAction + * @see org.apache.geode.cache.EvictionAction * @since 1.6.0 */ @SuppressWarnings("unused") @@ -39,7 +39,7 @@ public enum EvictionActionType { * Constructs an instance of the EvictionActionType enum initialized with the matching GemFire EvictionAction. * * @param evictionAction the matching GemFire EvictionAction value for this enumerated value. - * @see com.gemstone.gemfire.cache.EvictionAction + * @see org.apache.geode.cache.EvictionAction */ EvictionActionType(final EvictionAction evictionAction) { this.evictionAction = evictionAction; @@ -63,7 +63,7 @@ public enum EvictionActionType { * @param evictionAction the GemFire EvictionAction used to lookup and match the appropriate EvictionActionType. * @return an EvictionActionType enumerated value matching the given GemFire EvictionAction * or null if no match was found. - * @see com.gemstone.gemfire.cache.EvictionAction + * @see org.apache.geode.cache.EvictionAction * @see #getEvictionAction() */ public static EvictionActionType valueOf(final EvictionAction evictionAction) { @@ -99,7 +99,7 @@ public enum EvictionActionType { * Gets the matching GemFire EvictionAction represented by this enumerated value. * * @return the GemFire EvictionAction represented by this enum. - * @see com.gemstone.gemfire.cache.EvictionAction + * @see org.apache.geode.cache.EvictionAction */ public EvictionAction getEvictionAction() { return evictionAction; diff --git a/src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java index 84cee6a7..2b0c3301 100644 --- a/src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/EvictionAttributesFactoryBean.java @@ -16,15 +16,14 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.util.ObjectSizer; +import org.apache.geode.internal.cache.lru.LRUCapacityController; +import org.apache.geode.internal.cache.lru.MemLRUCapacityController; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.util.ObjectSizer; -import com.gemstone.gemfire.internal.cache.lru.LRUCapacityController; -import com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController; - /** * Simple utility class used for defining nested factory-method like definitions w/o polluting the container with useless beans. * @@ -32,8 +31,8 @@ import com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController; * @author John Blum * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean - * @see com.gemstone.gemfire.cache.EvictionAttributes - * @see com.gemstone.gemfire.cache.util.ObjectSizer + * @see org.apache.geode.cache.EvictionAttributes + * @see org.apache.geode.cache.util.ObjectSizer */ @SuppressWarnings("unused") public class EvictionAttributesFactoryBean implements FactoryBean, InitializingBean { @@ -94,7 +93,7 @@ public class EvictionAttributesFactoryBean implements FactoryBean, InitializingBean { diff --git a/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java b/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java index 50d4e3ff..c939e45a 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireAccessor.java @@ -16,12 +16,11 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.GemFireCheckedException; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.cache.Region; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.GemFireCheckedException; +import org.apache.geode.GemFireException; +import org.apache.geode.cache.Region; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; import org.springframework.util.Assert; @@ -35,7 +34,7 @@ import org.springframework.util.Assert; * @author Costin Leau * @author John Blum * @see org.springframework.beans.factory.InitializingBean - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public class GemfireAccessor implements InitializingBean { @@ -49,7 +48,7 @@ public class GemfireAccessor implements InitializingBean { * @param the Region key class type. * @param the Region value class type. * @return the GemFire Cache Region. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ @SuppressWarnings("unchecked") public Region getRegion() { @@ -60,7 +59,7 @@ public class GemfireAccessor implements InitializingBean { * Sets the template GemFire Cache Region. * * @param region the GemFire Cache Region used by this template. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public void setRegion(Region region) { this.region = region; diff --git a/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java b/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java index f9b8bf1f..52badccd 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireBeanFactoryLocator.java @@ -36,16 +36,16 @@ import org.springframework.util.StringUtils; /** * {@link BeanFactoryLocator} used for storing Spring application context/bean factory for Gemfire - * user components (or {@link com.gemstone.gemfire.cache.Declarable}. As opposed to the "traditional" + * user components (or {@link org.apache.geode.cache.Declarable}. As opposed to the "traditional" * {@link org.springframework.beans.factory.access.SingletonBeanFactoryLocator} this implementation does * not require any configuration file; it rather assume declaration inside an application context - * (usually through {@link com.gemstone.gemfire.cache.CacheFactory} which it will store under the name - * and aliases of the bean (so the same "registry" can be used for storing multiple BeanFactories). + * (usually through {@link org.apache.geode.cache.CacheFactory} which it will store under the name + * and aliases of the bean (so the same "registry" can be used for storing multiple BeanFactories). * If there is only one BeanFactory registered then a null value can be used with {@link #setBeanName(String)}. - * + * * In most cases, one does not need to use this class directly as it is used internally - * by {@link com.gemstone.gemfire.cache.CacheFactory}. - * + * by {@link org.apache.geode.cache.CacheFactory}. + * * @author Costin Leau * @author John Blum */ diff --git a/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java b/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java index b2d927bc..97b79d1d 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireCacheUtils.java @@ -16,6 +16,54 @@ package org.springframework.data.gemfire; +import org.apache.geode.CancelException; +import org.apache.geode.CopyException; +import org.apache.geode.GemFireCacheException; +import org.apache.geode.GemFireCheckedException; +import org.apache.geode.GemFireConfigException; +import org.apache.geode.GemFireException; +import org.apache.geode.GemFireIOException; +import org.apache.geode.IncompatibleSystemException; +import org.apache.geode.InternalGemFireException; +import org.apache.geode.InvalidValueException; +import org.apache.geode.LicenseException; +import org.apache.geode.NoSystemException; +import org.apache.geode.SystemConnectException; +import org.apache.geode.SystemIsRunningException; +import org.apache.geode.UnmodifiableException; +import org.apache.geode.cache.CacheException; +import org.apache.geode.cache.CacheExistsException; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.CacheRuntimeException; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.CacheXmlException; +import org.apache.geode.cache.CommitConflictException; +import org.apache.geode.cache.CommitIncompleteException; +import org.apache.geode.cache.DiskAccessException; +import org.apache.geode.cache.EntryDestroyedException; +import org.apache.geode.cache.EntryExistsException; +import org.apache.geode.cache.EntryNotFoundException; +import org.apache.geode.cache.FailedSynchronizationException; +import org.apache.geode.cache.OperationAbortedException; +import org.apache.geode.cache.PartitionedRegionDistributionException; +import org.apache.geode.cache.PartitionedRegionStorageException; +import org.apache.geode.cache.RegionDestroyedException; +import org.apache.geode.cache.RegionExistsException; +import org.apache.geode.cache.ResourceException; +import org.apache.geode.cache.RoleException; +import org.apache.geode.cache.StatisticsDisabledException; +import org.apache.geode.cache.SynchronizationCommitConflictException; +import org.apache.geode.cache.VersionException; +import org.apache.geode.cache.client.ServerConnectivityException; +import org.apache.geode.cache.execute.FunctionException; +import org.apache.geode.cache.query.CqClosedException; +import org.apache.geode.cache.query.IndexInvalidException; +import org.apache.geode.cache.query.IndexMaintenanceException; +import org.apache.geode.cache.query.QueryException; +import org.apache.geode.cache.query.QueryExecutionTimeoutException; +import org.apache.geode.cache.query.QueryInvalidException; +import org.apache.geode.distributed.LeaseExpiredException; +import org.apache.geode.security.GemFireSecurityException; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.DataIntegrityViolationException; @@ -28,58 +76,9 @@ import org.springframework.dao.PessimisticLockingFailureException; import org.springframework.dao.TypeMismatchDataAccessException; import org.springframework.util.ClassUtils; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.CopyException; -import com.gemstone.gemfire.GemFireCacheException; -import com.gemstone.gemfire.GemFireCheckedException; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.IncompatibleSystemException; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.InvalidValueException; -import com.gemstone.gemfire.LicenseException; -import com.gemstone.gemfire.NoSystemException; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.SystemIsRunningException; -import com.gemstone.gemfire.UnmodifiableException; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheExistsException; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheRuntimeException; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.CacheXmlException; -import com.gemstone.gemfire.cache.CommitConflictException; -import com.gemstone.gemfire.cache.CommitIncompleteException; -import com.gemstone.gemfire.cache.DiskAccessException; -import com.gemstone.gemfire.cache.EntryDestroyedException; -import com.gemstone.gemfire.cache.EntryExistsException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.FailedSynchronizationException; -import com.gemstone.gemfire.cache.OperationAbortedException; -import com.gemstone.gemfire.cache.PartitionedRegionDistributionException; -import com.gemstone.gemfire.cache.PartitionedRegionStorageException; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.cache.ResourceException; -import com.gemstone.gemfire.cache.RoleException; -import com.gemstone.gemfire.cache.StatisticsDisabledException; -import com.gemstone.gemfire.cache.SynchronizationCommitConflictException; -import com.gemstone.gemfire.cache.VersionException; -import com.gemstone.gemfire.cache.client.ServerConnectivityException; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.query.CqClosedException; -import com.gemstone.gemfire.cache.query.IndexInvalidException; -import com.gemstone.gemfire.cache.query.IndexMaintenanceException; -import com.gemstone.gemfire.cache.query.QueryException; -import com.gemstone.gemfire.cache.query.QueryExecutionTimeoutException; -import com.gemstone.gemfire.cache.query.QueryInvalidException; -import com.gemstone.gemfire.distributed.LeaseExpiredException; -import com.gemstone.gemfire.security.GemFireSecurityException; - /** * Helper class featuring methods for GemFire Cache or Region handling. - * + * * @author Costin Leau */ public abstract class GemfireCacheUtils { @@ -90,7 +89,7 @@ public abstract class GemfireCacheUtils { Class type = null; try { - type = ClassUtils.resolveClassName("com.gemstone.gemfire.cache.query.CqInvalidException", + type = ClassUtils.resolveClassName("org.apache.geode.cache.query.CqInvalidException", GemfireCacheUtils.class.getClassLoader()); } @@ -104,7 +103,7 @@ public abstract class GemfireCacheUtils { /** * Converts the given (unchecked) Gemfire exception to an appropriate one from the * org.springframework.dao hierarchy. - * + * * @param ex Gemfire unchecked exception * @return new the corresponding DataAccessException instance */ @@ -154,7 +153,7 @@ public abstract class GemfireCacheUtils { return new GemfireIndexException((IndexMaintenanceException) ex); } if (ex instanceof OperationAbortedException) { - // treat user exceptions first + // treat user exceptions first if (ex instanceof CacheLoaderException) { return new GemfireSystemException(ex); } @@ -176,7 +175,7 @@ public abstract class GemfireCacheUtils { if (ex instanceof RegionDestroyedException) { return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex); } - if (ex instanceof com.gemstone.gemfire.admin.RegionNotFoundException) { + if (ex instanceof org.apache.geode.admin.RegionNotFoundException) { return new InvalidDataAccessResourceUsageException(ex.getMessage(), ex); } if (ex instanceof ResourceException) { @@ -195,7 +194,7 @@ public abstract class GemfireCacheUtils { if (ex instanceof CopyException) { return new GemfireSystemException(ex); } - if (ex instanceof com.gemstone.gemfire.cache.EntryNotFoundInRegion) { + if (ex instanceof org.apache.geode.cache.EntryNotFoundInRegion) { return new DataRetrievalFailureException(ex.getMessage(), ex); } if (ex instanceof FunctionException) { @@ -231,7 +230,7 @@ public abstract class GemfireCacheUtils { if (ex instanceof NoSystemException) { return new GemfireSystemException(ex); } - if (ex instanceof com.gemstone.gemfire.admin.RuntimeAdminException) { + if (ex instanceof org.apache.geode.admin.RuntimeAdminException) { return new GemfireSystemException(ex); } if (ex instanceof ServerConnectivityException) { @@ -295,7 +294,7 @@ public abstract class GemfireCacheUtils { return new DataAccessResourceFailureException(ex.getMessage(), ex); } // admin exception - if (ex instanceof com.gemstone.gemfire.admin.AdminException) { + if (ex instanceof org.apache.geode.admin.AdminException) { return new GemfireSystemException(ex); } // fall back diff --git a/src/main/java/org/springframework/data/gemfire/GemfireCallback.java b/src/main/java/org/springframework/data/gemfire/GemfireCallback.java index 30c9a4fc..c80702c3 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireCallback.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireCallback.java @@ -16,18 +16,18 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.GemFireCheckedException; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.cache.Region; +import org.apache.geode.GemFireCheckedException; +import org.apache.geode.GemFireException; +import org.apache.geode.cache.Region; /** * Callback interface for GemFire code. To be used with {@link GemfireTemplate}'s execution methods, often as anonymous * classes within a method implementation. A typical implementation will call Region.get/put/query to perform some - * operations on stored objects. - * + * operations on stored objects. + * * @author Costin Leau * @author John Blum - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public interface GemfireCallback { @@ -40,13 +40,13 @@ public interface GemfireCallback { * * A thrown custom RuntimeException is treated as an application exception: it gets propagated to * the caller of the template. - * + * * @param region the GemFire Cache Region upon which the operation of this callback will be performed. * @return a result object, or null if no result. * @throws GemFireCheckedException for checked Exceptions occurring in GemFire. * @throws GemFireException for runtime Exceptions occurring in GemFire. * @see org.springframework.data.gemfire.GemfireTemplate - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ T doInGemfire(Region region) throws GemFireCheckedException, GemFireException; diff --git a/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java b/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java index c7b2aaef..ff065dee 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireCancellationException.java @@ -16,13 +16,12 @@ package org.springframework.data.gemfire; +import org.apache.geode.CancelException; import org.springframework.dao.InvalidDataAccessResourceUsageException; -import com.gemstone.gemfire.CancelException; - /** * GemFire-specific class for exceptions caused by system cancellations. - * + * * @author Costin Leau */ @SuppressWarnings("serial") diff --git a/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java b/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java index b275452d..e3d36a80 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireIndexException.java @@ -16,24 +16,23 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.query.IndexCreationException; +import org.apache.geode.cache.query.IndexExistsException; +import org.apache.geode.cache.query.IndexInvalidException; +import org.apache.geode.cache.query.IndexMaintenanceException; +import org.apache.geode.cache.query.IndexNameConflictException; import org.springframework.dao.DataIntegrityViolationException; -import com.gemstone.gemfire.cache.query.IndexCreationException; -import com.gemstone.gemfire.cache.query.IndexExistsException; -import com.gemstone.gemfire.cache.query.IndexInvalidException; -import com.gemstone.gemfire.cache.query.IndexMaintenanceException; -import com.gemstone.gemfire.cache.query.IndexNameConflictException; - /** * Gemfire-specific subclass thrown on Index management. - * + * * @author Costin Leau * @author John Blum - * @see com.gemstone.gemfire.cache.query.IndexCreationException - * @see com.gemstone.gemfire.cache.query.IndexExistsException - * @see com.gemstone.gemfire.cache.query.IndexInvalidException - * @see com.gemstone.gemfire.cache.query.IndexMaintenanceException - * @see com.gemstone.gemfire.cache.query.IndexNameConflictException + * @see org.apache.geode.cache.query.IndexCreationException + * @see org.apache.geode.cache.query.IndexExistsException + * @see org.apache.geode.cache.query.IndexInvalidException + * @see org.apache.geode.cache.query.IndexMaintenanceException + * @see org.apache.geode.cache.query.IndexNameConflictException */ @SuppressWarnings({ "serial", "unused" }) public class GemfireIndexException extends DataIntegrityViolationException { diff --git a/src/main/java/org/springframework/data/gemfire/GemfireOperations.java b/src/main/java/org/springframework/data/gemfire/GemfireOperations.java index 227b8189..4a6aa479 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireOperations.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireOperations.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -15,14 +15,13 @@ package org.springframework.data.gemfire; import java.util.Collection; import java.util.Map; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.Query; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.cache.query.SelectResults; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; - /** * @author David Turanski * @author John Blum diff --git a/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java b/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java index 39290d09..8db04b97 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireQueryException.java @@ -16,16 +16,15 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.query.QueryException; +import org.apache.geode.cache.query.QueryExecutionTimeoutException; +import org.apache.geode.cache.query.QueryInvalidException; import org.springframework.dao.InvalidDataAccessResourceUsageException; -import com.gemstone.gemfire.cache.query.QueryException; -import com.gemstone.gemfire.cache.query.QueryExecutionTimeoutException; -import com.gemstone.gemfire.cache.query.QueryInvalidException; - /** * GemFire-specific subclass of {@link InvalidDataAccessResourceUsageException} thrown on invalid * OQL query syntax. - * + * * @author Costin Leau */ @SuppressWarnings("serial") @@ -62,4 +61,4 @@ public class GemfireQueryException extends InvalidDataAccessResourceUsageExcepti public GemfireQueryException(RuntimeException ex) { super(ex.getMessage(), ex); } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java b/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java index 96803355..bbc4ab40 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireSystemException.java @@ -16,14 +16,13 @@ package org.springframework.data.gemfire; +import org.apache.geode.GemFireCheckedException; +import org.apache.geode.GemFireException; import org.springframework.dao.UncategorizedDataAccessException; -import com.gemstone.gemfire.GemFireCheckedException; -import com.gemstone.gemfire.GemFireException; - /** * GemFire-specific subclass of UncategorizedDataAccessException, for GemFire system errors that do not match any concrete org.springframework.dao exceptions. - * + * * @author Costin Leau */ @SuppressWarnings("serial") diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java index cb16331d..29b0bc53 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireTemplate.java @@ -24,18 +24,17 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import com.gemstone.gemfire.GemFireCheckedException; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.query.IndexInvalidException; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryInvalidException; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.internal.cache.LocalRegion; - +import org.apache.geode.GemFireCheckedException; +import org.apache.geode.GemFireException; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.query.IndexInvalidException; +import org.apache.geode.cache.query.Query; +import org.apache.geode.cache.query.QueryInvalidException; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.internal.cache.LocalRegion; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.util.Assert; @@ -59,10 +58,10 @@ import org.springframework.util.StringUtils; * @see java.util.Map * @see org.springframework.data.gemfire.GemfireAccessor * @see org.springframework.data.gemfire.GemfireOperations - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.query.Query - * @see com.gemstone.gemfire.cache.query.QueryService - * @see com.gemstone.gemfire.cache.query.SelectResults + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.query.Query + * @see org.apache.geode.cache.query.QueryService + * @see org.apache.geode.cache.query.SelectResults */ @SuppressWarnings("unused") public class GemfireTemplate extends GemfireAccessor implements GemfireOperations { @@ -389,10 +388,10 @@ public class GemfireTemplate extends GemfireAccessor implements GemfireOperation * * @param region {@link Region} used to acquire the {@link QueryService}. * @return the {@link QueryService} that will perform the query. - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.Region#getRegionService() - * @see com.gemstone.gemfire.cache.RegionService#getQueryService() - * @see com.gemstone.gemfire.cache.client.ClientCache#getLocalQueryService() + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.Region#getRegionService() + * @see org.apache.geode.cache.RegionService#getQueryService() + * @see org.apache.geode.cache.client.ClientCache#getLocalQueryService() */ protected QueryService resolveQueryService(Region region) { return (region.getRegionService() instanceof ClientCache ? resolveClientQueryService(region) @@ -485,7 +484,7 @@ public class GemfireTemplate extends GemfireAccessor implements GemfireOperation * @param the Region value class type. * @param region the GemFire Cache Region to create a proxy for. * @return the Region proxy implementing all interfaces implemented by the passed-in Region object. - * @see com.gemstone.gemfire.cache.Region#close() + * @see org.apache.geode.cache.Region#close() * @see #execute(GemfireCallback, boolean) */ @SuppressWarnings("unchecked") @@ -500,7 +499,7 @@ public class GemfireTemplate extends GemfireAccessor implements GemfireOperation /** * InvocationHandler that suppresses close calls on GemFire Cache Regions. * - * @see com.gemstone.gemfire.cache.Region#close() + * @see org.apache.geode.cache.Region#close() * @see java.lang.reflect.InvocationHandler */ private static class RegionCloseSuppressingInvocationHandler implements InvocationHandler { diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java b/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java index 8cf37f57..9cb0a818 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java @@ -16,6 +16,9 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheTransactionManager; +import org.apache.geode.cache.Region; import org.springframework.beans.factory.InitializingBean; import org.springframework.transaction.CannotCreateTransactionException; import org.springframework.transaction.NoTransactionException; @@ -28,38 +31,34 @@ import org.springframework.transaction.support.ResourceTransactionManager; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.Region; - /** * Local transaction manager for GemFire Enterprise Fabric (GEF). Provides a * {@link PlatformTransactionManager} implementation for a single GemFire * {@link CacheTransactionManager}. - * + * * Binds one or multiple GemFire regions for the specified {@link Cache} to the * thread, potentially allowing for one region per cache model. - * + * *

* This local strategy is an alternative to executing cache operations within * JTA transactions. Its advantage is that is able to work in any environment, * for example a stand-alone application or a test suite. It is not able * to provide XA transactions, for example to share transactions with data * access. - * + * *

* To prevent dirty reads, by default, the cache is configured to return copies * rather then direct references for get operations. As a * workaround, one could use explicitly deep copy objects before making changes * to them to avoid unnecessary copying on every fetch. - * - * @see com.gemstone.gemfire.cache.CacheTransactionManager - * @see com.gemstone.gemfire.cache.Cache#setCopyOnRead(boolean) - * @see com.gemstone.gemfire.cache.Region#get(Object) - * @see com.gemstone.gemfire.CopyHelper#copy(Object) + * + * @see org.apache.geode.cache.CacheTransactionManager + * @see org.apache.geode.cache.Cache#setCopyOnRead(boolean) + * @see org.apache.geode.cache.Region#get(Object) + * @see org.apache.geode.CopyHelper#copy(Object) * @see #setCopyOnRead(boolean) * @see org.springframework.transaction.support.AbstractPlatformTransactionManager - * + * * @author Costin Leau */ // TODO add lenient behavior if a transaction is already started on the current @@ -80,7 +79,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage /** * Creates a new GemfireTransactionManager instance. - * + * * @param cache a reference to the GemFire Cache associated with Cache transactions. */ public GemfireTransactionManager(Cache cache) { @@ -147,8 +146,8 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage throw new NoTransactionException( "No transaction associated with the current thread; are there multiple transaction managers ?", ex); } - - catch (com.gemstone.gemfire.cache.TransactionException ex) { + + catch (org.apache.geode.cache.TransactionException ex) { throw new GemfireTransactionCommitException("Unexpected failure on commit of Cache local transaction", ex); } } @@ -189,7 +188,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage /** * Returns the Cache that this instance manages local transactions for. - * + * * @return Gemfire cache */ public Cache getCache() { @@ -198,7 +197,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage /** * Sets the Cache that this instance manages local transactions for. - * + * * @param cache Gemfire cache */ public void setCache(Cache cache) { @@ -229,11 +228,11 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage * concurrent threads in the same VM, whether or not transactions are used. * * One could explicitly deep copy objects before making changes (for example - * by using {@link com.gemstone.gemfire.CopyHelper#copy(Object)} in which + * by using {@link org.apache.geode.CopyHelper#copy(Object)} in which * case this setting can be set to false. However, unless there * is a measurable performance penalty, the recommendation is to keep this * setting to true - * + * * @param copyOnRead whether copies (default) rather then direct references * will be returned on fetch operations */ @@ -243,7 +242,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage /** * Indicates whether copy on read is set or not on the transaction manager. - * + * * @see #setCopyOnRead(boolean) * @return the copyOnRead */ @@ -253,7 +252,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage /** * GemfireTM local transaction object. - * + * * @author Costin Leau */ private static class CacheTransactionObject { diff --git a/src/main/java/org/springframework/data/gemfire/GemfireUtils.java b/src/main/java/org/springframework/data/gemfire/GemfireUtils.java index 006f59e2..b237098c 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireUtils.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireUtils.java @@ -16,22 +16,21 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.internal.GemFireVersion; import org.springframework.data.gemfire.config.support.GemfireFeature; import org.springframework.data.gemfire.util.CacheUtils; import org.springframework.util.ClassUtils; import org.w3c.dom.Element; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.internal.GemFireVersion; - /** * GemfireUtils is an abstract utility class encapsulating common functionality to access features and capabilities * of GemFire based on version and other configuration meta-data. * * @author John Blum * @see org.springframework.data.gemfire.util.DistributedSystemUtils - * @see com.gemstone.gemfire.cache.CacheFactory - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.CacheFactory + * @see org.apache.geode.cache.Region * @since 1.3.3 */ public abstract class GemfireUtils extends CacheUtils { @@ -40,13 +39,13 @@ public abstract class GemfireUtils extends CacheUtils { public final static String GEMFIRE_VERSION = CacheFactory.getVersion(); private static final String ASYNC_EVENT_QUEUE_ELEMENT_NAME = "async-event-queue"; - private static final String ASYNC_EVENT_QUEUE_TYPE_NAME = "com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue"; + private static final String ASYNC_EVENT_QUEUE_TYPE_NAME = "org.apache.geode.cache.asyncqueue.AsyncEventQueue"; private static final String CQ_ELEMENT_NAME = "cq-listener-container"; - private static final String CQ_TYPE_NAME = "com.gemstone.gemfire.cache.query.internal.cq.CqServiceFactoryImpl"; + private static final String CQ_TYPE_NAME = "org.apache.geode.cache.query.internal.cq.CqServiceFactoryImpl"; private static final String GATEWAY_RECEIVER_ELEMENT_NAME = "gateway-receiver"; - private static final String GATEWAY_RECEIVER_TYPE_NAME = "com.gemstone.gemfire.internal.cache.wan.GatewayReceiverFactoryImpl"; + private static final String GATEWAY_RECEIVER_TYPE_NAME = "org.apache.geode.internal.cache.wan.GatewayReceiverFactoryImpl"; private static final String GATEWAY_SENDER_ELEMENT_NAME = "gateway-sender"; - private static final String GATEWAY_SENDER_TYPE_NAME = "com.gemstone.gemfire.internal.cache.wan.GatewaySenderFactoryImpl"; + private static final String GATEWAY_SENDER_TYPE_NAME = "org.apache.geode.internal.cache.wan.GatewaySenderFactoryImpl"; /* (non-Javadoc) */ public static boolean isClassAvailable(String fullyQualifiedClassName) { diff --git a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java index a346dad8..0b8c6005 100644 --- a/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/IndexFactoryBean.java @@ -18,6 +18,15 @@ package org.springframework.data.gemfire; import java.util.Collection; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.IndexExistsException; +import org.apache.geode.cache.query.IndexInvalidException; +import org.apache.geode.cache.query.IndexNameConflictException; +import org.apache.geode.cache.query.IndexStatistics; +import org.apache.geode.cache.query.QueryService; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -31,16 +40,6 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexExistsException; -import com.gemstone.gemfire.cache.query.IndexInvalidException; -import com.gemstone.gemfire.cache.query.IndexNameConflictException; -import com.gemstone.gemfire.cache.query.IndexStatistics; -import com.gemstone.gemfire.cache.query.QueryService; - /** * Spring FactoryBean for easy declarative creation of GemFire Indexes. * @@ -52,9 +51,9 @@ import com.gemstone.gemfire.cache.query.QueryService; * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean * @see org.springframework.data.gemfire.IndexFactoryBean.IndexWrapper - * @see com.gemstone.gemfire.cache.RegionService - * @see com.gemstone.gemfire.cache.query.Index - * @see com.gemstone.gemfire.cache.query.QueryService + * @see org.apache.geode.cache.RegionService + * @see org.apache.geode.cache.query.Index + * @see org.apache.geode.cache.query.QueryService * @since 1.0.0 */ public class IndexFactoryBean implements InitializingBean, FactoryBean, BeanNameAware, BeanFactoryAware { @@ -466,7 +465,7 @@ public class IndexFactoryBean implements InitializingBean, FactoryBean, B @Override @SuppressWarnings("deprecation") - public com.gemstone.gemfire.cache.query.IndexType getType() { + public org.apache.geode.cache.query.IndexType getType() { return getIndex().getType(); } diff --git a/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java b/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java index 60fc9ab6..f2f5746b 100644 --- a/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java +++ b/src/main/java/org/springframework/data/gemfire/IndexMaintenancePolicyType.java @@ -16,16 +16,16 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.RegionFactory; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.RegionFactory; /** * The IndexMaintenanceType enum is a enumerated type of GemFire Index maintenance update options. * * @author John Blum - * @see com.gemstone.gemfire.cache.AttributesFactory#setIndexMaintenanceSynchronous(boolean) - * @see com.gemstone.gemfire.cache.RegionAttributes#getIndexMaintenanceSynchronous() - * @see com.gemstone.gemfire.cache.RegionFactory#setIndexMaintenanceSynchronous(boolean) + * @see org.apache.geode.cache.AttributesFactory#setIndexMaintenanceSynchronous(boolean) + * @see org.apache.geode.cache.RegionAttributes#getIndexMaintenanceSynchronous() + * @see org.apache.geode.cache.RegionFactory#setIndexMaintenanceSynchronous(boolean) * @since 1.6.0 */ @SuppressWarnings("unused") @@ -61,7 +61,7 @@ public enum IndexMaintenancePolicyType { * * @param attributesFactory the AttributesFactory instance on which to set the indexMaintenanceProperty. * @throws java.lang.NullPointerException if the AttributesFactory reference is null. - * @see #setIndexMaintenance(com.gemstone.gemfire.cache.RegionFactory) + * @see #setIndexMaintenance(org.apache.geode.cache.RegionFactory) */ @SuppressWarnings("deprecation") public void setIndexMaintenance(final AttributesFactory attributesFactory) { @@ -74,7 +74,7 @@ public enum IndexMaintenancePolicyType { * * @param regionFactory the RegionFactory instance on which to set the indexMaintenanceProperty. * @throws java.lang.NullPointerException if the RegionFactory reference is null. - * @see #setIndexMaintenance(com.gemstone.gemfire.cache.AttributesFactory) + * @see #setIndexMaintenance(org.apache.geode.cache.AttributesFactory) */ public void setIndexMaintenance(final RegionFactory regionFactory) { regionFactory.setIndexMaintenanceSynchronous(equals(SYNCHRONOUS)); diff --git a/src/main/java/org/springframework/data/gemfire/IndexType.java b/src/main/java/org/springframework/data/gemfire/IndexType.java index d1a936eb..904c35d9 100644 --- a/src/main/java/org/springframework/data/gemfire/IndexType.java +++ b/src/main/java/org/springframework/data/gemfire/IndexType.java @@ -20,25 +20,25 @@ package org.springframework.data.gemfire; * The IndexType class is an enumerated type of GemFire Index Types. * * @author John Blum - * @see com.gemstone.gemfire.cache.query.IndexType + * @see org.apache.geode.cache.query.IndexType * @since 1.5.2 */ @SuppressWarnings({ "deprecation", "unused" }) public enum IndexType { - FUNCTIONAL(com.gemstone.gemfire.cache.query.IndexType.FUNCTIONAL), - HASH(com.gemstone.gemfire.cache.query.IndexType.HASH), - PRIMARY_KEY(com.gemstone.gemfire.cache.query.IndexType.PRIMARY_KEY), - KEY(com.gemstone.gemfire.cache.query.IndexType.PRIMARY_KEY); + FUNCTIONAL(org.apache.geode.cache.query.IndexType.FUNCTIONAL), + HASH(org.apache.geode.cache.query.IndexType.HASH), + PRIMARY_KEY(org.apache.geode.cache.query.IndexType.PRIMARY_KEY), + KEY(org.apache.geode.cache.query.IndexType.PRIMARY_KEY); - private final com.gemstone.gemfire.cache.query.IndexType gemfireIndexType; + private final org.apache.geode.cache.query.IndexType gemfireIndexType; /** * Constructs an instance of the IndexType enum initialized with the given GemFire IndexType. * * @param gemfireIndexType the corresponding GemFire IndexType - * @see com.gemstone.gemfire.cache.query.IndexType + * @see org.apache.geode.cache.query.IndexType */ - IndexType(final com.gemstone.gemfire.cache.query.IndexType gemfireIndexType) { + IndexType(final org.apache.geode.cache.query.IndexType gemfireIndexType) { this.gemfireIndexType = gemfireIndexType; } @@ -82,9 +82,9 @@ public enum IndexType { * @param gemfireIndexType the GemFire IndexType. * @return a IndexType matching the GemFire IndexType or null if the GemFire IndexType does not match * any IndexType in this enumeration. - * @see com.gemstone.gemfire.cache.query.IndexType + * @see org.apache.geode.cache.query.IndexType */ - public static IndexType valueOf(final com.gemstone.gemfire.cache.query.IndexType gemfireIndexType) { + public static IndexType valueOf(final org.apache.geode.cache.query.IndexType gemfireIndexType) { for (IndexType indexType : values()) { if (indexType.getGemfireIndexType().equals(gemfireIndexType)) { return indexType; @@ -115,9 +115,9 @@ public enum IndexType { * Gets the matching GemFire IndexType for this IndexType enumerated value. * * @return the matching GemFire IndexType. - * @see com.gemstone.gemfire.cache.query.IndexType + * @see org.apache.geode.cache.query.IndexType */ - public com.gemstone.gemfire.cache.query.IndexType getGemfireIndexType() { + public org.apache.geode.cache.query.IndexType getGemfireIndexType() { return gemfireIndexType; } diff --git a/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java index 4e038915..4b26cb1d 100644 --- a/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/InterestPolicyConverter.java @@ -16,17 +16,16 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.InterestPolicy; import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; -import com.gemstone.gemfire.cache.InterestPolicy; - /** * The InterestPolicyConverter class is a Spring Converter implementation and Java PropertyEditor handling * the conversion between Strings and GemFire InterestPolicy values. * * @author John Blum * @see org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport - * @see com.gemstone.gemfire.cache.InterestPolicy + * @see org.apache.geode.cache.InterestPolicy * @since 1.6.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/InterestPolicyType.java b/src/main/java/org/springframework/data/gemfire/InterestPolicyType.java index d754e22f..21ce6658 100644 --- a/src/main/java/org/springframework/data/gemfire/InterestPolicyType.java +++ b/src/main/java/org/springframework/data/gemfire/InterestPolicyType.java @@ -15,14 +15,14 @@ */ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.InterestPolicy; +import org.apache.geode.cache.InterestPolicy; /** * The InterestPolicyType enum is an enumeration of all the GemFire Subscription, InterestPolicy values. * * @author Lyndon Adams * @author John Blum - * @see com.gemstone.gemfire.cache.InterestPolicy + * @see org.apache.geode.cache.InterestPolicy * @since 1.3.0 */ @SuppressWarnings("unused") @@ -38,7 +38,7 @@ public enum InterestPolicyType { * Constructs an instance of the SubscriptionType enum initialized with the matching GemFire InterestPolicy. * * @param interestPolicy a GemFire InterestPolicy corresponding to this SubscriptionType. - * @see com.gemstone.gemfire.cache.InterestPolicy + * @see org.apache.geode.cache.InterestPolicy */ InterestPolicyType(final InterestPolicy interestPolicy) { this.interestPolicy = interestPolicy; @@ -50,7 +50,7 @@ public enum InterestPolicyType { * @param interestPolicyType the InterestPolicyType enum from which to extract GemFire's InterestPolicy * @return a GemFire InterestPolicy for the given InterestPolicyType enumerated value * or null if InterestPolicyType is null. - * @see com.gemstone.gemfire.cache.InterestPolicy + * @see org.apache.geode.cache.InterestPolicy */ public static InterestPolicy getInterestPolicy(final InterestPolicyType interestPolicyType) { return (interestPolicyType != null ? interestPolicyType.getInterestPolicy() : null); @@ -62,7 +62,7 @@ public enum InterestPolicyType { * @param interestPolicy the GemFire InterestPolicy used to lookup and match a SubscriptionType. * @return a SubscriptionType enumerated value matching the given GemFire InterestPolicy * or null if no matching value was found. - * @see com.gemstone.gemfire.cache.InterestPolicy + * @see org.apache.geode.cache.InterestPolicy * @see #getInterestPolicy() */ public static InterestPolicyType valueOf(final InterestPolicy interestPolicy) { @@ -98,7 +98,7 @@ public enum InterestPolicyType { * Returns the GemFire InterestPolicy corresponding to this SubscriptionType enumerated value. * * @return the GemFire InterestPolicy corresponding to this SubscriptionType. - * @see com.gemstone.gemfire.cache.InterestPolicy + * @see org.apache.geode.cache.InterestPolicy */ public InterestPolicy getInterestPolicy() { return interestPolicy; diff --git a/src/main/java/org/springframework/data/gemfire/LazyWiringDeclarableSupport.java b/src/main/java/org/springframework/data/gemfire/LazyWiringDeclarableSupport.java index 77271e7f..792667a4 100644 --- a/src/main/java/org/springframework/data/gemfire/LazyWiringDeclarableSupport.java +++ b/src/main/java/org/springframework/data/gemfire/LazyWiringDeclarableSupport.java @@ -19,6 +19,7 @@ package org.springframework.data.gemfire; import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; +import org.apache.geode.cache.Declarable; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.access.BeanFactoryReference; @@ -33,8 +34,6 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Declarable; - /** * The LazyWiringDeclarableSupport class is an implementation of the GemFire Declarable interface that enables support * for wiring GemFire components with Spring bean dependencies defined in the Spring context. @@ -51,7 +50,7 @@ import com.gemstone.gemfire.cache.Declarable; * @see org.springframework.data.gemfire.DeclarableSupport * @see org.springframework.data.gemfire.WiringDeclarableSupport * @see org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer - * @see com.gemstone.gemfire.cache.Declarable + * @see org.apache.geode.cache.Declarable * @since 1.3.4 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java index 1bd9373a..7f549305 100644 --- a/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/LocalRegionFactoryBean.java @@ -15,13 +15,12 @@ */ package org.springframework.data.gemfire; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.Scope; import org.springframework.data.gemfire.support.RegionShortcutWrapper; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; - /** * @author David Turanski * @author John Blum @@ -70,15 +69,15 @@ public class LocalRegionFactoryBean extends RegionFactoryBean { /** * Resolves the Data Policy used by this "local" GemFire Region (i.e. locally Scoped; Scope.LOCAL) based on the - * enumerated value from com.gemstone.gemfire.cache.RegionShortcuts (LOCAL, LOCAL_PERSISTENT, LOCAL_HEAP_LRU, + * enumerated value from org.apache.geode.cache.RegionShortcuts (LOCAL, LOCAL_PERSISTENT, LOCAL_HEAP_LRU, * LOCAL_OVERFLOW, and LOCAL_PERSISTENT_OVERFLOW), but without consideration of the Eviction settings. * * @param regionFactory the GemFire RegionFactory used to created the Local Region. * @param persistent a boolean value indicating whether the Local Region should persist it's data. * @param dataPolicy requested Data Policy as set by the user in the Spring GemFire configuration meta-data. - * @see com.gemstone.gemfire.cache.DataPolicy - * @see com.gemstone.gemfire.cache.RegionFactory - * @see com.gemstone.gemfire.cache.RegionShortcut + * @see org.apache.geode.cache.DataPolicy + * @see org.apache.geode.cache.RegionFactory + * @see org.apache.geode.cache.RegionShortcut */ @Override protected void resolveDataPolicy(RegionFactory regionFactory, Boolean persistent, String dataPolicy) { diff --git a/src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java index 2a57dc35..db8bff37 100644 --- a/src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/LookupRegionFactoryBean.java @@ -16,27 +16,26 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.AttributesMutator; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.EvictionAttributesMutator; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.wan.GatewaySender; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.EvictionAttributesMutator; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * The LookupRegionFactoryBean class is a concrete implementation of RegionLookupFactoryBean for handling * >gfe:lookup-region/< SDG XML namespace (XSD) elements. * * @author John Blum * @see org.springframework.data.gemfire.RegionLookupFactoryBean - * @see com.gemstone.gemfire.cache.AttributesMutator + * @see org.apache.geode.cache.AttributesMutator * @since 1.6.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java index 64bc36c1..04a9891d 100644 --- a/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/PartitionAttributesFactoryBean.java @@ -18,18 +18,17 @@ package org.springframework.data.gemfire; import java.util.List; +import org.apache.geode.cache.FixedPartitionAttributes; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.PartitionResolver; +import org.apache.geode.cache.partition.PartitionListener; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import com.gemstone.gemfire.cache.FixedPartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionResolver; -import com.gemstone.gemfire.cache.partition.PartitionListener; - /** * Spring-friendly bean for creating {@link PartitionAttributes}. Eliminates the need of using * a XML 'factory-method' tag and allows the attributes properties to be set directly. - * + * * @author Costin Leau * @author David Turanski * @author John Blum @@ -37,8 +36,8 @@ import com.gemstone.gemfire.cache.partition.PartitionListener; @SuppressWarnings({ "rawtypes", "unchecked", "unused" }) public class PartitionAttributesFactoryBean implements FactoryBean, InitializingBean { - private final com.gemstone.gemfire.cache.PartitionAttributesFactory partitionAttributesFactory = - new com.gemstone.gemfire.cache.PartitionAttributesFactory(); + private final org.apache.geode.cache.PartitionAttributesFactory partitionAttributesFactory = + new org.apache.geode.cache.PartitionAttributesFactory(); private List listeners; diff --git a/src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java index c05da736..ea919f6a 100644 --- a/src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/PartitionedRegionFactoryBean.java @@ -15,11 +15,10 @@ */ package org.springframework.data.gemfire; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.RegionFactory; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.RegionFactory; - /** * @author David Turanski * @author John Blum diff --git a/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java index 76df609f..fd23bf3b 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java @@ -16,12 +16,11 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.RegionAttributes; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.RegionAttributes; - /** * Spring-friendly bean for creating {@link RegionAttributes}. Eliminates the need of using a XML 'factory-method' tag. * @@ -29,8 +28,8 @@ import com.gemstone.gemfire.cache.RegionAttributes; * @author John Blum * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean - * @see com.gemstone.gemfire.cache.AttributesFactory - * @see com.gemstone.gemfire.cache.RegionAttributes + * @see org.apache.geode.cache.AttributesFactory + * @see org.apache.geode.cache.RegionAttributes */ @SuppressWarnings({ "deprecation", "unused" }) public class RegionAttributesFactoryBean extends AttributesFactory implements FactoryBean, diff --git a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java index c982e342..6877df59 100644 --- a/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/RegionFactoryBean.java @@ -18,27 +18,26 @@ package org.springframework.data.gemfire; import java.lang.reflect.Field; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributesFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.internal.cache.UserSpecifiedRegionAttributes; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.PartitionAttributesFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionShortcut; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.internal.cache.UserSpecifiedRegionAttributes; import org.springframework.beans.factory.DisposableBean; import org.springframework.context.SmartLifecycle; import org.springframework.core.io.Resource; @@ -184,10 +183,10 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean createRegionFactory(final Cache cache) { if (shortcut != null) { @@ -213,10 +212,10 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean extends RegionLookupFactoryBean RegionFactory mergeRegionAttributes(final RegionFactory regionFactory, @@ -332,11 +331,11 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean extends RegionLookupFactoryBean extends RegionLookupFactoryBean extends RegionLookupFactoryBean regionFactory) { regionFactory.setOffHeap(Boolean.TRUE.equals(offHeap)); @@ -440,7 +439,7 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean region) { } @@ -453,9 +452,9 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean regionFactory, Boolean persistent, DataPolicy dataPolicy) { if (dataPolicy != null) { @@ -475,8 +474,8 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean regionFactory, Boolean persistent, String dataPolicy) { if (dataPolicy != null) { @@ -552,7 +551,7 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean region = getRegion(); @@ -626,7 +625,7 @@ public abstract class RegionFactoryBean extends RegionLookupFactoryBean extends RegionLookupFactoryBean extends RegionLookupFactoryBean extends RegionLookupFactoryBean implements FactoryBean>, InitializingBean, BeanNameAware { @@ -85,7 +84,7 @@ public abstract class RegionLookupFactoryBean implements FactoryBean implements FactoryBean implements FactoryBean implements FactoryBean parent) { this.parent = parent; @@ -157,7 +156,7 @@ public abstract class RegionLookupFactoryBean implements FactoryBean getParent() { return parent; @@ -167,7 +166,7 @@ public abstract class RegionLookupFactoryBean implements FactoryBean getRegion() { return region; @@ -179,7 +178,7 @@ public abstract class RegionLookupFactoryBean implements FactoryBean extends com.gemstone.gemfire.cache.AttributesFactory +public class SubRegionFactoryBean extends org.apache.geode.cache.AttributesFactory implements FactoryBean>, InitializingBean { protected final Log log = LogFactory.getLog(getClass()); @@ -124,7 +123,7 @@ public class SubRegionFactoryBean extends com.gemstone.gemfire.cache.Attri /** * Sets the cache listeners used for the region used by this factory. Used * only when a new region is created. Overrides the settings specified - * through setAttributes(com.gemstone.gemfire.cache.RegionAttributes). + * through setAttributes(org.apache.geode.cache.RegionAttributes). * * @param cacheListeners the cacheListeners to set on a newly created region */ diff --git a/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java b/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java index 17f80c03..4c6337f9 100644 --- a/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java @@ -15,23 +15,22 @@ */ package org.springframework.data.gemfire; +import org.apache.geode.cache.InterestPolicy; +import org.apache.geode.cache.SubscriptionAttributes; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.SubscriptionAttributes; - /** * The SubscriptionAttributesFactoryBean class is a Spring FactoryBean used for defining and constructing * a GemFire SubscriptionAttributes object, which determines the Subscription policy used by Regions to * declared their data interests. - * + * * @author Lyndon Adams * @author John Blum * @see org.springframework.beans.factory.FactoryBean * @see org.springframework.beans.factory.InitializingBean - * @see com.gemstone.gemfire.cache.InterestPolicy - * @see com.gemstone.gemfire.cache.SubscriptionAttributes + * @see org.apache.geode.cache.InterestPolicy + * @see org.apache.geode.cache.SubscriptionAttributes * @since 1.3.0 */ public class SubscriptionAttributesFactoryBean implements FactoryBean, InitializingBean { @@ -48,7 +47,7 @@ public class SubscriptionAttributesFactoryBean implements FactoryBeanThis implementation first looks for a 'bean-name' property which will be used to locate a 'template' * bean definition. Autowiring will be performed, based on the settings defined in the Spring container. - * + * * @author Costin Leau * @author John Blum * @see org.springframework.beans.factory.BeanFactory @@ -39,7 +38,7 @@ import com.gemstone.gemfire.cache.Declarable; * @see org.springframework.beans.factory.wiring.BeanWiringInfo * @see org.springframework.data.gemfire.DeclarableSupport * @see org.springframework.data.gemfire.LazyWiringDeclarableSupport - * @see com.gemstone.gemfire.cache.Declarable + * @see org.apache.geode.cache.Declarable * @deprecated please use LazyWiringDeclarableSupport instead. */ @Deprecated diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java index 1660c487..b84b358e 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java @@ -20,15 +20,14 @@ import java.net.InetSocketAddress; import java.util.Map; import java.util.Properties; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.pdx.PdxSerializer; - +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolManager; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.pdx.PdxSerializer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; @@ -56,13 +55,13 @@ import org.springframework.util.ObjectUtils; * @see org.springframework.data.gemfire.CacheFactoryBean * @see org.springframework.data.gemfire.support.ConnectionEndpoint * @see org.springframework.data.gemfire.support.ConnectionEndpointList - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.client.ClientCacheFactory - * @see com.gemstone.gemfire.cache.client.Pool - * @see com.gemstone.gemfire.cache.client.PoolManager - * @see com.gemstone.gemfire.distributed.DistributedSystem - * @see com.gemstone.gemfire.pdx.PdxSerializer + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientCacheFactory + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolManager + * @see org.apache.geode.distributed.DistributedSystem + * @see org.apache.geode.pdx.PdxSerializer */ @SuppressWarnings("unused") public class ClientCacheFactoryBean extends CacheFactoryBean implements ApplicationListener { @@ -108,10 +107,10 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * * @param is Class type extension of GemFireCache. * @return the existing GemFire ClientCache instance if available. - * @throws com.gemstone.gemfire.cache.CacheClosedException if an existing GemFire Cache instance does not exist. + * @throws org.apache.geode.cache.CacheClosedException if an existing GemFire Cache instance does not exist. * @throws java.lang.IllegalStateException if the GemFire cache instance is not a ClientCache. - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.client.ClientCacheFactory#getAnyInstance() + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.client.ClientCacheFactory#getAnyInstance() */ @Override @SuppressWarnings("unchecked") @@ -155,7 +154,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * @param gemfireProperties a Properties object containing GemFire System properties. * @return an instance of a GemFire factory used to create a GemFire cache instance. * @see java.util.Properties - * @see com.gemstone.gemfire.cache.client.ClientCacheFactory + * @see org.apache.geode.cache.client.ClientCacheFactory */ @Override protected Object createFactory(Properties gemfireProperties) { @@ -180,7 +179,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * * @param clientCacheFactory the GemFire {@link ClientCacheFactory} used to configure and create * a GemFire {@link ClientCache}. - * @see com.gemstone.gemfire.cache.client.ClientCacheFactory + * @see org.apache.geode.cache.client.ClientCacheFactory */ ClientCacheFactory initializePdx(ClientCacheFactory clientCacheFactory) { if (isPdxOptionsSpecified()) { @@ -214,8 +213,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * * @param clientCacheFactory the GemFire {@link ClientCacheFactory} used to configure and create * a GemFire {@link ClientCache}. - * @see com.gemstone.gemfire.cache.client.ClientCacheFactory - * @see com.gemstone.gemfire.cache.client.Pool + * @see org.apache.geode.cache.client.ClientCacheFactory + * @see org.apache.geode.cache.client.Pool */ ClientCacheFactory initializePool(ClientCacheFactory clientCacheFactory) { DefaultableDelegatingPoolAdapter pool = DefaultableDelegatingPoolAdapter.from( @@ -270,8 +269,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * the GemFire {@link ClientCache}. * * @return the resolved GemFire {@link Pool}. - * @see com.gemstone.gemfire.cache.client.PoolManager#find(String) - * @see com.gemstone.gemfire.cache.client.Pool + * @see org.apache.geode.cache.client.PoolManager#find(String) + * @see org.apache.geode.cache.client.Pool */ Pool resolvePool() { Pool localPool = getPool(); @@ -312,8 +311,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * @param name a String indicating the name of the GemFire {@link Pool} to find. * @return a {@link Pool} instance with the given name registered in GemFire or null if no {@link Pool} * with name exists. - * @see com.gemstone.gemfire.cache.client.PoolManager#find(String) - * @see com.gemstone.gemfire.cache.client.Pool + * @see org.apache.geode.cache.client.PoolManager#find(String) + * @see org.apache.geode.cache.client.Pool */ Pool findPool(String name) { return PoolManager.find(name); @@ -325,8 +324,8 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * @param parameterized Class type extension of {@link GemFireCache}. * @param factory the appropriate GemFire factory used to create a cache instance. * @return an instance of the GemFire cache. - * @see com.gemstone.gemfire.cache.client.ClientCacheFactory#create() - * @see com.gemstone.gemfire.cache.GemFireCache + * @see org.apache.geode.cache.client.ClientCacheFactory#create() + * @see org.apache.geode.cache.GemFireCache */ @Override @SuppressWarnings("unchecked") @@ -338,7 +337,7 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat * Inform the GemFire cluster that this client cache is ready to receive events iff the client is non-durable. * * @param event the ApplicationContextEvent fired when the ApplicationContext is refreshed. - * @see com.gemstone.gemfire.cache.client.ClientCache#readyForEvents() + * @see org.apache.geode.cache.client.ClientCache#readyForEvents() * @see #getReadyForEvents() * @see #getObject() */ diff --git a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java index edc3f8bf..a55d95f6 100644 --- a/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/ClientRegionFactoryBean.java @@ -18,6 +18,17 @@ package org.springframework.data.gemfire.client; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.client.Pool; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -31,18 +42,6 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; - /** * Client extension for GemFire Regions. * @@ -53,16 +52,16 @@ import com.gemstone.gemfire.cache.client.Pool; * @see org.springframework.beans.factory.BeanFactoryAware * @see org.springframework.beans.factory.DisposableBean * @see org.springframework.data.gemfire.RegionLookupFactoryBean - * @see com.gemstone.gemfire.cache.CacheListener - * @see com.gemstone.gemfire.cache.CacheLoader - * @see com.gemstone.gemfire.cache.CacheWriter - * @see com.gemstone.gemfire.cache.DataPolicy - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.RegionAttributes - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.client.ClientRegionFactory - * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut + * @see org.apache.geode.cache.CacheListener + * @see org.apache.geode.cache.CacheLoader + * @see org.apache.geode.cache.CacheWriter + * @see org.apache.geode.cache.DataPolicy + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.RegionAttributes + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientRegionFactory + * @see org.apache.geode.cache.client.ClientRegionShortcut */ @SuppressWarnings("unused") public class ClientRegionFactoryBean extends RegionLookupFactoryBean @@ -183,7 +182,7 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean } else { // NOTE the Data Policy validation is based on the ClientRegionShortcut initialization logic - // in com.gemstone.gemfire.internal.cache.GemFireCacheImpl.initializeClientRegionShortcuts + // in org.apache.geode.internal.cache.GemFireCacheImpl.initializeClientRegionShortcuts throw new IllegalArgumentException(String.format( "Data Policy '%1$s' is invalid for Client Regions.", this.dataPolicy)); } @@ -239,7 +238,7 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean * configuration meta-data. * @see #isPersistent() * @see #isNotPersistent() - * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut + * @see org.apache.geode.cache.client.ClientRegionShortcut */ protected void assertClientRegionShortcutAndPersistentAttributeAreCompatible(final ClientRegionShortcut resolvedShortcut) { final boolean persistentNotSpecified = (this.persistent == null); @@ -263,7 +262,7 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean * meta-data. * @see #isPersistent() * @see #isNotPersistent() - * @see com.gemstone.gemfire.cache.DataPolicy + * @see org.apache.geode.cache.DataPolicy */ protected void assertDataPolicyAndPersistentAttributeAreCompatible(final DataPolicy resolvedDataPolicy) { if (resolvedDataPolicy.withPersistence()) { @@ -454,7 +453,7 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean * Sets the CacheLoader used to load data local to the client's Region on cache misses. * * @param cacheLoader a GemFire CacheLoader used to load data into the client Region. - * @see com.gemstone.gemfire.cache.CacheLoader + * @see org.apache.geode.cache.CacheLoader */ public void setCacheLoader(CacheLoader cacheLoader) { this.cacheLoader = cacheLoader; @@ -464,7 +463,7 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean * Sets the CacheWriter used to perform a synchronous write-behind when data is put into the client's Region. * * @param cacheWriter the GemFire CacheWriter used to perform synchronous write-behinds on put ops. - * @see com.gemstone.gemfire.cache.CacheWriter + * @see org.apache.geode.cache.CacheWriter */ public void setCacheWriter(CacheWriter cacheWriter) { this.cacheWriter = cacheWriter; @@ -474,7 +473,7 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean * Sets the Data Policy. Used only when a new Region is created. * * @param dataPolicy the client Region's Data Policy. - * @see com.gemstone.gemfire.cache.DataPolicy + * @see org.apache.geode.cache.DataPolicy */ public void setDataPolicy(DataPolicy dataPolicy) { this.dataPolicy = dataPolicy; @@ -484,8 +483,8 @@ public class ClientRegionFactoryBean extends RegionLookupFactoryBean * An alternate way to set the Data Policy, using the String name of the enumerated value. * * @param dataPolicyName the enumerated value String name of the Data Policy. - * @see com.gemstone.gemfire.cache.DataPolicy - * @see #setDataPolicy(com.gemstone.gemfire.cache.DataPolicy) + * @see org.apache.geode.cache.DataPolicy + * @see #setDataPolicy(org.apache.geode.cache.DataPolicy) * @deprecated use setDataPolicy(:DataPolicy) instead. */ @Deprecated diff --git a/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java b/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java index 4bb4638d..ac572161 100644 --- a/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessor.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -18,6 +18,13 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.management.internal.cli.domain.RegionInformation; +import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -26,14 +33,6 @@ import org.springframework.data.gemfire.support.ListRegionsOnServerFunction; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.management.internal.cli.domain.RegionInformation; -import com.gemstone.gemfire.management.internal.cli.functions.GetRegionsFunction; - /** * A Spring {@link BeanFactoryPostProcessor} used to register a Client Region Proxy bean for each Region * accessible to a GemFire DataSource. If the Region is already defined, the bean definition will not be overridden. @@ -44,11 +43,11 @@ import com.gemstone.gemfire.management.internal.cli.functions.GetRegionsFunction * @see org.springframework.beans.factory.config.ConfigurableListableBeanFactory * @see org.springframework.data.gemfire.function.execution.GemfireOnServersFunctionTemplate * @see org.springframework.data.gemfire.support.ListRegionsOnServerFunction - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.client.ClientRegionFactory - * @see com.gemstone.gemfire.cache.execute.Function - * @see com.gemstone.gemfire.management.internal.cli.functions.GetRegionsFunction + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientRegionFactory + * @see org.apache.geode.cache.execute.Function + * @see org.apache.geode.management.internal.cli.functions.GetRegionsFunction * @since 1.2.0 */ public class GemfireDataSourcePostProcessor implements BeanFactoryPostProcessor { @@ -63,7 +62,7 @@ public class GemfireDataSourcePostProcessor implements BeanFactoryPostProcessor * configured in the GemFire cluster. * * @param clientCache the GemFire ClientCache instance. - * @see com.gemstone.gemfire.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientCache */ public GemfireDataSourcePostProcessor(final ClientCache clientCache) { this.clientCache = clientCache; diff --git a/src/main/java/org/springframework/data/gemfire/client/Interest.java b/src/main/java/org/springframework/data/gemfire/client/Interest.java index 120c1c92..885cf193 100644 --- a/src/main/java/org/springframework/data/gemfire/client/Interest.java +++ b/src/main/java/org/springframework/data/gemfire/client/Interest.java @@ -16,19 +16,18 @@ package org.springframework.data.gemfire.client; +import org.apache.geode.cache.InterestResultPolicy; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.Constants; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.InterestResultPolicy; - /** * The Interest class holds details for registering a client interest. - * + * * @author Costin Leau * @author John Blum * @see org.springframework.beans.factory.InitializingBean - * @see com.gemstone.gemfire.cache.InterestResultPolicy + * @see org.apache.geode.cache.InterestResultPolicy * @since 1.0.0 */ @SuppressWarnings("unused") @@ -85,7 +84,7 @@ public class Interest implements InitializingBean { /** * Returns the key of interest. - * + * * @return the key */ public K getKey() { @@ -94,7 +93,7 @@ public class Interest implements InitializingBean { /** * Sets the key of interest. - * + * * @param key the key to set */ public void setKey(K key) { @@ -103,7 +102,7 @@ public class Interest implements InitializingBean { /** * Returns the interest policy. - * + * * @return the policy */ public InterestResultPolicy getPolicy() { @@ -114,7 +113,7 @@ public class Interest implements InitializingBean { * Sets the interest policy. The argument is set as an Object * to be able to accept both InterestResultType instances but also * Strings (for XML configurations). - * + * * @param policy the policy to set */ public void setPolicy(Object policy) { @@ -132,7 +131,7 @@ public class Interest implements InitializingBean { /** * Returns the interest durability. - * + * * @return the durable */ public boolean isDurable() { @@ -141,7 +140,7 @@ public class Interest implements InitializingBean { /** * Sets the interest durability. - * + * * @param durable the durable to set */ public void setDurable(boolean durable) { @@ -150,7 +149,7 @@ public class Interest implements InitializingBean { /** * Returns the type of values received by the listener. - * + * * @return the receiveValues */ public boolean isReceiveValues() { @@ -159,7 +158,7 @@ public class Interest implements InitializingBean { /** * Switches between the different entities received by the listener. - * + * * @param receiveValues the receiveValues to set */ public void setReceiveValues(boolean receiveValues) { diff --git a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java index 7aead724..7110cb98 100644 --- a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyConverter.java @@ -16,17 +16,16 @@ package org.springframework.data.gemfire.client; +import org.apache.geode.cache.InterestResultPolicy; import org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport; -import com.gemstone.gemfire.cache.InterestResultPolicy; - /** * The InterestResultPolicyConverter class is a Spring Converter and JavaBeans PropertyEditor capable of converting * a String into a GemFire InterestResultPolicyConverter. * * @author John Blum * @see org.springframework.data.gemfire.support.AbstractPropertyEditorConverterSupport - * @see com.gemstone.gemfire.cache.InterestResultPolicy + * @see org.apache.geode.cache.InterestResultPolicy * @since 1.6.0 */ public class InterestResultPolicyConverter extends AbstractPropertyEditorConverterSupport { @@ -40,7 +39,7 @@ public class InterestResultPolicyConverter extends AbstractPropertyEditorConvert * @see org.springframework.data.gemfire.client.InterestResultPolicyType#getInterestResultPolicy(InterestResultPolicyType) * @see org.springframework.data.gemfire.client.InterestResultPolicyType#valueOfIgnoreCase(String) * @see #assertConverted(String, Object, Class) - * @see com.gemstone.gemfire.cache.InterestResultPolicy + * @see org.apache.geode.cache.InterestResultPolicy */ @Override public InterestResultPolicy convert(final String source) { diff --git a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java b/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java index 7708c5df..817ac8dd 100644 --- a/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java +++ b/src/main/java/org/springframework/data/gemfire/client/InterestResultPolicyType.java @@ -16,13 +16,13 @@ package org.springframework.data.gemfire.client; -import com.gemstone.gemfire.cache.InterestResultPolicy; +import org.apache.geode.cache.InterestResultPolicy; /** * The InterestResultPolicyType enum is an enumeration of all client Register Interests (result) policy values. * * @author John Blum - * @see com.gemstone.gemfire.cache.InterestResultPolicy + * @see org.apache.geode.cache.InterestResultPolicy * @since 1.6.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java b/src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java index bb89d72b..18368272 100644 --- a/src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/client/PoolAdapter.java @@ -20,8 +20,8 @@ package org.springframework.data.gemfire.client; import java.net.InetSocketAddress; import java.util.List; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.query.QueryService; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.query.QueryService; /** * The PoolAdapter class is an abstract, default no-op implementation of the GemFire {@link Pool} interface @@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache.query.QueryService; * * @author John Blum * @see org.springframework.data.gemfire.client.PoolFactoryBean - * @see com.gemstone.gemfire.cache.client.Pool + * @see org.apache.geode.cache.client.Pool * @since 1.8.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java index 7d8dc30e..a05d9430 100644 --- a/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/client/PoolFactoryBean.java @@ -19,15 +19,14 @@ package org.springframework.data.gemfire.client; import java.net.InetSocketAddress; import java.util.List; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.distributed.DistributedSystem; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; +import org.apache.geode.cache.client.PoolManager; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.distributed.DistributedSystem; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -58,9 +57,9 @@ import org.springframework.util.StringUtils; * @see org.springframework.beans.factory.InitializingBean * @see org.springframework.data.gemfire.support.ConnectionEndpoint * @see org.springframework.data.gemfire.support.ConnectionEndpointList - * @see com.gemstone.gemfire.cache.client.Pool - * @see com.gemstone.gemfire.cache.client.PoolFactory - * @see com.gemstone.gemfire.cache.client.PoolManager + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolFactory + * @see org.apache.geode.cache.client.PoolManager */ @SuppressWarnings("unused") public class PoolFactoryBean implements FactoryBean, InitializingBean, DisposableBean, @@ -112,9 +111,9 @@ public class PoolFactoryBean implements FactoryBean, InitializingBean, Dis * Constructs and initializes a GemFire {@link Pool}. * * @throws Exception if the {@link Pool} creation and initialization fails. - * @see com.gemstone.gemfire.cache.client.Pool - * @see com.gemstone.gemfire.cache.client.PoolFactory - * @see com.gemstone.gemfire.cache.client.PoolManager + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolFactory + * @see org.apache.geode.cache.client.PoolManager * @see #createPoolFactory() */ @Override @@ -207,11 +206,11 @@ public class PoolFactoryBean implements FactoryBean, InitializingBean, Dis /** * Attempts to eagerly initialize the GemFire {@link ClientCache} if not already present so that the single - * {@link com.gemstone.gemfire.distributed.DistributedSystem} will exists, which is required to create + * {@link org.apache.geode.distributed.DistributedSystem} will exists, which is required to create * a {@link Pool} instance. * * @see org.springframework.beans.factory.BeanFactory#getBean(Class) - * @see com.gemstone.gemfire.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientCache */ void eagerlyInitializeClientCacheIfNotPresent() { if (!isDistributedSystemPresent()) { @@ -225,7 +224,7 @@ public class PoolFactoryBean implements FactoryBean, InitializingBean, Dis * @return a boolean value indicating whether the single, GemFire DistributedSystem has been created already. * @see org.springframework.data.gemfire.GemfireUtils#getDistributedSystem() * @see org.springframework.data.gemfire.GemfireUtils#isConnected(DistributedSystem) - * @see com.gemstone.gemfire.distributed.DistributedSystem + * @see org.apache.geode.distributed.DistributedSystem */ boolean isDistributedSystemPresent() { return GemfireUtils.isConnected(GemfireUtils.getDistributedSystem()); @@ -236,8 +235,8 @@ public class PoolFactoryBean implements FactoryBean, InitializingBean, Dis * a GemFire {@link Pool}. * * @return a {@link PoolFactory} implementation to create a {@link Pool}. - * @see com.gemstone.gemfire.cache.client.PoolManager#createFactory() - * @see com.gemstone.gemfire.cache.client.PoolFactory + * @see org.apache.geode.cache.client.PoolManager#createFactory() + * @see org.apache.geode.cache.client.PoolFactory */ protected PoolFactory createPoolFactory() { return PoolManager.createFactory(); diff --git a/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java b/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java index a189e516..b2dc1ddd 100644 --- a/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapter.java @@ -21,18 +21,17 @@ import java.net.InetSocketAddress; import java.util.Collection; import java.util.List; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.query.QueryService; import org.springframework.data.gemfire.util.SpringUtils; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.query.QueryService; - /** * The DefaultableDelegatingPoolAdapter class is a wrapper class around Pool allowing default configuration property * values to be providing in the case that the Pool's setting were null. * * @author John Blum - * @see com.gemstone.gemfire.cache.client.Pool + * @see org.apache.geode.cache.client.Pool * @since 1.8.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java b/src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java index a60c621b..ecff636f 100644 --- a/src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapter.java @@ -20,8 +20,8 @@ package org.springframework.data.gemfire.client.support; import java.net.InetSocketAddress; import java.util.List; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.query.QueryService; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.query.QueryService; /** * DelegatingPoolAdapter is an abstract implementation of GemFire's {@link Pool} interface and extension of @@ -33,7 +33,7 @@ import com.gemstone.gemfire.cache.query.QueryService; * * @author John Blum * @see FactoryDefaultsPoolAdapter - * @see com.gemstone.gemfire.cache.client.Pool + * @see org.apache.geode.cache.client.Pool * @since 1.8.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java b/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java index b5abd8a0..fee33eb2 100644 --- a/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapter.java @@ -21,21 +21,20 @@ import java.net.InetSocketAddress; import java.util.Collections; import java.util.List; +import org.apache.geode.cache.client.PoolFactory; +import org.apache.geode.cache.query.QueryService; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.client.PoolAdapter; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.query.QueryService; - /** - * FactoryDefaultsPoolAdapter is an abstract implementation of GemFire's {@link com.gemstone.gemfire.cache.client.Pool} + * FactoryDefaultsPoolAdapter is an abstract implementation of GemFire's {@link org.apache.geode.cache.client.Pool} * interface and extension of {@link PoolAdapter} providing default factory values for all configuration properties * (e.g. freeConnectionTimeout, idleTimeout, etc). * * @author John Blum * @see org.springframework.data.gemfire.client.PoolAdapter - * @see com.gemstone.gemfire.cache.client.PoolFactory - * @see com.gemstone.gemfire.cache.client.Pool + * @see org.apache.geode.cache.client.PoolFactory + * @see org.apache.geode.cache.client.Pool * @since 1.8.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java index fc8f842d..135bfb68 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java @@ -28,11 +28,10 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; -import com.gemstone.gemfire.cache.TransactionListener; -import com.gemstone.gemfire.cache.TransactionWriter; -import com.gemstone.gemfire.cache.util.GatewayConflictResolver; -import com.gemstone.gemfire.pdx.PdxSerializer; - +import org.apache.geode.cache.TransactionListener; +import org.apache.geode.cache.TransactionWriter; +import org.apache.geode.cache.util.GatewayConflictResolver; +import org.apache.geode.pdx.PdxSerializer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; @@ -67,8 +66,8 @@ import org.springframework.util.StringUtils; * {@link org.springframework.context.annotation.Configuration} support. * * This class encapsulates configuration settings common to both GemFire peer - * {@link com.gemstone.gemfire.cache.Cache caches} and - * {@link com.gemstone.gemfire.cache.client.ClientCache client caches}. + * {@link org.apache.geode.cache.Cache caches} and + * {@link org.apache.geode.cache.client.ClientCache client caches}. * * @author John Blum * @see org.springframework.beans.factory.BeanClassLoaderAware @@ -183,7 +182,7 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware * depending on the type of configuration meta-data applied. * * Both 'mcast-port' and 'locators' are to set 0 and empty String respectively, which is necessary - * for {@link com.gemstone.gemfire.cache.client.ClientCache cache client}-based applications. These values + * for {@link org.apache.geode.cache.client.ClientCache cache client}-based applications. These values * can be changed for peer cache and cache server applications. * * Finally, GemFire's {@literal log-level} System property defaults to {@literal config}. @@ -446,7 +445,7 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware } /** - * Determines whether this is a GemFire {@link com.gemstone.gemfire.cache.server.CacheServer} application, + * Determines whether this is a GemFire {@link org.apache.geode.cache.server.CacheServer} application, * which is indicated by the presence of the {@link CacheServerApplication} annotation on a Spring application * {@link org.springframework.context.annotation.Configuration @Configuration} class. * @@ -461,7 +460,7 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware } /** - * Determines whether this is a GemFire {@link com.gemstone.gemfire.cache.client.ClientCache} application, + * Determines whether this is a GemFire {@link org.apache.geode.cache.client.ClientCache} application, * which is indicated by the presence of the {@link ClientCacheApplication} annotation on a Spring application * {@link org.springframework.context.annotation.Configuration @Configuration} class. * @@ -476,7 +475,7 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware } /** - * Determines whether this is a GemFire peer {@link com.gemstone.gemfire.cache.Cache} application, + * Determines whether this is a GemFire peer {@link org.apache.geode.cache.Cache} application, * which is indicated by the presence of the {@link PeerCacheApplication} annotation on a Spring application * {@link org.springframework.context.annotation.Configuration @Configuration} class. * @@ -510,8 +509,8 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware } /** - * Determines whether this is a GemFire {@link com.gemstone.gemfire.cache.server.CacheServer} or - * {@link com.gemstone.gemfire.cache.Cache peer cache} application, which is indicated by the presence + * Determines whether this is a GemFire {@link org.apache.geode.cache.server.CacheServer} or + * {@link org.apache.geode.cache.Cache peer cache} application, which is indicated by the presence * of either the {@link CacheServerApplication} annotation or the {@link PeerCacheApplication} annotation * on a Spring application {@link org.springframework.context.annotation.Configuration @Configuration} class. * @@ -529,8 +528,8 @@ public abstract class AbstractCacheConfiguration implements BeanClassLoaderAware } /** - * Determine whether this Spring application is a {@link com.gemstone.gemfire.cache.server.CacheServer}, - * {@link com.gemstone.gemfire.cache.client.ClientCache} or a {@link com.gemstone.gemfire.cache.Cache} application. + * Determine whether this Spring application is a {@link org.apache.geode.cache.server.CacheServer}, + * {@link org.apache.geode.cache.client.ClientCache} or a {@link org.apache.geode.cache.Cache} application. * * @param importMetadata {@link AnnotationMetadata} containing application configuration meta-data * from the class type-level annotations used to configure the Spring application. diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java index d38efa0d..1b51fa0f 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/AddCacheServerConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.data.gemfire.server.CacheServerFactoryBean; /** * The {@link AddCacheServerConfiguration} class is a Spring {@link ImportBeanDefinitionRegistrar} that registers - * a {@link CacheServerFactoryBean} definition for the {@link com.gemstone.gemfire.cache.server.CacheServer} + * a {@link CacheServerFactoryBean} definition for the {@link org.apache.geode.cache.server.CacheServer} * configuration meta-data defined in {@link EnableCacheServer}. * * @author John Blum diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java index ec9477b8..3de83bea 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/AddPoolConfiguration.java @@ -33,7 +33,7 @@ import org.springframework.util.StringUtils; /** * The {@link AddCacheServerConfiguration} class is a Spring {@link ImportBeanDefinitionRegistrar} that registers - * a {@link PoolFactoryBean} definition for the {@link com.gemstone.gemfire.cache.client.Pool} + * a {@link PoolFactoryBean} definition for the {@link org.apache.geode.cache.client.Pool} * configuration meta-data defined in {@link EnablePool}. * * @author John Blum @@ -106,11 +106,11 @@ public class AddPoolConfiguration implements ImportBeanDefinitionRegistrar { /** * Uses the list of GemFire Locator and Server connection endpoint definitions and meta-data to configure - * the GemFire client {@link com.gemstone.gemfire.cache.client.Pool} used to communicate with the servers + * the GemFire client {@link org.apache.geode.cache.client.Pool} used to communicate with the servers * in the GemFire cluster. * * @param enablePoolAttributes {@link EnablePool} annotation containing - * {@link com.gemstone.gemfire.cache.client.Pool} Locator/Server connection endpoint meta-data. + * {@link org.apache.geode.cache.client.Pool} Locator/Server connection endpoint meta-data. * @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication * @see java.util.Map */ diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java index 36b7eea4..a82b49de 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerApplication.java @@ -24,28 +24,27 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.gemstone.gemfire.cache.control.ResourceManager; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; - +import org.apache.geode.cache.control.ResourceManager; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; /** * The CacheServerApplication annotation enables an embedded GemFire - * {@link com.gemstone.gemfire.cache.server.CacheServer} instance in a Spring Data GemFire based application. + * {@link org.apache.geode.cache.server.CacheServer} instance in a Spring Data GemFire based application. * - * In addition, this also implies an embedded GemFire peer {@link com.gemstone.gemfire.cache.Cache} must exist + * In addition, this also implies an embedded GemFire peer {@link org.apache.geode.cache.Cache} must exist * and therefore will be configured, constructed and initialized as a Spring bean in the application context. * * @author John Blum * @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.Import * @see org.springframework.data.gemfire.config.annotation.PeerCacheConfiguration - * @see com.gemstone.gemfire.cache.control.ResourceManager - * @see com.gemstone.gemfire.cache.server.CacheServer - * @see com.gemstone.gemfire.cache.server.ClientSubscriptionConfig + * @see org.apache.geode.cache.control.ResourceManager + * @see org.apache.geode.cache.server.CacheServer + * @see org.apache.geode.cache.server.ClientSubscriptionConfig * @since 1.9.0 */ @Target(ElementType.TYPE) @@ -67,7 +66,7 @@ public @interface CacheServerApplication { /** * Configures the ip address or host name that this cache server will listen on. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_BIND_ADDRESS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_BIND_ADDRESS */ String bindAddress() default CacheServer.DEFAULT_BIND_ADDRESS; @@ -81,7 +80,7 @@ public @interface CacheServerApplication { /** * Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable. * - * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE + * @see org.apache.geode.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE */ float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_PERCENTAGE; @@ -98,7 +97,7 @@ public @interface CacheServerApplication { * Configures the percentage of heap at or above which the eviction should begin on Regions configured * for HeapLRU eviction. * - * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE + * @see org.apache.geode.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE */ float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_PERCENTAGE; @@ -106,14 +105,14 @@ public @interface CacheServerApplication { * Configures the ip address or host name that server locators will tell clients that this cache server * is listening on. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_HOSTNAME_FOR_CLIENTS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_HOSTNAME_FOR_CLIENTS */ String hostnameForClients() default CacheServer.DEFAULT_HOSTNAME_FOR_CLIENTS; /** * Configures the frequency in milliseconds to poll the load probe on this cache server. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_LOAD_POLL_INTERVAL + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_LOAD_POLL_INTERVAL */ long loadPollInterval() default CacheServer.DEFAULT_LOAD_POLL_INTERVAL; @@ -147,28 +146,28 @@ public @interface CacheServerApplication { /** * Configures the maximum allowed client connections. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAX_CONNECTIONS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAX_CONNECTIONS */ int maxConnections() default CacheServer.DEFAULT_MAX_CONNECTIONS; /** * Configures he maximum number of messages that can be enqueued in a client-queue. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAXIMUM_MESSAGE_COUNT + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAXIMUM_MESSAGE_COUNT */ int maxMessageCount() default CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT; /** * Configures the maximum number of threads allowed in this cache server to service client requests. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAX_THREADS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAX_THREADS */ int maxThreads() default CacheServer.DEFAULT_MAX_THREADS; /** * Configures the maximum amount of time between client pings. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS */ int maxTimeBetweenPings() default CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS; @@ -183,7 +182,7 @@ public @interface CacheServerApplication { /** * Configures the time (in seconds ) after which a message in the client queue will expire. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MESSAGE_TIME_TO_LIVE + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MESSAGE_TIME_TO_LIVE */ int messageTimeToLive() default CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE; @@ -197,7 +196,7 @@ public @interface CacheServerApplication { /** * Configures the port on which this cache server listens for clients. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_PORT + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_PORT */ int port() default CacheServer.DEFAULT_PORT; @@ -211,14 +210,14 @@ public @interface CacheServerApplication { /** * Configures the configured buffer size of the socket connection for this CacheServer. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_SOCKET_BUFFER_SIZE + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_SOCKET_BUFFER_SIZE */ int socketBufferSize() default CacheServer.DEFAULT_SOCKET_BUFFER_SIZE; /** * Configures the capacity of the client queue. * - * @see com.gemstone.gemfire.cache.server.ClientSubscriptionConfig#DEFAULT_CAPACITY + * @see org.apache.geode.cache.server.ClientSubscriptionConfig#DEFAULT_CAPACITY */ int subscriptionCapacity() default ClientSubscriptionConfig.DEFAULT_CAPACITY; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java index da72f42f..4911928c 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/CacheServerConfiguration.java @@ -20,12 +20,11 @@ package org.springframework.data.gemfire.config.annotation; import java.util.Map; import java.util.Set; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.InterestRegistrationListener; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; -import com.gemstone.gemfire.cache.server.ServerLoadProbe; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.InterestRegistrationListener; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; +import org.apache.geode.cache.server.ServerLoadProbe; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.type.AnnotationMetadata; @@ -42,8 +41,8 @@ import org.springframework.data.gemfire.util.SpringUtils; * @see org.springframework.context.annotation.Bean * @see org.springframework.context.annotation.Configuration * @see org.springframework.data.gemfire.config.annotation.PeerCacheConfiguration - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.server.CacheServer + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.server.CacheServer * @since 1.9.0 */ @Configuration diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java index 06fcccda..eb1c4745 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheApplication.java @@ -24,23 +24,22 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.control.ResourceManager; - +import org.apache.geode.cache.client.PoolFactory; +import org.apache.geode.cache.control.ResourceManager; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.GemfireUtils; /** * The {@link ClientCacheApplication} annotation enables a Spring Data GemFire based application to become - * a GemFire cache client (i.e. {@link com.gemstone.gemfire.cache.client.ClientCache}). + * a GemFire cache client (i.e. {@link org.apache.geode.cache.client.ClientCache}). * * @author John Blum * @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.Import * @see org.springframework.data.gemfire.config.annotation.ClientCacheConfiguration - * @see com.gemstone.gemfire.cache.client.PoolFactory - * @see com.gemstone.gemfire.cache.control.ResourceManager + * @see org.apache.geode.cache.client.PoolFactory + * @see org.apache.geode.cache.control.ResourceManager * @since 1.9.0 */ @Target(ElementType.TYPE) @@ -62,7 +61,7 @@ public @interface ClientCacheApplication { /** * Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable. * - * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE + * @see org.apache.geode.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE */ float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_PERCENTAGE; @@ -83,21 +82,21 @@ public @interface ClientCacheApplication { * Configures the percentage of heap at or above which the eviction should begin on Regions configured * for HeapLRU eviction. * - * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE + * @see org.apache.geode.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE */ float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_PERCENTAGE; /** * Configures the free connection timeout for this pool. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_FREE_CONNECTION_TIMEOUT + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_FREE_CONNECTION_TIMEOUT */ int freeConnectionTimeout() default PoolFactory.DEFAULT_FREE_CONNECTION_TIMEOUT; /** * Configures the amount of time a connection can be idle before expiring the connection. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_IDLE_TIMEOUT + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_IDLE_TIMEOUT */ long idleTimeout() default PoolFactory.DEFAULT_IDLE_TIMEOUT; @@ -111,12 +110,12 @@ public @interface ClientCacheApplication { /** * Configures the load conditioning interval for this pool. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_LOAD_CONDITIONING_INTERVAL + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_LOAD_CONDITIONING_INTERVAL */ int loadConditioningInterval() default PoolFactory.DEFAULT_LOAD_CONDITIONING_INTERVAL; /** - * Configures the GemFire {@link com.gemstone.gemfire.distributed.Locator}s to which + * Configures the GemFire {@link org.apache.geode.distributed.Locator}s to which * this cache client will connect. */ Locator[] locators() default {}; @@ -131,21 +130,21 @@ public @interface ClientCacheApplication { /** * Configures the max number of client to server connections that the pool will create. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MAX_CONNECTIONS + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MAX_CONNECTIONS */ int maxConnections() default PoolFactory.DEFAULT_MAX_CONNECTIONS; /** * Configures the minimum number of connections to keep available at all times. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MIN_CONNECTIONS + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MIN_CONNECTIONS */ int minConnections() default PoolFactory.DEFAULT_MIN_CONNECTIONS; /** * If set to true then the created pool can be used by multiple users. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MULTIUSER_AUTHENTICATION + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MULTIUSER_AUTHENTICATION */ boolean multiUserAuthentication() default PoolFactory.DEFAULT_MULTIUSER_AUTHENTICATION; @@ -159,15 +158,15 @@ public @interface ClientCacheApplication { /** * Configures how often to ping servers to verify that they are still alive. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_PING_INTERVAL + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_PING_INTERVAL */ long pingInterval() default PoolFactory.DEFAULT_PING_INTERVAL; /** * By default {@code prSingleHopEnabled} is {@literal true} in which case the client is aware of the location - * of partitions on servers hosting Regions with {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION}. + * of partitions on servers hosting Regions with {@link org.apache.geode.cache.DataPolicy#PARTITION}. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_PR_SINGLE_HOP_ENABLED + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_PR_SINGLE_HOP_ENABLED */ boolean prSingleHopEnabled() default PoolFactory.DEFAULT_PR_SINGLE_HOP_ENABLED; @@ -175,7 +174,7 @@ public @interface ClientCacheApplication { * Configures the number of milliseconds to wait for a response from a server before timing out the operation * and trying another server (if any are available). * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_READ_TIMEOUT + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_READ_TIMEOUT */ int readTimeout() default PoolFactory.DEFAULT_READ_TIMEOUT; @@ -189,19 +188,19 @@ public @interface ClientCacheApplication { /** * Configures the number of times to retry a request after timeout/exception. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_RETRY_ATTEMPTS + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_RETRY_ATTEMPTS */ int retryAttempts() default PoolFactory.DEFAULT_RETRY_ATTEMPTS; /** * Configures the group that all servers this pool connects to must belong to. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SERVER_GROUP + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SERVER_GROUP */ String serverGroup() default PoolFactory.DEFAULT_SERVER_GROUP; /** - * Configures the GemFire {@link com.gemstone.gemfire.cache.server.CacheServer}s to which + * Configures the GemFire {@link org.apache.geode.cache.server.CacheServer}s to which * this cache client will connect. */ Server[] servers() default {}; @@ -209,14 +208,14 @@ public @interface ClientCacheApplication { /** * Configures the socket buffer size for each connection made in this pool. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SOCKET_BUFFER_SIZE + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SOCKET_BUFFER_SIZE */ int socketBufferSize() default PoolFactory.DEFAULT_SOCKET_BUFFER_SIZE; /** * Configures how often to send client statistics to the server. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_STATISTIC_INTERVAL + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_STATISTIC_INTERVAL */ int statisticInterval() default PoolFactory.DEFAULT_STATISTIC_INTERVAL; @@ -224,14 +223,14 @@ public @interface ClientCacheApplication { * Configures the interval in milliseconds to wait before sending acknowledgements to the cache server * for events received from the server subscriptions. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ACK_INTERVAL + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ACK_INTERVAL */ int subscriptionAckInterval() default PoolFactory.DEFAULT_SUBSCRIPTION_ACK_INTERVAL; /** * If set to true then the created pool will have server-to-client subscriptions enabled. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ENABLED + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ENABLED */ boolean subscriptionEnabled() default PoolFactory.DEFAULT_SUBSCRIPTION_ENABLED; @@ -239,21 +238,21 @@ public @interface ClientCacheApplication { * Configures the messageTrackingTimeout attribute which is the time-to-live period, in milliseconds, * for subscription events the client has received from the server. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT */ int subscriptionMessageTrackingTimeout() default PoolFactory.DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT; /** * Configures the redundancy level for this pools server-to-client subscriptions. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_REDUNDANCY + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_REDUNDANCY */ int subscriptionRedundancy() default PoolFactory.DEFAULT_SUBSCRIPTION_REDUNDANCY; /** * Configures the thread local connections policy for this pool. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_THREAD_LOCAL_CONNECTIONS + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_THREAD_LOCAL_CONNECTIONS */ boolean threadLocalConnections() default PoolFactory.DEFAULT_THREAD_LOCAL_CONNECTIONS; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java index 6b34a0ba..4eef2f22 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/ClientCacheConfiguration.java @@ -34,13 +34,13 @@ import org.springframework.data.gemfire.support.ConnectionEndpointList; /** * Spring {@link Configuration} class used to configure, construct and initialize - * a GemFire {@link com.gemstone.gemfire.cache.client.ClientCache} instance in a Spring application context. + * a GemFire {@link org.apache.geode.cache.client.ClientCache} instance in a Spring application context. * * @author John Blum * @see org.springframework.context.annotation.Bean * @see org.springframework.context.annotation.Configuration * @see org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration - * @see com.gemstone.gemfire.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientCache * @since 1.0.0 */ @Configuration @@ -143,10 +143,10 @@ public class ClientCacheConfiguration extends AbstractCacheConfiguration { } /** - * Configures GemFire {@link com.gemstone.gemfire.cache.client.ClientCache} specific settings. + * Configures GemFire {@link org.apache.geode.cache.client.ClientCache} specific settings. * * @param importMetadata {@link AnnotationMetadata} containing client cache meta-data used to configure - * the GemFire {@link com.gemstone.gemfire.cache.client.ClientCache}. + * the GemFire {@link org.apache.geode.cache.client.ClientCache}. * @see org.springframework.core.type.AnnotationMetadata */ @Override @@ -186,11 +186,11 @@ public class ClientCacheConfiguration extends AbstractCacheConfiguration { /** * Uses the list of GemFire Locator and Server connection endpoint definitions and meta-data to configure - * the GemFire client {@link com.gemstone.gemfire.cache.client.Pool} used to communicate with the servers + * the GemFire client {@link org.apache.geode.cache.client.Pool} used to communicate with the servers * in the GemFire cluster. * * @param clientCacheApplicationAttributes {@link ClientCacheApplication} annotation containing - * {@link com.gemstone.gemfire.cache.client.Pool} Locator/Server connection endpoint meta-data. + * {@link org.apache.geode.cache.client.Pool} Locator/Server connection endpoint meta-data. * @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication * @see java.util.Map */ diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java index e486ebd2..2c7335bf 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java @@ -24,10 +24,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.gemstone.gemfire.security.AccessControl; -import com.gemstone.gemfire.security.AuthInitialize; -import com.gemstone.gemfire.security.Authenticator; - +import org.apache.geode.security.AccessControl; +import org.apache.geode.security.AuthInitialize; +import org.apache.geode.security.Authenticator; import org.springframework.context.annotation.Import; /** @@ -36,9 +35,9 @@ import org.springframework.context.annotation.Import; * * @author John Blum * @see org.springframework.data.gemfire.config.annotation.AuthConfiguration - * @see com.gemstone.gemfire.security.AccessControl - * @see com.gemstone.gemfire.security.AuthInitialize - * @see com.gemstone.gemfire.security.Authenticator + * @see org.apache.geode.security.AccessControl + * @see org.apache.geode.security.AuthInitialize + * @see org.apache.geode.security.Authenticator * @see Authentication * @see Authorization * @since 1.9.0 diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java index fac7594f..627590b2 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAutoRegionLookup.java @@ -28,11 +28,11 @@ import org.springframework.context.annotation.Import; /** * The {@link EnableAutoRegionLookup} annotation configures a Spring {@link org.springframework.context.annotation.Configuration} - * annotated class with the ability to automatically look up and register GemFire {@link com.gemstone.gemfire.cache.Region Regions} + * annotated class with the ability to automatically look up and register GemFire {@link org.apache.geode.cache.Region Regions} * which may have be defined in {@literal cache.xml} or by using GemFire's Cluster Configuration Service. * * This annotation defines the {@code enabled} attribute to allow users to dynamically change the behavior - * of auto {@link com.gemstone.gemfire.cache.Region} lookup at application configuration time using either a SpEL + * of auto {@link org.apache.geode.cache.Region} lookup at application configuration time using either a SpEL * expression or a Spring property placeholder. * * @author John Blum @@ -48,11 +48,11 @@ import org.springframework.context.annotation.Import; public @interface EnableAutoRegionLookup { /** - * Attribute to indicate whether auto {@link com.gemstone.gemfire.cache.Region} lookup should be enabled; + * Attribute to indicate whether auto {@link org.apache.geode.cache.Region} lookup should be enabled; * Defaults to {@literal true}. * * This attribute accepts either a SpEL or Spring property placeholder expression so that - * auto {@link com.gemstone.gemfire.cache.Region} lookup behavior can be determined + * auto {@link org.apache.geode.cache.Region} lookup behavior can be determined * at application configuration time. */ String enabled() default "true"; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java index c7dc909a..00c92f6d 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServer.java @@ -24,9 +24,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; - +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; @@ -43,7 +42,7 @@ import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; * @author John Blum * @see org.springframework.data.gemfire.config.annotation.AddCacheServerConfiguration - * @see com.gemstone.gemfire.cache.server.CacheServer + * @see org.apache.geode.cache.server.CacheServer * @since 1.9.0 */ @Target(ElementType.TYPE) @@ -64,7 +63,7 @@ public @interface EnableCacheServer { /** * Configures the ip address or host name that this cache server will listen on. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_BIND_ADDRESS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_BIND_ADDRESS */ String bindAddress() default CacheServer.DEFAULT_BIND_ADDRESS; @@ -72,70 +71,70 @@ public @interface EnableCacheServer { * Configures the ip address or host name that server locators will tell clients that this cache server * is listening on. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_HOSTNAME_FOR_CLIENTS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_HOSTNAME_FOR_CLIENTS */ String hostnameForClients() default CacheServer.DEFAULT_HOSTNAME_FOR_CLIENTS; /** * Configures the frequency in milliseconds to poll the load probe on this cache server. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_LOAD_POLL_INTERVAL + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_LOAD_POLL_INTERVAL */ long loadPollInterval() default CacheServer.DEFAULT_LOAD_POLL_INTERVAL; /** * Configures the maximum allowed client connections. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAX_CONNECTIONS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAX_CONNECTIONS */ int maxConnections() default CacheServer.DEFAULT_MAX_CONNECTIONS; /** * Configures he maximum number of messages that can be enqueued in a client-queue. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAXIMUM_MESSAGE_COUNT + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAXIMUM_MESSAGE_COUNT */ int maxMessageCount() default CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT; /** * Configures the maximum number of threads allowed in this cache server to service client requests. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAX_THREADS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAX_THREADS */ int maxThreads() default CacheServer.DEFAULT_MAX_THREADS; /** * Configures the maximum amount of time between client pings. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS */ int maxTimeBetweenPings() default CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS; /** * Configures the time (in seconds ) after which a message in the client queue will expire. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_MESSAGE_TIME_TO_LIVE + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_MESSAGE_TIME_TO_LIVE */ int messageTimeToLive() default CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE; /** * Configures the port on which this cache server listens for clients. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_PORT + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_PORT */ int port() default CacheServer.DEFAULT_PORT; /** * Configures the configured buffer size of the socket connection for this CacheServer. * - * @see com.gemstone.gemfire.cache.server.CacheServer#DEFAULT_SOCKET_BUFFER_SIZE + * @see org.apache.geode.cache.server.CacheServer#DEFAULT_SOCKET_BUFFER_SIZE */ int socketBufferSize() default CacheServer.DEFAULT_SOCKET_BUFFER_SIZE; /** * Configures the capacity of the client queue. * - * @see com.gemstone.gemfire.cache.server.ClientSubscriptionConfig#DEFAULT_CAPACITY + * @see org.apache.geode.cache.server.ClientSubscriptionConfig#DEFAULT_CAPACITY */ int subscriptionCapacity() default ClientSubscriptionConfig.DEFAULT_CAPACITY; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java index 0db7d480..3da0b0ed 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableCacheServers.java @@ -27,7 +27,7 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Import; /** - * The {@link EnableCacheServers} annotation enables 1 or more GemFire {@link com.gemstone.gemfire.cache.server.CacheServer CacheServers} + * The {@link EnableCacheServers} annotation enables 1 or more GemFire {@link org.apache.geode.cache.server.CacheServer CacheServers} * to be defined and used in a GemFire peer cache application configured with Spring (Data GemFire). * * @author John Blum @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Import; public @interface EnableCacheServers { /** - * Enables the definition of multiple GemFire {@link com.gemstone.gemfire.cache.server.CacheServer CacheServers}. + * Enables the definition of multiple GemFire {@link org.apache.geode.cache.server.CacheServer CacheServers}. */ EnableCacheServer[] servers() default {}; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java index 021fb2da..79a24970 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnableOffHeap.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Import; /** * The EnableOffHeap annotation marks a Spring {@link org.springframework.context.annotation.Configuration @Configuration} * annotated class to configure and enable Apache Geode Off-Heap Memory support and data storage - * in Geode's cache {@link com.gemstone.gemfire.cache.Region Regions}. + * in Geode's cache {@link org.apache.geode.cache.Region Regions}. * * @author John Blum * @see org.springframework.data.gemfire.config.annotation.OffHeapConfiguration diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java index c48d4bc1..96f8a2c6 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePdx.java @@ -59,7 +59,7 @@ public @interface EnablePdx { boolean persistent() default false; /** - * Configures the object preference to {@link com.gemstone.gemfire.pdx.PdxInstance} type or {@link Object}. + * Configures the object preference to {@link org.apache.geode.pdx.PdxInstance} type or {@link Object}. * * Default is {@literal false}. */ diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java index c5ea6eb8..1294d60b 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePool.java @@ -24,9 +24,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; - +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.GemfireUtils; @@ -42,8 +41,8 @@ import org.springframework.data.gemfire.GemfireUtils; * * @author John Blum * @see org.springframework.data.gemfire.config.annotation.AddPoolConfiguration - * @see com.gemstone.gemfire.cache.client.Pool - * @see com.gemstone.gemfire.cache.client.PoolFactory + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolFactory * @since 1.9.0 */ @Target(ElementType.TYPE) @@ -57,26 +56,26 @@ public @interface EnablePool { /** * Configures the free connection timeout for this pool. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_FREE_CONNECTION_TIMEOUT + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_FREE_CONNECTION_TIMEOUT */ int freeConnectionTimeout() default PoolFactory.DEFAULT_FREE_CONNECTION_TIMEOUT; /** * Configures the amount of time a connection can be idle before expiring the connection. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_IDLE_TIMEOUT + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_IDLE_TIMEOUT */ long idleTimeout() default PoolFactory.DEFAULT_IDLE_TIMEOUT; /** * Configures the load conditioning interval for this pool. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_LOAD_CONDITIONING_INTERVAL + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_LOAD_CONDITIONING_INTERVAL */ int loadConditioningInterval() default PoolFactory.DEFAULT_LOAD_CONDITIONING_INTERVAL; /** - * Configures the GemFire {@link com.gemstone.gemfire.distributed.Locator Locators} to which + * Configures the GemFire {@link org.apache.geode.distributed.Locator Locators} to which * this cache client will connect. */ Locator[] locators() default {}; @@ -92,21 +91,21 @@ public @interface EnablePool { /** * Configures the max number of client to server connections that the pool will create. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MAX_CONNECTIONS + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MAX_CONNECTIONS */ int maxConnections() default PoolFactory.DEFAULT_MAX_CONNECTIONS; /** * Configures the minimum number of connections to keep available at all times. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MIN_CONNECTIONS + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MIN_CONNECTIONS */ int minConnections() default PoolFactory.DEFAULT_MIN_CONNECTIONS; /** * If set to true then the created pool can be used by multiple users. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_MULTIUSER_AUTHENTICATION + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_MULTIUSER_AUTHENTICATION */ boolean multiUserAuthentication() default PoolFactory.DEFAULT_MULTIUSER_AUTHENTICATION; @@ -118,15 +117,15 @@ public @interface EnablePool { /** * Configures how often to ping servers to verify that they are still alive. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_PING_INTERVAL + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_PING_INTERVAL */ long pingInterval() default PoolFactory.DEFAULT_PING_INTERVAL; /** * By default {@code prSingleHopEnabled} is {@literal true} in which case the client is aware of the location - * of partitions on servers hosting Regions with {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION}. + * of partitions on servers hosting Regions with {@link org.apache.geode.cache.DataPolicy#PARTITION}. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_PR_SINGLE_HOP_ENABLED + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_PR_SINGLE_HOP_ENABLED */ boolean prSingleHopEnabled() default PoolFactory.DEFAULT_PR_SINGLE_HOP_ENABLED; @@ -134,26 +133,26 @@ public @interface EnablePool { * Configures the number of milliseconds to wait for a response from a server before timing out the operation * and trying another server (if any are available). * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_READ_TIMEOUT + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_READ_TIMEOUT */ int readTimeout() default PoolFactory.DEFAULT_READ_TIMEOUT; /** * Configures the number of times to retry a request after timeout/exception. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_RETRY_ATTEMPTS + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_RETRY_ATTEMPTS */ int retryAttempts() default PoolFactory.DEFAULT_RETRY_ATTEMPTS; /** * Configures the group that all servers this pool connects to must belong to. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SERVER_GROUP + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SERVER_GROUP */ String serverGroup() default PoolFactory.DEFAULT_SERVER_GROUP; /** - * Configures the GemFire {@link com.gemstone.gemfire.cache.server.CacheServer CacheServers} to which + * Configures the GemFire {@link org.apache.geode.cache.server.CacheServer CacheServers} to which * this cache client will connect. */ Server[] servers() default {}; @@ -169,14 +168,14 @@ public @interface EnablePool { /** * Configures the socket buffer size for each connection made in this pool. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SOCKET_BUFFER_SIZE + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SOCKET_BUFFER_SIZE */ int socketBufferSize() default PoolFactory.DEFAULT_SOCKET_BUFFER_SIZE; /** * Configures how often to send client statistics to the server. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_STATISTIC_INTERVAL + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_STATISTIC_INTERVAL */ int statisticInterval() default PoolFactory.DEFAULT_STATISTIC_INTERVAL; @@ -184,14 +183,14 @@ public @interface EnablePool { * Configures the interval in milliseconds to wait before sending acknowledgements to the cache server * for events received from the server subscriptions. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ACK_INTERVAL + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ACK_INTERVAL */ int subscriptionAckInterval() default PoolFactory.DEFAULT_SUBSCRIPTION_ACK_INTERVAL; /** * If set to true then the created pool will have server-to-client subscriptions enabled. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ENABLED + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_ENABLED */ boolean subscriptionEnabled() default PoolFactory.DEFAULT_SUBSCRIPTION_ENABLED; @@ -199,21 +198,21 @@ public @interface EnablePool { * Configures the messageTrackingTimeout attribute which is the time-to-live period, in milliseconds, * for subscription events the client has received from the server. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT */ int subscriptionMessageTrackingTimeout() default PoolFactory.DEFAULT_SUBSCRIPTION_MESSAGE_TRACKING_TIMEOUT; /** * Configures the redundancy level for this pools server-to-client subscriptions. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_REDUNDANCY + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_SUBSCRIPTION_REDUNDANCY */ int subscriptionRedundancy() default PoolFactory.DEFAULT_SUBSCRIPTION_REDUNDANCY; /** * Configures the thread local connections policy for this pool. * - * @see com.gemstone.gemfire.cache.client.PoolFactory#DEFAULT_THREAD_LOCAL_CONNECTIONS + * @see org.apache.geode.cache.client.PoolFactory#DEFAULT_THREAD_LOCAL_CONNECTIONS */ boolean threadLocalConnections() default PoolFactory.DEFAULT_THREAD_LOCAL_CONNECTIONS; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java b/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java index 04821fa8..94054d83 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/EnablePools.java @@ -27,7 +27,7 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Import; /** - * The {@link EnablePools} annotation enables 1 or more GemFire {@link com.gemstone.gemfire.cache.client.Pool Pools} + * The {@link EnablePools} annotation enables 1 or more GemFire {@link org.apache.geode.cache.client.Pool Pools} * to be defined and used in a GemFire client cache application configured with Spring (Data GemFire). * * @author John Blum @@ -44,7 +44,7 @@ import org.springframework.context.annotation.Import; public @interface EnablePools { /** - * Enables the definition of multiple GemFire {@link com.gemstone.gemfire.cache.client.Pool Pools}. + * Enables the definition of multiple GemFire {@link org.apache.geode.cache.client.Pool Pools}. */ EnablePool[] pools() default {}; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/OffHeapConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/OffHeapConfiguration.java index 5971b21c..886a8e28 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/OffHeapConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/OffHeapConfiguration.java @@ -24,8 +24,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.Region; import org.springframework.beans.BeansException; import org.springframework.beans.PropertyValue; import org.springframework.beans.factory.BeanFactory; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java index 87e8830c..d74f01fa 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplication.java @@ -24,20 +24,19 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.gemstone.gemfire.cache.control.ResourceManager; - +import org.apache.geode.cache.control.ResourceManager; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; /** - * The {@link PeerCacheApplication} annotation enables an embedded GemFire peer {@link com.gemstone.gemfire.cache.Cache} + * The {@link PeerCacheApplication} annotation enables an embedded GemFire peer {@link org.apache.geode.cache.Cache} * instance in a Spring Data GemFire based application. * * @author John Blum * @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.Import * @see org.springframework.data.gemfire.config.annotation.PeerCacheConfiguration - * @see com.gemstone.gemfire.cache.control.ResourceManager + * @see org.apache.geode.cache.control.ResourceManager * @since 1.9.0 */ @Target({ ElementType.ANNOTATION_TYPE, ElementType.TYPE}) @@ -59,7 +58,7 @@ public @interface PeerCacheApplication { /** * Configures the percentage of heap at or above which the cache is considered in danger of becoming inoperable. * - * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE + * @see org.apache.geode.cache.control.ResourceManager#DEFAULT_CRITICAL_PERCENTAGE */ float criticalHeapPercentage() default ResourceManager.DEFAULT_CRITICAL_PERCENTAGE; @@ -76,7 +75,7 @@ public @interface PeerCacheApplication { * Configures the percentage of heap at or above which the eviction should begin on Regions configured * for HeapLRU eviction. * - * @see com.gemstone.gemfire.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE + * @see org.apache.geode.cache.control.ResourceManager#DEFAULT_EVICTION_PERCENTAGE */ float evictionHeapPercentage() default ResourceManager.DEFAULT_EVICTION_PERCENTAGE; diff --git a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java index 03d01803..5e8ffc85 100644 --- a/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java +++ b/src/main/java/org/springframework/data/gemfire/config/annotation/PeerCacheConfiguration.java @@ -26,13 +26,13 @@ import org.springframework.data.gemfire.CacheFactoryBean; /** * Spring {@link Configuration} class used to configure, construct and initialize - * a GemFire peer {@link com.gemstone.gemfire.cache.Cache} instance in a Spring application context. + * a GemFire peer {@link org.apache.geode.cache.Cache} instance in a Spring application context. * * @author John Blum * @see org.springframework.context.annotation.Bean * @see org.springframework.context.annotation.Configuration * @see org.springframework.data.gemfire.config.annotation.AbstractCacheConfiguration - * @see com.gemstone.gemfire.cache.Cache + * @see org.apache.geode.cache.Cache * @since 1.9.0 */ @Configuration @@ -77,10 +77,10 @@ public class PeerCacheConfiguration extends AbstractCacheConfiguration { } /** - * Configures GemFire peer {@link com.gemstone.gemfire.cache.Cache} specific settings. + * Configures GemFire peer {@link org.apache.geode.cache.Cache} specific settings. * * @param importMetadata {@link AnnotationMetadata} containing peer cache meta-data used to configure - * the GemFire peer {@link com.gemstone.gemfire.cache.Cache}. + * the GemFire peer {@link org.apache.geode.cache.Cache}. * @see org.springframework.core.type.AnnotationMetadata * @see #isCacheServerOrPeerCacheApplication(AnnotationMetadata) */ diff --git a/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java index fd1ab0e0..ffad4dde 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessor.java @@ -19,9 +19,8 @@ package org.springframework.data.gemfire.config.support; import java.util.Collections; import java.util.Set; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -41,8 +40,8 @@ import org.springframework.util.ObjectUtils; * @see org.springframework.beans.factory.BeanFactory * @see org.springframework.beans.factory.BeanFactoryAware * @see org.springframework.beans.factory.config.BeanPostProcessor - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.Region * @since 1.5.0 */ public class AutoRegionLookupBeanPostProcessor implements BeanPostProcessor, BeanFactoryAware { diff --git a/src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java index 498c0469..0ff966c5 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/ClientRegionPoolBeanFactoryPostProcessor.java @@ -31,9 +31,9 @@ import org.springframework.data.gemfire.util.SpringUtils; /** * {@link ClientRegionPoolBeanFactoryPostProcessor} is a Spring {@link BeanFactoryPostProcessor} implementation - * ensuring a proper dependency is declared between a GemFire client {@link com.gemstone.gemfire.cache.Region} - * and the GemFire client {@link com.gemstone.gemfire.cache.client.Pool} it references and uses, providing - * the GemFire client {@link com.gemstone.gemfire.cache.client.Pool} has been defined and configured with + * ensuring a proper dependency is declared between a GemFire client {@link org.apache.geode.cache.Region} + * and the GemFire client {@link org.apache.geode.cache.client.Pool} it references and uses, providing + * the GemFire client {@link org.apache.geode.cache.client.Pool} has been defined and configured with * Spring (Data GemFire) configuration meta-data (e.g. XML). * * @author John Blum diff --git a/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java b/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java index 2cff128c..78c53e19 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessor.java @@ -18,13 +18,12 @@ package org.springframework.data.gemfire.config.support; import java.beans.PropertyEditorSupport; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.wan.GatewaySender; - +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.InterestPolicy; +import org.apache.geode.cache.InterestResultPolicy; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.wan.GatewaySender; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java b/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java index 6732aad9..697b22b4 100644 --- a/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java +++ b/src/main/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListener.java @@ -16,11 +16,10 @@ package org.springframework.data.gemfire.config.support; -import com.gemstone.gemfire.cache.query.MultiIndexCreationException; -import com.gemstone.gemfire.cache.query.QueryService; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.query.MultiIndexCreationException; +import org.apache.geode.cache.query.QueryService; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; @@ -28,14 +27,14 @@ import org.springframework.data.gemfire.config.xml.GemfireConstants; /** * {@link DefinedIndexesApplicationListener} is a Spring {@link ApplicationListener} used to create all - * "defined" GemFire {@link com.gemstone.gemfire.cache.query.Index Indexes} by using the {@link QueryService}, + * "defined" GemFire {@link org.apache.geode.cache.query.Index Indexes} by using the {@link QueryService}, * {@literal defineXxxIndex(..)} methods. * * @author John Blum * @see org.springframework.context.ApplicationContext * @see org.springframework.context.ApplicationListener * @see org.springframework.context.event.ContextRefreshedEvent - * @see com.gemstone.gemfire.cache.query.QueryService + * @see org.apache.geode.cache.query.QueryService * @since 1.7.0 */ public class DefinedIndexesApplicationListener implements ApplicationListener { @@ -43,13 +42,13 @@ public class DefinedIndexesApplicationListener implements ApplicationListener resultSender; - + public BatchingResultSender(int batchSize, ResultSender resultSender) { Assert.notNull(resultSender, "resultSender cannot be null"); Assert.isTrue(batchSize >= 0, "batchSize must be >= 0"); this.batchSize = batchSize; this.resultSender = resultSender; } - - + + public void sendResults(Iterable result) { if (batchSize == 0) { resultSender.lastResult(result); return; - } - + } + List chunk = new ArrayList(batchSize); - + for (Iterator it = result.iterator(); it.hasNext();) { if (chunk.size() < batchSize) { chunk.add(it.next()); - } - + } + if (chunk.size() == batchSize || !it.hasNext()) { if (it.hasNext()) { resultSender.sendResult(chunk); @@ -65,19 +64,19 @@ class BatchingResultSender { } } - + public void sendArrayResults(Object result) { - + if (batchSize == 0) { resultSender.lastResult(result); return; } - - Assert.isTrue(ObjectUtils.isArray(result)); - + + Assert.isTrue(ObjectUtils.isArray(result)); + int length = Array.getLength(result); - - for (int from =0; from < length; from += batchSize) { + + for (int from =0; from < length; from += batchSize) { int to = Math.min(length,from + batchSize); Object chunk = copyOfRange(result,from, to); @@ -85,7 +84,7 @@ class BatchingResultSender { resultSender.lastResult(chunk); } else { resultSender.sendResult(chunk); - } + } } } @@ -97,10 +96,10 @@ class BatchingResultSender { * @return */ private Object copyOfRange(Object result, int from, int to) { - + Class arrayClass = result.getClass(); int size = to - from; - + if (int[].class.isAssignableFrom(arrayClass)) { int[] array = new int[size]; for(int i = 0; i < size ; ++i){ @@ -108,7 +107,7 @@ class BatchingResultSender { } return array; } - + if (float[].class.isAssignableFrom(arrayClass)) { float[] array = new float[size]; for(int i = 0; i < size ; ++i){ @@ -116,7 +115,7 @@ class BatchingResultSender { } return array; } - + if (double[].class.isAssignableFrom(arrayClass)) { double[] array = new double[size]; for(int i = 0; i < size ; ++i){ @@ -124,7 +123,7 @@ class BatchingResultSender { } return array; } - + if (boolean[].class.isAssignableFrom(arrayClass)) { boolean[] array = new boolean[size]; for(int i = 0; i < size ; ++i){ @@ -132,7 +131,7 @@ class BatchingResultSender { } return array; } - + if (byte[].class.isAssignableFrom(arrayClass)) { byte[] array = new byte[size]; for(int i = 0; i < size ; ++i){ @@ -140,7 +139,7 @@ class BatchingResultSender { } return array; } - + if (short[].class.isAssignableFrom(arrayClass)) { short[] array = new short[size]; for(int i = 0; i < size ; ++i){ @@ -148,7 +147,7 @@ class BatchingResultSender { } return array; } - + if (long[].class.isAssignableFrom(arrayClass)) { long[] array = new long[size]; for(int i = 0; i < size ; ++i){ @@ -156,7 +155,7 @@ class BatchingResultSender { } return array; } - + if (char[].class.isAssignableFrom(arrayClass)) { char[] array = new char[size]; for(int i = 0; i < size ; ++i){ @@ -164,8 +163,8 @@ class BatchingResultSender { } return array; } - + return Arrays.copyOfRange((Object[])result, from, to); - + } } diff --git a/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java b/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java index 33ca6489..03a8bb19 100644 --- a/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java +++ b/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,7 +14,7 @@ package org.springframework.data.gemfire.function; import java.lang.reflect.Method; -import com.gemstone.gemfire.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.FunctionContext; /** * @author David Turanski @@ -38,7 +38,7 @@ class DefaultFunctionArgumentResolver implements FunctionArgumentResolver { /* * (non-Javadoc) * - * @see org.springframework.data.gemfire.function.FunctionArgumentResolver#resolveFunctionArguments(com.gemstone.gemfire.cache.execute.FunctionContext) + * @see org.springframework.data.gemfire.function.FunctionArgumentResolver#resolveFunctionArguments(org.apache.geode.cache.execute.FunctionContext) */ @Override public Object[] resolveFunctionArguments(final FunctionContext functionContext) { diff --git a/src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java b/src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java index 3d9e2ce1..20b5c902 100644 --- a/src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java +++ b/src/main/java/org/springframework/data/gemfire/function/FunctionArgumentResolver.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,7 +14,7 @@ package org.springframework.data.gemfire.function; import java.lang.reflect.Method; -import com.gemstone.gemfire.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.FunctionContext; /** * The FunctionArgumentResolver interface is a Strategy Interface for resolving Function invocation arguments, @@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.execute.FunctionContext; * * @author David Turanski * @author John Blum - * @see com.gemstone.gemfire.cache.execute.FunctionContext + * @see org.apache.geode.cache.execute.FunctionContext * @since 1.3.0 */ interface FunctionArgumentResolver { diff --git a/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java b/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java index 21765272..b84bf1c9 100644 --- a/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java +++ b/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -18,17 +18,16 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.RegionFunctionContext; +import org.apache.geode.cache.execute.ResultSender; +import org.apache.geode.cache.partition.PartitionRegionHelper; import org.springframework.data.gemfire.function.annotation.Filter; import org.springframework.data.gemfire.function.annotation.RegionData; import org.springframework.data.gemfire.util.ArrayUtils; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.RegionFunctionContext; -import com.gemstone.gemfire.cache.execute.ResultSender; -import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; - /** * @author David Turanski * @since 1.3.0 @@ -113,7 +112,7 @@ class FunctionContextInjectingArgumentResolver extends PdxFunctionArgumentResolv /* * (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.RegionFunctionContext + * @see org.apache.geode.cache.execute.RegionFunctionContext */ private static Region getRegionForContext(RegionFunctionContext regionFunctionContext) { Region region = regionFunctionContext.getDataSet(); diff --git a/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java b/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java index 6ee3085f..89c2bca7 100644 --- a/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java +++ b/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -21,11 +21,10 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.execute.FunctionService; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** * @author David Turanski */ diff --git a/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java b/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java index 999b7375..12cbaa65 100644 --- a/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java +++ b/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java @@ -18,13 +18,12 @@ package org.springframework.data.gemfire.function; import java.lang.reflect.Method; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.pdx.PdxInstance; import org.springframework.util.ClassUtils; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.pdx.PdxInstance; - /** * The PdxFunctionArgumentResolver class is a Spring Data GemFire FunctionArgumentResolver that automatically resolves * PDX types when GemFire is configured with read-serialized set to true, but the application domain classes @@ -32,7 +31,7 @@ import com.gemstone.gemfire.pdx.PdxInstance; * * @author John Blum * @see org.springframework.data.gemfire.function.DefaultFunctionArgumentResolver - * @see com.gemstone.gemfire.pdx.PdxInstance + * @see org.apache.geode.pdx.PdxInstance * @since 1.5.2 */ @SuppressWarnings("unused") @@ -41,7 +40,7 @@ class PdxFunctionArgumentResolver extends DefaultFunctionArgumentResolver { /* * (non-Javadoc) * - * @see com.gemstone.gemfire.cache.execute.FunctionContext + * @see org.apache.geode.cache.execute.FunctionContext */ @Override public Object[] resolveFunctionArguments(final FunctionContext functionContext) { @@ -79,8 +78,8 @@ class PdxFunctionArgumentResolver extends DefaultFunctionArgumentResolver { /* * (non-Javadoc) * - * @see com.gemstone.gemfire.cache.Cache#getPdxSerializer() - * @see com.gemstone.gemfire.cache.CacheFactory#getAnyInstance() + * @see org.apache.geode.cache.Cache#getPdxSerializer() + * @see org.apache.geode.cache.CacheFactory#getAnyInstance() */ boolean isPdxSerializerConfigured() { try { diff --git a/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java b/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java index 607c6b76..4a975079 100644 --- a/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/function/PojoFunctionWrapper.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -16,20 +16,19 @@ import java.lang.reflect.Method; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.ResultSender; import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.ResultSender; - /** - * Invokes a POJO's given method as a Gemfire remote function. - * If the POJO has a constructor that takes a Map, and the function context is Region, the + * Invokes a POJO's given method as a Gemfire remote function. + * If the POJO has a constructor that takes a Map, and the function context is Region, the * region will be injected. The delegate class name, the method name, and the method arguments - * are part of a remote function invocation, therefore all arguments must be serializable - * or an alternate serialization method must be used. + * are part of a remote function invocation, therefore all arguments must be serializable + * or an alternate serialization method must be used. * The delegate class must be the class path of the remote cache(s) * @author David Turanski * diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java index 33c3f561..6601e550 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecution.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -19,15 +19,14 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionException; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; - /** * Base class for * Creating a GemFire {@link Execution} using {@link FunctionService}. Protected setters support * method chaining. @@ -86,7 +85,7 @@ abstract class AbstractFunctionExecution { long getTimeout() { return timeout; } - + Iterable execute() { return execute(true); } diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java index 74b44f1f..b4d7c42e 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplate.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,17 +14,16 @@ package org.springframework.data.gemfire.function.execution; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.ResultCollector; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.ResultCollector; /** * The base class for GemFire FunctionTemplates used to invoke GemFire Functions. * * @author David Turanski * @author John Blum - * @see com.gemstone.gemfire.cache.execute.Function - * @see com.gemstone.gemfire.cache.execute.ResultCollector + * @see org.apache.geode.cache.execute.Function + * @see org.apache.geode.cache.execute.ResultCollector */ abstract class AbstractFunctionTemplate implements GemfireFunctionOperations { @@ -67,7 +66,7 @@ abstract class AbstractFunctionTemplate implements GemfireFunctionOperations { protected Iterable execute(AbstractFunctionExecution execution) { return execution.setTimeout(timeout).setResultCollector(resultCollector).execute(); } - + protected Iterable execute(AbstractFunctionExecution execution, boolean returnResult) { return execution.setTimeout(timeout).setResultCollector(resultCollector).execute(returnResult); } diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java index af3093a5..2a4dadb0 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/AllMembersFunctionExecution.java @@ -1,19 +1,19 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; /** * A FunctionExecution wrapper for onMembers execution @@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService; * @since 1.3.0 */ class AllMembersFunctionExecution extends AbstractFunctionExecution { - + @Override protected Execution getExecution() { return FunctionService.onMembers(); diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java index a5b0006e..e088534c 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/DefaultMemberFunctionExecution.java @@ -1,26 +1,26 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; /** * @author David Turanski * */ class DefaultMemberFunctionExecution extends AbstractFunctionExecution { - + @Override protected Execution getExecution() { return FunctionService.onMember(); diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java index fb4c6e68..2849eb43 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMemberFunctionExecution.java @@ -1,42 +1,41 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.distributed.DistributedMember; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.distributed.DistributedMember; - /** * @author David Turanski * */ class DistributedMemberFunctionExecution extends AbstractFunctionExecution { - + private final DistributedMember distributedMember; /** - * + * * @param distributedMember */ public DistributedMemberFunctionExecution(DistributedMember distributedMember) { super(); Assert.notNull(distributedMember); - this.distributedMember = distributedMember; + this.distributedMember = distributedMember; } - + @Override protected Execution getExecution() { return FunctionService.onMember(this.distributedMember); diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java index 5970ff77..f71d0eff 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/DistributedMembersFunctionExecution.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,26 +14,26 @@ package org.springframework.data.gemfire.function.execution; import java.util.Set; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.distributed.DistributedMember; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.distributed.DistributedMember; /** * @author David Turanski * */ class DistributedMembersFunctionExecution extends AbstractFunctionExecution { - + private final Set distributedMembers; /** - * + * * @param distributedMembers */ public DistributedMembersFunctionExecution(Set distributedMembers ) { super( ); - this.distributedMembers = distributedMembers; + this.distributedMembers = distributedMembers; } - + @Override protected Execution getExecution() { return FunctionService.onMembers(this.distributedMembers); diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionCallback.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionCallback.java index 8845f19a..6c2a132d 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionCallback.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionCallback.java @@ -1,18 +1,18 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; -import com.gemstone.gemfire.cache.execute.Execution; +import org.apache.geode.cache.execute.Execution; /** * A callback for Gemfire Function Templates diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionOperations.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionOperations.java index cf74b94b..bb91a5c2 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionOperations.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionOperations.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -13,12 +13,12 @@ package org.springframework.data.gemfire.function.execution; -import com.gemstone.gemfire.cache.execute.Function; +import org.apache.geode.cache.execute.Function; /** - * + * * An interface for invoking Gemfire functions - * + * * @author David Turanski */ public interface GemfireFunctionOperations { @@ -50,7 +50,7 @@ public interface GemfireFunctionOperations { * @param function the GemFire Function object. * @param args an array of Object arguments to the Function call. * @return the first item in the ResultsCollector. - * @see com.gemstone.gemfire.cache.execute.Function + * @see org.apache.geode.cache.execute.Function */ public abstract T executeAndExtract(Function function, Object... args); @@ -73,7 +73,7 @@ public interface GemfireFunctionOperations { public void executeWithNoResult(String functionId, Object... args); /** - * Execute a GemFire Function using a native GemFire {@link com.gemstone.gemfire.cache.execute.Execution} instance. + * Execute a GemFire Function using a native GemFire {@link org.apache.geode.cache.execute.Execution} instance. * * @param type parameter specifying the result type of the Function execution. * @param callback a callback providing the execution instance. diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMemberFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMemberFunctionTemplate.java index cf81fc78..32bb30b3 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMemberFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMemberFunctionTemplate.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -13,34 +13,34 @@ package org.springframework.data.gemfire.function.execution; -import com.gemstone.gemfire.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedMember; /** * @author David Turanski * @see org.springframework.data.gemfire.function.execution.AbstractFunctionTemplate - * @see com.gemstone.gemfire.distributed.DistributedMember + * @see org.apache.geode.distributed.DistributedMember */ public class GemfireOnMemberFunctionTemplate extends AbstractFunctionTemplate { - + private final DistributedMember distributedMember; private final String[] groups; - + public GemfireOnMemberFunctionTemplate (DistributedMember distributedMember) { this.distributedMember = distributedMember; this.groups = null; } - + public GemfireOnMemberFunctionTemplate (String[] groups) { this.distributedMember = null; this.groups = groups; } - + public GemfireOnMemberFunctionTemplate () { this.distributedMember = null; this.groups = null; } - - + + protected AbstractFunctionExecution getFunctionExecution() { if (distributedMember == null && groups == null) { return new DefaultMemberFunctionExecution(); diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMembersFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMembersFunctionTemplate.java index 8a407832..94588565 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMembersFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnMembersFunctionTemplate.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,12 +14,12 @@ package org.springframework.data.gemfire.function.execution; import java.util.Set; -import com.gemstone.gemfire.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedMember; /** * @author David Turanski * @see org.springframework.data.gemfire.function.execution.AbstractFunctionTemplate - * @see com.gemstone.gemfire.distributed.DistributedMember + * @see org.apache.geode.distributed.DistributedMember */ public class GemfireOnMembersFunctionTemplate extends AbstractFunctionTemplate { @@ -50,5 +50,5 @@ public class GemfireOnMembersFunctionTemplate extends AbstractFunctionTemplate return new DistributedMembersFunctionExecution(this.distributedMembers); } - + } diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java index 04086e34..e3263fb6 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionFunctionTemplate.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,11 +14,10 @@ package org.springframework.data.gemfire.function.execution; import java.util.Set; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.Function; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.Function; - /** * @author David Turanski * @@ -31,7 +30,7 @@ public class GemfireOnRegionFunctionTemplate extends AbstractFunctionTemplate im * Constructs an instance of the GemFireOnRegionFunctionTemplate with the given GemFire Cache Region. * * @param region the GemFire Cache Region upon which the Function will be executed. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public GemfireOnRegionFunctionTemplate(Region region) { Assert.notNull(region, "Region cannot be null"); diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionOperations.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionOperations.java index 2ea5ff60..f6ca87b3 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionOperations.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnRegionOperations.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,7 +14,7 @@ package org.springframework.data.gemfire.function.execution; import java.util.Set; -import com.gemstone.gemfire.cache.execute.Function; +import org.apache.geode.cache.execute.Function; /** * @author David Turanski diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServerFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServerFunctionTemplate.java index 79f28b0b..5ebe4fd2 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServerFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServerFunctionTemplate.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -13,8 +13,8 @@ package org.springframework.data.gemfire.function.execution; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.client.Pool; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.client.Pool; /** * @author David Turanski @@ -29,7 +29,7 @@ public class GemfireOnServerFunctionTemplate extends AbstractFunctionTemplate { this.cache = cache; this.pool = null; } - + public GemfireOnServerFunctionTemplate(Pool pool) { this.cache = null; this.pool = pool; @@ -39,5 +39,5 @@ public class GemfireOnServerFunctionTemplate extends AbstractFunctionTemplate { protected AbstractFunctionExecution getFunctionExecution() { return (pool != null ? new PoolServerFunctionExecution(this.pool) : new ServerFunctionExecution(this.cache)); } - + } diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java index d5c7942b..7f0e1a0d 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GemfireOnServersFunctionTemplate.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -13,29 +13,29 @@ package org.springframework.data.gemfire.function.execution; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.client.Pool; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.client.Pool; /** * @author David Turanski * */ public class GemfireOnServersFunctionTemplate extends AbstractFunctionTemplate { - + private final RegionService cache; private final Pool pool; - + public GemfireOnServersFunctionTemplate (RegionService cache) { this.cache = cache; this.pool = null; } - + public GemfireOnServersFunctionTemplate (Pool pool) { this.pool = pool; this.cache = null; } - + @Override protected AbstractFunctionExecution getFunctionExecution() { if (this.pool == null) { @@ -43,5 +43,5 @@ public class GemfireOnServersFunctionTemplate extends AbstractFunctionTemplate } return new PoolServersFunctionExecution(this.pool); } - + } diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java index fb1f1ef1..7fef164b 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GroupMemberFunctionExecution.java @@ -1,31 +1,30 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** * @author David Turanski * @author John Blum * @see org.springframework.data.gemfire.function.execution.AbstractFunctionExecution - * @see com.gemstone.gemfire.cache.execute.Execution - * @see com.gemstone.gemfire.cache.execute.FunctionService + * @see org.apache.geode.cache.execute.Execution + * @see org.apache.geode.cache.execute.FunctionService */ class GroupMemberFunctionExecution extends AbstractFunctionExecution { - + private final String[] groups; /** @@ -37,14 +36,14 @@ class GroupMemberFunctionExecution extends AbstractFunctionExecution { */ public GroupMemberFunctionExecution(final String... groups) { Assert.notEmpty(groups, "'groups' cannot be null or empty."); - this.groups = groups; + this.groups = groups; } /** * Executes the data independent Function on a single member from each of the specified groups. * * @return an Execution to execute the Function. - * @see com.gemstone.gemfire.cache.execute.FunctionService#onMember(String...) + * @see org.apache.geode.cache.execute.FunctionService#onMember(String...) */ @Override protected Execution getExecution() { diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java index 99d911fe..efc63e09 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/GroupMembersFunctionExecution.java @@ -1,31 +1,30 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** * @author David Turanski * @author John Blum * @see org.springframework.data.gemfire.function.execution.AbstractFunctionExecution - * @see com.gemstone.gemfire.cache.execute.Execution - * @see com.gemstone.gemfire.cache.execute.FunctionService + * @see org.apache.geode.cache.execute.Execution + * @see org.apache.geode.cache.execute.FunctionService */ class GroupMembersFunctionExecution extends AbstractFunctionExecution { - + private final String[] groups; /** @@ -36,14 +35,14 @@ class GroupMembersFunctionExecution extends AbstractFunctionExecution { */ public GroupMembersFunctionExecution(final String... groups) { Assert.notEmpty(groups, "'groups' cannot be null or empty."); - this.groups = groups; + this.groups = groups; } /** * Executes the data independent Function on all members from each of the specified groups. * * @return an Execution to execute the Function. - * @see com.gemstone.gemfire.cache.execute.FunctionService#onMembers(String...) + * @see org.apache.geode.cache.execute.FunctionService#onMembers(String...) */ @Override protected Execution getExecution() { diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java index e5f75161..1e749b20 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/PoolServerFunctionExecution.java @@ -1,36 +1,35 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolManager; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** * Creates a GemFire {@link Execution} using {code}FunctionService.onServer(Pool pool){code} * @author David Turanski * */ class PoolServerFunctionExecution extends AbstractFunctionExecution implements InitializingBean { - + private Pool pool; private String poolname; - + /** * @param pool the {@link Pool} @@ -40,15 +39,15 @@ class PoolServerFunctionExecution extends AbstractFunctionExecution implements I Assert.notNull(pool, "pool cannot be null"); this.pool = pool; } - + public PoolServerFunctionExecution(String poolname) { super(); Assert.notNull(poolname, "pool name cannot be null"); this.poolname = poolname; - + } - - + + @Override protected Execution getExecution() { return FunctionService.onServer(this.pool); @@ -62,6 +61,6 @@ class PoolServerFunctionExecution extends AbstractFunctionExecution implements I public void afterPropertiesSet() throws Exception { this.pool = PoolManager.find(poolname); Assert.notNull(pool," pool " + poolname+ " does not exist"); - + } } diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java index 7c223eff..ac5b5415 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/PoolServersFunctionExecution.java @@ -1,30 +1,29 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** * Creates a GemFire {@link Execution} using {code}FunctionService.onServers(Pool pool){code} * @author David Turanski * */ class PoolServersFunctionExecution extends AbstractFunctionExecution { - + private final Pool pool; @@ -36,7 +35,7 @@ class PoolServersFunctionExecution extends AbstractFunctionExecution { Assert.notNull(pool, "pool cannot be null"); this.pool = pool; } - + @Override protected Execution getExecution() { return FunctionService.onServers(this.pool); diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java index e198c396..8aadc39e 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/RegionFunctionExecution.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,33 +14,32 @@ package org.springframework.data.gemfire.function.execution; import java.util.Set; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; import org.springframework.util.CollectionUtils; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** - * Creates a GemFire {@link Execution} using {code}FunctionService.onRegion(Region region){code} + * Creates a GemFire {@link Execution} using {code}FunctionService.onRegion(Region region){code} * @author David Turanski - * + * */ class RegionFunctionExecution extends AbstractFunctionExecution { private final Region region; private volatile Set keys; - + public RegionFunctionExecution(Region region) { super(); this.region = region; } - + public RegionFunctionExecution setKeys(Set keys) { this.keys = keys; return this; } - + protected Set getKeys() { return this.keys; } diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/ServerFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/ServerFunctionExecution.java index 4a8314d1..e529c6f6 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/ServerFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/ServerFunctionExecution.java @@ -1,23 +1,22 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** * Creates a GemFire {@link Execution} using {code}FunctionService.onServer(RegionService regionService){code} * @author David Turanski @@ -29,7 +28,7 @@ class ServerFunctionExecution extends AbstractFunctionExecution { public ServerFunctionExecution(RegionService regionService) { Assert.notNull(regionService, "RegionService must not be null"); - this.regionService = regionService; + this.regionService = regionService; } @Override diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java b/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java index 638ed619..cf6104d3 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/ServersFunctionExecution.java @@ -1,35 +1,34 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.function.execution; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.FunctionService; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** * Creates a GemFire {@link Execution} using {code}FunctionService.onServers(RegionService regionService){code} * @author David Turanski * */ class ServersFunctionExecution extends AbstractFunctionExecution { - + private final RegionService regionService; /** - * + * * @param regionService e.g., Cache,Client, or GemFireCache * @param function * @param args @@ -37,7 +36,7 @@ class ServersFunctionExecution extends AbstractFunctionExecution { public ServersFunctionExecution(RegionService regionService ) { super(); Assert.notNull(regionService,"regionService cannot be null"); - this.regionService = regionService; + this.regionService = regionService; } @Override diff --git a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java index 3bc61af9..72c56f08 100644 --- a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java +++ b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryDefinition.java @@ -16,15 +16,14 @@ package org.springframework.data.gemfire.listener; +import org.apache.geode.cache.query.CqQuery; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.query.CqQuery; - /** * Basic holder class for defining an {@link CqQuery}. Useful for configuring GemFire {@link CqQuery}s by mean of * XML or using JavaBeans. - * + * * @author Costin Leau * @author John Blum * @see org.springframework.beans.factory.InitializingBean diff --git a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java index 610f7caa..ce6b7845 100644 --- a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java +++ b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListener.java @@ -16,11 +16,11 @@ package org.springframework.data.gemfire.listener; -import com.gemstone.gemfire.cache.query.CqEvent; +import org.apache.geode.cache.query.CqEvent; /** * Continuous Query (CQ) listener listening for events and notifications by a GemFire Continuous Query (CQ). - * + * * @author Costin Leau * @author John Blum */ @@ -30,7 +30,7 @@ public interface ContinuousQueryListener { * Action performed by the listener when notified of a CQ event. * * @param event the event from the CQ. - * @see com.gemstone.gemfire.cache.query.CqEvent + * @see org.apache.geode.cache.query.CqEvent */ void onEvent(CqEvent event); diff --git a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java index 07675dda..874c726a 100644 --- a/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java +++ b/src/main/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainer.java @@ -24,6 +24,16 @@ import java.util.concurrent.Executor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolManager; +import org.apache.geode.cache.query.CqAttributes; +import org.apache.geode.cache.query.CqAttributesFactory; +import org.apache.geode.cache.query.CqEvent; +import org.apache.geode.cache.query.CqListener; +import org.apache.geode.cache.query.CqQuery; +import org.apache.geode.cache.query.QueryException; +import org.apache.geode.cache.query.QueryService; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -43,17 +53,6 @@ import org.springframework.util.ClassUtils; import org.springframework.util.ErrorHandler; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.query.CqAttributes; -import com.gemstone.gemfire.cache.query.CqAttributesFactory; -import com.gemstone.gemfire.cache.query.CqEvent; -import com.gemstone.gemfire.cache.query.CqListener; -import com.gemstone.gemfire.cache.query.CqQuery; -import com.gemstone.gemfire.cache.query.QueryException; -import com.gemstone.gemfire.cache.query.QueryService; - /** * Container providing asynchronous behaviour for GemFire continuous queries. * @@ -65,13 +64,13 @@ import com.gemstone.gemfire.cache.query.QueryService; * @see org.springframework.context.SmartLifecycle * @see org.springframework.core.task.SimpleAsyncTaskExecutor * @see org.springframework.core.task.TaskExecutor - * @see com.gemstone.gemfire.cache.RegionService - * @see com.gemstone.gemfire.cache.client.Pool - * @see com.gemstone.gemfire.cache.client.PoolManager - * @see com.gemstone.gemfire.cache.query.CqEvent - * @see com.gemstone.gemfire.cache.query.CqListener - * @see com.gemstone.gemfire.cache.query.CqQuery - * @see com.gemstone.gemfire.cache.query.QueryService + * @see org.apache.geode.cache.RegionService + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolManager + * @see org.apache.geode.cache.query.CqEvent + * @see org.apache.geode.cache.query.CqListener + * @see org.apache.geode.cache.query.CqQuery + * @see org.apache.geode.cache.query.QueryService */ @SuppressWarnings("unused") public class ContinuousQueryListenerContainer implements BeanFactoryAware, BeanNameAware, @@ -354,7 +353,7 @@ public class ContinuousQueryListenerContainer implements BeanFactoryAware, BeanN * Set the underlying RegionService (GemFire Cache) used for registering Queries. * * @param cache the RegionService (GemFire Cache) used for registering Queries. - * @see com.gemstone.gemfire.cache.RegionService + * @see org.apache.geode.cache.RegionService */ public void setCache(RegionService cache) { setQueryService(cache.getQueryService()); @@ -413,7 +412,7 @@ public class ContinuousQueryListenerContainer implements BeanFactoryAware, BeanN * Set the GemFire QueryService used by this container to create ContinuousQueries (CQ). * * @param service the GemFire QueryService object used by the container to create ContinuousQueries (CQ). - * @see com.gemstone.gemfire.cache.query.QueryService + * @see org.apache.geode.cache.query.QueryService */ public void setQueryService(QueryService service) { this.queryService = service; diff --git a/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java b/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java index 907d3074..dcb6d40f 100644 --- a/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/listener/adapter/ContinuousQueryListenerAdapter.java @@ -24,6 +24,9 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.Operation; +import org.apache.geode.cache.query.CqEvent; +import org.apache.geode.cache.query.CqQuery; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.gemfire.listener.ContinuousQueryListener; @@ -33,16 +36,12 @@ import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils.MethodCallback; import org.springframework.util.ReflectionUtils.MethodFilter; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.query.CqEvent; -import com.gemstone.gemfire.cache.query.CqQuery; - /** * Event listener adapter that delegates the handling of messages to target * listener methods via reflection, with flexible event type conversion. * Allows listener methods to operate on event content types, completely * independent from the GemFire API. - * + * *

Modeled as much as possible after the JMS MessageListenerAdapter in * Spring Framework. * @@ -93,7 +92,7 @@ public class ContinuousQueryListenerAdapter implements ContinuousQueryListener { /** * Create a new {@link ContinuousQueryListenerAdapter} for the given delegate. - * + * * @param delegate the delegate object */ public ContinuousQueryListenerAdapter(Object delegate) { @@ -106,7 +105,7 @@ public class ContinuousQueryListenerAdapter implements ContinuousQueryListener { *

If no explicit delegate object has been specified, listener * methods are expected to present on this adapter instance, that is, * on a custom subclass of this adapter, defining listener methods. - * + * * @param delegate delegate object */ public void setDelegate(Object delegate) { @@ -117,7 +116,7 @@ public class ContinuousQueryListenerAdapter implements ContinuousQueryListener { /** * Returns the target object to delegate event listening to. - * + * * @return event listening delegation */ public Object getDelegate() { @@ -150,7 +149,7 @@ public class ContinuousQueryListenerAdapter implements ContinuousQueryListener { *

Delegates the event to the target listener method, with appropriate * conversion of the event argument. In case of an exception, the * {@link #handleListenerException(Throwable)} method will be invoked. - * + * * @param event the incoming GemFire event * @see #handleListenerException */ diff --git a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java index 76d022c5..69170035 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java @@ -15,14 +15,13 @@ */ package org.springframework.data.gemfire.mapping; +import org.apache.geode.pdx.PdxReader; import org.springframework.data.mapping.model.PropertyValueProvider; import org.springframework.util.Assert; -import com.gemstone.gemfire.pdx.PdxReader; - /** * {@link PropertyValueProvider} to read property values from a {@link PdxReader}. - * + * * @author Oliver Gierke * @author David Turanski */ @@ -32,7 +31,7 @@ class GemfirePropertyValueProvider implements PropertyValueProvider T getPropertyValue(GemfirePersistentProperty property) { return (T) reader.readField(property.getName()); } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java b/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java index 60e5a2ae..0035b15b 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java @@ -18,12 +18,11 @@ package org.springframework.data.gemfire.mapping; import java.util.Collections; import java.util.Map; -import com.gemstone.gemfire.pdx.PdxReader; -import com.gemstone.gemfire.pdx.PdxSerializer; -import com.gemstone.gemfire.pdx.PdxWriter; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.pdx.PdxReader; +import org.apache.geode.pdx.PdxSerializer; +import org.apache.geode.pdx.PdxWriter; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -55,9 +54,9 @@ import org.springframework.util.Assert; * @see org.springframework.data.mapping.PersistentPropertyAccessor * @see org.springframework.data.mapping.model.PersistentEntityParameterValueProvider * @see org.springframework.data.mapping.model.SpELContext - * @see com.gemstone.gemfire.pdx.PdxReader - * @see com.gemstone.gemfire.pdx.PdxSerializer - * @see com.gemstone.gemfire.pdx.PdxWriter + * @see org.apache.geode.pdx.PdxReader + * @see org.apache.geode.pdx.PdxSerializer + * @see org.apache.geode.pdx.PdxWriter */ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAware { @@ -285,7 +284,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw * @return a "custom" PdxSerializer for the given class type or null if no custom PdxSerializer * for the given class type was registered. * @see #getCustomSerializers() - * @see com.gemstone.gemfire.pdx.PdxSerializer + * @see org.apache.geode.pdx.PdxSerializer */ protected PdxSerializer getCustomSerializer(Class type) { return getCustomSerializers().get(type); diff --git a/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java b/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java index 4e52e7b9..7f91dc5c 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java @@ -15,22 +15,21 @@ */ package org.springframework.data.gemfire.mapping; +import org.apache.geode.pdx.PdxReader; import org.springframework.expression.EvaluationContext; import org.springframework.expression.PropertyAccessor; import org.springframework.expression.TypedValue; -import com.gemstone.gemfire.pdx.PdxReader; - /** * {@link PropertyAccessor} to read values from a {@link PdxReader}. - * + * * @author Oliver Gierke */ enum PdxReaderPropertyAccessor implements PropertyAccessor { INSTANCE; - /* + /* * (non-Javadoc) * @see org.springframework.expression.PropertyAccessor#getSpecificTargetClasses() */ @@ -39,7 +38,7 @@ enum PdxReaderPropertyAccessor implements PropertyAccessor { return new Class[] { PdxReader.class }; } - /* + /* * (non-Javadoc) * @see org.springframework.expression.PropertyAccessor#canRead(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String) */ @@ -48,7 +47,7 @@ enum PdxReaderPropertyAccessor implements PropertyAccessor { return ((PdxReader) target).hasField(name); } - /* + /* * (non-Javadoc) * @see org.springframework.expression.PropertyAccessor#read(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String) */ @@ -58,7 +57,7 @@ enum PdxReaderPropertyAccessor implements PropertyAccessor { return object == null ? TypedValue.NULL : new TypedValue(object); } - /* + /* * (non-Javadoc) * @see org.springframework.expression.PropertyAccessor#canWrite(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String) */ @@ -67,7 +66,7 @@ enum PdxReaderPropertyAccessor implements PropertyAccessor { return false; } - /* + /* * (non-Javadoc) * @see org.springframework.expression.PropertyAccessor#write(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String, java.lang.Object) */ @@ -75,4 +74,4 @@ enum PdxReaderPropertyAccessor implements PropertyAccessor { public void write(EvaluationContext context, Object target, String name, Object newValue) { throw new UnsupportedOperationException(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/data/gemfire/mapping/Region.java b/src/main/java/org/springframework/data/gemfire/mapping/Region.java index cedeae80..fd40881a 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/Region.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/Region.java @@ -24,7 +24,7 @@ import java.lang.annotation.Target; /** * Annotation to define the region an entity will be stored in. - * + * * @author Oliver Gierke */ @Inherited @@ -34,7 +34,7 @@ import java.lang.annotation.Target; public @interface Region { /** - * The name, or fully-qualified bean name of the {@link com.gemstone.gemfire.cache.Region} the entity + * The name, or fully-qualified bean name of the {@link org.apache.geode.cache.Region} the entity * shall be stored in (e.g. "Users", or "/Local/Admin/Users"). * * @return the name or qualified path of the Region the entity shall be persisted in. diff --git a/src/main/java/org/springframework/data/gemfire/mapping/Regions.java b/src/main/java/org/springframework/data/gemfire/mapping/Regions.java index 659c0af5..96da48a0 100644 --- a/src/main/java/org/springframework/data/gemfire/mapping/Regions.java +++ b/src/main/java/org/springframework/data/gemfire/mapping/Regions.java @@ -21,11 +21,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.apache.geode.cache.Region; import org.springframework.data.mapping.context.MappingContext; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; - /** * Simple value object to abstract access to regions by name and mapped type. * diff --git a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java b/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java index 4a52f876..5c4e4475 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBean.java @@ -22,17 +22,17 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.HashSet; import java.util.Set; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; +import org.apache.geode.cache.Region; import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactory; import org.springframework.data.repository.cdi.CdiRepositoryBean; import org.springframework.data.repository.config.CustomRepositoryImplementationDetector; -import com.gemstone.gemfire.cache.Region; - /** * A CDI-based bean that represents a GemFire Repository. * @@ -45,7 +45,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.data.gemfire.repository.support.GemfireRepositoryFactory * @see org.springframework.data.repository.cdi.CdiRepositoryBean * @see org.springframework.data.repository.config.CustomRepositoryImplementationDetector - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @since 1.8.0 */ class GemfireRepositoryBean extends CdiRepositoryBean { diff --git a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java b/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java index 3978ccff..1ce13308 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java +++ b/src/main/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtension.java @@ -24,20 +24,20 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.ProcessBean; +import org.apache.geode.cache.Region; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.repository.cdi.CdiRepositoryBean; import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport; -import com.gemstone.gemfire.cache.Region; - /** * The GemfireRepositoryExtension class... * diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java b/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java index 2b043f95..0fdc90e3 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/GemfireEntityInformation.java @@ -17,20 +17,19 @@ package org.springframework.data.gemfire.repository.query; import java.io.Serializable; +import org.apache.geode.cache.Region; import org.springframework.data.repository.core.EntityInformation; -import com.gemstone.gemfire.cache.Region; - /** * {@link EntityInformation} to capture Gemfire specific information. - * + * * @author Oliver Gierke */ public interface GemfireEntityInformation extends EntityInformation { /** * Returns the name of the {@link Region} the entity is held in. - * + * * @return the name of the {@link Region} the entity is held in. */ String getRegionName(); diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java b/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java index df8a0d1a..13e50c30 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/QueryBuilder.java @@ -61,11 +61,11 @@ class QueryBuilder { /** * Constructs an instance of {@link QueryBuilder} with the given {@link GemfirePersistentEntity} - * and {@link PartTree} that determines the GemFire {@link com.gemstone.gemfire.cache.Region} + * and {@link PartTree} that determines the GemFire {@link org.apache.geode.cache.Region} * to query and whether the query should capture unique results. * * @param entity {@link GemfirePersistentEntity} used to determine the GemFire - * {@link com.gemstone.gemfire.cache.Region} to query. + * {@link org.apache.geode.cache.Region} to query. * @param tree {@link PartTree} containing parts of the OQL Query for determining things * like uniqueness. * @see org.springframework.data.gemfire.mapping.GemfirePersistentEntity diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java b/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java index 628bfdf2..cb7adb84 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/QueryString.java @@ -21,8 +21,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.Region; import org.springframework.data.domain.Sort; import org.springframework.data.gemfire.repository.query.support.OqlKeyword; import org.springframework.util.Assert; @@ -132,7 +131,7 @@ public class QueryString { * @param region the GemFire Region in which to query; must not be {@literal null}. * @return a Query String with the FROM clause in the OQL statement evaluated and replaced with * the fully-qualified Region to query. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ @SuppressWarnings("unused") public QueryString forRegion(Class domainClass, Region region) { diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java b/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java index 523e205e..28491606 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.repository.query; import java.util.Collection; import java.util.Collections; +import org.apache.geode.cache.query.SelectResults; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.repository.query.ParametersParameterAccessor; @@ -26,8 +27,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.query.SelectResults; - /** * {@link GemfireRepositoryQuery} using plain {@link String} based OQL queries. *

@@ -183,7 +182,7 @@ public class StringBasedGemfireRepositoryQuery extends GemfireRepositoryQuery { * @see java.util.Arrays#asList(Object[]) * @see java.util.Collection * @see org.springframework.util.CollectionUtils#arrayToList(Object) - * @see com.gemstone.gemfire.cache.query.SelectResults + * @see org.apache.geode.cache.query.SelectResults */ Collection toCollection(final Object source) { if (source instanceof SelectResults) { diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java index 10bad37d..6e855e3a 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java @@ -19,8 +19,7 @@ package org.springframework.data.gemfire.repository.support; import java.io.Serializable; import java.lang.reflect.Method; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.Region; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.gemfire.mapping.GemfirePersistentProperty; diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java index 09ae7927..704891fa 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBean.java @@ -20,6 +20,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.Collections; +import org.apache.geode.cache.Region; import org.springframework.beans.BeansException; import org.springframework.beans.factory.FactoryBean; import org.springframework.context.ApplicationContext; @@ -32,11 +33,9 @@ import org.springframework.data.repository.core.support.RepositoryFactoryBeanSup import org.springframework.data.repository.core.support.RepositoryFactorySupport; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; - /** * {@link FactoryBean} adapter for {@link GemfireRepositoryFactory}. - * + * * @author Oliver Gierke * @author John Blum * @see org.springframework.beans.factory.FactoryBean @@ -49,7 +48,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.data.repository.Repository * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport * @see org.springframework.data.repository.core.support.RepositoryFactorySupport - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public class GemfireRepositoryFactoryBean, S, ID extends Serializable> extends RepositoryFactoryBeanSupport implements ApplicationContextAware { @@ -57,7 +56,7 @@ public class GemfireRepositoryFactoryBean, S, ID ext private Iterable> regions; private MappingContext, GemfirePersistentProperty> mappingContext; - + /** * Sets a reference to the Spring {@link ApplicationContext} in which this object runs. * @@ -71,10 +70,10 @@ public class GemfireRepositoryFactoryBean, S, ID ext Collection regions = applicationContext.getBeansOfType(Region.class).values(); this.regions = (Iterable) Collections.unmodifiableCollection(regions); } - + /** * Configures the {@link MappingContext} used to perform domain object type to store mappings. - * + * * @param mappingContext the {@link MappingContext} to set. * @see org.springframework.data.gemfire.mapping.GemfireMappingContext * @see org.springframework.data.mapping.context.MappingContext @@ -117,8 +116,8 @@ public class GemfireRepositoryFactoryBean, S, ID ext protected RepositoryFactorySupport createRepositoryFactory() { return new GemfireRepositoryFactory(getRegions(), getGemfireMappingContext()); } - - /* + + /* * (non-Javadoc) * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#afterPropertiesSet() */ diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java b/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java index 3764baff..6659fae8 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java @@ -22,6 +22,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheTransactionManager; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.SelectResults; import org.springframework.data.domain.Sort; import org.springframework.data.gemfire.GemfireCallback; import org.springframework.data.gemfire.GemfireTemplate; @@ -31,12 +36,6 @@ import org.springframework.data.gemfire.repository.query.QueryString; import org.springframework.data.repository.core.EntityInformation; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.SelectResults; - /** * Basic Repository implementation for GemFire. * @@ -46,8 +45,8 @@ import com.gemstone.gemfire.cache.query.SelectResults; * @see java.io.Serializable * @see org.springframework.data.gemfire.GemfireTemplate * @see org.springframework.data.gemfire.repository.GemfireRepository - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.Region */ public class SimpleGemfireRepository implements GemfireRepository { @@ -222,8 +221,8 @@ public class SimpleGemfireRepository implements Gemf /* * (non-Javadoc) * - * @see com.gemstone.gemfire.cache.Region#getAttributes() - * @see com.gemstone.gemfire.cache.RegionAttributes#getDataPolicy() + * @see org.apache.geode.cache.Region#getAttributes() + * @see org.apache.geode.cache.RegionAttributes#getDataPolicy() */ boolean isPartitioned(final Region region) { return (region != null && region.getAttributes() != null @@ -233,7 +232,7 @@ public class SimpleGemfireRepository implements Gemf /* * (non-Javadoc) * - * @see com.gemstone.gemfire.cache.DataPolicy#withPartitioning() + * @see org.apache.geode.cache.DataPolicy#withPartitioning() */ boolean isPartitioned(final DataPolicy dataPolicy) { return (dataPolicy != null && dataPolicy.withPartitioning()); @@ -242,8 +241,8 @@ public class SimpleGemfireRepository implements Gemf /* * (non-Javadoc) * - * @see com.gemstone.gemfire.cache.Region#getRegionService() - * @see com.gemstone.gemfire.cache.Cache#getCacheTransactionManager() + * @see org.apache.geode.cache.Region#getRegionService() + * @see org.apache.geode.cache.Cache#getCacheTransactionManager() */ boolean isTransactionPresent(final Region region) { return (region.getRegionService() instanceof Cache @@ -253,7 +252,7 @@ public class SimpleGemfireRepository implements Gemf /* * (non-Javadoc) * - * @see com.gemstone.gemfire.cache.CacheTransactionManager#exists() + * @see org.apache.geode.cache.CacheTransactionManager#exists() */ boolean isTransactionPresent(final CacheTransactionManager cacheTransactionManager) { return (cacheTransactionManager != null && cacheTransactionManager.exists()); diff --git a/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java b/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java index 0eeaa4a2..d1f108f7 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/AsmInstantiatorGenerator.java @@ -25,6 +25,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; import org.springframework.asm.ClassWriter; import org.springframework.asm.FieldVisitor; import org.springframework.asm.MethodVisitor; @@ -33,14 +35,11 @@ import org.springframework.asm.Type; import org.springframework.beans.BeanUtils; import org.springframework.util.Assert; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; - /** * ASM based {@link InstantiatorGenerator} implementation. This class relies on ASM 2.x package * repacked by Spring framework to minimize the number of dependencies and avoid any versioning * confusion. - * + * * @author Costin Leau */ public class AsmInstantiatorGenerator implements InstantiatorGenerator, Opcodes { @@ -109,7 +108,7 @@ public class AsmInstantiatorGenerator implements InstantiatorGenerator, Opcodes /** * Returns an instance of the custom instantiator created for the given class. - * + * * @param clazz * @param classId * @return @@ -123,7 +122,7 @@ public class AsmInstantiatorGenerator implements InstantiatorGenerator, Opcodes /** * Does basic sanity checks to make sure the constructor can be properly invoked by our generated * class. - * + * * @param clazz */ private void validateClass(Class clazz) { @@ -140,12 +139,12 @@ public class AsmInstantiatorGenerator implements InstantiatorGenerator, Opcodes /** * Generates a new Instantiator class for the given custom class. - * + * * The generated class has the following definition: - * + * * 

 	 * package org.springframework.data.gemfire.serialization;
-	 * 
+	 *
 	 * public class <T>Instantiator$SyntheticCounter extends Instantiator implements Serializable {
 	 *
 	 *  private static final Class<T> clazz = T.class;
@@ -154,7 +153,7 @@ public class AsmInstantiatorGenerator implements InstantiatorGenerator, Opcodes
 	 *  public DateInstantiator() {
 	 *     this(clazz, classId);
 	 *  }
-	 *	
+	 *
 	 *  public DateInstantiator(Class c, int classId) {
 	 *     super(c, classId);
 	 *  }
@@ -164,7 +163,7 @@ public class AsmInstantiatorGenerator implements InstantiatorGenerator, Opcodes
 	 *  }
 	 * }
 	 *
- * + * * @param clazz * @return */ @@ -250,4 +249,4 @@ public class AsmInstantiatorGenerator implements InstantiatorGenerator, Opcodes return cw.toByteArray(); } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java b/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java index f0ea08f8..b2055394 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/EnumSerializer.java @@ -23,13 +23,13 @@ import java.io.Serializable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.internal.InternalDataSerializer; +import org.apache.geode.DataSerializer; +import org.apache.geode.internal.InternalDataSerializer; /** * Generic Serializer for JDK Enums. The class needs to be registered only once - custom enums * will be then understood by the converter by calling {@link #addEnum(Class)}. - * + * * @author Costin Leau */ public class EnumSerializer extends DataSerializer implements Serializable { @@ -92,10 +92,10 @@ public class EnumSerializer extends DataSerializer implements Serializable { /** * Sets the id for this serializer. Default is 1024; - * + * * @param id the id to set */ public void setId(int id) { this.id = id; } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java index 55dda504..34057906 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorFactoryBean.java @@ -21,21 +21,20 @@ import java.util.Collection; import java.util.Map; import java.util.Map.Entry; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; - /** * {@link FactoryBean} that eases registration of custom {@link Instantiator} through - * {@link InstantiatorGenerator}s, inside the Spring container. - * + * {@link InstantiatorGenerator}s, inside the Spring container. + * * By default, the returns {@link Instantiator}s (created through {@link AsmInstantiatorGenerator} if a custom * generator is not specified) are registered at startup with GemFire. - * + * * @author Costin Leau */ public class InstantiatorFactoryBean implements BeanClassLoaderAware, FactoryBean>, @@ -91,7 +90,7 @@ public class InstantiatorFactoryBean implements BeanClassLoaderAware, FactoryBea /** * Sets the custom types and associated user ids for generating the {@link Instantiator}s. - * + * * @param types map containing as keys the custom types and values the associated user ids. */ public void setCustomTypes(Map, Integer> types) { @@ -100,7 +99,7 @@ public class InstantiatorFactoryBean implements BeanClassLoaderAware, FactoryBea /** * Sets the generator to use for creating {@link Instantiator}s. - * + * * @param generator the generator to set */ public void setGenerator(InstantiatorGenerator generator) { @@ -110,7 +109,7 @@ public class InstantiatorFactoryBean implements BeanClassLoaderAware, FactoryBea /** * Sets the auto-registration of this {@link Instantiator} during the container startup. * Default is true, meaning the registration will occur once this factory is initialized. - * + * * @see Instantiator#register(Instantiator) * @param autoRegister the autoRegister to set */ @@ -122,11 +121,11 @@ public class InstantiatorFactoryBean implements BeanClassLoaderAware, FactoryBea /** * Sets the distribution of the region of this {@link Instantiator} during the container startup. * Default is false, meaning the registration will not be distributed to other clients. - * + * * @see Instantiator#register(Instantiator, boolean) * @param distribute whether the registration is distributable or not */ public void setDistribute(boolean distribute) { this.distribute = distribute; } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java index 21aefb99..28b75988 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/InstantiatorGenerator.java @@ -16,13 +16,13 @@ package org.springframework.data.gemfire.serialization; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; /** * Factory that generates {@link Instantiator} classes to improve instantiation of * custom types. - * + * * @author Costin Leau */ public interface InstantiatorGenerator { @@ -30,7 +30,7 @@ public interface InstantiatorGenerator { /** * Returns a (potentially new) Instantiator that optimizes the instantiation of the given types. * - * @param clazz class produced by the instantiator + * @param clazz class produced by the instantiator * @param classId instantiator class id * @return an instantiator optimized for the given type. */ diff --git a/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java b/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java index 71c1d92b..d2525d6f 100644 --- a/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java +++ b/src/main/java/org/springframework/data/gemfire/serialization/WiringInstantiator.java @@ -16,6 +16,8 @@ package org.springframework.data.gemfire.serialization; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; import org.springframework.beans.BeanUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; @@ -24,23 +26,20 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.wiring.BeanConfigurerSupport; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; - /** * Instantiator that performs instance wiring using the Spring IoC container, allowing common properties * to be injected before the object is hydrated/deserialized. The newly created instances can be configured * either by relying on an existing bean definition (which acts as a template) or by providing an embedded * configuration through annotations. - * + * * Can reuse existing instantiators to optimize instance creation. If one is not provided, it will fallback * to reflection invocation. - * + * * By default, on initialization, the class will register itself as an {@link Instantiator} through - * {@link #register(Instantiator)}. This behaviour can be disabled through {@link #setAutoRegister(boolean)}. + * {@link #register(Instantiator)}. This behaviour can be disabled through {@link #setAutoRegister(boolean)}. * Additionally, the instantiator registration is not distributed by default, to allow the application context * to be reused. This can be changed through {@link #setDistribute(boolean)}. - * + * * @see org.springframework.beans.factory.wiring.BeanConfigurerSupport * @see org.springframework.beans.factory.wiring.BeanWiringInfoResolver * @see org.springframework.beans.factory.annotation.Autowired @@ -108,8 +107,8 @@ public class WiringInstantiator extends Instantiator implements BeanFactoryAware /** * Sets the manager responsible for configuring the newly created instances. - * The given configurer needs to be configured and initialized before-hand. - * + * The given configurer needs to be configured and initialized before-hand. + * * @param configurer the configurer to set */ public void setConfigurer(BeanConfigurerSupport configurer) { @@ -119,7 +118,7 @@ public class WiringInstantiator extends Instantiator implements BeanFactoryAware /** * Sets the auto-registration of this {@link Instantiator} during the container startup. * Default is true, meaning the registration will occur once this factory is initialized. - * + * * @see #register(Instantiator) * @param autoRegister the autoRegister to set */ @@ -130,7 +129,7 @@ public class WiringInstantiator extends Instantiator implements BeanFactoryAware /** * Sets the distribution of the region of this {@link Instantiator} during the container startup. * Default is false, meaning the registration will not be distributed to other clients. - * + * * @see #register(Instantiator, boolean) * @param distribute whether the registration is distributable or not */ diff --git a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java index 261ccbf8..53f638e0 100644 --- a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java @@ -19,12 +19,11 @@ import java.io.IOException; import java.util.Collections; import java.util.Set; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.InterestRegistrationListener; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; -import com.gemstone.gemfire.cache.server.ServerLoadProbe; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.InterestRegistrationListener; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; +import org.apache.geode.cache.server.ServerLoadProbe; import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; diff --git a/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java b/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java index 236823a7..eee097a9 100644 --- a/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java +++ b/src/main/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicy.java @@ -16,12 +16,12 @@ package org.springframework.data.gemfire.server; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; /** * Enumeration of the various client subscription policies for {@link CacheServer}. - * + * * @author Costin Leau * @author John Blum * @since 1.1.0 @@ -62,7 +62,7 @@ public enum SubscriptionEvictionPolicy { * @param config a GemFire ClientSubscriptionConfig object holding the configuration setting and meta-data * about the client's subscription configuration. * @return the ClientSubscriptionConfig object. - * @see com.gemstone.gemfire.cache.server.ClientSubscriptionConfig#setEvictionPolicy(String) + * @see org.apache.geode.cache.server.ClientSubscriptionConfig#setEvictionPolicy(String) */ public ClientSubscriptionConfig setEvictionPolicy(final ClientSubscriptionConfig config) { if (config != null) { diff --git a/src/main/java/org/springframework/data/gemfire/server/package-info.java b/src/main/java/org/springframework/data/gemfire/server/package-info.java index 457f4f8a..1002d5b0 100644 --- a/src/main/java/org/springframework/data/gemfire/server/package-info.java +++ b/src/main/java/org/springframework/data/gemfire/server/package-info.java @@ -1,5 +1,5 @@ /** - * Support package for GemFire {@link com.gemstone.gemfire.cache.server.CacheServer}. + * Support package for GemFire {@link org.apache.geode.cache.server.CacheServer}. * */ -package org.springframework.data.gemfire.server; \ No newline at end of file +package org.springframework.data.gemfire.server; diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java b/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java index 578381d2..eab53042 100644 --- a/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java @@ -16,7 +16,7 @@ package org.springframework.data.gemfire.snapshot; -import static com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat; +import static org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat; import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotServiceAdapter; import java.io.Closeable; @@ -34,12 +34,17 @@ import java.util.zip.ZipFile; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.snapshot.CacheSnapshotService; +import org.apache.geode.cache.snapshot.RegionSnapshotService; +import org.apache.geode.cache.snapshot.SnapshotFilter; +import org.apache.geode.cache.snapshot.SnapshotOptions; 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; @@ -47,13 +52,6 @@ import org.springframework.util.FileCopyUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.snapshot.CacheSnapshotService; -import com.gemstone.gemfire.cache.snapshot.RegionSnapshotService; -import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; -import com.gemstone.gemfire.cache.snapshot.SnapshotOptions; - /** * The SnapshotServiceFactoryBean class is a Spring FactoryBean used to configure and create an instance * of an appropriate GemFire Snapshot Service to perform data import and exports. A CacheSnapshotService is created @@ -65,8 +63,8 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotOptions; * @see org.springframework.beans.factory.InitializingBean * @see org.springframework.context.ApplicationListener * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotServiceAdapter - * @see com.gemstone.gemfire.cache.snapshot.CacheSnapshotService - * @see com.gemstone.gemfire.cache.snapshot.RegionSnapshotService + * @see org.apache.geode.cache.snapshot.CacheSnapshotService + * @see org.apache.geode.cache.snapshot.RegionSnapshotService * @since 1.7.0 */ @SuppressWarnings("unused") @@ -107,7 +105,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean implements FactoryBean implements FactoryBean region) { @@ -185,7 +183,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean getRegion() { @@ -292,7 +290,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean wrap(CacheSnapshotService cacheSnapshotService) { return new CacheSnapshotServiceAdapter(cacheSnapshotService); @@ -306,7 +304,7 @@ public class SnapshotServiceFactoryBean implements FactoryBean wrap(RegionSnapshotService regionSnapshotService) { return new RegionSnapshotServiceAdapter(regionSnapshotService); diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java b/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java index 7bfd8e85..d7b7e147 100644 --- a/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java @@ -18,18 +18,17 @@ package org.springframework.data.gemfire.snapshot.event; import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata; +import org.apache.geode.cache.Region; import org.springframework.context.ApplicationEvent; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Region; - /** * The SnapshotApplicationEvent class is a Spring ApplicationEvent signaling a GemFire Cache or Region snapshot event, * used to trigger a snapshot to occur. * * @author John Blum * @see org.springframework.context.ApplicationEvent - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @since 1.7.0 */ @SuppressWarnings("unused") @@ -70,7 +69,7 @@ public abstract class SnapshotApplicationEvent extends ApplicationEvent { * Gets the absolute pathname of the Region in GemFire for which the snapshot will be taken. * * @return a String indicating the absolute pathname of the Region. - * @see com.gemstone.gemfire.cache.Region#getFullPath() + * @see org.apache.geode.cache.Region#getFullPath() */ public String getRegionPath() { return regionPath; @@ -111,7 +110,7 @@ public abstract class SnapshotApplicationEvent extends ApplicationEvent { * * @param region the Region being evaluated as the subject of this event. * @return a boolean value indicating whether this event has been targeted for the specified Region - * @see com.gemstone.gemfire.cache.Region#getFullPath() + * @see org.apache.geode.cache.Region#getFullPath() * @see #getRegionPath() * @see #matches(String) */ diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java b/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java index 67a85c3e..0819beab 100644 --- a/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java +++ b/src/main/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilter.java @@ -18,14 +18,14 @@ package org.springframework.data.gemfire.snapshot.filter; import java.util.Map; -import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; +import org.apache.geode.cache.snapshot.SnapshotFilter; /** * The ComposableSnapshotFilter class is a GemFire SnapshotFilter implementation of the Composition design pattern * allowing 2 or more SnapshotFilters to be combined by logical AND and OR operators acting as a single SnapshotFilter. * * @author John Blum - * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter + * @see org.apache.geode.cache.snapshot.SnapshotFilter * @since 1.7.0 */ @SuppressWarnings("unused") @@ -66,7 +66,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * @param rightOperand the operator used to combine the resulting boolean expressions * from the evaluation of the operands. * @see ComposableSnapshotFilter.Operator - * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter + * @see org.apache.geode.cache.snapshot.SnapshotFilter */ private ComposableSnapshotFilter(SnapshotFilter leftOperand, Operator operator, SnapshotFilter rightOperand) { this.leftOperand = leftOperand; @@ -90,7 +90,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * using the Operator. * @return a SnapshotFilter implementation composed of the SnapshotFilters using the specified Operator. * @see ComposableSnapshotFilter.Operator - * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter + * @see org.apache.geode.cache.snapshot.SnapshotFilter */ protected static SnapshotFilter compose(Operator operator, SnapshotFilter... snapshotFilters) { SnapshotFilter composedSnapshotFilter = null; @@ -112,7 +112,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * using the AND Operator. * @return a SnapshotFilter implementation composed of the SnapshotFilters using the AND Operator. * @see ComposableSnapshotFilter.Operator#AND - * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter + * @see org.apache.geode.cache.snapshot.SnapshotFilter */ public static SnapshotFilter and(SnapshotFilter... snapshotFilters) { return compose(Operator.AND, snapshotFilters); @@ -127,7 +127,7 @@ public class ComposableSnapshotFilter implements SnapshotFilter { * using the OR Operator. * @return a SnapshotFilter implementation composed of the SnapshotFilters using the OR Operator. * @see ComposableSnapshotFilter.Operator#OR - * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter + * @see org.apache.geode.cache.snapshot.SnapshotFilter */ public static SnapshotFilter or(SnapshotFilter... snapshotFilters) { return compose(Operator.OR, snapshotFilters); @@ -139,7 +139,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 ComposableSnapshotFilter.Operator - * @see com.gemstone.gemfire.cache.snapshot.SnapshotFilter#accept(Map.Entry) + * @see org.apache.geode.cache.snapshot.SnapshotFilter#accept(Map.Entry) * @see java.util.Map.Entry */ @Override diff --git a/src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java b/src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java index c2a47927..1887802e 100644 --- a/src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java +++ b/src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java @@ -19,6 +19,10 @@ package org.springframework.data.gemfire.support; import java.lang.annotation.Annotation; import java.util.concurrent.atomic.AtomicReference; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -42,11 +46,6 @@ import org.springframework.expression.spel.support.StandardTypeLocator; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; - /** * The AnnotationBasedExpiration class is an implementation of GemFire's CustomExpiry interface that determines * the Time-To-Live (TTL) or Idle-Timeout (TTI) expiration policy of a Region entry by introspecting the Region @@ -61,10 +60,10 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.data.gemfire.support.Expiration * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration * @see org.springframework.data.gemfire.support.TimeToLiveExpiration - * @see com.gemstone.gemfire.cache.CustomExpiry - * @see com.gemstone.gemfire.cache.ExpirationAction - * @see com.gemstone.gemfire.cache.ExpirationAttributes - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.CustomExpiry + * @see org.apache.geode.cache.ExpirationAction + * @see org.apache.geode.cache.ExpirationAttributes + * @see org.apache.geode.cache.Region * @since 1.7.0 */ @SuppressWarnings("unused") @@ -90,7 +89,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * expiration policy. * * @param defaultExpirationAttributes expiration settings used as the default expiration policy. - * @see com.gemstone.gemfire.cache.ExpirationAttributes + * @see org.apache.geode.cache.ExpirationAttributes */ public AnnotationBasedExpiration(ExpirationAttributes defaultExpirationAttributes) { this.defaultExpirationAttributes = defaultExpirationAttributes; @@ -105,7 +104,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @return an AnnotationBasedExpiration instance to process Idle Timeout Expiration annotated Region Entries. * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration * @see org.springframework.data.gemfire.support.IdleTimeoutExpiration - * @see #forIdleTimeout(com.gemstone.gemfire.cache.ExpirationAttributes) + * @see #forIdleTimeout(org.apache.geode.cache.ExpirationAttributes) */ public static AnnotationBasedExpiration forIdleTimeout() { return forIdleTimeout(null); @@ -141,7 +140,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * @return an AnnotationBasedExpiration instance to process Time-To-Live Expiration annotated Region Entries. * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration * @see org.springframework.data.gemfire.support.TimeToLiveExpiration - * @see #forTimeToLive(com.gemstone.gemfire.cache.ExpirationAttributes) + * @see #forTimeToLive(org.apache.geode.cache.ExpirationAttributes) */ public static AnnotationBasedExpiration forTimeToLive() { return forTimeToLive(null); @@ -230,7 +229,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * * @param defaultExpirationAttributes expiration settings used as the default expiration policy. * @see #getDefaultExpirationAttributes() - * @see com.gemstone.gemfire.cache.ExpirationAttributes + * @see org.apache.geode.cache.ExpirationAttributes */ public void setDefaultExpirationAttributes(ExpirationAttributes defaultExpirationAttributes) { this.defaultExpirationAttributes = defaultExpirationAttributes; @@ -241,8 +240,8 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * has been specified. * * @return an instance of ExpirationAttributes with expiration settings defining the default expiration policy. - * @see #setDefaultExpirationAttributes(com.gemstone.gemfire.cache.ExpirationAttributes) - * @see com.gemstone.gemfire.cache.ExpirationAttributes + * @see #setDefaultExpirationAttributes(org.apache.geode.cache.ExpirationAttributes) + * @see org.apache.geode.cache.ExpirationAttributes */ protected ExpirationAttributes getDefaultExpirationAttributes() { //return (defaultExpirationAttributes != null ? defaultExpirationAttributes : ExpirationAttributes.DEFAULT); @@ -255,7 +254,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * * @param entry the entry to calculate the expiration for. * @return the expiration to be used, null if the Region's defaults should be used. - * @see com.gemstone.gemfire.cache.ExpirationAttributes + * @see org.apache.geode.cache.ExpirationAttributes */ @Override public ExpirationAttributes getExpiry(Region.Entry entry) { @@ -285,7 +284,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * or the default expiration settings if the application domain object has not been annotated with custom * expiration meta-data. * @see org.springframework.data.gemfire.support.AnnotationBasedExpiration.ExpirationMetaData - * @see com.gemstone.gemfire.cache.ExpirationAttributes + * @see org.apache.geode.cache.ExpirationAttributes * @see #getDefaultExpirationAttributes() */ protected ExpirationAttributes newExpirationAttributes(ExpirationMetaData expirationMetaData) { @@ -390,7 +389,7 @@ public class AnnotationBasedExpiration implements BeanFactoryAware, Custom * The ExpirationMetaData class encapsulates the settings constituting the expiration policy including * the expiration timeout and the action performed when expiration occurs. * - * @see com.gemstone.gemfire.cache.ExpirationAttributes + * @see org.apache.geode.cache.ExpirationAttributes */ protected static class ExpirationMetaData { diff --git a/src/main/java/org/springframework/data/gemfire/support/CallableCacheLoaderAdapter.java b/src/main/java/org/springframework/data/gemfire/support/CallableCacheLoaderAdapter.java index 324236eb..0e184fae 100644 --- a/src/main/java/org/springframework/data/gemfire/support/CallableCacheLoaderAdapter.java +++ b/src/main/java/org/springframework/data/gemfire/support/CallableCacheLoaderAdapter.java @@ -19,14 +19,13 @@ package org.springframework.data.gemfire.support; import java.util.concurrent.Callable; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.TimeoutException; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.TimeoutException; - /** * The CallableCacheLoaderAdapter class is a {@link Callable} and GemFire {@link CacheLoader} implementation that * adapts the {@link Callable} interface into an instance of the {@link CacheLoader} interface. This class is useful @@ -35,9 +34,9 @@ import com.gemstone.gemfire.cache.TimeoutException; * * @author John Blum * @see java.util.concurrent.Callable - * @see com.gemstone.gemfire.cache.CacheLoader - * @see com.gemstone.gemfire.cache.LoaderHelper - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.CacheLoader + * @see org.apache.geode.cache.LoaderHelper + * @see org.apache.geode.cache.Region * @since 1.0.0 */ @SuppressWarnings("unused") @@ -56,7 +55,7 @@ public class CallableCacheLoaderAdapter implements Callable, CacheLoade * * @param delegate the {@link CacheLoader} delegated to by this adapter. * @see #CallableCacheLoaderAdapter(CacheLoader, Object, Region, Object) - * @see com.gemstone.gemfire.cache.CacheLoader + * @see org.apache.geode.cache.CacheLoader */ public CallableCacheLoaderAdapter(CacheLoader delegate) { this(delegate, null, null, null); @@ -71,8 +70,8 @@ public class CallableCacheLoaderAdapter implements Callable, CacheLoade * @param key the key for which the value will be loaded. * @param region the {@link Region} in which the entry (key/value) belongs. * @see #CallableCacheLoaderAdapter(CacheLoader, Object, Region, Object) - * @see com.gemstone.gemfire.cache.CacheLoader - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.CacheLoader + * @see org.apache.geode.cache.Region */ public CallableCacheLoaderAdapter(CacheLoader delegate, K key, Region region) { this(delegate, key, region, null); @@ -89,8 +88,8 @@ public class CallableCacheLoaderAdapter implements Callable, CacheLoade * @param region the {@link Region} in which the entry (key/value) belongs. * @param argument the Object argument used with the {@link CacheLoader} delegate. * @see #CallableCacheLoaderAdapter(CacheLoader, Object, Region, Object) - * @see com.gemstone.gemfire.cache.CacheLoader - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.CacheLoader + * @see org.apache.geode.cache.Region */ public CallableCacheLoaderAdapter(CacheLoader delegate, K key, Region region, Object argument) { Assert.notNull(delegate, "CacheLoader must not be null"); @@ -113,7 +112,7 @@ public class CallableCacheLoaderAdapter implements Callable, CacheLoade * The {@link CacheLoader} delegate used to actually load the cache value for the specified key. * * @return a reference to the actual {@link CacheLoader} used when loading the cache value for the specified key. - * @see com.gemstone.gemfire.cache.CacheLoader + * @see org.apache.geode.cache.CacheLoader */ protected CacheLoader getCacheLoader() { return cacheLoader; @@ -132,7 +131,7 @@ public class CallableCacheLoaderAdapter implements Callable, CacheLoade * Returns the Region to which the entry (key/value) belongs. * * @return the Region to which the entry belongs. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ protected Region getRegion() { return region; @@ -190,8 +189,8 @@ public class CallableCacheLoaderAdapter implements Callable, CacheLoade * @throws CacheLoaderException if an error occurs during the load operation. This exception, or any other * Exception thrown by this method will be propagated back to the application from the * {@link Region#get(Object)} method. - * @see com.gemstone.gemfire.cache.CacheLoader#load(LoaderHelper) - * @see com.gemstone.gemfire.cache.LoaderHelper + * @see org.apache.geode.cache.CacheLoader#load(LoaderHelper) + * @see org.apache.geode.cache.LoaderHelper * @see #getCacheLoader() */ public V load(LoaderHelper loaderHelper) throws CacheLoaderException { diff --git a/src/main/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapper.java b/src/main/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapper.java index 5e58d266..56ba884c 100644 --- a/src/main/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapper.java @@ -16,16 +16,15 @@ package org.springframework.data.gemfire.support; +import org.apache.geode.cache.client.ClientRegionShortcut; import org.springframework.util.ObjectUtils; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; - /** * The ClientRegionShortcutWrapper enum is a Java enumerated type that wraps GemFire's ClientRegionShortcuts * with Spring Data GemFire ClientRegionShortcutWrapper enumerated values. * * @author John Blum - * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut + * @see org.apache.geode.cache.client.ClientRegionShortcut * @since 1.4.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java b/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java index c4a3a29a..fffe62b2 100644 --- a/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java +++ b/src/main/java/org/springframework/data/gemfire/support/GemfireCache.java @@ -18,9 +18,8 @@ package org.springframework.data.gemfire.support; import java.util.concurrent.Callable; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; import org.springframework.cache.Cache; import org.springframework.cache.support.SimpleValueWrapper; import org.springframework.util.Assert; @@ -32,7 +31,7 @@ import org.springframework.util.Assert; * @author John Blum * @author Oliver Gierke * @see org.springframework.cache.Cache - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public class GemfireCache implements Cache { @@ -44,7 +43,7 @@ public class GemfireCache implements Cache { * * @param region GemFire {@link Region} to wrap. * @return an instance of {@link GemfireCache} backed by the provided GemFire {@link Region}. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @see org.springframework.cache.Cache * @see #GemfireCache(Region) */ @@ -69,7 +68,7 @@ public class GemfireCache implements Cache { * Returns the GemFire {@link Region} used as the implementation for this Spring {@link Cache}. * * @return the GemFire {@link Region} used as the implementation for this Spring {@link Cache}. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public Region getNativeCache() { return this.region; @@ -79,7 +78,7 @@ public class GemfireCache implements Cache { * Returns the name of this Spring {@link Cache}. * * @return the name of this Spring {@link Cache}. - * @see com.gemstone.gemfire.cache.Region#getName() + * @see org.apache.geode.cache.Region#getName() */ public String getName() { return getNativeCache().getName(); @@ -88,7 +87,7 @@ public class GemfireCache implements Cache { /** * Clears the entire contents of this Spring {@link Cache}. * - * @see com.gemstone.gemfire.cache.Region#clear() + * @see org.apache.geode.cache.Region#clear() */ public void clear() { getNativeCache().clear(); @@ -98,7 +97,7 @@ public class GemfireCache implements Cache { * Evicts (destroys) the entry (key/value) mapped to the given key from this Spring {@link Cache}. * * @param key key used to identify the cache entry to evict. - * @see com.gemstone.gemfire.cache.Region#destroy(Object) + * @see org.apache.geode.cache.Region#destroy(Object) */ public void evict(Object key) { getNativeCache().remove(key); @@ -111,7 +110,7 @@ public class GemfireCache implements Cache { * @param key key identifying the the value to retrieve from the cache. * @return the value cached with the given key. * @see org.springframework.cache.Cache.ValueWrapper - * @see com.gemstone.gemfire.cache.Region#get(Object) + * @see org.apache.geode.cache.Region#get(Object) */ public ValueWrapper get(Object key) { Object value = getNativeCache().get(key); @@ -127,7 +126,7 @@ public class GemfireCache implements Cache { * @param type desired {@link Class} type of the value. * @return the cache value for the given key cast to the specified {@link Class} type. * @throws IllegalStateException if the value is not null and not an instance of the desired type. - * @see com.gemstone.gemfire.cache.Region#get(Object) + * @see org.apache.geode.cache.Region#get(Object) */ @SuppressWarnings("unchecked") public T get(Object key, Class type) { @@ -186,7 +185,7 @@ public class GemfireCache implements Cache { * * @param key key used to reference the value in the cache. * @param value value to store in the cache referenced by the key. - * @see com.gemstone.gemfire.cache.Region#put(Object, Object) + * @see org.apache.geode.cache.Region#put(Object, Object) */ @SuppressWarnings("unchecked") public void put(Object key, Object value) { @@ -202,7 +201,7 @@ public class GemfireCache implements Cache { * * @return the existing value if the given key is already mapped to a value. * @see org.springframework.cache.Cache#putIfAbsent(java.lang.Object, java.lang.Object) - * @see com.gemstone.gemfire.cache.Region#putIfAbsent(Object, Object) + * @see org.apache.geode.cache.Region#putIfAbsent(Object, Object) */ @SuppressWarnings("unchecked") public ValueWrapper putIfAbsent(Object key, Object value) { diff --git a/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java b/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java index 42b8e3af..4ab15385 100644 --- a/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java +++ b/src/main/java/org/springframework/data/gemfire/support/GemfireCacheManager.java @@ -21,9 +21,8 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.cache.support.AbstractCacheManager; @@ -42,15 +41,15 @@ import org.springframework.util.Assert; * @see org.springframework.cache.Cache * @see org.springframework.cache.CacheManager * @see org.springframework.cache.support.AbstractCacheManager - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.Region */ @SuppressWarnings("unused") public class GemfireCacheManager extends AbstractCacheManager { private final AtomicBoolean dynamic = new AtomicBoolean(true); - private com.gemstone.gemfire.cache.GemFireCache gemfireCache; + private org.apache.geode.cache.GemFireCache gemfireCache; private Set> regions; @@ -142,7 +141,7 @@ public class GemfireCacheManager extends AbstractCacheManager { * @param region GemFire {@link Region} to wrap (adapt). * @return an instance of {@link GemfireCache} initialized with the given GemFire {@link Region}. * @see org.springframework.data.gemfire.support.GemfireCache - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ protected GemfireCache newGemfireCache(Region region) { return GemfireCache.wrap(region); @@ -193,9 +192,9 @@ public class GemfireCacheManager extends AbstractCacheManager { * * @param gemfireCache the GemFire cache instance used by this {@link CacheManager} * to manage Spring {@link Cache Caches}. - * @see com.gemstone.gemfire.cache.GemFireCache + * @see org.apache.geode.cache.GemFireCache */ - public void setCache(com.gemstone.gemfire.cache.GemFireCache gemfireCache) { + public void setCache(org.apache.geode.cache.GemFireCache gemfireCache) { this.gemfireCache = gemfireCache; } @@ -203,9 +202,9 @@ public class GemfireCacheManager extends AbstractCacheManager { * Returns the {@link GemFireCache} instance backing this {@link CacheManager}. * * @return the {@link GemFireCache} instance backing this {@link CacheManager}. - * @see com.gemstone.gemfire.cache.GemFireCache + * @see org.apache.geode.cache.GemFireCache */ - protected com.gemstone.gemfire.cache.GemFireCache getCache() { + protected org.apache.geode.cache.GemFireCache getCache() { return this.gemfireCache; } @@ -231,7 +230,7 @@ public class GemfireCacheManager extends AbstractCacheManager { * * @param regions {@link Set} of GemFire {@link Region Regions} used by this {@link CacheManager} * as Spring {@link Cache Caches}. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public void setRegions(Set> regions) { this.regions = regions; @@ -243,7 +242,7 @@ public class GemfireCacheManager extends AbstractCacheManager { * * @return the set of GemFire {@link Region Regions} functioning as Spring {@link Cache Caches} * in Spring's caching infrastructure - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ protected Set> getRegions() { return this.regions; diff --git a/src/main/java/org/springframework/data/gemfire/support/GemfireDaoSupport.java b/src/main/java/org/springframework/data/gemfire/support/GemfireDaoSupport.java index 1c5ee859..df0aeae9 100644 --- a/src/main/java/org/springframework/data/gemfire/support/GemfireDaoSupport.java +++ b/src/main/java/org/springframework/data/gemfire/support/GemfireDaoSupport.java @@ -16,24 +16,23 @@ package org.springframework.data.gemfire.support; +import org.apache.geode.cache.Region; import org.springframework.dao.support.DaoSupport; import org.springframework.data.gemfire.GemfireOperations; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; - /** * Convenient super class for GemFire data access objects. Intended for - * GemfireTemplate usage. - * - *

Requires a Region to be set, providing a GemfireTemplate based on it to subclasses. + * GemfireTemplate usage. + * + *

Requires a Region to be set, providing a GemfireTemplate based on it to subclasses. * Can alternatively be initialized directly via a GemfireTemplate, to reuse the latter's * settings. * - *

This class will create its own GemfireTemplate if an Region reference is passed in. + *

This class will create its own GemfireTemplate if an Region reference is passed in. * A custom GemfireTemplate instance can be used through overriding createGemfireTemplate. - * + * * @author Costin Leau * @author John Blum * @see org.springframework.dao.support.DaoSupport @@ -47,8 +46,8 @@ public class GemfireDaoSupport extends DaoSupport { * an instance of the GemfireTemplate for the given Region. * * @param region the GemFire Cache Region upon which this DAO operates. - * @see com.gemstone.gemfire.cache.Region - * @see #createGemfireTemplate(com.gemstone.gemfire.cache.Region) + * @see org.apache.geode.cache.Region + * @see #createGemfireTemplate(org.apache.geode.cache.Region) */ public void setRegion(Region region) { this.gemfireTemplate = createGemfireTemplate(region); @@ -84,7 +83,7 @@ public class GemfireDaoSupport extends DaoSupport { * * @param region the GemFire Cache Region for which the GemfireTemplate is created. * @return a new GemfireTemplate instance configured with the given GemFire Cache Region. - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @see #setRegion */ protected GemfireOperations createGemfireTemplate(Region region) { diff --git a/src/main/java/org/springframework/data/gemfire/support/JSONRegionAdvice.java b/src/main/java/org/springframework/data/gemfire/support/JSONRegionAdvice.java index 4c64db39..c07ed907 100644 --- a/src/main/java/org/springframework/data/gemfire/support/JSONRegionAdvice.java +++ b/src/main/java/org/springframework/data/gemfire/support/JSONRegionAdvice.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -21,23 +21,24 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.query.internal.ResultsBag; +import org.apache.geode.pdx.JSONFormatter; +import org.apache.geode.pdx.PdxInstance; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.util.CollectionUtils; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.internal.ResultsBag; -import com.gemstone.gemfire.pdx.JSONFormatter; -import com.gemstone.gemfire.pdx.PdxInstance; - /** * @author David Turanski + * @author John Blum */ @Aspect @SuppressWarnings("unused") @@ -91,10 +92,10 @@ public class JSONRegionAdvice { this.prettyPrint = prettyPrint; } - @Around("execution(* com.gemstone.gemfire.cache.Region.put(..)) || " - + "execution(* com.gemstone.gemfire.cache.Region.create(..)) ||" - + "execution(* com.gemstone.gemfire.cache.Region.putIfAbsent(..)) ||" - + "execution(* com.gemstone.gemfire.cache.Region.replace(..))") + @Around("execution(* org.apache.geode.cache.Region.put(..)) || " + + "execution(* org.apache.geode.cache.Region.create(..)) ||" + + "execution(* org.apache.geode.cache.Region.putIfAbsent(..)) ||" + + "execution(* org.apache.geode.cache.Region.replace(..))") public Object put(ProceedingJoinPoint pjp) { boolean JSONRegion = isIncludedSONRegion(pjp.getTarget()); Object returnValue = null; @@ -119,7 +120,7 @@ public class JSONRegionAdvice { return returnValue; } - @Around("execution(* com.gemstone.gemfire.cache.Region.putAll(..))") + @Around("execution(* org.apache.geode.cache.Region.putAll(..))") public Object putAll(ProceedingJoinPoint pjp) { boolean JSONRegion = isIncludedSONRegion(pjp.getTarget()); Object returnValue = null; @@ -146,9 +147,9 @@ public class JSONRegionAdvice { return returnValue; } - @Around("execution(* com.gemstone.gemfire.cache.Region.get(..)) " - + "|| execution(* com.gemstone.gemfire.cache.Region.selectValue(..))" - + "|| execution(* com.gemstone.gemfire.cache.Region.remove(..))") + @Around("execution(* org.apache.geode.cache.Region.get(..)) " + + "|| execution(* org.apache.geode.cache.Region.selectValue(..))" + + "|| execution(* org.apache.geode.cache.Region.remove(..))") public Object get(ProceedingJoinPoint pjp) { Object returnValue = null; @@ -170,7 +171,7 @@ public class JSONRegionAdvice { } @SuppressWarnings("unchecked") - @Around("execution(* com.gemstone.gemfire.cache.Region.getAll(..))") + @Around("execution(* org.apache.geode.cache.Region.getAll(..))") public Map getAll(ProceedingJoinPoint pjp) { Map result = null; @@ -195,7 +196,7 @@ public class JSONRegionAdvice { } @SuppressWarnings("unchecked") - @Around("execution(* com.gemstone.gemfire.cache.Region.values(..))") + @Around("execution(* org.apache.geode.cache.Region.values(..))") public Collection values(ProceedingJoinPoint pjp) { Collection result = null; diff --git a/src/main/java/org/springframework/data/gemfire/support/ListRegionsOnServerFunction.java b/src/main/java/org/springframework/data/gemfire/support/ListRegionsOnServerFunction.java index b3015838..ad3e06b9 100644 --- a/src/main/java/org/springframework/data/gemfire/support/ListRegionsOnServerFunction.java +++ b/src/main/java/org/springframework/data/gemfire/support/ListRegionsOnServerFunction.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -15,11 +15,11 @@ package org.springframework.data.gemfire.support; import java.util.ArrayList; import java.util.List; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; /** * ListRegionsOnServerFunction is a GemFire Function class that returns a List of names for all Regions @@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.execute.FunctionContext; * * @author David Turanski * @author John Blum - * @see com.gemstone.gemfire.cache.execute.Function + * @see org.apache.geode.cache.execute.Function */ @SuppressWarnings("serial") public class ListRegionsOnServerFunction implements Function { @@ -38,7 +38,7 @@ public class ListRegionsOnServerFunction implements Function { /* * (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.Function#execute(com.gemstone.gemfire.cache.execute.FunctionContext) + * @see org.apache.geode.cache.execute.Function#execute(org.apache.geode.cache.execute.FunctionContext) */ @Override public void execute(FunctionContext functionContext) { @@ -58,7 +58,7 @@ public class ListRegionsOnServerFunction implements Function { /* * (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.Function#getId() + * @see org.apache.geode.cache.execute.Function#getId() */ @Override public String getId() { @@ -67,7 +67,7 @@ public class ListRegionsOnServerFunction implements Function { /* * (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.Function#hasResult() + * @see org.apache.geode.cache.execute.Function#hasResult() */ @Override public boolean hasResult() { @@ -76,7 +76,7 @@ public class ListRegionsOnServerFunction implements Function { /* * (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.Function#isHA() + * @see org.apache.geode.cache.execute.Function#isHA() */ @Override public boolean isHA() { @@ -85,7 +85,7 @@ public class ListRegionsOnServerFunction implements Function { /* * (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.Function#optimizeForWrite() + * @see org.apache.geode.cache.execute.Function#optimizeForWrite() */ @Override public boolean optimizeForWrite() { diff --git a/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java b/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java index 66a99294..522466c5 100644 --- a/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java @@ -16,16 +16,15 @@ package org.springframework.data.gemfire.support; +import org.apache.geode.cache.RegionShortcut; import org.springframework.util.ObjectUtils; -import com.gemstone.gemfire.cache.RegionShortcut; - /** * The RegionShortcutWrapper enum is a Java enumerated type that wraps GemFire's RegionShortcuts * with Spring Data GemFire RegionShortcutWrapper enumerated values. * * @author John Blum - * @see com.gemstone.gemfire.cache.RegionShortcut + * @see org.apache.geode.cache.RegionShortcut * @since 1.4.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java b/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java index a3b9b52f..7a544a44 100644 --- a/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java +++ b/src/main/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializer.java @@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.Declarable; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationListener; @@ -42,8 +43,6 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Declarable; - /** * The SpringContextBootstrappingInitializer class is a GemFire configuration initializer used to bootstrap a Spring * ApplicationContext inside a GemFire Server JVM-based process. This enables a GemFire Cache Server resources to be @@ -59,7 +58,7 @@ import com.gemstone.gemfire.cache.Declarable; * @see org.springframework.context.event.ApplicationContextEvent * @see org.springframework.context.event.ApplicationEventMulticaster * @see org.springframework.context.support.ClassPathXmlApplicationContext - * @see com.gemstone.gemfire.cache.Declarable + * @see org.apache.geode.cache.Declarable * @link http://gemfire.docs.pivotal.io/latest/userguide/index.html#basic_config/the_cache/setting_cache_initializer.html * @link https://jira.springsource.org/browse/SGF-248 * @since 1.4.0 diff --git a/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java b/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java index 3786ab3f..d3300d74 100644 --- a/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java +++ b/src/main/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProvider.java @@ -17,22 +17,21 @@ package org.springframework.data.gemfire.support; import java.util.Properties; +import org.apache.geode.cache.Cache; +import org.apache.geode.distributed.ServerLauncher; +import org.apache.geode.distributed.ServerLauncher.Builder; +import org.apache.geode.distributed.ServerLauncherCacheProvider; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.distributed.ServerLauncher; -import com.gemstone.gemfire.distributed.ServerLauncher.Builder; -import com.gemstone.gemfire.distributed.ServerLauncherCacheProvider; - /** * The SpringServerLauncherCacheProvider class overrides the default behavior of GemFire's {@link ServerLauncher} * to bootstrap the GemFire cache using a Spring {@link org.springframework.context.ApplicationContext} instead * of GemFire cache.xml inside a GemFire Server JVM-based process. This enables a GemFire Cache Server's resources * to be configured with Spring Data GemFire's XML namespace. - * + * * Unlike {@link SpringContextBootstrappingInitializer}, this allows the configuration of the cache to specified * in the Spring context. - * + * * To use this cache provider, ensure that the Spring Data GemFire JAR file is on the classpath of the GemFire server * and specify the --spring-xml-location option from the Gfsh command line or call * {@link Builder#setSpringXmlLocation(String)} when launching the GemFire server. @@ -41,7 +40,7 @@ import com.gemstone.gemfire.distributed.ServerLauncherCacheProvider; * @author John Blum * @see org.springframework.context.ApplicationContext * @see org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer - * @see com.gemstone.gemfire.distributed.ServerLauncherCacheProvider + * @see org.apache.geode.distributed.ServerLauncherCacheProvider * @since 1.7.0 * @link http://gemfire.docs.pivotal.io/latest/userguide/index.html#basic_config/the_cache/setting_cache_initializer.html */ diff --git a/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java b/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java index 17c681ab..7e2a554a 100644 --- a/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java +++ b/src/main/java/org/springframework/data/gemfire/util/CacheUtils.java @@ -17,31 +17,30 @@ package org.springframework.data.gemfire.util; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.internal.cache.GemFireCacheImpl; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; - /** * CacheUtils is an abstract utility class encapsulating common operations for working with GemFire Cache * and ClientCache instances. * * @author John Blum * @see org.springframework.data.gemfire.util.DistributedSystemUtils - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.CacheFactory - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.client.ClientCacheFactory - * @see com.gemstone.gemfire.distributed.DistributedSystem - * @see com.gemstone.gemfire.internal.cache.GemFireCacheImpl + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.CacheFactory + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientCacheFactory + * @see org.apache.geode.distributed.DistributedSystem + * @see org.apache.geode.internal.cache.GemFireCacheImpl * @since 1.8.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java b/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java index fe607ed2..afb10d4b 100644 --- a/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java +++ b/src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java @@ -18,15 +18,14 @@ package org.springframework.data.gemfire.util; import java.util.Properties; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.internal.DistributionLocator; - +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.Locator; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.InternalLocator; +import org.apache.geode.internal.DistributionLocator; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -34,11 +33,11 @@ import org.springframework.util.StringUtils; * DistributedSystemUtils is an abstract utility class for working with the GemFire DistributedSystem. * * @author John Blum - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.distributed.DistributedSystem - * @see com.gemstone.gemfire.distributed.internal.DistributionConfig - * @see com.gemstone.gemfire.distributed.internal.InternalDistributedSystem - * @see com.gemstone.gemfire.internal.DistributionLocator + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.distributed.DistributedSystem + * @see org.apache.geode.distributed.internal.DistributionConfig + * @see org.apache.geode.distributed.internal.InternalDistributedSystem + * @see org.apache.geode.internal.DistributionLocator * @since 1.7.0 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java index edfab517..1e9561a8 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.geode.cache.Cache; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; @@ -27,8 +28,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Cache; - /** * Base class for GemFire WAN Gateway component factory beans. * diff --git a/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java index 8557577e..e50ff357 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBean.java @@ -15,15 +15,14 @@ */ package org.springframework.data.gemfire.wan; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory; +import org.apache.geode.cache.wan.GatewaySender; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * FactoryBean for creating GemFire {@link AsyncEventQueue}s. * @@ -55,7 +54,7 @@ public class AsyncEventQueueFactoryBean extends AbstractWANComponentFactoryBean< * Constructs an instance of the AsyncEventQueueFactoryBean for creating an GemFire AsyncEventQueue. * * @param cache the GemFire Cache reference. - * @see #AsyncEventQueueFactoryBean(com.gemstone.gemfire.cache.Cache, com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener) + * @see #AsyncEventQueueFactoryBean(org.apache.geode.cache.Cache, org.apache.geode.cache.asyncqueue.AsyncEventListener) */ public AsyncEventQueueFactoryBean(Cache cache) { this(cache, null); @@ -218,9 +217,9 @@ public class AsyncEventQueueFactoryBean extends AbstractWANComponentFactoryBean< * {@literal true} will add all expiration destroy events to the AEQ. * * @param forwardExpirationDestroy boolean value indicating whether to forward expiration destroy events. - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory#setForwardExpirationDestroy(boolean) - * @see com.gemstone.gemfire.cache.ExpirationAttributes#getAction() - * @see com.gemstone.gemfire.cache.ExpirationAction#DESTROY + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory#setForwardExpirationDestroy(boolean) + * @see org.apache.geode.cache.ExpirationAttributes#getAction() + * @see org.apache.geode.cache.ExpirationAction#DESTROY */ public void setForwardExpirationDestroy(Boolean forwardExpirationDestroy) { this.forwardExpirationDestroy = forwardExpirationDestroy; diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java index 3aa78f40..23d440b8 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java @@ -18,26 +18,25 @@ package org.springframework.data.gemfire.wan; import java.io.IOException; import java.util.List; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.wan.GatewayReceiver; +import org.apache.geode.cache.wan.GatewayReceiverFactory; +import org.apache.geode.cache.wan.GatewayTransportFilter; import org.springframework.context.SmartLifecycle; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; -import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; - /** * Spring FactoryBean for creating a GemFire {@link GatewayReceiver}. - * + * * @author David Turanski * @author John Blum * @see org.springframework.context.SmartLifecycle * @see org.springframework.data.gemfire.wan.AbstractWANComponentFactoryBean - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.wan.GatewayReceiver - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.wan.GatewayReceiver + * @see org.apache.geode.cache.wan.GatewayReceiverFactory * @since 1.2.2 */ @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java index c782f52f..049e30bb 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java @@ -17,17 +17,16 @@ package org.springframework.data.gemfire.wan; import java.util.List; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.wan.GatewayEventFilter; +import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; +import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.cache.wan.GatewaySenderFactory; +import org.apache.geode.cache.wan.GatewayTransportFilter; import org.springframework.context.SmartLifecycle; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.wan.GatewayEventFilter; -import com.gemstone.gemfire.cache.wan.GatewayEventSubstitutionFilter; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; -import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; - /** * FactoryBean for creating a parallel or serial GemFire {@link GatewaySender}. * @@ -35,9 +34,9 @@ import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; * @author John Blum * @see org.springframework.context.SmartLifecycle * @see org.springframework.data.gemfire.wan.AbstractWANComponentFactoryBean - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.wan.GatewaySender - * @see com.gemstone.gemfire.cache.wan.GatewaySenderFactory + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.wan.GatewaySender + * @see org.apache.geode.cache.wan.GatewaySenderFactory * @since 1.2.2 */ @SuppressWarnings("unused") @@ -77,7 +76,7 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean cats; + private org.apache.geode.cache.Region cats; Cat save(Cat cat) { cats.put(cat.getName(), cat); @@ -359,7 +358,7 @@ public class GemfireTemplateQueriesOnGroupedPooledClientCacheRegionsIntegrationT static class GemFireCacheServerTwoConfiguration extends AbstractGemFireCacheServerConfiguration { @Resource(name = "Dogs") - private com.gemstone.gemfire.cache.Region dogs; + private org.apache.geode.cache.Region dogs; Dog save(Dog dog) { dogs.put(dog.getName(), dog); diff --git a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java b/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java index 179f6d05..f65ec2a1 100644 --- a/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/GemfireTemplateUnitTests.java @@ -34,17 +34,16 @@ import java.util.Arrays; import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; -import com.gemstone.gemfire.GemFireCheckedException; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.SelectResults; - +import org.apache.geode.GemFireCheckedException; +import org.apache.geode.GemFireException; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.query.Query; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.cache.query.SelectResults; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java b/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java index eea263bf..65c7138c 100644 --- a/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java +++ b/src/test/java/org/springframework/data/gemfire/GemfireUtilsTest.java @@ -27,12 +27,11 @@ import static org.mockito.Mockito.when; import java.util.Properties; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.distributed.DistributedSystem; import org.junit.Test; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.distributed.DistributedSystem; - /** * The GemfireUtilsTest class is a test suite of test cases testing the contract and functionality of the GemfireUtils * abstract utility class. diff --git a/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java index b9491eb5..73f3482b 100644 --- a/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/GenericRegionFactoryBeanTest.java @@ -19,16 +19,15 @@ package org.springframework.data.gemfire; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Scope; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; - /** * The GenericRegionFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the GenericRegionFactoryBean class. @@ -39,7 +38,7 @@ import com.gemstone.gemfire.cache.Scope; */ public class GenericRegionFactoryBeanTest { - // as defined in the com.gemstone.gemfire.internal.cache.AbstractRegion class + // as defined in the org.apache.geode.internal.cache.AbstractRegion class private static final Scope DEFAULT_SCOPE = Scope.DISTRIBUTED_NO_ACK; private static Region defaultRegion; diff --git a/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java index 4b385729..1602db3e 100644 --- a/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/IndexConflictsIntegrationTest.java @@ -27,6 +27,9 @@ import static org.junit.Assert.assertThat; import java.util.Properties; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.IndexExistsException; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; @@ -39,10 +42,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.Import; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexExistsException; - /** * The IndexConflictsIntegrationTest class... * diff --git a/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java index 5bc28f02..159326d2 100644 --- a/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/IndexFactoryBeanTest.java @@ -49,6 +49,14 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.IndexExistsException; +import org.apache.geode.cache.query.IndexInvalidException; +import org.apache.geode.cache.query.IndexNameConflictException; +import org.apache.geode.cache.query.IndexStatistics; +import org.apache.geode.cache.query.QueryService; import org.junit.After; import org.junit.Rule; import org.junit.Test; @@ -60,15 +68,6 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.data.gemfire.config.xml.GemfireConstants; import org.springframework.data.util.ReflectionUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexExistsException; -import com.gemstone.gemfire.cache.query.IndexInvalidException; -import com.gemstone.gemfire.cache.query.IndexNameConflictException; -import com.gemstone.gemfire.cache.query.IndexStatistics; -import com.gemstone.gemfire.cache.query.QueryService; - /** * The IndexFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the IndexFactoryBean class. @@ -76,10 +75,10 @@ import com.gemstone.gemfire.cache.query.QueryService; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.IndexFactoryBean - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.query.Index - * @see com.gemstone.gemfire.cache.query.QueryService + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.query.Index + * @see org.apache.geode.cache.query.QueryService * @since 1.5.2 */ public class IndexFactoryBeanTest { @@ -1021,7 +1020,7 @@ public class IndexFactoryBeanTest { when(mockIndex.getName()).thenReturn("MockIndex"); when(mockIndex.getProjectionAttributes()).thenReturn("id"); when(mockIndex.getStatistics()).thenReturn(mockIndexStats); - when(mockIndex.getType()).thenReturn(com.gemstone.gemfire.cache.query.IndexType.HASH); + when(mockIndex.getType()).thenReturn(org.apache.geode.cache.query.IndexType.HASH); when(mockQueryService.getIndexes()).thenReturn(Collections.singletonList(mockIndex)); IndexFactoryBean.IndexWrapper indexWrapper = new IndexFactoryBean.IndexWrapper(mockQueryService, "MockIndex"); @@ -1041,7 +1040,7 @@ public class IndexFactoryBeanTest { assertEquals("MockIndex", indexWrapper.getName()); assertEquals("id", indexWrapper.getProjectionAttributes()); assertSame(mockIndexStats, indexWrapper.getStatistics()); - assertEquals(com.gemstone.gemfire.cache.query.IndexType.HASH, indexWrapper.getType()); + assertEquals(org.apache.geode.cache.query.IndexType.HASH, indexWrapper.getType()); Index sameIndex = indexWrapper.getIndex(); diff --git a/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java index 38bc2e92..5cca4530 100644 --- a/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/IndexMaintenancePolicyTypeTest.java @@ -23,11 +23,10 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.RegionFactory; import org.junit.Test; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.RegionFactory; - /** * The IndexMaintenanceTypeTest class is a test suite of test cases testing the contract and functionality of the * IndexMaintenanceType enum type. diff --git a/src/test/java/org/springframework/data/gemfire/IndexTypeTest.java b/src/test/java/org/springframework/data/gemfire/IndexTypeTest.java index cf6949d9..edf25443 100644 --- a/src/test/java/org/springframework/data/gemfire/IndexTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/IndexTypeTest.java @@ -37,22 +37,22 @@ public class IndexTypeTest { @Test public void testGetGemfireIndexType() { - assertEquals(com.gemstone.gemfire.cache.query.IndexType.FUNCTIONAL, IndexType.FUNCTIONAL.getGemfireIndexType()); - assertEquals(com.gemstone.gemfire.cache.query.IndexType.HASH, IndexType.HASH.getGemfireIndexType()); - assertEquals(com.gemstone.gemfire.cache.query.IndexType.PRIMARY_KEY, IndexType.KEY.getGemfireIndexType()); - assertEquals(com.gemstone.gemfire.cache.query.IndexType.PRIMARY_KEY, IndexType.PRIMARY_KEY.getGemfireIndexType()); + assertEquals(org.apache.geode.cache.query.IndexType.FUNCTIONAL, IndexType.FUNCTIONAL.getGemfireIndexType()); + assertEquals(org.apache.geode.cache.query.IndexType.HASH, IndexType.HASH.getGemfireIndexType()); + assertEquals(org.apache.geode.cache.query.IndexType.PRIMARY_KEY, IndexType.KEY.getGemfireIndexType()); + assertEquals(org.apache.geode.cache.query.IndexType.PRIMARY_KEY, IndexType.PRIMARY_KEY.getGemfireIndexType()); } @Test public void testValueOf() { - assertEquals(IndexType.FUNCTIONAL, IndexType.valueOf(com.gemstone.gemfire.cache.query.IndexType.FUNCTIONAL)); - assertEquals(IndexType.HASH, IndexType.valueOf(com.gemstone.gemfire.cache.query.IndexType.HASH)); - assertEquals(IndexType.PRIMARY_KEY, IndexType.valueOf(com.gemstone.gemfire.cache.query.IndexType.PRIMARY_KEY)); + assertEquals(IndexType.FUNCTIONAL, IndexType.valueOf(org.apache.geode.cache.query.IndexType.FUNCTIONAL)); + assertEquals(IndexType.HASH, IndexType.valueOf(org.apache.geode.cache.query.IndexType.HASH)); + assertEquals(IndexType.PRIMARY_KEY, IndexType.valueOf(org.apache.geode.cache.query.IndexType.PRIMARY_KEY)); } @Test public void testValueOfWithNull() { - assertNull(IndexType.valueOf((com.gemstone.gemfire.cache.query.IndexType) null)); + assertNull(IndexType.valueOf((org.apache.geode.cache.query.IndexType) null)); } @Test diff --git a/src/test/java/org/springframework/data/gemfire/Init.java b/src/test/java/org/springframework/data/gemfire/Init.java index 02cd847f..678c9137 100644 --- a/src/test/java/org/springframework/data/gemfire/Init.java +++ b/src/test/java/org/springframework/data/gemfire/Init.java @@ -16,18 +16,17 @@ package org.springframework.data.gemfire; +import org.apache.geode.cache.server.CacheServer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.server.CacheServer; - /** - * Simple bean used to check initialization order - * + * Simple bean used to check initialization order + * * @author Costin Leau */ public class Init implements InitializingBean, BeanFactoryAware { diff --git a/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java index 61d7b6ea..14a43ac6 100644 --- a/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/InterestPolicyConverterUnitTests.java @@ -20,8 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import com.gemstone.gemfire.cache.InterestPolicy; - +import org.apache.geode.cache.InterestPolicy; import org.junit.After; import org.junit.Rule; import org.junit.Test; @@ -33,7 +32,7 @@ import org.junit.rules.ExpectedException; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.InterestPolicyConverter - * @see com.gemstone.gemfire.cache.InterestPolicy + * @see org.apache.geode.cache.InterestPolicy * @since 1.6.0 */ public class InterestPolicyConverterUnitTests { diff --git a/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java index 524a7cf7..bdadabb4 100644 --- a/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/InterestPolicyTypeTest.java @@ -21,10 +21,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import org.apache.geode.cache.InterestPolicy; import org.junit.Test; -import com.gemstone.gemfire.cache.InterestPolicy; - /** * The InterestPolicyTypeTest class is a test suite of test cases testing the contract and functionality * of the InterestPolicyType enum. @@ -32,7 +31,7 @@ import com.gemstone.gemfire.cache.InterestPolicy; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.InterestPolicyType - * @see com.gemstone.gemfire.cache.InterestPolicy + * @see org.apache.geode.cache.InterestPolicy * @since 1.6.0 */ public class InterestPolicyTypeTest { diff --git a/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java index 24cf388d..ac1892ac 100644 --- a/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java @@ -22,6 +22,9 @@ import static org.junit.Assert.assertThat; import java.util.Properties; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -32,10 +35,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; - /** * The LazyWiringDeclarableSupportFunctionBasedIntegrationTest class is a test suite of test cases testing the contract * and functionality of a GemFire Function implementing LazyWiringDeclarableSupport, defined using native GemFire diff --git a/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportIntegrationTest.java index 8712edcd..9f504636 100644 --- a/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportIntegrationTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.Properties; + import javax.sql.DataSource; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java index 5c6e5662..93fc6f28 100644 --- a/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/LocalRegionFactoryBeanTest.java @@ -23,14 +23,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionShortcut; import org.junit.Test; import org.springframework.data.gemfire.support.AbstractRegionFactoryBeanTest; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; - /** * The PartitionedRegionFactoryBeanTest class is a test suite of test cases testing the component functionality * and correct behavior of the PartitionedRegionFactoryBean class. diff --git a/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java index e222727c..7b6ebab7 100644 --- a/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/LookupRegionFactoryBeanTest.java @@ -27,21 +27,20 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import org.apache.geode.cache.AttributesMutator; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.EvictionAttributesMutator; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.wan.GatewaySender; import org.junit.Test; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.EvictionAttributesMutator; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * The LookupRegionFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the LookupRegionFactoryBean class. @@ -50,10 +49,10 @@ import com.gemstone.gemfire.cache.wan.GatewaySender; * @see org.junit.Test * @see org.mockito.Mockito * @see org.springframework.data.gemfire.LookupRegionFactoryBean - * @see com.gemstone.gemfire.cache.AttributesMutator - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.EvictionAttributesMutator - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.AttributesMutator + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.EvictionAttributesMutator + * @see org.apache.geode.cache.Region * @since 1.7.0 */ public class LookupRegionFactoryBeanTest { diff --git a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java index 94fb58bf..327fcd13 100644 --- a/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/LookupRegionMutationIntegrationTest.java @@ -25,8 +25,28 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; + import javax.annotation.Resource; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAlgorithm; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionEvent; +import org.apache.geode.cache.asyncqueue.AsyncEvent; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.util.CacheListenerAdapter; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanNameAware; @@ -34,26 +54,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; - /** * The LookupRegionMutationIntegrationTest class is a test suite of test cases testing the contract and integrated * functionality between natively-defined GemFire Cache Regions and SDG's Region lookup functionality combined with diff --git a/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java b/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java index d2c3ca24..1bffe78d 100644 --- a/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java +++ b/src/test/java/org/springframework/data/gemfire/LookupSubRegionTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -27,8 +28,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; - /** * The LookupSubRegionTest class is a test suite of test cases testing the contract and functionality of Region lookups * using Spring Data GemFire configuration and GemFire native cache.xml. @@ -38,7 +37,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.context.ApplicationContext * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @since 1.3.3 * @since 7.0.1 (GemFire) */ diff --git a/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java index 4d3133f5..9349d6ee 100644 --- a/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/PartitionAttributesFactoryBeanTest.java @@ -21,11 +21,10 @@ import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.PartitionResolver; import org.junit.Test; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.PartitionResolver; - /** * The PartitionAttributesFactoryBeanTest class is test suite of test cases testing the contract and functionality of * the PartitionAttributesFactoryBean class. diff --git a/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java index 0d520b86..d3dbf70f 100644 --- a/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/PartitionedRegionFactoryBeanTest.java @@ -22,11 +22,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.RegionFactory; import org.junit.Test; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.RegionFactory; - /** * The PartitionedRegionFactoryBeanTest class is a test suite of test cases testing the component functionality * and correct behavior of the PartitionedRegionFactoryBean class. @@ -35,8 +34,8 @@ import com.gemstone.gemfire.cache.RegionFactory; * @see org.junit.Test * @see org.mockito.Mockito * @see org.springframework.data.gemfire.PartitionedRegionFactoryBean - * @see com.gemstone.gemfire.cache.DataPolicy - * @see com.gemstone.gemfire.cache.RegionFactory + * @see org.apache.geode.cache.DataPolicy + * @see org.apache.geode.cache.RegionFactory * @since 1.3.3 */ @SuppressWarnings("unchecked") diff --git a/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java index d6c38673..f0f3ea46 100644 --- a/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/PdxDiskStoreIntegrationTest.java @@ -22,8 +22,10 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.Serializable; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -34,8 +36,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; - /** * The PdxDiskStoreTest class is a test suite containing tests to reproduce the issue in JIRA SGF-197. * diff --git a/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java index 31b943ff..f4aa5db4 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/RegionDataPolicyShortcutsIntegrationTest.java @@ -23,16 +23,15 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAlgorithm; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.Region; - /** * The RegionShortcutsIntegrationTest class is a test suite of test cases testing the use of RegionShortcuts in the * Spring Data GemFire XML Namespace! @@ -42,7 +41,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.junit.runner.RunWith * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @since 1.4.0 */ @ContextConfiguration("region-datapolicy-shortcuts.xml") diff --git a/src/test/java/org/springframework/data/gemfire/RegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/RegionFactoryBeanTest.java index 7fa54b28..14465bf6 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/RegionFactoryBeanTest.java @@ -33,26 +33,24 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.concurrent.atomic.AtomicBoolean; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.SubscriptionAttributes; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.MembershipAttributes; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionShortcut; +import org.apache.geode.cache.SubscriptionAttributes; +import org.apache.geode.internal.cache.GemFireCacheImpl; import org.junit.After; import org.junit.Test; import org.springframework.data.gemfire.support.AbstractRegionFactoryBeanTest; @@ -65,13 +63,13 @@ import org.springframework.data.gemfire.util.ArrayUtils; * @author David Turanski * @author John Blum * @see org.springframework.data.gemfire.RegionFactoryBean - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.DataPolicy - * @see com.gemstone.gemfire.cache.PartitionAttributes - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.RegionAttributes - * @see com.gemstone.gemfire.cache.RegionFactory - * @see com.gemstone.gemfire.cache.RegionShortcut + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.DataPolicy + * @see org.apache.geode.cache.PartitionAttributes + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.RegionAttributes + * @see org.apache.geode.cache.RegionFactory + * @see org.apache.geode.cache.RegionShortcut */ @SuppressWarnings("unchecked") public class RegionFactoryBeanTest extends AbstractRegionFactoryBeanTest { diff --git a/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java index bf1d107c..46eb283f 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/RegionLookupIntegrationTests.java @@ -22,16 +22,15 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionExistsException; +import org.apache.geode.cache.Scope; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.cache.Scope; - /** * The RegionLookupIntegrationTests class is a test suite of test cases testing the lookup functionality for various * peer Region types. @@ -40,7 +39,7 @@ import com.gemstone.gemfire.cache.Scope; * @see org.junit.Test * @see org.springframework.context.ConfigurableApplicationContext * @see org.springframework.data.gemfire.fork.SpringCacheServerProcess - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @since 1.4.0 * @link https://jira.spring.io/browse/SGF-204 */ diff --git a/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java b/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java index a15c4140..cf00b10a 100644 --- a/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java +++ b/src/test/java/org/springframework/data/gemfire/RegionShortcutConverterTest.java @@ -18,10 +18,9 @@ package org.springframework.data.gemfire; import static org.junit.Assert.assertEquals; +import org.apache.geode.cache.RegionShortcut; import org.junit.Test; -import com.gemstone.gemfire.cache.RegionShortcut; - /** * The RegionShortcutConverterTest class is a test suite of test cases testing the contract and functionality of the * RegionShortcutConverter class @@ -29,7 +28,7 @@ import com.gemstone.gemfire.cache.RegionShortcut; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.RegionShortcutConverter - * @see com.gemstone.gemfire.cache.RegionShortcut + * @see org.apache.geode.cache.RegionShortcut * @since 1.3.4 */ public class RegionShortcutConverterTest { diff --git a/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java index 5a61d879..fb1332c5 100644 --- a/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/ReplicatedRegionFactoryBeanTest.java @@ -22,11 +22,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.RegionFactory; import org.junit.Test; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.RegionFactory; - /** * The ReplicatedRegionFactoryBeanTest class is a test suite of test cases testing the component functionality * and correct behavior of the ReplicatedRegionFactoryBean class. @@ -35,8 +34,8 @@ import com.gemstone.gemfire.cache.RegionFactory; * @see org.junit.Test * @see org.mockito.Mockito * @see org.springframework.data.gemfire.ReplicatedRegionFactoryBean - * @see com.gemstone.gemfire.cache.DataPolicy - * @see com.gemstone.gemfire.cache.RegionFactory + * @see org.apache.geode.cache.DataPolicy + * @see org.apache.geode.cache.RegionFactory * @since 1.3.3 */ @SuppressWarnings("unchecked") diff --git a/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java index 0a24be73..aeaf8d60 100644 --- a/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/ScopeConverterUnitTests.java @@ -20,8 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import com.gemstone.gemfire.cache.Scope; - +import org.apache.geode.cache.Scope; import org.junit.After; import org.junit.Rule; import org.junit.Test; @@ -33,7 +32,7 @@ import org.junit.rules.ExpectedException; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.ScopeConverter - * @see com.gemstone.gemfire.cache.Scope + * @see org.apache.geode.cache.Scope * @since 1.6.0 */ public class ScopeConverterUnitTests { diff --git a/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java b/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java index 05c45053..2eb88036 100644 --- a/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/ScopeTypeTest.java @@ -21,17 +21,16 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import org.apache.geode.cache.Scope; import org.junit.Test; -import com.gemstone.gemfire.cache.Scope; - /** * The ScopeTypeTest class is a test suite of test cases testing the contract and functionality of the ScopeType enum. * * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.ScopeType - * @see com.gemstone.gemfire.cache.Scope + * @see org.apache.geode.cache.Scope * @since 1.6.0 */ public class ScopeTypeTest { diff --git a/src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java b/src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java index 14717664..e9b30ef7 100644 --- a/src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java +++ b/src/test/java/org/springframework/data/gemfire/SimpleCacheListener.java @@ -16,7 +16,7 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; +import org.apache.geode.cache.util.CacheListenerAdapter; /** * @author Costin Leau diff --git a/src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java b/src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java index 23202f1b..3365ea95 100644 --- a/src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java +++ b/src/test/java/org/springframework/data/gemfire/SimpleCacheLoader.java @@ -16,9 +16,9 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; /** * @author Costin Leau diff --git a/src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java b/src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java index 345b90fc..4dd088d6 100644 --- a/src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java +++ b/src/test/java/org/springframework/data/gemfire/SimpleCacheWriter.java @@ -16,7 +16,7 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.util.CacheWriterAdapter; +import org.apache.geode.cache.util.CacheWriterAdapter; /** * @author Costin Leau diff --git a/src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java b/src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java index cd9da6ce..392b1d0e 100644 --- a/src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java +++ b/src/test/java/org/springframework/data/gemfire/SimpleObjectSizer.java @@ -16,7 +16,7 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.util.ObjectSizer; +import org.apache.geode.cache.util.ObjectSizer; /** * @author Costin Leau diff --git a/src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java b/src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java index 833cdb00..db7c824c 100644 --- a/src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java +++ b/src/test/java/org/springframework/data/gemfire/SimplePartitionResolver.java @@ -18,8 +18,8 @@ package org.springframework.data.gemfire; import java.io.Serializable; -import com.gemstone.gemfire.cache.EntryOperation; -import com.gemstone.gemfire.cache.PartitionResolver; +import org.apache.geode.cache.EntryOperation; +import org.apache.geode.cache.PartitionResolver; /** * @author Costin Leau diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java index d9840cd0..b2513079 100644 --- a/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/SubRegionIntegrationTest.java @@ -24,6 +24,18 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.InterestPolicy; +import org.apache.geode.cache.LossAction; +import org.apache.geode.cache.MembershipAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.ResumptionAction; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.SubscriptionAttributes; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -31,19 +43,6 @@ import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitia import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.LossAction; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.ResumptionAction; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.SubscriptionAttributes; - /** * The SubRegionIntegrationTest class is a test suite of test cases testing the functionality of SubRegions in GemFire * configured with Spring Data GemFire's XML namespace configuration meta-data. This test class tests a complex diff --git a/src/test/java/org/springframework/data/gemfire/SubRegionTest.java b/src/test/java/org/springframework/data/gemfire/SubRegionTest.java index 69a1dab0..8e0c1200 100644 --- a/src/test/java/org/springframework/data/gemfire/SubRegionTest.java +++ b/src/test/java/org/springframework/data/gemfire/SubRegionTest.java @@ -19,13 +19,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; import org.junit.Test; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; - /** - * + * * @author David Turanski * @author John Blum */ diff --git a/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java index cd17c080..c4ac6bf8 100644 --- a/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBeanTest.java @@ -20,11 +20,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.apache.geode.cache.InterestPolicy; +import org.apache.geode.cache.SubscriptionAttributes; import org.junit.Test; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.SubscriptionAttributes; - /** * The SubscriptionAttributesFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the SubscriptionAttributesFactoryBean class. diff --git a/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java index 5bc1c5eb..17a596d7 100644 --- a/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/TxIntegrationTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Map; + import javax.annotation.Resource; import org.junit.Test; @@ -33,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; /** * Simple TX integration test. - * + * * @author Costin Leau */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/UserObject.java b/src/test/java/org/springframework/data/gemfire/UserObject.java index 7180b614..9aea9a8f 100644 --- a/src/test/java/org/springframework/data/gemfire/UserObject.java +++ b/src/test/java/org/springframework/data/gemfire/UserObject.java @@ -16,13 +16,13 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; /** * User object used for testing Spring wiring. - * + * * @author Costin Leau */ @SuppressWarnings("rawtypes") @@ -71,4 +71,4 @@ public class UserObject extends WiringDeclarableSupport implements CacheLoader { public void setProp2(Object prop2) { this.prop2 = prop2; } -} \ No newline at end of file +} diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java index ff0277d2..46b5804e 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java @@ -45,14 +45,13 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.pdx.PdxSerializer; - +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.pdx.PdxSerializer; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -73,8 +72,8 @@ import org.springframework.data.gemfire.util.DistributedSystemUtils; * @see org.mockito.Mockito * @see org.junit.Test * @see org.springframework.data.gemfire.client.ClientCacheFactoryBean - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.client.ClientCacheFactory + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientCacheFactory * @since 1.7.0 */ public class ClientCacheFactoryBeanTest { diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java index 62d40869..d93663b1 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheIndexingTest.java @@ -26,6 +26,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.IndexType; +import org.apache.geode.cache.query.QueryService; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -40,12 +45,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexType; -import com.gemstone.gemfire.cache.query.QueryService; - /** * The ClientCacheIndexingTest class is a test suite of test cases testing the creation and application of indexes * on client Regions of a GemFire ClientCache using the <gfe:index/> tag element in the Spring Data GemFire @@ -57,10 +56,10 @@ import com.gemstone.gemfire.cache.query.QueryService; * @see org.springframework.data.gemfire.IndexFactoryBean * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.query.Index - * @see com.gemstone.gemfire.cache.query.QueryService + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.query.Index + * @see org.apache.geode.cache.query.QueryService * @since 1.5.2 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java b/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java index d03f1aeb..5752e171 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCachePoolTests.java @@ -23,6 +23,10 @@ import static org.junit.Assert.assertThat; import javax.annotation.Resource; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -33,11 +37,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The ClientCachePoolTests class... * diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java index 7fae0a15..34574c4b 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheSecurityTest.java @@ -25,8 +25,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.annotation.Resource; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -40,11 +45,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The ClientCacheSecurityTest class is a test suite with test cases testing SSL configuration between a GemFire client * and server using the cluster-ssl-* GemFire System properties. diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java index 8f4d8431..84d65d65 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheTest.java @@ -21,6 +21,8 @@ import static org.junit.Assert.assertThat; import javax.annotation.Resource; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.context.ConfigurableApplicationContext; @@ -29,9 +31,6 @@ import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitia import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java index 96917bc0..ea383040 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableLocatorsTest.java @@ -26,8 +26,13 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.Resource; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -41,11 +46,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The ClientCacheVariableLocatorsTest class is a test suite of test cases testing the use of variable "locators" * attribute on <gfe:pool/< in Spring (Data GemFire) configuration meta-data when connecting a client/server. diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java index f1b5e65d..9a87f451 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheVariableServersTest.java @@ -26,8 +26,13 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.Resource; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -41,11 +46,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The ClientCacheVariableServersTest class is a test suite of test cases testing the use of variable "servers" * attribute on <gfe:pool/< in Spring (Data GemFire) configuration meta-data when connecting a client/server. diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java index ce2f422d..aea2388c 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java @@ -37,6 +37,17 @@ import static org.mockito.Mockito.when; import java.io.InputStream; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.compression.Compressor; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -45,18 +56,6 @@ import org.springframework.core.io.Resource; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.config.xml.GemfireConstants; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.compression.Compressor; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java index 8fa49b96..1af5525f 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionWithCacheLoaderWriterTest.java @@ -22,8 +22,16 @@ import static org.junit.Assert.assertNotNull; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; + import javax.annotation.Resource; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.util.CacheWriterAdapter; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -31,14 +39,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.util.CacheWriterAdapter; - /** * The ClientRegionWithCacheLoaderWriterTest class is a test suite of test cases testing the addition of CacheLoaders * and CacheWriters to a client, local Region inside a GemFire Cache. @@ -49,9 +49,9 @@ import com.gemstone.gemfire.cache.util.CacheWriterAdapter; * @see org.springframework.context.ApplicationContext * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.CacheLoader - * @see com.gemstone.gemfire.cache.CacheWriter - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.CacheLoader + * @see org.apache.geode.cache.CacheWriter + * @see org.apache.geode.cache.Region * @since 1.3.3 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java index f762b364..6d48a912 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientSubRegionTest.java @@ -22,6 +22,8 @@ import static org.junit.Assert.assertSame; import javax.annotation.Resource; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,9 +34,6 @@ import org.springframework.data.gemfire.fork.SpringCacheServerProcess; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; - /** * The ClientSubRegionTest class is a test suite of test cases testing SubRegion functionality from a client * GemFire Cache. diff --git a/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java index f30315fe..686e259d 100644 --- a/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/DurableClientCacheIntegrationTest.java @@ -32,8 +32,17 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; + import javax.annotation.Resource; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.util.CacheListenerAdapter; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -55,15 +64,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; import org.springframework.util.SocketUtils; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; - /** * The DurableClientCacheIntegrationTest class is a test suite of test cases testing GemFire's Durable Client * functionality in the context of Spring Data GemFire. @@ -77,9 +77,9 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter; * @see org.springframework.data.gemfire.test.AbstractGemFireClientServerIntegrationTest * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.util.CacheListenerAdapter + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.util.CacheListenerAdapter * @since 1.6.3 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java index 6816d41d..31ef9aa4 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceIntegrationTest.java @@ -28,8 +28,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -45,9 +48,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; - /** * The GemFireDataSourceIntegrationTest class is a test suite of test cases testing the contract and functionality * of the <gfe-data:datasource> element in the context of a GemFire cluster running both native, @@ -60,8 +60,8 @@ import com.gemstone.gemfire.cache.client.ClientCache; * @see org.springframework.context.ApplicationContext * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.client.ClientCache + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.client.ClientCache * @since 1.7.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java index 428403af..ce7b16b4 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -18,6 +18,10 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.Pool; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -31,11 +35,6 @@ import org.springframework.data.gemfire.repository.sample.PersonRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.Pool; - /** * @author David Turanski * diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java index 157aefa3..827ad0c9 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest.java @@ -29,8 +29,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.distributed.ServerLauncher; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -49,10 +53,6 @@ import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.distributed.ServerLauncher; - /** * The GemFireDataSourceUsingNonSpringConfiguredGemFireServerIntegrationTest class is a test suite of test cases * testing the contract and functionality of the GemfireDataSourcePostProcessor using the <gfe-data:datasource> diff --git a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceWithLocalRegionTest.java b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceWithLocalRegionTest.java index 206d420c..b98d546d 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceWithLocalRegionTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceWithLocalRegionTest.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,6 +14,8 @@ package org.springframework.data.gemfire.client; import static org.junit.Assert.assertEquals; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -25,9 +27,6 @@ import org.springframework.data.gemfire.fork.SpringCacheServerProcess; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * @@ -35,26 +34,26 @@ import com.gemstone.gemfire.cache.Region; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("/org/springframework/data/gemfire/client/datasource-client-with-regions.xml") public class GemFireDataSourceWithLocalRegionTest { - @Autowired + @Autowired ApplicationContext ctx; - + @BeforeClass public static void startUp() throws Exception { - ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " " + ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " " + "/org/springframework/data/gemfire/client/datasource-server.xml"); } - - + + @Test public void testRegionDefinitionNotOverridden() { Region simple = ctx.getBean("simple",Region.class); assertEquals(DataPolicy.NORMAL, simple.getAttributes().getDataPolicy()); } - - - - + + + + @AfterClass public static void cleanUp() { ForkUtil.sendSignal(); diff --git a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java b/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java index f4a9d99c..0323d666 100644 --- a/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/GemfireDataSourcePostProcessorTest.java @@ -42,6 +42,16 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.management.internal.cli.domain.RegionInformation; +import org.apache.geode.management.internal.cli.functions.GetRegionsFunction; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -50,17 +60,6 @@ import org.mockito.stubbing.Answer; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.data.gemfire.support.ListRegionsOnServerFunction; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.management.internal.cli.domain.RegionInformation; -import com.gemstone.gemfire.management.internal.cli.functions.GetRegionsFunction; - /** * The GemfireDataSourcePostProcessor class is a test suite of test cases testing the contract and functionality * of the GemfireDataSourcePostProcessor class, which is responsible for creating client PROXY Regions @@ -71,9 +70,9 @@ import com.gemstone.gemfire.management.internal.cli.functions.GetRegionsFunction * @see org.mockito.Mockito * @see org.springframework.beans.factory.config.ConfigurableListableBeanFactory * @see org.springframework.data.gemfire.client.GemfireDataSourcePostProcessor - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.client.ClientRegionFactory + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientRegionFactory * @since 1.7.0 */ public class GemfireDataSourcePostProcessorTest { diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java index 5ec82327..2390592d 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyConverterUnitTests.java @@ -20,8 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import com.gemstone.gemfire.cache.InterestResultPolicy; - +import org.apache.geode.cache.InterestResultPolicy; import org.junit.After; import org.junit.Rule; import org.junit.Test; @@ -34,7 +33,7 @@ import org.junit.rules.ExpectedException; * @see org.junit.Test * @see org.springframework.data.gemfire.client.InterestResultPolicyConverter * @see org.springframework.data.gemfire.client.InterestResultPolicyType - * @see com.gemstone.gemfire.cache.InterestResultPolicy + * @see org.apache.geode.cache.InterestResultPolicy * @since 1.6.0 */ public class InterestResultPolicyConverterUnitTests { diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java index 27cc0c26..a6610b6a 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestResultPolicyTypeTest.java @@ -21,10 +21,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import org.apache.geode.cache.InterestResultPolicy; import org.junit.Test; -import com.gemstone.gemfire.cache.InterestResultPolicy; - /** * The InterestResultPolicyTypeTest class is a test suite of test cases testing the contract and functionality * of the InterestResultPolicyType enum. @@ -32,7 +31,7 @@ import com.gemstone.gemfire.cache.InterestResultPolicy; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.client.InterestResultPolicyTypeTest - * @see com.gemstone.gemfire.cache.InterestResultPolicy + * @see org.apache.geode.cache.InterestResultPolicy * @since 1.6.0 */ public class InterestResultPolicyTypeTest { diff --git a/src/test/java/org/springframework/data/gemfire/client/InterestTest.java b/src/test/java/org/springframework/data/gemfire/client/InterestTest.java index 91b8fefe..f5deb352 100644 --- a/src/test/java/org/springframework/data/gemfire/client/InterestTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/InterestTest.java @@ -21,11 +21,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import org.apache.geode.cache.InterestResultPolicy; import org.junit.Test; import org.springframework.core.ConstantException; -import com.gemstone.gemfire.cache.InterestResultPolicy; - /** * The InterestTest class is a test suite of test cases testing the contract and functionality of the Interest class. * diff --git a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java index 7079f7f1..b6409123 100644 --- a/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/LocalOnlyClientCacheIntegrationTest.java @@ -24,8 +24,14 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; import java.util.Properties; + import javax.annotation.Resource; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.client.ClientRegionShortcut; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,12 +44,6 @@ import org.springframework.data.gemfire.RegionAttributesFactoryBean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; - /** * The LocalOnlyClientCacheIntegrationTest class... * diff --git a/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java b/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java index 1494bf61..2e0a3360 100644 --- a/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/MultipleClientCacheTest.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -16,13 +16,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java index df6cc0b7..ceacebe6 100644 --- a/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/PoolFactoryBeanTest.java @@ -38,11 +38,10 @@ import java.net.InetSocketAddress; import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.query.QueryService; - +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; +import org.apache.geode.cache.query.QueryService; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -63,9 +62,9 @@ import org.springframework.data.util.ReflectionUtils; * @see org.mockito.Mockito * @see org.springframework.data.gemfire.client.PoolFactoryBean * @see org.springframework.data.gemfire.support.ConnectionEndpoint - * @see com.gemstone.gemfire.cache.GemFireCache - * @see com.gemstone.gemfire.cache.client.Pool - * @see com.gemstone.gemfire.cache.client.PoolFactory + * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolFactory * @since 1.7.0 */ public class PoolFactoryBeanTest { diff --git a/src/test/java/org/springframework/data/gemfire/client/PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/client/PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests.java index 9260e69a..277dd776 100644 --- a/src/test/java/org/springframework/data/gemfire/client/PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/client/PoolsConfiguredWithLocatorsAndServersExpressionsIntegrationTests.java @@ -24,9 +24,8 @@ import static org.mockito.Mockito.when; import java.util.Properties; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; - +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.invocation.InvocationOnMock; diff --git a/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java index b40d6628..00bfdbdf 100644 --- a/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/RegionIntegrationTest.java @@ -21,6 +21,15 @@ import static org.junit.Assert.assertSame; import java.util.Arrays; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.util.CacheListenerAdapter; +import org.apache.geode.cache.util.CacheWriterAdapter; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -31,16 +40,6 @@ import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitia import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; -import com.gemstone.gemfire.cache.util.CacheWriterAdapter; - /** * @author Costin Leau * @author David Turanski @@ -71,7 +70,7 @@ public class RegionIntegrationTest { @Autowired private ApplicationContext ctx; - + @Test public void testBasicRegion() throws Exception { @SuppressWarnings("rawtypes") @@ -123,4 +122,4 @@ public class RegionIntegrationTest { assertEquals(512, pa.getLocalMaxMemory()); assertEquals(1, pa.getRedundantCopies()); } -} \ No newline at end of file +} diff --git a/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java index e594eed3..f250260f 100644 --- a/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/SpringJavaConfiguredClientCacheIntegrationTest.java @@ -22,6 +22,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; import java.util.Properties; + import javax.annotation.Resource; import org.junit.Test; @@ -43,7 +44,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @see org.springframework.data.gemfire.client.ClientCacheFactoryBean * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.client.ClientCache + * @see org.apache.geode.cache.client.ClientCache * @link https://jira.spring.io/browse/SGF-441 * @since 1.8.0 */ diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java index c25acf46..d146b68f 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/DefaultableDelegatingPoolAdapterTest.java @@ -33,6 +33,8 @@ import java.net.InetSocketAddress; import java.util.Collections; import java.util.List; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.query.QueryService; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -42,9 +44,6 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.query.QueryService; - /** * The DefaultableDelegatingPoolAdapterTest class is a default suite of default cases testing the contract and functionality * of the {@link DefaultableDelegatingPoolAdapter} class. diff --git a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java index 9baa0e95..a4640904 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/DelegatingPoolAdapterTest.java @@ -32,6 +32,9 @@ import static org.mockito.Mockito.when; import java.net.InetSocketAddress; import java.util.Collections; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; +import org.apache.geode.cache.query.QueryService; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -41,10 +44,6 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.query.QueryService; - /** * The DelegatingPoolAdapterTest class is a test suite of test cases testing the contract and functionality * of the {@link DelegatingPoolAdapter} class. @@ -58,8 +57,8 @@ import com.gemstone.gemfire.cache.query.QueryService; * @see org.mockito.Mockito * @see org.mockito.runners.MockitoJUnitRunner * @see DelegatingPoolAdapter - * @see com.gemstone.gemfire.cache.client.Pool - * @see com.gemstone.gemfire.cache.client.PoolFactory + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolFactory * @since 1.8.0 */ @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java b/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java index 0bd18702..6ab5fc02 100644 --- a/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/support/FactoryDefaultsPoolAdapterTest.java @@ -25,13 +25,12 @@ import static org.junit.Assert.assertThat; import java.net.InetSocketAddress; import java.util.Collections; +import org.apache.geode.cache.client.PoolFactory; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.client.PoolFactory; - /** * The FactoryDefaultsPoolAdapterTest class is a test suite of test cases testing the contract and functionality * of the {@link FactoryDefaultsPoolAdapter} class. @@ -41,8 +40,8 @@ import com.gemstone.gemfire.cache.client.PoolFactory; * @see org.junit.Test * @see org.junit.rules.ExpectedException * @see FactoryDefaultsPoolAdapter - * @see com.gemstone.gemfire.cache.client.Pool - * @see com.gemstone.gemfire.cache.client.PoolFactory + * @see org.apache.geode.cache.client.Pool + * @see org.apache.geode.cache.client.PoolFactory * @since 1.8.0 */ public class FactoryDefaultsPoolAdapterTest { diff --git a/src/test/java/org/springframework/data/gemfire/config/AsyncEventQueueNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/AsyncEventQueueNamespaceTest.java index 76a7e114..1c1c4f1d 100644 --- a/src/test/java/org/springframework/data/gemfire/config/AsyncEventQueueNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/AsyncEventQueueNamespaceTest.java @@ -24,17 +24,16 @@ import static org.junit.Assert.assertThat; import java.util.List; +import org.apache.geode.cache.asyncqueue.AsyncEvent; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.wan.GatewaySender; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * The AsyncEventQueueNamespaceTest class is a test suite of test cases testing the contract and functionality * of configuring a Pivotal GemFire or Apache Geode {@link AsyncEventQueue} using the SDG XML namespace. @@ -46,7 +45,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender; * @see org.springframework.data.gemfire.wan.AsyncEventQueueFactoryBean * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue * @since 1.0.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java index 248c4d98..215d7999 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfigurationUnitTests.java @@ -33,8 +33,7 @@ import static org.mockito.Mockito.when; import java.util.HashMap; import java.util.Map; -import com.gemstone.gemfire.pdx.PdxSerializer; - +import org.apache.geode.pdx.PdxSerializer; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java index 3ab32e38..dcd10d22 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/ClientServerCacheApplicationIntegrationTests.java @@ -31,14 +31,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientRegionShortcut; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -68,8 +67,8 @@ import org.springframework.util.Assert; * @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.server.CacheServer + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.server.CacheServer * @since 1.9.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java index 11da0347..ee8115bd 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/PeerCacheApplicationIntegrationTests.java @@ -23,12 +23,11 @@ import static org.junit.Assert.assertThat; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.context.annotation.Bean; @@ -45,7 +44,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @see org.springframework.data.gemfire.config.annotation.PeerCacheApplication * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Cache + * @see org.apache.geode.cache.Cache * @since 1.9.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java index f36b80bd..8e0728d8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/AutoRegionLookupBeanPostProcessorUnitTests.java @@ -36,9 +36,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java index 87a9d37e..92ed23eb 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/CustomEditorBeanFactoryPostProcessorUnitTests.java @@ -23,13 +23,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.wan.GatewaySender; - +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.InterestPolicy; +import org.apache.geode.cache.InterestResultPolicy; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.wan.GatewaySender; import org.junit.Test; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.data.gemfire.EvictionActionConverter; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java index 7c435a10..7b6e93ec 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesApplicationListenerUnitTests.java @@ -30,10 +30,9 @@ import static org.mockito.Mockito.when; import java.util.Collections; import java.util.HashMap; -import com.gemstone.gemfire.cache.query.MultiIndexCreationException; -import com.gemstone.gemfire.cache.query.QueryService; - import org.apache.commons.logging.Log; +import org.apache.geode.cache.query.MultiIndexCreationException; +import org.apache.geode.cache.query.QueryService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java index de3d2d9e..1167dcf1 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/DefinedIndexesIntegrationTests.java @@ -27,13 +27,12 @@ import java.util.List; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.QueryService; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.QueryService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,10 +57,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.IndexFactoryBean - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.query.Index - * @see com.gemstone.gemfire.cache.query.QueryService + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.query.Index + * @see org.apache.geode.cache.query.QueryService * @since 1.7.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java index d811ad4e..2c605408 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/DiskStoreDirectoryBeanPostProcessorIntegrationTests.java @@ -22,8 +22,7 @@ import java.io.File; import java.util.Arrays; import java.util.Collections; -import com.gemstone.gemfire.cache.GemFireCache; - +import org.apache.geode.cache.GemFireCache; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java index 8cdacf71..f49f309a 100644 --- a/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/support/PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests.java @@ -29,11 +29,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; - +import org.apache.geode.cache.DiskStore; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.internal.cache.PartitionedRegion; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -51,9 +50,9 @@ import org.springframework.data.gemfire.util.ArrayUtils; * @see org.junit.Test * @see org.mockito.Mockito * @see org.springframework.data.gemfire.config.support.PdxDiskStoreAwareBeanFactoryPostProcessor - * @see com.gemstone.gemfire.cache.DiskStore - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue + * @see org.apache.geode.cache.DiskStore + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue * @since 1.3.3 */ public class PdxDiskStoreAwareBeanFactoryPostProcessorUnitTests { diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java index ad75e7d2..f02b75ae 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/CacheNamespaceTest.java @@ -27,11 +27,10 @@ import static org.junit.Assert.assertTrue; import java.util.Properties; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.util.GatewayConflictHelper; -import com.gemstone.gemfire.cache.util.GatewayConflictResolver; -import com.gemstone.gemfire.cache.util.TimestampedEntryEvent; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.util.GatewayConflictHelper; +import org.apache.geode.cache.util.GatewayConflictResolver; +import org.apache.geode.cache.util.TimestampedEntryEvent; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java index 6b20c3b2..800ed278 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/CacheServerNamespaceTest.java @@ -20,9 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; - +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -44,8 +43,8 @@ import org.springframework.util.StringUtils; * @see org.springframework.context.ApplicationContext * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.server.CacheServer - * @see com.gemstone.gemfire.cache.server.ClientSubscriptionConfig + * @see org.apache.geode.cache.server.CacheServer + * @see org.apache.geode.cache.server.ClientSubscriptionConfig */ @ContextConfiguration(locations="server-ns.xml", initializers=GemfireTestApplicationContextInitializer.class) @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java index 86e9565a..7a9e94b4 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/CacheSubscriptionTest.java @@ -20,10 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.SubscriptionAttributes; - +import org.apache.geode.cache.InterestPolicy; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.SubscriptionAttributes; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java index e80fc552..60bb5e77 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/CacheUsingPdxNamespaceTest.java @@ -21,8 +21,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import com.gemstone.gemfire.pdx.PdxSerializer; - +import org.apache.geode.pdx.PdxSerializer; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java index ed987cde..d15f94c6 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest.java @@ -23,8 +23,7 @@ import static org.junit.Assert.assertThat; import java.util.Properties; -import com.gemstone.gemfire.pdx.PdxSerializer; - +import org.apache.geode.pdx.PdxSerializer; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java index 56d43cac..6eaccd69 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java @@ -33,23 +33,22 @@ import java.io.File; import java.io.FilenameFilter; import java.util.concurrent.atomic.AtomicReference; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.InterestResultPolicy; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.util.CacheWriterAdapter; -import com.gemstone.gemfire.compression.Compressor; - +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAlgorithm; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.InterestResultPolicy; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.util.CacheWriterAdapter; +import org.apache.geode.compression.Compressor; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java index 8fb16ec2..0b455f76 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ContinuousQueryListenerContainerNamespaceTest.java @@ -29,10 +29,9 @@ import java.util.concurrent.Executor; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.query.CqListener; -import com.gemstone.gemfire.cache.query.CqQuery; - +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.query.CqListener; +import org.apache.geode.cache.query.CqQuery; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -59,9 +58,9 @@ import org.springframework.util.ErrorHandler; * @see org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.cache.query.CqListener - * @see com.gemstone.gemfire.cache.query.CqQuery + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.cache.query.CqListener + * @see org.apache.geode.cache.query.CqQuery * @since 1.4.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java index da0b1939..1b4728c3 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreAndEvictionRegionParsingTest.java @@ -26,22 +26,21 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FilenameFilter; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Region.Entry; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.ObjectSizer; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.DiskStore; +import org.apache.geode.cache.DiskStoreFactory; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAlgorithm; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Region.Entry; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.util.ObjectSizer; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java index f7dfefe7..c873c433 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/DiskStoreNamespaceTest.java @@ -22,8 +22,7 @@ import static org.junit.Assert.assertNotNull; import java.io.File; import java.util.Properties; -import com.gemstone.gemfire.cache.DiskStore; - +import org.apache.geode.cache.DiskStore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/DynamicRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/DynamicRegionNamespaceTest.java index 7e743443..dbb67968 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/DynamicRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/DynamicRegionNamespaceTest.java @@ -23,9 +23,8 @@ import static org.junit.Assert.assertTrue; import java.io.File; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DynamicRegionFactory; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.DynamicRegionFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java index 4cba1295..5387915b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/FunctionServiceNamespaceTest.java @@ -19,10 +19,9 @@ package org.springframework.data.gemfire.config.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionService; - +import org.apache.geode.cache.execute.FunctionAdapter; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.FunctionService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java index 2eefe88a..764c0aa7 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverAutoStartNamespaceTest.java @@ -22,8 +22,7 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; - +import org.apache.geode.cache.wan.GatewayReceiver; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; @@ -46,7 +45,7 @@ import org.springframework.util.StringUtils; * @see org.springframework.test.context.ActiveProfiles * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.wan.GatewayReceiver + * @see org.apache.geode.cache.wan.GatewayReceiver * @since 1.5.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java index 6b21a01e..ce71763b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverDefaultStartNamespaceTest.java @@ -22,8 +22,7 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; - +import org.apache.geode.cache.wan.GatewayReceiver; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; @@ -46,7 +45,7 @@ import org.springframework.util.StringUtils; * @see org.springframework.test.context.ActiveProfiles * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.wan.GatewayReceiver + * @see org.apache.geode.cache.wan.GatewayReceiver * @since 1.5.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java index 7345d196..db32c201 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GatewayReceiverManualStartNamespaceTest.java @@ -22,8 +22,7 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; - +import org.apache.geode.cache.wan.GatewayReceiver; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; @@ -45,7 +44,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @see org.springframework.test.context.ActiveProfiles * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.wan.GatewayReceiver + * @see org.apache.geode.cache.wan.GatewayReceiver * @since 1.5.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java index 8aff8764..266521d5 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV7GatewayNamespaceTest.java @@ -27,17 +27,16 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewayEventFilter; -import com.gemstone.gemfire.cache.wan.GatewayQueueEvent; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; -import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; - +import org.apache.geode.cache.Region; +import org.apache.geode.cache.asyncqueue.AsyncEvent; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.wan.GatewayEventFilter; +import org.apache.geode.cache.wan.GatewayQueueEvent; +import org.apache.geode.cache.wan.GatewayReceiver; +import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; +import org.apache.geode.cache.wan.GatewayTransportFilter; import org.junit.AfterClass; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; @@ -54,9 +53,9 @@ import org.springframework.data.gemfire.wan.GatewaySenderFactoryBean; * @author David Turanski * @author John Blum * @see org.springframework.data.gemfire.RecreatingSpringApplicationContextTest - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue - * @see com.gemstone.gemfire.cache.wan.GatewayReceiver - * @see com.gemstone.gemfire.cache.wan.GatewaySender + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue + * @see org.apache.geode.cache.wan.GatewayReceiver + * @see org.apache.geode.cache.wan.GatewaySender */ @SuppressWarnings("unused") public class GemfireV7GatewayNamespaceTest extends RecreatingSpringApplicationContextTest { diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java index ab7de8c1..cd82d20f 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/GemfireV8GatewayNamespaceTest.java @@ -21,10 +21,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.wan.GatewayEventSubstitutionFilter; -import com.gemstone.gemfire.cache.wan.GatewaySender; - +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; +import org.apache.geode.cache.wan.GatewaySender; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -44,8 +43,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @see org.springframework.data.gemfire.wan.GatewaySenderFactoryBean * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.wan.GatewaySender - * @see com.gemstone.gemfire.cache.wan.GatewayEventSubstitutionFilter + * @see org.apache.geode.cache.wan.GatewaySender + * @see org.apache.geode.cache.wan.GatewayEventSubstitutionFilter * @since 2.0.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java index 2d0be669..0ccf759b 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/IndexNamespaceTest.java @@ -20,9 +20,8 @@ import static org.junit.Assert.assertEquals; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.Index; - +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.Index; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; @@ -62,7 +61,7 @@ public class IndexNamespaceTest { assertEquals("status", simple.getIndexedExpression()); assertEquals(Region.SEPARATOR + TEST_REGION_NAME, simple.getFromClause()); assertEquals(TEST_REGION_NAME, simple.getRegion().getName()); - assertEquals(com.gemstone.gemfire.cache.query.IndexType.FUNCTIONAL, simple.getType()); + assertEquals(org.apache.geode.cache.query.IndexType.FUNCTIONAL, simple.getType()); } @Test @@ -71,7 +70,7 @@ public class IndexNamespaceTest { assertEquals("tsi.name", complex.getIndexedExpression()); assertEquals(Region.SEPARATOR + TEST_REGION_NAME + " tsi", complex.getFromClause()); assertEquals(TEST_REGION_NAME, complex.getRegion().getName()); - assertEquals(com.gemstone.gemfire.cache.query.IndexType.HASH, complex.getType()); + assertEquals(org.apache.geode.cache.query.IndexType.HASH, complex.getType()); } } diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java index d3112535..0a3a6213 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsPropertyPlaceholderTest.java @@ -24,8 +24,7 @@ import static org.junit.Assert.fail; import java.util.List; import java.util.Map; -import com.gemstone.gemfire.internal.datasource.ConfigProperty; - +import org.apache.geode.internal.datasource.ConfigProperty; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java index 31a7f6c7..5ce273fc 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/JndiBindingsTest.java @@ -19,9 +19,8 @@ package org.springframework.data.gemfire.config.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.internal.datasource.GemFireBasicDataSource; - +import org.apache.geode.cache.Cache; +import org.apache.geode.internal.datasource.GemFireBasicDataSource; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java index cea1e7be..f382c700 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionNamespaceTest.java @@ -23,14 +23,13 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.compression.Compressor; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.Scope; +import org.apache.geode.compression.Compressor; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java index d6cf3acc..71e34a24 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/LocalRegionWithEvictionPolicyActionNamespaceTest.java @@ -21,11 +21,10 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; - +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Scope; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java index 08f12861..46b0596e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/MembershipAttributesTest.java @@ -19,12 +19,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import com.gemstone.gemfire.cache.LossAction; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.ResumptionAction; -import com.gemstone.gemfire.distributed.Role; - +import org.apache.geode.cache.LossAction; +import org.apache.geode.cache.MembershipAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.ResumptionAction; +import org.apache.geode.distributed.Role; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java index 506f5e85..4c7a0cc8 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/MultipleCacheTest.java @@ -16,9 +16,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java index 54ef7131..60762746 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/PartitionedRegionNamespaceTest.java @@ -26,16 +26,15 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.FixedPartitionAttributes; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.partition.PartitionListener; -import com.gemstone.gemfire.cache.partition.PartitionListenerAdapter; -import com.gemstone.gemfire.compression.Compressor; - +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.FixedPartitionAttributes; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.partition.PartitionListener; +import org.apache.geode.cache.partition.PartitionListenerAdapter; +import org.apache.geode.compression.Compressor; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java index 668654da..c522d026 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/PoolNamespaceTest.java @@ -20,8 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Iterator; -import com.gemstone.gemfire.cache.client.Pool; - +import org.apache.geode.cache.client.Pool; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +44,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @see org.springframework.data.gemfire.client.PoolFactoryBean * @see org.springframework.data.gemfire.config.xml.PoolParser * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer - * @see com.gemstone.gemfire.cache.client.Pool + * @see org.apache.geode.cache.client.Pool */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "pool-ns.xml", initializers = GemfireTestApplicationContextInitializer.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java index 55637c2e..390b0aa1 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionDefinitionUsingBeansNamespaceTest.java @@ -22,11 +22,10 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; - +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -50,8 +49,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.DataPolicy - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.DataPolicy + * @see org.apache.geode.cache.Region * @since 1.6.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java index a0f8a75b..d81790a1 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionEvictionAttributesNamespaceTest.java @@ -21,12 +21,11 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.internal.cache.lru.LRUCapacityController; - +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAlgorithm; +import org.apache.geode.cache.Region; +import org.apache.geode.internal.cache.lru.LRUCapacityController; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java index f3e52db4..206356cf 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest.java @@ -23,12 +23,11 @@ import static org.mockito.Mockito.mock; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; @@ -46,9 +45,9 @@ import org.springframework.util.Assert; * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.RegionAttributes - * @see com.gemstone.gemfire.cache.EvictionAttributes + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.RegionAttributes + * @see org.apache.geode.cache.EvictionAttributes * @since 1.5.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java index 6ba80d6f..31324807 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionSubscriptionAttributesNamespaceTest.java @@ -21,10 +21,9 @@ import static org.junit.Assert.assertNotNull; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.InterestPolicy; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java index 4748c184..8e370524 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/RegionsWithDiskStoreAndPersistenceEvictionSettingsTest.java @@ -22,10 +22,9 @@ import static org.junit.Assert.assertNull; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java index e82ab24e..53c29549 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/ReplicatedRegionNamespaceTest.java @@ -24,14 +24,13 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.compression.Compressor; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.Scope; +import org.apache.geode.compression.Compressor; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java index 85bb6ea8..b9730a41 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionNamespaceTest.java @@ -20,10 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java index 1d55b00d..3ab10358 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/SubRegionSubElementNamespaceTest.java @@ -23,12 +23,11 @@ import java.util.List; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; - +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.asyncqueue.AsyncEvent; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.util.CacheListenerAdapter; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -46,7 +45,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @link https://jira.springsource.org/browse/SGF-219 * @link https://jira.springsource.org/browse/SGF-220 * @link https://jira.springsource.org/browse/SGF-221 diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java index d322102d..9585f4cb 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateClientRegionNamespaceTest.java @@ -27,21 +27,20 @@ import java.util.Arrays; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; -import com.gemstone.gemfire.cache.util.CacheWriterAdapter; -import com.gemstone.gemfire.cache.util.ObjectSizer; - +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAlgorithm; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.util.CacheListenerAdapter; +import org.apache.geode.cache.util.CacheWriterAdapter; +import org.apache.geode.cache.util.ObjectSizer; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; @@ -58,8 +57,8 @@ import org.springframework.util.StringUtils; * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.Region * @since 1.5.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java index 2414ad9b..0f3f6d06 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TemplatePersistentPartitionRegionNamespaceTest.java @@ -23,14 +23,13 @@ import java.io.File; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.EntryOperation; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.PartitionResolver; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.DiskStore; +import org.apache.geode.cache.EntryOperation; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAlgorithm; +import org.apache.geode.cache.PartitionResolver; +import org.apache.geode.cache.Region; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.PartitionedRegionFactoryBean - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @link https://jira.spring.io/browse/SGF-384 * @since 1.6.0 */ diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java index 67c03d8a..f9660430 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TemplateRegionsNamespaceTests.java @@ -30,34 +30,33 @@ import java.util.List; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryOperation; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAlgorithm; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.InterestPolicy; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.LossAction; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.PartitionResolver; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.ResumptionAction; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.SubscriptionAttributes; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.partition.PartitionListener; -import com.gemstone.gemfire.cache.partition.PartitionListenerAdapter; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; -import com.gemstone.gemfire.cache.util.CacheWriterAdapter; -import com.gemstone.gemfire.cache.util.ObjectSizer; -import com.gemstone.gemfire.distributed.Role; - +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EntryOperation; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAlgorithm; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.InterestPolicy; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.LossAction; +import org.apache.geode.cache.MembershipAttributes; +import org.apache.geode.cache.PartitionResolver; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.ResumptionAction; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.SubscriptionAttributes; +import org.apache.geode.cache.asyncqueue.AsyncEvent; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.partition.PartitionListener; +import org.apache.geode.cache.partition.PartitionListenerAdapter; +import org.apache.geode.cache.util.CacheListenerAdapter; +import org.apache.geode.cache.util.CacheWriterAdapter; +import org.apache.geode.cache.util.ObjectSizer; +import org.apache.geode.distributed.Role; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.BeansException; @@ -81,8 +80,8 @@ import org.springframework.util.StringUtils; * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.Region * @since 1.5.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java b/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java index d4c38d39..5e96758e 100644 --- a/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java +++ b/src/test/java/org/springframework/data/gemfire/config/xml/TxEventHandlersTest.java @@ -20,12 +20,11 @@ import static org.junit.Assert.assertSame; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.TransactionEvent; -import com.gemstone.gemfire.cache.TransactionListener; -import com.gemstone.gemfire.cache.TransactionWriter; -import com.gemstone.gemfire.cache.TransactionWriterException; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.TransactionEvent; +import org.apache.geode.cache.TransactionListener; +import org.apache.geode.cache.TransactionWriter; +import org.apache.geode.cache.TransactionWriterException; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanNameAware; diff --git a/src/test/java/org/springframework/data/gemfire/fork/CacheServerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/CacheServerProcess.java index ffad0eca..a1143c3c 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/CacheServerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/CacheServerProcess.java @@ -20,16 +20,15 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.Properties; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.server.CacheServer; import org.springframework.data.gemfire.ForkUtil; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.server.CacheServer; - /** * @author Costin Leau * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java index cd1546f9..be808f7d 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/FunctionCacheServerProcess.java @@ -20,19 +20,18 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.Properties; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.execute.FunctionAdapter; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.server.CacheServer; import org.springframework.data.gemfire.ForkUtil; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.server.CacheServer; - /** * @author Costin Leau * @author David Turanski @@ -45,8 +44,8 @@ public class FunctionCacheServerProcess { props.setProperty("name", "FunctionServer"); props.setProperty("log-level", "config"); props.setProperty("groups","g1,g2,g3"); - - + + Cache cache = new CacheFactory(props).create(); // Create region. @@ -59,34 +58,34 @@ public class FunctionCacheServerProcess { // Start Cache Server. CacheServer server = cache.addCacheServer(); server.setPort(40404); - server.start(); + server.start(); System.out.println("Server started"); - + testRegion.put("one", 1); testRegion.put("two", 2); - testRegion.put("three", 3); - + testRegion.put("three", 3); + System.out.println("Registering ServerFunction"); FunctionService.registerFunction(new ServerFunction()); System.out.println("Registered ServerFunction"); - + System.out.println("Registering EchoFunction"); FunctionService.registerFunction(new EchoFunction()); System.out.println("Registered EchoFunction"); - + ForkUtil.createControlFile(FunctionCacheServerProcess.class.getName()); - + System.out.println("Waiting for shutdown"); BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in)); bufferedReader.readLine(); } - + @SuppressWarnings("serial") static class ServerFunction extends FunctionAdapter { - + /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.FunctionAdapter#execute(com.gemstone.gemfire.cache.execute.FunctionContext) + * @see org.apache.geode.cache.execute.FunctionAdapter#execute(org.apache.geode.cache.execute.FunctionContext) */ @Override public void execute(FunctionContext functionContext) { @@ -96,20 +95,20 @@ public class FunctionCacheServerProcess { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.FunctionAdapter#getId() + * @see org.apache.geode.cache.execute.FunctionAdapter#getId() */ @Override public String getId() { - return "serverFunction"; + return "serverFunction"; } - + } - + @SuppressWarnings("serial") static class EchoFunction extends FunctionAdapter { - + /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.FunctionAdapter#execute(com.gemstone.gemfire.cache.execute.FunctionContext) + * @see org.apache.geode.cache.execute.FunctionAdapter#execute(org.apache.geode.cache.execute.FunctionContext) */ @Override public void execute(FunctionContext functionContext) { @@ -121,15 +120,15 @@ public class FunctionCacheServerProcess { functionContext.getResultSender().sendResult(args[i]); } } - - + + } @Override public String getId() { - return "echoFunction"; + return "echoFunction"; } - + } - - + + } diff --git a/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java b/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java index ed2a8bd3..b881b0da 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/GemFireBasedServerProcess.java @@ -18,18 +18,17 @@ package org.springframework.data.gemfire.fork; import java.io.File; +import org.apache.geode.distributed.ServerLauncher; +import org.apache.geode.distributed.internal.DistributionConfig; import org.springframework.data.gemfire.process.support.ProcessUtils; import org.springframework.data.gemfire.test.support.FileSystemUtils; -import com.gemstone.gemfire.distributed.ServerLauncher; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; - /** * The GemFireBasedServerProcess class is a main Java class used to launch a GemFire Server * using GemFire's ServerLauncher API. * * @author John Blum - * @see com.gemstone.gemfire.distributed.ServerLauncher + * @see org.apache.geode.distributed.ServerLauncher * @since 1.7.0 */ public class GemFireBasedServerProcess { diff --git a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java b/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java index c0cfbe02..96910823 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java @@ -21,22 +21,21 @@ import java.io.IOException; import java.util.Properties; import java.util.concurrent.TimeUnit; +import org.apache.geode.distributed.Locator; +import org.apache.geode.distributed.LocatorLauncher; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.InternalLocator; import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.process.support.ProcessUtils; import org.springframework.data.gemfire.test.support.FileSystemUtils; import org.springframework.data.gemfire.test.support.ThreadUtils; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.LocatorLauncher; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.InternalLocator; - /** * The LocatorProcess class is a main Java class that is used fork and launch a GemFire Locator process using the * LocatorLauncher class. * * @author John Blum - * @see com.gemstone.gemfire.distributed.LocatorLauncher + * @see org.apache.geode.distributed.LocatorLauncher * @since 1.5.0 */ public class LocatorProcess { diff --git a/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java b/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java index 0d26d479..272b5888 100644 --- a/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/BatchingResultSenderTest.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -20,27 +20,26 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.apache.geode.cache.execute.ResultSender; import org.junit.Test; -import com.gemstone.gemfire.cache.execute.ResultSender; - /** * @author David Turanski * */ public class BatchingResultSenderTest { - + @Test public void testArrayChunking() { - + testBatchingResultSender(new TestArrayResultSender(),1); testBatchingResultSender(new TestArrayResultSender(),0); testBatchingResultSender(new TestArrayResultSender(),9); testBatchingResultSender(new TestArrayResultSender(),10); testBatchingResultSender(new TestArrayResultSender(),1000); } - - + + @Test public void testListChunking() { testBatchingResultSender(new TestListResultSender(),1); @@ -49,10 +48,10 @@ public class BatchingResultSenderTest { testBatchingResultSender(new TestListResultSender(),10); testBatchingResultSender(new TestListResultSender(),1000); } - + private void testBatchingResultSender(AbstractTestResultSender resultSender, int batchSize){ BatchingResultSender brs = new BatchingResultSender(batchSize, resultSender); - + List result = new ArrayList(); for (int i = 0; i< 100; i++) { result.add(i); @@ -62,21 +61,21 @@ public class BatchingResultSenderTest { brs.sendArrayResults(result.toArray(new Integer[100])); } else { brs.sendResults(result); - } - + } + assertEquals(100,resultSender.getResults().size()); - + for(int i=0; i< 100; i++) { assertEquals(i,resultSender.getResults().get(i)); } - + } - + public static abstract class AbstractTestResultSender implements ResultSender { private List results = new ArrayList(); - + /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.ResultSender#lastResult(java.lang.Object) + * @see org.apache.geode.cache.execute.ResultSender#lastResult(java.lang.Object) */ @Override public void lastResult(Object arg0) { @@ -87,37 +86,37 @@ public class BatchingResultSenderTest { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.ResultSender#sendException(java.lang.Throwable) + * @see org.apache.geode.cache.execute.ResultSender#sendException(java.lang.Throwable) */ @Override public void sendException(Throwable arg0) { fail(); - + } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.ResultSender#sendResult(java.lang.Object) + * @see org.apache.geode.cache.execute.ResultSender#sendResult(java.lang.Object) */ @Override public void sendResult(Object arg0) { if (arg0 == null) { return; } - addResults(arg0, results); + addResults(arg0, results); } - + protected abstract void addResults(Object item, List results); - + public List getResults() { return this.results; } - - + + } - + public static class TestArrayResultSender extends AbstractTestResultSender { - - protected void addResults(Object arg0, List results) { + + protected void addResults(Object arg0, List results) { assertTrue(arg0.getClass().isArray()); Object[] array = (Object[]) arg0; for (Object obj: array) { @@ -125,7 +124,7 @@ public class BatchingResultSenderTest { } } } - + public static class TestListResultSender extends AbstractTestResultSender { protected void addResults(Object arg0, List results) { if (arg0 == null) { @@ -134,6 +133,6 @@ public class BatchingResultSenderTest { assertTrue(arg0 instanceof Collection); Collection list = (Collection) arg0; results.addAll(list); - } + } } } diff --git a/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java index f5c93f4e..824f2c21 100644 --- a/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/ClientCacheFunctionExecutionWithPdxIntegrationTest.java @@ -26,6 +26,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.pdx.PdxInstance; +import org.apache.geode.pdx.PdxInstanceFactory; +import org.apache.geode.pdx.PdxReader; +import org.apache.geode.pdx.PdxSerializer; +import org.apache.geode.pdx.PdxWriter; +import org.apache.geode.pdx.internal.PdxInstanceEnum; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,14 +48,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.pdx.PdxInstance; -import com.gemstone.gemfire.pdx.PdxInstanceFactory; -import com.gemstone.gemfire.pdx.PdxReader; -import com.gemstone.gemfire.pdx.PdxSerializer; -import com.gemstone.gemfire.pdx.PdxWriter; -import com.gemstone.gemfire.pdx.internal.PdxInstanceEnum; - /** * The ClientCacheFunctionExecutionWithPdxIntegrationTest class is a test suite of test cases testing Spring Data * GemFire's Function annotation support and interaction between a GemFire client and server Cache @@ -62,10 +61,10 @@ import com.gemstone.gemfire.pdx.internal.PdxInstanceEnum; * @see org.springframework.data.gemfire.function.sample.ApplicationDomainFunctionExecutions * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.client.ClientCache - * @see com.gemstone.gemfire.pdx.PdxInstance - * @see com.gemstone.gemfire.pdx.PdxSerializer - * @see com.gemstone.gemfire.pdx.internal.PdxInstanceEnum + * @see org.apache.geode.cache.client.ClientCache + * @see org.apache.geode.pdx.PdxInstance + * @see org.apache.geode.pdx.PdxSerializer + * @see org.apache.geode.pdx.internal.PdxInstanceEnum * @since 1.5.2 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java index 8a36feee..2b49ac18 100644 --- a/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/ExceptionThrowingFunctionExecutionIntegrationTest.java @@ -25,6 +25,9 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.geode.cache.execute.FunctionAdapter; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.FunctionException; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; @@ -42,10 +45,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionException; - /** * The ExceptionThrowingFunctionExecutionIntegrationTest class is a test suite of test cases testing the invocation * of a GemFire Function using Spring Data GemFire Function Execution Annotation support when that Function throws diff --git a/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java b/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java index e809e26d..c1ab0e2e 100644 --- a/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -24,15 +24,14 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.RegionFunctionContext; +import org.apache.geode.cache.execute.ResultSender; import org.junit.Test; import org.springframework.data.gemfire.function.annotation.Filter; import org.springframework.data.gemfire.function.annotation.RegionData; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.RegionFunctionContext; -import com.gemstone.gemfire.cache.execute.ResultSender; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java b/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java index 31b9a387..07940be8 100644 --- a/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolverTest.java @@ -26,24 +26,23 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.pdx.PdxInstance; +import org.apache.geode.pdx.PdxInstanceFactory; +import org.apache.geode.pdx.PdxReader; +import org.apache.geode.pdx.PdxSerializer; +import org.apache.geode.pdx.PdxWriter; +import org.apache.geode.pdx.internal.PdxInstanceEnum; +import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.pdx.PdxInstance; -import com.gemstone.gemfire.pdx.PdxInstanceFactory; -import com.gemstone.gemfire.pdx.PdxReader; -import com.gemstone.gemfire.pdx.PdxSerializer; -import com.gemstone.gemfire.pdx.PdxWriter; -import com.gemstone.gemfire.pdx.internal.PdxInstanceEnum; -import com.gemstone.gemfire.pdx.internal.PdxInstanceFactoryImpl; - /** * The PdxFunctionArgumentResolverTest class is a test suite of test cases testing the contract and functionality * of the PdxFunctionArgumentResolver class. @@ -52,11 +51,11 @@ import com.gemstone.gemfire.pdx.internal.PdxInstanceFactoryImpl; * @see org.junit.Test * @see org.mockito.Mockito * @see org.springframework.data.gemfire.function.PdxFunctionArgumentResolver - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.execute.FunctionContext - * @see com.gemstone.gemfire.pdx.PdxInstance - * @see com.gemstone.gemfire.pdx.PdxSerializer - * @see com.gemstone.gemfire.pdx.internal.PdxInstanceEnum + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.execute.FunctionContext + * @see org.apache.geode.pdx.PdxInstance + * @see org.apache.geode.pdx.PdxSerializer + * @see org.apache.geode.pdx.internal.PdxInstanceEnum * @since 1.5.2 */ @SuppressWarnings("unused") diff --git a/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java b/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java index fc8d9d21..31a6cb33 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/AnnotationDrivenFunctionsTest.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -19,6 +19,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -30,9 +32,6 @@ import org.springframework.stereotype.Component; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionService; - /** * @author David Turanski * diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java index d8aea8df..38bdbdf1 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionClientCacheTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -17,6 +17,12 @@ import static org.junit.Assert.assertTrue; import java.util.concurrent.TimeUnit; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.execute.FunctionException; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.distributed.DistributedMember; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -28,13 +34,6 @@ import org.springframework.data.gemfire.function.execution.GemfireOnServerFuncti import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.execute.ResultCollector; -import com.gemstone.gemfire.distributed.DistributedMember; - /** * @author David Turanski * @@ -81,28 +80,28 @@ class TestClientCacheConfig { class MyResultCollector implements ResultCollector { /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, java.lang.Object) + * @see org.apache.geode.cache.execute.ResultCollector#addResult(org.apache.geode.distributed.DistributedMember, java.lang.Object) */ @Override public void addResult(DistributedMember arg0, Object arg1) { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.ResultCollector#clearResults() + * @see org.apache.geode.cache.execute.ResultCollector#clearResults() */ @Override public void clearResults() { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.ResultCollector#endResults() + * @see org.apache.geode.cache.execute.ResultCollector#endResults() */ @Override public void endResults() { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.ResultCollector#getResult() + * @see org.apache.geode.cache.execute.ResultCollector#getResult() */ @Override public Object getResult() throws FunctionException { @@ -110,7 +109,7 @@ class MyResultCollector implements ResultCollector { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.execute.ResultCollector#getResult(long, java.util.concurrent.TimeUnit) + * @see org.apache.geode.cache.execute.ResultCollector#getResult(long, java.util.concurrent.TimeUnit) */ @Override public Object getResult(long arg0, TimeUnit arg1) throws FunctionException, InterruptedException { diff --git a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java index ec11fd97..5a5f8e82 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/FunctionExecutionIntegrationTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -15,6 +15,7 @@ package org.springframework.data.gemfire.function.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -29,8 +30,6 @@ import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitia import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * diff --git a/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java index c8fbc1dd..5c188f1a 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/XmlConfiguredFunctionExecutionIntegrationTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -15,6 +15,7 @@ package org.springframework.data.gemfire.function.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -27,8 +28,6 @@ import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitia import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java index b7e95b35..2b1cd337 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionExecutionTest.java @@ -37,6 +37,10 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionException; +import org.apache.geode.cache.execute.ResultCollector; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -44,11 +48,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.execute.ResultCollector; - /** * The AbstractFunctionExecutionTest class is a test suite of test cases testing the contract and functionality * of the AbstractFunctionExecution class. @@ -59,7 +58,7 @@ import com.gemstone.gemfire.cache.execute.ResultCollector; * @see org.mockito.Mockito * @see org.mockito.runners.MockitoJUnitRunner * @see org.springframework.data.gemfire.function.execution.AbstractFunctionExecution - * @see com.gemstone.gemfire.cache.execute.Execution + * @see org.apache.geode.cache.execute.Execution * @since 1.7.0 */ @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java index 644db3d7..7a462a85 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/AbstractFunctionTemplateTest.java @@ -28,14 +28,13 @@ import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.List; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.ResultCollector; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.ResultCollector; - /** * The AbstractFunctionTemplateTest class is a test suite of test cases testing the contract and functionality * of the AbstractFunctionTemplate class. @@ -45,8 +44,8 @@ import com.gemstone.gemfire.cache.execute.ResultCollector; * @see org.mockito.Mockito * @see org.springframework.data.gemfire.function.execution.AbstractFunctionExecution * @see org.springframework.data.gemfire.function.execution.AbstractFunctionTemplate - * @see com.gemstone.gemfire.cache.execute.Function - * @see com.gemstone.gemfire.cache.execute.ResultCollector + * @see org.apache.geode.cache.execute.Function + * @see org.apache.geode.cache.execute.ResultCollector * @since 1.7.0 */ @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionTests.java b/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionTests.java index 92310bae..64f14834 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/FunctionExecutionTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -17,24 +17,23 @@ import static org.junit.Assert.assertEquals; import java.util.Iterator; import java.util.Properties; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; +import org.apache.geode.cache.client.PoolManager; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.data.gemfire.ForkUtil; import org.springframework.data.gemfire.fork.FunctionCacheServerProcess; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.client.PoolManager; - /** * @author David Turanski - * + * */ public class FunctionExecutionTests { @@ -86,21 +85,21 @@ public class FunctionExecutionTests { } @Test - public void testBasicFunctionExecutions() { + public void testBasicFunctionExecutions() { verifyfunctionExecution(new RegionFunctionExecution(clientRegion)); verifyfunctionExecution(new ServerFunctionExecution(cache)); verifyfunctionExecution(new PoolServerFunctionExecution(pool)); - verifyfunctionExecution(new ServersFunctionExecution(cache)); + verifyfunctionExecution(new ServersFunctionExecution(cache)); } - - - + + + private void verifyfunctionExecution(AbstractFunctionExecution functionExecution) { Iterable results = functionExecution .setArgs("1","2","3") .setFunctionId("echoFunction") .execute(); - + Iterator it = results.iterator(); for (int i = 1; i<= 3; i++) { assertEquals(String.valueOf(i),it.next()); diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java index 8d439347..a027a53e 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/FunctionIntegrationTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -22,8 +22,10 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -37,8 +39,6 @@ import org.springframework.stereotype.Component; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateTests.java b/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateTests.java index 06d31a63..0b40337d 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionTemplateTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -17,21 +17,20 @@ import static org.junit.Assert.assertEquals; import java.util.Iterator; import java.util.Properties; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.client.PoolFactory; +import org.apache.geode.cache.client.PoolManager; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.data.gemfire.ForkUtil; import org.springframework.data.gemfire.fork.FunctionCacheServerProcess; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.client.PoolFactory; -import com.gemstone.gemfire.cache.client.PoolManager; - /** * @author David Turanski * @@ -82,19 +81,19 @@ public class GemfireFunctionTemplateTests { } cache = null; } - - @Test + + @Test public void testFunctionTemplates() { verifyfunctionTemplateExecution( new GemfireOnServerFunctionTemplate(cache)); verifyfunctionTemplateExecution( new GemfireOnServersFunctionTemplate(cache)); - verifyfunctionTemplateExecution( new GemfireOnRegionFunctionTemplate(clientRegion)); - verifyfunctionTemplateExecution( new GemfireOnServerFunctionTemplate(pool)); - verifyfunctionTemplateExecution( new GemfireOnServersFunctionTemplate(pool)); - } - + verifyfunctionTemplateExecution( new GemfireOnRegionFunctionTemplate(clientRegion)); + verifyfunctionTemplateExecution( new GemfireOnServerFunctionTemplate(pool)); + verifyfunctionTemplateExecution( new GemfireOnServersFunctionTemplate(pool)); + } + private void verifyfunctionTemplateExecution(GemfireFunctionOperations functionTemplate) { Iterable results = functionTemplate.execute("echoFunction","1","2","3"); - + Iterator it = results.iterator(); for (int i = 1; i<= 3; i++) { assertEquals(String.valueOf(i),it.next()); diff --git a/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java b/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java index 09e05218..291e4fa3 100644 --- a/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java +++ b/src/test/java/org/springframework/data/gemfire/function/sample/ApplicationDomainFunctionExecutions.java @@ -16,11 +16,10 @@ package org.springframework.data.gemfire.function.sample; +import org.apache.geode.pdx.PdxInstance; import org.springframework.data.gemfire.function.ClientCacheFunctionExecutionWithPdxIntegrationTest; import org.springframework.data.gemfire.function.annotation.OnServer; -import com.gemstone.gemfire.pdx.PdxInstance; - /** * The ApplicationDomainFunctionExecutions class defines a GemFire Client Cache Function execution targeted at a * GemFire Server. @@ -28,7 +27,7 @@ import com.gemstone.gemfire.pdx.PdxInstance; * @author John Blum * @see org.springframework.data.gemfire.function.ClientCacheFunctionExecutionWithPdxIntegrationTest * @see org.springframework.data.gemfire.function.annotation.OnServer - * @see com.gemstone.gemfire.pdx.PdxInstance + * @see org.apache.geode.pdx.PdxInstance * @since 1.0.0 */ @OnServer diff --git a/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerTest.java b/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerTest.java index 4aa7e1c4..003b2613 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerTest.java +++ b/src/test/java/org/springframework/data/gemfire/listener/ContinuousQueryListenerContainerTest.java @@ -35,6 +35,10 @@ import static org.mockito.Mockito.when; import java.util.concurrent.Executor; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.internal.cache.PoolManagerImpl; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -45,11 +49,6 @@ import org.springframework.data.gemfire.GemfireUtils; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.config.xml.GemfireConstants; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.internal.cache.PoolManagerImpl; - /** * The ContinuousQueryListenerContainerTest class is a test suite of test cases testing the contract and functionality * of the {@link ContinuousQueryListenerContainer} class. diff --git a/src/test/java/org/springframework/data/gemfire/listener/GemfireMDP.java b/src/test/java/org/springframework/data/gemfire/listener/GemfireMDP.java index f36db1d8..eac0df4f 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/GemfireMDP.java +++ b/src/test/java/org/springframework/data/gemfire/listener/GemfireMDP.java @@ -16,13 +16,13 @@ package org.springframework.data.gemfire.listener; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.query.CqEvent; -import com.gemstone.gemfire.cache.query.CqQuery; +import org.apache.geode.cache.Operation; +import org.apache.geode.cache.query.CqEvent; +import org.apache.geode.cache.query.CqQuery; /** * Simple GemFire-message/event-driven-pojo. - * + * * @author Costin Leau */ public class GemfireMDP { diff --git a/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerTests.java b/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerTests.java index d24f1deb..2a5dda78 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerTests.java +++ b/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerTests.java @@ -20,6 +20,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.client.ClientCacheFactory; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.query.CqEvent; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -27,11 +31,6 @@ import org.junit.Test; import org.springframework.data.gemfire.ForkUtil; import org.springframework.data.gemfire.listener.adapter.ContinuousQueryListenerAdapter; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.client.ClientCacheFactory; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.query.CqEvent; - /** * @author Costin Leau */ diff --git a/src/test/java/org/springframework/data/gemfire/listener/ThrowableEventListener.java b/src/test/java/org/springframework/data/gemfire/listener/ThrowableEventListener.java index 413f1e71..078f6ed2 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/ThrowableEventListener.java +++ b/src/test/java/org/springframework/data/gemfire/listener/ThrowableEventListener.java @@ -1,12 +1,12 @@ /* * Copyright 2011-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,11 @@ */ package org.springframework.data.gemfire.listener; -import com.gemstone.gemfire.cache.query.CqEvent; +import org.apache.geode.cache.query.CqEvent; /** - * + * * @author Costin Leau */ public class ThrowableEventListener implements ContinuousQueryListener { diff --git a/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupTest.java b/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupTest.java index 560350d0..bf7fe055 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupTest.java +++ b/src/test/java/org/springframework/data/gemfire/listener/adapter/ContainerXmlSetupTest.java @@ -21,6 +21,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.query.CqQuery; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -32,10 +35,6 @@ import org.springframework.data.gemfire.listener.ContinuousQueryListenerContaine import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.query.CqQuery; - /** * @author Costin Leau * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java b/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java index 4d81e899..795892d4 100644 --- a/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/listener/adapter/QueryListenerAdapterTest.java @@ -26,14 +26,13 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import org.apache.geode.cache.Operation; +import org.apache.geode.cache.query.CqEvent; +import org.apache.geode.cache.query.CqQuery; import org.junit.Before; import org.junit.Test; import org.springframework.data.gemfire.listener.ContinuousQueryListener; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.query.CqEvent; -import com.gemstone.gemfire.cache.query.CqQuery; - /** * @author Costin Leau * @author Oliver Gierke diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTest.java index f3007704..747c1177 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTest.java @@ -24,6 +24,12 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -31,16 +37,9 @@ import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.data.gemfire.repository.sample.Address; import org.springframework.data.gemfire.repository.sample.Person; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; - /** * Integration tests for {@link MappingPdxSerializer}. - * + * * @author Oliver Gierke * @author John Blum */ @@ -141,16 +140,16 @@ public class MappingPdxSerializerIntegrationTest { super(id, firstname, lastname); this.dsProperty = dsProperty; } - + public DataSerializableProperty getDataSerializableProperty() { return this.dsProperty; } - + } - + @SuppressWarnings("serial") public static class DataSerializableProperty implements DataSerializable { - + static { Instantiator.register(new Instantiator(DataSerializableProperty.class,101) { public DataSerializable newInstance() { @@ -158,30 +157,30 @@ public class MappingPdxSerializerIntegrationTest { } }); } - + private String value; - + public DataSerializableProperty(String value) { this.value = value; } - - + + @Override public void fromData(DataInput dataInput) throws IOException, ClassNotFoundException { value = dataInput.readUTF(); - + } @Override public void toData(DataOutput dataOutput) throws IOException { dataOutput.writeUTF(value); } - + public String getValue() { return this.value; } - + } } diff --git a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java index d0b00314..3cbc4db4 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java @@ -29,10 +29,9 @@ import static org.mockito.Mockito.when; import java.util.Collections; -import com.gemstone.gemfire.pdx.PdxReader; -import com.gemstone.gemfire.pdx.PdxSerializer; -import com.gemstone.gemfire.pdx.PdxWriter; - +import org.apache.geode.pdx.PdxReader; +import org.apache.geode.pdx.PdxSerializer; +import org.apache.geode.pdx.PdxWriter; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -62,9 +61,9 @@ import org.springframework.data.mapping.model.ParameterValueProvider; * @see org.mockito.runners.MockitoJUnitRunner * @see org.springframework.core.convert.ConversionService * @see org.springframework.data.gemfire.mapping.MappingPdxSerializer - * @see com.gemstone.gemfire.pdx.PdxReader - * @see com.gemstone.gemfire.pdx.PdxSerializer - * @see com.gemstone.gemfire.pdx.PdxWriter + * @see org.apache.geode.pdx.PdxReader + * @see org.apache.geode.pdx.PdxSerializer + * @see org.apache.geode.pdx.PdxWriter */ @RunWith(MockitoJUnitRunner.class) public class MappingPdxSerializerUnitTests { diff --git a/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java b/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java index e1127d61..75d77f8b 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessorUnitTests.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.List; +import org.apache.geode.pdx.PdxReader; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -30,10 +31,8 @@ import org.mockito.runners.MockitoJUnitRunner; import org.springframework.core.convert.TypeDescriptor; import org.springframework.expression.TypedValue; -import com.gemstone.gemfire.pdx.PdxReader; - /** - * + * * @author Oliver Gierke */ @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java b/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java index df59b260..f7996108 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/RegionsTest.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.geode.cache.Region; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -42,8 +43,6 @@ import org.springframework.data.gemfire.repository.sample.RootUser; import org.springframework.data.gemfire.repository.sample.User; import org.springframework.data.mapping.context.MappingContext; -import com.gemstone.gemfire.cache.Region; - /** * The RegionsTest class is a test suite of test cases testing the contract and functionality of the Regions class. * diff --git a/src/test/java/org/springframework/data/gemfire/process/ProcessWrapper.java b/src/test/java/org/springframework/data/gemfire/process/ProcessWrapper.java index fe84e331..522ed325 100644 --- a/src/test/java/org/springframework/data/gemfire/process/ProcessWrapper.java +++ b/src/test/java/org/springframework/data/gemfire/process/ProcessWrapper.java @@ -44,7 +44,6 @@ import org.springframework.data.gemfire.test.support.IOUtils; import org.springframework.data.gemfire.test.support.ThreadUtils; import org.springframework.data.gemfire.test.support.ThrowableUtils; import org.springframework.util.Assert; -import org.springframework.util.StringUtils; /** * The ProcessWrapper class is a wrapper for a Process object representing an OS process and the ProcessBuilder used diff --git a/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java index 5d5f80f8..b873a91d 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/GemFireRepositoryFactoryInformationIntegrationTests.java @@ -28,6 +28,8 @@ import java.util.Arrays; import java.util.Map; import java.util.Properties; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.RegionAttributes; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -47,9 +49,6 @@ import org.springframework.data.repository.core.support.RepositoryFactoryInforma import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.RegionAttributes; - /** * Test suite of test cases testing that the GemFire-based {@link org.springframework.data.repository.Repository} * factories, implementing the {@link RepositoryFactoryInformation} interface, can in fact be looked up in the diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java index a8889dc9..a2d5de9d 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java @@ -24,6 +24,8 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheFactory; import org.apache.webbeans.cditest.CdiTestContainer; import org.apache.webbeans.cditest.CdiTestContainerLoader; import org.junit.AfterClass; @@ -31,9 +33,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.springframework.data.gemfire.repository.sample.Person; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; - /** * The CdiExtensionIntegrationTest class... * diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java index dc78e78a..69061dc4 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireCacheRegionProducer.java @@ -20,15 +20,14 @@ package org.springframework.data.gemfire.repository.cdi; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionShortcut; import org.springframework.data.gemfire.repository.sample.Person; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionShortcut; - /** * The GemfireCacheRegionProducer class is an application scoped CDI context bean that is responsible * for creating the GemFire Cache "People" Region used to store {@link Person} instances. @@ -36,10 +35,10 @@ import com.gemstone.gemfire.cache.RegionShortcut; * @author John Blum * @see javax.enterprise.context.ApplicationScoped * @see javax.enterprise.inject.Produces - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.CacheFactory - * @see com.gemstone.gemfire.cache.Region - * @see com.gemstone.gemfire.cache.RegionFactory + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.CacheFactory + * @see org.apache.geode.cache.Region + * @see org.apache.geode.cache.RegionFactory * @since 1.8.0 */ @SuppressWarnings("unused") diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java index fcd7b3db..4d709a6c 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryBeanTest.java @@ -42,10 +42,13 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicBoolean; + import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -62,9 +65,6 @@ import org.springframework.data.gemfire.repository.support.SimpleGemfireReposito import org.springframework.data.repository.core.RepositoryInformation; import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; - /** * The GemfireRepositoryBeanTest class is a test suite of test cases testing the contract and functionality * of the GemfireRepositoryBean class. diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java index fef05409..44ed4842 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/GemfireRepositoryExtensionTest.java @@ -35,12 +35,14 @@ import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.Set; + import javax.enterprise.inject.spi.AfterBeanDiscovery; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.ProcessBean; import javax.inject.Qualifier; +import org.apache.geode.cache.Region; import org.junit.Before; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; @@ -48,8 +50,6 @@ import org.mockito.stubbing.Answer; import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.gemfire.repository.GemfireRepository; -import com.gemstone.gemfire.cache.Region; - /** * The GemfireRepositoryExtensionTest class is a test suite of unit tests testing the contract and proper functionality * of the {@link GemfireRepositoryExtension} class in a Java EE CDI context. diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java index 959e00e5..a8e0ae1c 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java +++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/RepositoryClient.java @@ -18,6 +18,7 @@ package org.springframework.data.gemfire.repository.cdi; import java.util.concurrent.atomic.AtomicLong; + import javax.inject.Inject; import org.springframework.data.gemfire.repository.sample.Person; diff --git a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java index 1c3dd740..f4fdf4c4 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/config/GemfireRepositoriesRegistrarIntegrationTest.java @@ -16,6 +16,8 @@ */ package org.springframework.data.gemfire.repository.config; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -32,13 +34,10 @@ import org.springframework.data.gemfire.test.MockCacheFactoryBean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; - /** * Integration test for {@link GemfireRepositoriesRegistrar} (annotation based * repository configuration). - * + * * @author Oliver Gierke */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java index 59667177..f4d46e6b 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/QueryStringUnitTests.java @@ -31,8 +31,7 @@ import static org.springframework.data.gemfire.repository.query.QueryString.TRAC import java.util.Arrays; import java.util.regex.Pattern; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.Region; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java b/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java index ec1055dd..9a88242d 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQueryTest.java @@ -39,11 +39,10 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.query.internal.ResultsBag; import org.junit.Test; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.query.internal.ResultsBag; - /** * The SpringBasedGemfireRepositoryQueryTest class is a test suite of test cases testing the contract and functionality * of the StringBasedGemfireRepositoryQuery class. diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java index 09faa738..feebf11b 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/AlgorithmRepositoryTest.java @@ -23,14 +23,13 @@ import static org.junit.Assert.assertTrue; import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; - /** * The AlgorithmRepositoryTest class is a test suite of test cases testing the contract and functionality of GemFire's * Repository extension when using a plain old Java interface for defining the application domain object/entity type, diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java index 3a92fe82..cbc3fc65 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java @@ -17,13 +17,13 @@ package org.springframework.data.gemfire.repository.sample; import java.io.Serializable; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import org.springframework.data.annotation.Id; import org.springframework.data.annotation.PersistenceConstructor; import org.springframework.data.gemfire.mapping.Region; import org.springframework.util.ObjectUtils; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - /** * The Person class models a person. * @@ -111,7 +111,7 @@ public class Person implements Serializable { return String.format("%1$s %2$s", getFirstname(), getLastname()); } - /* + /* * (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ @@ -130,7 +130,7 @@ public class Person implements Serializable { return (this.id != null && this.id.equals(that.id)); } - /* + /* * (non-Javadoc) * @see java.lang.Object#hashCode() */ diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepository.java b/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepository.java index c283817c..51b69555 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepository.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepository.java @@ -21,7 +21,6 @@ import java.util.List; import org.springframework.data.domain.Sort; import org.springframework.data.gemfire.repository.GemfireRepository; import org.springframework.data.gemfire.repository.Query; -import org.springframework.data.gemfire.repository.query.annotation.Trace; /** * Sample Repository interface managing {@link Person}s. diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java index e802a195..f25105a2 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/PersonRepositoryIntegrationTests.java @@ -26,9 +26,8 @@ import java.util.List; import java.util.Properties; import java.util.concurrent.atomic.AtomicLong; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.RegionAttributes; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.RegionAttributes; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java b/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java index 3a917a4b..75e6107d 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -14,10 +14,9 @@ package org.springframework.data.gemfire.repository.sample; import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.springframework.beans.factory.InitializingBean; -import com.gemstone.gemfire.cache.Region; - /** * @author David Turanski * @@ -33,11 +32,11 @@ public class RegionPopulator implements InitializingBean { public void afterPropertiesSet() throws Exception { region.put(1L,new Person(1L,"first1", "last1")); region.put(2L,new Person(2L,"first2", "last2")); - + } - + public void setRegion(Region region) { this.region=region; } - + } diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java index e89a6c8c..d11adf6e 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/SubRegionRepositoryIntegrationTest.java @@ -26,8 +26,10 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,8 +38,6 @@ import org.springframework.data.gemfire.repository.Wrapper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; - /** * The SubRegionRepositoryTest class is a test suite of test cases testing the use of GemFire Repositories on GemFire * Cache Subregions. @@ -50,7 +50,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.data.gemfire.repository.sample.ProgrammerRepository * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @link https://jira.springsource.org/browse/SGF-251 * @link https://jira.springsource.org/browse/SGF-252 * @since 1.4.0 diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java index b13353b0..824406a9 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/UserRepositoryQueriesIntegrationTest.java @@ -25,8 +25,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.List; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,8 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; - /** * The RepositoryQueriesTest class is a test suite of test cases testing the GemFire Query capability of Spring Data * GemFire Repositories. diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java index 8d1b270d..32fd6d1f 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest.java @@ -23,8 +23,10 @@ import static org.junit.Assert.assertThat; import java.util.ArrayList; import java.util.List; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,8 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.Region; - /** * The UsingQueryAnnotationExtensionsInUserRepositoryIntegrationTest class is a test suite of test cases testing * the contract and functionality of the Spring Data Commons Repository abstraction, Spring Data GemFire Repository @@ -45,7 +45,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.data.gemfire.repository.GemfireRepository * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @since 1.7.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java index 2902829a..1b4e1058 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/AbstractGemfireRepositoryFactoryIntegrationTests.java @@ -25,6 +25,7 @@ import static org.junit.Assert.fail; import java.util.Arrays; import java.util.List; +import org.apache.geode.cache.Region; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; @@ -37,14 +38,12 @@ import org.springframework.data.gemfire.mapping.Regions; import org.springframework.data.gemfire.repository.sample.Person; import org.springframework.data.gemfire.repository.sample.PersonRepository; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.gemstone.gemfire.cache.Region; /** * Integration test for {@link GemfireRepositoryFactory}. - * + * * @author Oliver Gierke */ - + @RunWith(SpringJUnit4ClassRunner.class) public abstract class AbstractGemfireRepositoryFactoryIntegrationTests { diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java index ec0bb706..4dffc8c8 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryBeanTest.java @@ -16,12 +16,16 @@ package org.springframework.data.gemfire.repository.support; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.junit.Assert.assertThat; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import java.util.Collections; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -30,9 +34,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.mapping.GemfireMappingContext; import org.springframework.data.gemfire.repository.sample.PersonRepository; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; - /** * The GemfireRepositoryFactoryBeanTest class is test suite of test cases testing the contract and functionality * of the GemfireRepositoryFactoryBean class. @@ -59,32 +60,32 @@ public class GemfireRepositoryFactoryBeanTest { @Test public void rejectsMappingContextNotSet() { - + exception.expect(IllegalStateException.class); exception.expectMessage("GemfireMappingContext"); - + repositoryFactoryBean.afterPropertiesSet(); } - + @Test @SuppressWarnings("unchecked") public void initializesWithMappingContext() { - + RegionAttributes attributes = mock(RegionAttributes.class); doReturn(Long.class).when(attributes).getKeyConstraint(); - + Region region = mock(Region.class); doReturn("simple").when(region).getName(); doReturn(attributes).when(region).getAttributes(); - + ApplicationContext applicationContext = mock(ApplicationContext.class); doReturn(Collections.singletonMap("simple", region)).when(applicationContext).getBeansOfType(Region.class); - + repositoryFactoryBean.setApplicationContext(applicationContext); repositoryFactoryBean.setRepositoryInterface(PersonRepository.class); repositoryFactoryBean.setGemfireMappingContext(new GemfireMappingContext()); repositoryFactoryBean.afterPropertiesSet(); - + assertThat(repositoryFactoryBean.getObject(), is(notNullValue())); } } diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java index 4f20aace..4cba2072 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryIntegrationTests.java @@ -15,8 +15,9 @@ */ package org.springframework.data.gemfire.repository.support; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.junit.Assert.assertThat; import java.util.Collections; @@ -33,7 +34,7 @@ import org.springframework.test.context.ContextConfiguration; /** * Integration test for {@link GemfireRepositoryFactory}. - * + * * @author Oliver Gierke */ @ContextConfiguration("../config/repo-context.xml") diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java index 6ee2499b..fd2259c8 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactoryUnitTests.java @@ -33,9 +33,8 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Collections; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; - +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java index 8509c7a6..69a4548d 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTests.java @@ -24,12 +24,11 @@ import java.util.Properties; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionEvent; -import com.gemstone.gemfire.cache.query.SelectResults; -import com.gemstone.gemfire.cache.util.CacheListenerAdapter; - +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionEvent; +import org.apache.geode.cache.query.SelectResults; +import org.apache.geode.cache.util.CacheListenerAdapter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java index 48dff615..74693df2 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryTransactionalIntegrationTest.java @@ -25,8 +25,10 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.concurrent.atomic.AtomicLong; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -43,8 +45,6 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallbackWithoutResult; import org.springframework.transaction.support.TransactionTemplate; -import com.gemstone.gemfire.cache.Region; - /** * The SimpleGemfireRepositoryTransactionalIntegrationTest class is a test suite of test cases testing * the SimpleGemfireRepository class and SDC Repository abstraction implementation in the context of diff --git a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTest.java b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTest.java index 50d2b2d1..538f8e31 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTest.java +++ b/src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTest.java @@ -40,12 +40,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheTransactionManager; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; diff --git a/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java b/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java index 8f082ff2..d57dce5f 100644 --- a/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java +++ b/src/test/java/org/springframework/data/gemfire/serialization/AsmInstantiatorFactoryTest.java @@ -25,12 +25,11 @@ import java.io.DataOutput; import java.io.IOException; import java.io.Serializable; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; import org.junit.Before; import org.junit.Test; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; - /** * @author Costin Leau */ @@ -87,4 +86,4 @@ public class AsmInstantiatorFactoryTest { Instantiator instance2 = asmFactory.getInstantiator(SomeClass.class, 125); assertSame(instance1, instance2); } -} \ No newline at end of file +} diff --git a/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java b/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java index 2ed7a151..648f658d 100644 --- a/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java +++ b/src/test/java/org/springframework/data/gemfire/serialization/WiringInstantiatorTest.java @@ -29,6 +29,8 @@ import java.io.DataOutput; import java.io.IOException; import java.util.List; +import org.apache.geode.DataSerializable; +import org.apache.geode.Instantiator; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +38,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.Instantiator; - /** * @author Costin Leau */ @@ -145,4 +144,4 @@ public class WiringInstantiatorTest { assertNotNull(list); assertEquals(2, list.size()); } -} \ No newline at end of file +} diff --git a/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java index b7bbb50e..8a21991d 100644 --- a/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/server/CacheServerFactoryBeanTest.java @@ -34,16 +34,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.InterestRegistrationListener; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; +import org.apache.geode.cache.server.ServerLoadProbe; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.InterestRegistrationListener; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; -import com.gemstone.gemfire.cache.server.ServerLoadProbe; - /** * The CacheServerFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the CacheServerFactoryBean class. diff --git a/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java b/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java index 5b777c29..9c83fa43 100644 --- a/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java +++ b/src/test/java/org/springframework/data/gemfire/server/SubscriptionEvictionPolicyTest.java @@ -24,10 +24,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import org.apache.geode.cache.server.ClientSubscriptionConfig; import org.junit.Test; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; - /** * The SubscriptionEvictionPolicyTest class is a test suite of test cases testing the contract and functionality * of the SubscriptionEvictionPolicy enum. diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java index 09203fcb..89a47354 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotApplicationEventTriggeredImportsExportsIntegrationTest.java @@ -26,8 +26,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; + import javax.annotation.Resource; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.snapshot.SnapshotFilter; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -46,9 +49,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; - /** * The SnapshotApplicationEventTriggeredImportsExportsIntegrationTest class is a test suite of test cases testing * the effects of the SnapshotServiceFactoryBean using Spring ApplicationEvents to trigger imports and exports @@ -64,7 +64,7 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; * @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 + * @see org.apache.geode.cache.Region * @since 1.7.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java index e8be26c6..6fdf0d8f 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java @@ -16,7 +16,7 @@ package org.springframework.data.gemfire.snapshot; -import static com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat; +import static org.apache.geode.cache.snapshot.SnapshotOptions.SnapshotFormat; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; @@ -49,6 +49,12 @@ import java.io.IOException; import java.util.Arrays; import org.apache.commons.logging.Log; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.snapshot.CacheSnapshotService; +import org.apache.geode.cache.snapshot.RegionSnapshotService; +import org.apache.geode.cache.snapshot.SnapshotFilter; +import org.apache.geode.cache.snapshot.SnapshotOptions; import org.junit.After; import org.junit.BeforeClass; import org.junit.Rule; @@ -61,13 +67,6 @@ import org.springframework.data.gemfire.snapshot.event.ImportSnapshotApplication import org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent; import org.springframework.data.gemfire.test.support.FileSystemUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.snapshot.CacheSnapshotService; -import com.gemstone.gemfire.cache.snapshot.RegionSnapshotService; -import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; -import com.gemstone.gemfire.cache.snapshot.SnapshotOptions; - /** * The SnapshotServiceFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the SnapshotServiceFactoryBean class. @@ -77,8 +76,8 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotOptions; * @see org.junit.Test * @see org.mockito.Mockito * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean - * @see com.gemstone.gemfire.cache.snapshot.CacheSnapshotService - * @see com.gemstone.gemfire.cache.snapshot.RegionSnapshotService + * @see org.apache.geode.cache.snapshot.CacheSnapshotService + * @see org.apache.geode.cache.snapshot.RegionSnapshotService * @since 1.7.0 */ @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java index b71fbce1..86a82da7 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java @@ -25,6 +25,7 @@ import java.io.File; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import org.apache.geode.cache.Region; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -37,8 +38,6 @@ import org.springframework.data.gemfire.test.support.FileSystemUtils; import org.springframework.data.gemfire.test.support.ThreadUtils; import org.springframework.util.FileCopyUtils; -import com.gemstone.gemfire.cache.Region; - /** * The SnapshotServiceImportExportIntegrationTest class is a test suite of test cases testing the import and export * of GemFire Cache Region data configured with SDG's Data Namespace >gfe-data:snapshot-service< (XML) element. @@ -49,7 +48,7 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.context.support.ClassPathXmlApplicationContext * @see org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean * @see org.springframework.data.gemfire.repository.sample.Person - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region * @since 1.7.0 */ @SuppressWarnings("unused") diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java index 04f54249..898eb6f7 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEventTest.java @@ -28,15 +28,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.snapshot.SnapshotOptions; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.data.gemfire.test.support.FileSystemUtils; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.snapshot.SnapshotOptions; - /** * The SnapshotApplicationEventTest class is a test suite of test cases testing the contract and functionality * of the SnapshotApplicationEvent class. diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java index 3d2512be..315e17cc 100644 --- a/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java +++ b/src/test/java/org/springframework/data/gemfire/snapshot/filter/ComposableSnapshotFilterTest.java @@ -31,11 +31,10 @@ import static org.springframework.data.gemfire.snapshot.filter.ComposableSnapsho import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.geode.cache.snapshot.SnapshotFilter; import org.junit.Test; import org.springframework.data.gemfire.TestUtils; -import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; - /** * The ComposableSnapshotFilterTest class is a test suite of test cases testing the contract and functionality * of the ComposableSnapshotFilter class. @@ -45,7 +44,7 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotFilter; * @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 + * @see org.apache.geode.cache.snapshot.SnapshotFilter * @since 1.7.0 */ public class ComposableSnapshotFilterTest { diff --git a/src/test/java/org/springframework/data/gemfire/support/AbstractRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/support/AbstractRegionFactoryBeanTest.java index e1d6b7bd..e0d7abca 100644 --- a/src/test/java/org/springframework/data/gemfire/support/AbstractRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/AbstractRegionFactoryBeanTest.java @@ -21,6 +21,7 @@ import java.io.FilenameFilter; import java.util.HashMap; import java.util.Map; +import org.apache.geode.cache.GemFireCache; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -28,8 +29,6 @@ import org.junit.Test; import org.springframework.data.gemfire.RegionFactoryBean; import org.springframework.data.gemfire.test.StubCache; -import com.gemstone.gemfire.cache.GemFireCache; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest.java index 9b0346e1..5cd58698 100644 --- a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest.java @@ -29,6 +29,10 @@ import static org.mockito.Mockito.when; import javax.annotation.Resource; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -41,11 +45,6 @@ import org.springframework.expression.EvaluationException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; - /** * The AnnotationBasedExpirationConfigurationIntegrationTest class is a test suite of test cases testing * the configuration of Annotation-defined expiration policies on Region Entry TTL and TTI @@ -59,9 +58,9 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.CustomExpiry - * @see com.gemstone.gemfire.cache.ExpirationAction - * @see com.gemstone.gemfire.cache.ExpirationAttributes + * @see org.apache.geode.cache.CustomExpiry + * @see org.apache.geode.cache.ExpirationAction + * @see org.apache.geode.cache.ExpirationAttributes * @since 1.7.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationTest.java b/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationTest.java index d6853fb9..a5d7813b 100644 --- a/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/AnnotationBasedExpirationTest.java @@ -33,6 +33,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.springframework.data.gemfire.support.AnnotationBasedExpiration.ExpirationMetaData; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; import org.junit.Test; import org.mockito.Matchers; import org.mockito.invocation.InvocationOnMock; @@ -48,10 +51,6 @@ import org.springframework.expression.TypeConverter; import org.springframework.expression.TypeLocator; import org.springframework.expression.spel.support.StandardEvaluationContext; -import com.gemstone.gemfire.cache.ExpirationAction; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; - /** * The AnnotationBasedExpirationTest class is a test suite of test cases testing the contract and functionality * of the AnnotationBasedExpirationTest. diff --git a/src/test/java/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest.java index ae563fbd..ea8c4311 100644 --- a/src/test/java/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/CachingWithGemFireIntegrationTest.java @@ -22,9 +22,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.Map; + import javax.annotation.PostConstruct; import javax.annotation.Resource; +import org.apache.geode.cache.Region; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -34,8 +36,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Region; - /** * The CachingWithGemFireIntegrationTest class is a test suite of test cases testing the contract and functionality * of Spring Framework's Cache Abstraction using GemFire as a caching provider applied with Spring Data GemFire. diff --git a/src/test/java/org/springframework/data/gemfire/support/CallableCacheLoaderAdapterTest.java b/src/test/java/org/springframework/data/gemfire/support/CallableCacheLoaderAdapterTest.java index 84de3d3f..83795512 100644 --- a/src/test/java/org/springframework/data/gemfire/support/CallableCacheLoaderAdapterTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/CallableCacheLoaderAdapterTest.java @@ -30,6 +30,9 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -39,12 +42,8 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** - * Tests the adaption of the {@link java.util.concurrent.Callable} in to GemFire's {@link com.gemstone.gemfire.cache.CacheLoader} interface. + * Tests the adaption of the {@link java.util.concurrent.Callable} in to GemFire's {@link org.apache.geode.cache.CacheLoader} interface. * * @author John Blum * @see org.junit.Rule @@ -55,9 +54,9 @@ import com.gemstone.gemfire.cache.Region; * @see org.mockito.Mockito * @see org.mockito.runners.MockitoJUnitRunner * @see java.util.concurrent.Callable - * @see com.gemstone.gemfire.cache.CacheLoader - * @see com.gemstone.gemfire.cache.LoaderHelper - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.CacheLoader + * @see org.apache.geode.cache.LoaderHelper + * @see org.apache.geode.cache.Region * @since 1.0.0 */ @RunWith(MockitoJUnitRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapperTest.java b/src/test/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapperTest.java index ad99cef2..c94bbcea 100644 --- a/src/test/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/ClientRegionShortcutWrapperTest.java @@ -21,10 +21,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.apache.geode.cache.client.ClientRegionShortcut; import org.junit.Test; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; - /** * The ClientRegionShortcutWrapperTest class is a test suite of test cases testing the contract and functionality of the * ClientRegionShortcutWrapper enum class type. @@ -32,7 +31,7 @@ import com.gemstone.gemfire.cache.client.ClientRegionShortcut; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.support.ClientRegionShortcutWrapper - * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut + * @see org.apache.geode.cache.client.ClientRegionShortcut * @since 1.4.0 */ public class ClientRegionShortcutWrapperTest { diff --git a/src/test/java/org/springframework/data/gemfire/support/CompoundCachePutCacheEvictIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/CompoundCachePutCacheEvictIntegrationTests.java index af5784dd..68ecdfd6 100644 --- a/src/test/java/org/springframework/data/gemfire/support/CompoundCachePutCacheEvictIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/CompoundCachePutCacheEvictIntegrationTests.java @@ -26,8 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Resource; -import com.gemstone.gemfire.cache.GemFireCache; - +import org.apache.geode.cache.GemFireCache; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -86,7 +85,7 @@ public class CompoundCachePutCacheEvictIntegrationTests { private PeopleService peopleService; @Resource(name = "People") - private com.gemstone.gemfire.cache.Region peopleRegion; + private org.apache.geode.cache.Region peopleRegion; protected void assertNoPeopleInDepartment(Department department) { assertPeopleInDepartment(department); @@ -154,7 +153,7 @@ public class CompoundCachePutCacheEvictIntegrationTests { GemfireCacheManager cacheManager(GemFireCache gemfireCache) { GemfireCacheManager cacheManager = new GemfireCacheManager() { @Override protected org.springframework.cache.Cache decorateCache(org.springframework.cache.Cache cache) { - return new GemfireCache((com.gemstone.gemfire.cache.Region) cache.getNativeCache()) { + return new GemfireCache((org.apache.geode.cache.Region) cache.getNativeCache()) { @Override public void evict(Object key) { getNativeCache().remove(key); } diff --git a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/support/GemfireCacheIntegrationTests.java index 3f0251d4..36785704 100644 --- a/src/test/java/org/springframework/data/gemfire/support/GemfireCacheIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/support/GemfireCacheIntegrationTests.java @@ -26,9 +26,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import edu.umd.cs.mtc.MultithreadedTestCase; import edu.umd.cs.mtc.TestFramework; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.Region; - +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -45,7 +44,7 @@ import org.springframework.data.gemfire.GemfireUtils; * @see edu.umd.cs.mtc.MultithreadedTestCase * @see edu.umd.cs.mtc.TestFramework * @see org.springframework.cache.Cache - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Region */ public class GemfireCacheIntegrationTests extends AbstractNativeCacheTests> { @@ -66,7 +65,7 @@ public class GemfireCacheIntegrationTests extends AbstractNativeCacheTests bpps = ctx.getBeansOfType(BeanPostProcessor.class); @@ -52,33 +51,33 @@ public class GemfirePersistenceExceptionTranslationTest { gemfireRepo1.doit(new QueryException()); fail("should throw a query exception"); } catch (GemfireQueryException e){ - + } - + try { gemfireRepo1.doit(new FunctionDomainException("test")); fail("should throw a query exception"); } catch (GemfireQueryException e) { - + } - + try { gemfireRepo1.doit(new QueryInvocationTargetException("test")); fail("should throw a query exception"); } catch (GemfireQueryException e) { - + } } - + /** - * Wraps GemfireCheckedExceptions in RuntimeException + * Wraps GemfireCheckedExceptions in RuntimeException * @author David Turanski * */ - @Repository + @Repository public static class GemFireRepo1 { public void doit(Exception e) { throw new RuntimeException(e); - } + } } } diff --git a/src/test/java/org/springframework/data/gemfire/support/JSONRegionAdviceTest.java b/src/test/java/org/springframework/data/gemfire/support/JSONRegionAdviceTest.java index 84531d08..4cf65e08 100644 --- a/src/test/java/org/springframework/data/gemfire/support/JSONRegionAdviceTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/JSONRegionAdviceTest.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -19,8 +19,14 @@ import java.io.IOException; import java.util.Arrays; import java.util.HashMap; import java.util.Map; + import javax.annotation.Resource; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.apache.geode.cache.Region; +import org.apache.geode.cache.query.SelectResults; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,11 +36,6 @@ import org.springframework.data.gemfire.repository.sample.Person; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.query.SelectResults; - /** * JSONRegionAdviceTest is a test suite of test cases testing SDG's support for storing and retrieving JSON data * in GemFire Cache Regions (un)marshalled using Jackson. diff --git a/src/test/java/org/springframework/data/gemfire/support/ListRegionsOnServerFunctionTest.java b/src/test/java/org/springframework/data/gemfire/support/ListRegionsOnServerFunctionTest.java index 47b156e8..7d87c6ba 100644 --- a/src/test/java/org/springframework/data/gemfire/support/ListRegionsOnServerFunctionTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/ListRegionsOnServerFunctionTest.java @@ -34,15 +34,14 @@ import java.util.HashSet; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.ResultSender; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.ResultSender; - /** * The ListRegionsOnServerFunctionTest class is a test suite of test cases testing the contract and functionality * of the ListRegionsOnServerFunction GemFire Function class. diff --git a/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java b/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java index 307b23bb..38b2f4e1 100644 --- a/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java @@ -21,10 +21,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import org.apache.geode.cache.RegionShortcut; import org.junit.Test; -import com.gemstone.gemfire.cache.RegionShortcut; - /** * The RegionShortcutWrapperTest class is a test suite of test cases testing the contract and functionality of the * RegionShortcutWrapper enum class type. @@ -32,7 +31,7 @@ import com.gemstone.gemfire.cache.RegionShortcut; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.support.RegionShortcutWrapper - * @see com.gemstone.gemfire.cache.RegionShortcut + * @see org.apache.geode.cache.RegionShortcut * @since 1.4.0 */ public class RegionShortcutWrapperTest { diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java index 071ca125..cdae3322 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/SpringContextBootstrappingInitializerIntegrationTest.java @@ -30,8 +30,16 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; + import javax.sql.DataSource; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -47,14 +55,6 @@ import org.springframework.data.gemfire.support.sample.TestUserService; import org.springframework.data.gemfire.test.support.DataSourceAdapter; import org.springframework.util.Assert; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheLoaderException; -import com.gemstone.gemfire.cache.LoaderHelper; -import com.gemstone.gemfire.cache.Region; - /** * The SpringContextBootstrappingInitializerTest class is a test suite of test cases testing the integrated * functionality of the SpringContextBootstrappingInitializer class. @@ -64,10 +64,10 @@ import com.gemstone.gemfire.cache.Region; * @see org.springframework.context.ConfigurableApplicationContext * @see org.springframework.data.gemfire.LazyWiringDeclarableSupport * @see org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.CacheFactory - * @see com.gemstone.gemfire.cache.CacheLoader - * @see com.gemstone.gemfire.cache.Region + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.CacheFactory + * @see org.apache.geode.cache.CacheLoader + * @see org.apache.geode.cache.Region * @since 1.4.0 */ @SuppressWarnings("unused") diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTest.java index 72951b44..e004ec0a 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderIntegrationTest.java @@ -21,22 +21,21 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertThat; +import org.apache.geode.cache.Cache; +import org.apache.geode.distributed.AbstractLauncher.Status; +import org.apache.geode.distributed.ServerLauncher; +import org.apache.geode.distributed.ServerLauncher.ServerState; import org.junit.After; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.distributed.AbstractLauncher.Status; -import com.gemstone.gemfire.distributed.ServerLauncher; -import com.gemstone.gemfire.distributed.ServerLauncher.ServerState; - /** * The SpringServerLauncherCacheProviderTest class is a test suite of test cases testing the contract and functionality * of the {@link SpringServerLauncherCacheProvider} class. * * This test class focuses on testing isolated units of functionality in the - * {@link com.gemstone.gemfire.distributed.ServerLauncherCacheProvider} class directly, mocking any dependencies + * {@link org.apache.geode.distributed.ServerLauncherCacheProvider} class directly, mocking any dependencies * as appropriate, in order for the class to uphold it's contract. * * @author Dan Smith @@ -45,8 +44,8 @@ import com.gemstone.gemfire.distributed.ServerLauncher.ServerState; * @see org.springframework.context.ApplicationContext * @see org.springframework.context.ConfigurableApplicationContext * @see org.springframework.data.gemfire.support.SpringServerLauncherCacheProvider - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.distributed.ServerLauncher + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.distributed.ServerLauncher */ public class SpringServerLauncherCacheProviderIntegrationTest { diff --git a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderTest.java b/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderTest.java index 8339f62f..7f682fa4 100644 --- a/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/SpringServerLauncherCacheProviderTest.java @@ -27,18 +27,17 @@ import static org.mockito.Mockito.when; import java.util.Properties; +import org.apache.geode.cache.Cache; +import org.apache.geode.distributed.ServerLauncher; import org.junit.After; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.data.gemfire.GemfireUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.distributed.ServerLauncher; - /** * The SpringServerLauncherCacheProviderTest class is a test suite of test cases testing the contract and functionality * of the {@link SpringServerLauncherCacheProvider} class. This test class focuses on testing isolated units - * of functionality in the {@link com.gemstone.gemfire.distributed.ServerLauncherCacheProvider} class directly, mocking + * of functionality in the {@link org.apache.geode.distributed.ServerLauncherCacheProvider} class directly, mocking * any dependencies as appropriate, in order for the class to uphold it's contract. * * @author Dan Smith @@ -48,9 +47,9 @@ import com.gemstone.gemfire.distributed.ServerLauncher; * @see org.springframework.context.ApplicationContext * @see org.springframework.context.ConfigurableApplicationContext * @see org.springframework.data.gemfire.support.SpringServerLauncherCacheProvider - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.distributed.ServerLauncher - * @see com.gemstone.gemfire.distributed.ServerLauncherCacheProvider + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.distributed.ServerLauncher + * @see org.apache.geode.distributed.ServerLauncherCacheProvider */ public class SpringServerLauncherCacheProviderTest { diff --git a/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java b/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java index 6517e7e3..22dbade2 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockCacheFactoryBean.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -13,10 +13,9 @@ package org.springframework.data.gemfire.test; +import org.apache.geode.cache.GemFireCache; import org.springframework.data.gemfire.CacheFactoryBean; -import com.gemstone.gemfire.cache.GemFireCache; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java b/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java index bf5bf47c..e88f4351 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockClientCacheFactoryBean.java @@ -1,21 +1,20 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ package org.springframework.data.gemfire.test; +import org.apache.geode.cache.GemFireCache; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; -import com.gemstone.gemfire.cache.GemFireCache; - /** * @author David Turanski * @author John Blum diff --git a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java b/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java index 6197f63e..8a08f735 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockClientRegionFactory.java @@ -25,20 +25,19 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.compression.Compressor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.compression.Compressor; - /** * The MockClientRegionFactory class... * @@ -59,7 +58,7 @@ public class MockClientRegionFactory extends MockRegionFactory { @SuppressWarnings({ "deprecation", "unchecked" }) public ClientRegionFactory mockClientRegionFactory(ClientRegionShortcut clientRegionShortcut) { - attributesFactory = new com.gemstone.gemfire.cache.AttributesFactory(); + attributesFactory = new org.apache.geode.cache.AttributesFactory(); attributesFactory.setDataPolicy(resolveDataPolicy(clientRegionShortcut)); final ClientRegionFactory mockClientRegionFactory = mock(ClientRegionFactory.class, "MockClientRegionFactory"); diff --git a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java index 39e7e03f..4c5a9a89 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactory.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -23,26 +23,25 @@ import static org.mockito.Mockito.when; import java.io.File; import java.lang.reflect.Field; +import org.apache.geode.cache.AttributesMutator; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.MembershipAttributes; +import org.apache.geode.cache.PartitionAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.SubscriptionAttributes; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.util.ReflectionUtils; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheLoader; -import com.gemstone.gemfire.cache.CacheWriter; -import com.gemstone.gemfire.cache.CustomExpiry; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.ExpirationAttributes; -import com.gemstone.gemfire.cache.MembershipAttributes; -import com.gemstone.gemfire.cache.PartitionAttributes; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.SubscriptionAttributes; - /** * @author David Turanski * @author John Blum @@ -52,7 +51,7 @@ public class MockRegionFactory { protected static AttributesMutator mockAttributesMutator = mock(AttributesMutator.class); - protected com.gemstone.gemfire.cache.AttributesFactory attributesFactory; + protected org.apache.geode.cache.AttributesFactory attributesFactory; protected final StubCache cache; @@ -66,8 +65,8 @@ public class MockRegionFactory { @SuppressWarnings({ "deprecation", "rawtypes", "unchecked" }) public RegionFactory createMockRegionFactory(RegionAttributes attributes) { - attributesFactory = (attributes != null ? new com.gemstone.gemfire.cache.AttributesFactory(attributes) - : new com.gemstone.gemfire.cache.AttributesFactory()); + attributesFactory = (attributes != null ? new org.apache.geode.cache.AttributesFactory(attributes) + : new org.apache.geode.cache.AttributesFactory()); // Workaround for GemFire bug??? if (attributes != null) { @@ -185,11 +184,11 @@ public class MockRegionFactory { } }); - when(regionFactory.setDiskWriteAttributes(any(com.gemstone.gemfire.cache.DiskWriteAttributes.class))) + when(regionFactory.setDiskWriteAttributes(any(org.apache.geode.cache.DiskWriteAttributes.class))) .thenAnswer(new Answer() { @Override public RegionFactory answer(InvocationOnMock invocation) throws Throwable { - com.gemstone.gemfire.cache.DiskWriteAttributes diskWriteAttributes = - (com.gemstone.gemfire.cache.DiskWriteAttributes) invocation.getArguments()[0]; + org.apache.geode.cache.DiskWriteAttributes diskWriteAttributes = + (org.apache.geode.cache.DiskWriteAttributes) invocation.getArguments()[0]; attributesFactory.setDiskWriteAttributes(diskWriteAttributes); return regionFactory; } diff --git a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java index 656727d2..f8fe3d33 100644 --- a/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java +++ b/src/test/java/org/springframework/data/gemfire/test/MockRegionFactoryTest.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -19,11 +19,10 @@ package org.springframework.data.gemfire.test; import static org.junit.Assert.assertEquals; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.Scope; import org.junit.Test; - -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.Scope; public class MockRegionFactoryTest { @Test public void testBasicAttributes() { diff --git a/src/test/java/org/springframework/data/gemfire/test/StubAsyncEventQueueFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubAsyncEventQueueFactory.java index 06c640c5..f11f3552 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubAsyncEventQueueFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubAsyncEventQueueFactory.java @@ -19,13 +19,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; -import com.gemstone.gemfire.cache.wan.GatewayEventFilter; -import com.gemstone.gemfire.cache.wan.GatewayEventSubstitutionFilter; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory; +import org.apache.geode.cache.wan.GatewayEventFilter; +import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; +import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; /** * @author David Turanski diff --git a/src/test/java/org/springframework/data/gemfire/test/StubCache.java b/src/test/java/org/springframework/data/gemfire/test/StubCache.java index ce7c1a09..a9ca379c 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubCache.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubCache.java @@ -17,54 +17,54 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; + import javax.naming.Context; +import org.apache.geode.CancelCriterion; +import org.apache.geode.LogWriter; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheTransactionManager; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.DiskStore; +import org.apache.geode.cache.DiskStoreFactory; +import org.apache.geode.cache.GatewayException; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionExistsException; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.RegionService; +import org.apache.geode.cache.RegionShortcut; +import org.apache.geode.cache.TimeoutException; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory; +import org.apache.geode.cache.client.ClientCache; +import org.apache.geode.cache.client.ClientRegionFactory; +import org.apache.geode.cache.client.ClientRegionShortcut; +import org.apache.geode.cache.client.Pool; +import org.apache.geode.cache.control.ResourceManager; +import org.apache.geode.cache.query.Index; +import org.apache.geode.cache.query.IndexExistsException; +import org.apache.geode.cache.query.IndexInvalidException; +import org.apache.geode.cache.query.IndexNameConflictException; +import org.apache.geode.cache.query.QueryService; +import org.apache.geode.cache.query.RegionNotFoundException; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.snapshot.CacheSnapshotService; +import org.apache.geode.cache.util.GatewayConflictResolver; +import org.apache.geode.cache.wan.GatewayReceiver; +import org.apache.geode.cache.wan.GatewayReceiverFactory; +import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.cache.wan.GatewaySenderFactory; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.i18n.LogWriterI18n; +import org.apache.geode.pdx.PdxInstance; +import org.apache.geode.pdx.PdxInstanceFactory; +import org.apache.geode.pdx.PdxSerializer; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; -import com.gemstone.gemfire.cache.GatewayException; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionExistsException; -import com.gemstone.gemfire.cache.RegionFactory; -import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; -import com.gemstone.gemfire.cache.client.ClientCache; -import com.gemstone.gemfire.cache.client.ClientRegionFactory; -import com.gemstone.gemfire.cache.client.ClientRegionShortcut; -import com.gemstone.gemfire.cache.client.Pool; -import com.gemstone.gemfire.cache.control.ResourceManager; -import com.gemstone.gemfire.cache.query.Index; -import com.gemstone.gemfire.cache.query.IndexExistsException; -import com.gemstone.gemfire.cache.query.IndexInvalidException; -import com.gemstone.gemfire.cache.query.IndexNameConflictException; -import com.gemstone.gemfire.cache.query.QueryService; -import com.gemstone.gemfire.cache.query.RegionNotFoundException; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.snapshot.CacheSnapshotService; -import com.gemstone.gemfire.cache.util.GatewayConflictResolver; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.pdx.PdxInstance; -import com.gemstone.gemfire.pdx.PdxInstanceFactory; -import com.gemstone.gemfire.pdx.PdxSerializer; - @SuppressWarnings({ "deprecation", "unused" }) public class StubCache implements Cache, ClientCache { @@ -115,9 +115,9 @@ public class StubCache implements Cache, ClientCache { rootRegions = new HashMap(); resourceManager = new StubResourceManager(); } - + /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#createDiskStoreFactory() + * @see org.apache.geode.cache.GemFireCache#createDiskStoreFactory() */ @Override public DiskStoreFactory createDiskStoreFactory() { @@ -125,7 +125,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#findDiskStore(java.lang.String) + * @see org.apache.geode.cache.GemFireCache#findDiskStore(java.lang.String) */ @Override public DiskStore findDiskStore(String name) { @@ -133,7 +133,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getCacheTransactionManager() + * @see org.apache.geode.cache.GemFireCache#getCacheTransactionManager() */ @Override public CacheTransactionManager getCacheTransactionManager() { @@ -145,7 +145,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getCopyOnRead() + * @see org.apache.geode.cache.GemFireCache#getCopyOnRead() */ @Override public boolean getCopyOnRead() { @@ -153,7 +153,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getDistributedSystem() + * @see org.apache.geode.cache.GemFireCache#getDistributedSystem() */ @Override public DistributedSystem getDistributedSystem() { @@ -166,7 +166,7 @@ public class StubCache implements Cache, ClientCache { /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getInitializer() + * @see org.apache.geode.cache.GemFireCache#getInitializer() */ @Override public Declarable getInitializer() { @@ -174,7 +174,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getInitializerProps() + * @see org.apache.geode.cache.GemFireCache#getInitializerProps() */ @Override public Properties getInitializerProps() { @@ -182,7 +182,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getJNDIContext() + * @see org.apache.geode.cache.GemFireCache#getJNDIContext() */ @Override public Context getJNDIContext() { @@ -190,7 +190,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getLogger() + * @see org.apache.geode.cache.GemFireCache#getLogger() */ @Override public LogWriter getLogger() { @@ -198,7 +198,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getName() + * @see org.apache.geode.cache.GemFireCache#getName() */ @Override public String getName() { @@ -206,7 +206,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getPdxDiskStore() + * @see org.apache.geode.cache.GemFireCache#getPdxDiskStore() */ @Override public String getPdxDiskStore() { @@ -214,7 +214,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getPdxIgnoreUnreadFields() + * @see org.apache.geode.cache.GemFireCache#getPdxIgnoreUnreadFields() */ @Override public boolean getPdxIgnoreUnreadFields() { @@ -222,7 +222,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getPdxPersistent() + * @see org.apache.geode.cache.GemFireCache#getPdxPersistent() */ @Override public boolean getPdxPersistent() { @@ -230,7 +230,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getPdxReadSerialized() + * @see org.apache.geode.cache.GemFireCache#getPdxReadSerialized() */ @Override public boolean getPdxReadSerialized() { @@ -238,7 +238,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getPdxSerializer() + * @see org.apache.geode.cache.GemFireCache#getPdxSerializer() */ @Override public PdxSerializer getPdxSerializer() { @@ -246,7 +246,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getRegionAttributes(java.lang.String) + * @see org.apache.geode.cache.GemFireCache#getRegionAttributes(java.lang.String) */ @SuppressWarnings("unchecked") @Override @@ -255,7 +255,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getResourceManager() + * @see org.apache.geode.cache.GemFireCache#getResourceManager() */ @Override public ResourceManager getResourceManager() { @@ -263,7 +263,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#getSecurityLogger() + * @see org.apache.geode.cache.GemFireCache#getSecurityLogger() */ @Override public LogWriter getSecurityLogger() { @@ -271,7 +271,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#listRegionAttributes() + * @see org.apache.geode.cache.GemFireCache#listRegionAttributes() */ @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @@ -286,14 +286,14 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#loadCacheXml(java.io.InputStream) + * @see org.apache.geode.cache.GemFireCache#loadCacheXml(java.io.InputStream) */ @Override public void loadCacheXml(InputStream is) throws TimeoutException, CacheWriterException, GatewayException, RegionExistsException { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#setCopyOnRead(boolean) + * @see org.apache.geode.cache.GemFireCache#setCopyOnRead(boolean) */ @Override public void setCopyOnRead(boolean arg0) { @@ -301,7 +301,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.GemFireCache#setRegionAttributes(java.lang.String, com.gemstone.gemfire.cache.RegionAttributes) + * @see org.apache.geode.cache.GemFireCache#setRegionAttributes(java.lang.String, org.apache.geode.cache.RegionAttributes) */ @Override public void setRegionAttributes(String region, RegionAttributes attributes) { @@ -310,7 +310,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.RegionService#close() + * @see org.apache.geode.cache.RegionService#close() */ @Override public void close() { @@ -318,7 +318,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.RegionService#createPdxEnum(java.lang.String, java.lang.String, int) + * @see org.apache.geode.cache.RegionService#createPdxEnum(java.lang.String, java.lang.String, int) */ @Override public PdxInstance createPdxEnum(String arg0, String arg1, int arg2) { @@ -326,7 +326,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.RegionService#createPdxInstanceFactory(java.lang.String) + * @see org.apache.geode.cache.RegionService#createPdxInstanceFactory(java.lang.String) */ @Override public PdxInstanceFactory createPdxInstanceFactory(String arg0) { @@ -334,7 +334,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.RegionService#getCancelCriterion() + * @see org.apache.geode.cache.RegionService#getCancelCriterion() */ @Override public CancelCriterion getCancelCriterion() { @@ -342,7 +342,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.RegionService#getQueryService() + * @see org.apache.geode.cache.RegionService#getQueryService() */ @Override public QueryService getQueryService() { @@ -357,7 +357,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.RegionService#getRegion(java.lang.String) + * @see org.apache.geode.cache.RegionService#getRegion(java.lang.String) */ @SuppressWarnings("unchecked") @Override @@ -366,7 +366,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.RegionService#isClosed() + * @see org.apache.geode.cache.RegionService#isClosed() */ @Override public boolean isClosed() { @@ -374,7 +374,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.RegionService#rootRegions() + * @see org.apache.geode.cache.RegionService#rootRegions() */ @Override public Set> rootRegions() { @@ -390,7 +390,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#addCacheServer() + * @see org.apache.geode.cache.Cache#addCacheServer() */ @Override public CacheServer addCacheServer() { @@ -399,17 +399,17 @@ public class StubCache implements Cache, ClientCache { /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#close(boolean) + * @see org.apache.geode.cache.Cache#close(boolean) */ @Override @Deprecated public void close(boolean arg0) { this.closed = true; - + } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createAsyncEventQueueFactory() + * @see org.apache.geode.cache.Cache#createAsyncEventQueueFactory() */ @Override public AsyncEventQueueFactory createAsyncEventQueueFactory() { @@ -417,7 +417,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createGatewayReceiverFactory() + * @see org.apache.geode.cache.Cache#createGatewayReceiverFactory() */ @Override public GatewayReceiverFactory createGatewayReceiverFactory() { @@ -425,7 +425,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createGatewaySenderFactory() + * @see org.apache.geode.cache.Cache#createGatewaySenderFactory() */ @Override public GatewaySenderFactory createGatewaySenderFactory() { @@ -433,7 +433,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createRegion(java.lang.String, com.gemstone.gemfire.cache.RegionAttributes) + * @see org.apache.geode.cache.Cache#createRegion(java.lang.String, org.apache.geode.cache.RegionAttributes) */ @Override @Deprecated @@ -442,7 +442,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createRegionFactory() + * @see org.apache.geode.cache.Cache#createRegionFactory() */ @Override @SuppressWarnings("unchecked") @@ -451,7 +451,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createRegionFactory(com.gemstone.gemfire.cache.RegionAttributes) + * @see org.apache.geode.cache.Cache#createRegionFactory(org.apache.geode.cache.RegionAttributes) */ @Override public RegionFactory createRegionFactory(RegionAttributes regionAttributes) { @@ -459,7 +459,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createRegionFactory(com.gemstone.gemfire.cache.RegionShortcut) + * @see org.apache.geode.cache.Cache#createRegionFactory(org.apache.geode.cache.RegionShortcut) */ @Override @SuppressWarnings("unchecked") @@ -468,7 +468,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createRegionFactory(java.lang.String) + * @see org.apache.geode.cache.Cache#createRegionFactory(java.lang.String) */ @Override @SuppressWarnings("unchecked") @@ -477,7 +477,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#createVMRegion(java.lang.String, com.gemstone.gemfire.cache.RegionAttributes) + * @see org.apache.geode.cache.Cache#createVMRegion(java.lang.String, org.apache.geode.cache.RegionAttributes) */ @Override @Deprecated @@ -486,7 +486,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getAdminMembers() + * @see org.apache.geode.cache.Cache#getAdminMembers() */ @Override public Set getAdminMembers() { @@ -494,7 +494,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getAsyncEventQueue(java.lang.String) + * @see org.apache.geode.cache.Cache#getAsyncEventQueue(java.lang.String) */ @Override public AsyncEventQueue getAsyncEventQueue(String name) { @@ -502,7 +502,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getAsyncEventQueues() + * @see org.apache.geode.cache.Cache#getAsyncEventQueues() */ @Override public Set getAsyncEventQueues() { @@ -510,7 +510,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getCacheServers() + * @see org.apache.geode.cache.Cache#getCacheServers() */ @Override public List getCacheServers() { @@ -518,7 +518,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getGatewayConflictResolver() + * @see org.apache.geode.cache.Cache#getGatewayConflictResolver() */ @Override public GatewayConflictResolver getGatewayConflictResolver() { @@ -526,7 +526,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getGatewayReceivers() + * @see org.apache.geode.cache.Cache#getGatewayReceivers() */ @Override public Set getGatewayReceivers() { @@ -534,7 +534,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getGatewaySender(java.lang.String) + * @see org.apache.geode.cache.Cache#getGatewaySender(java.lang.String) */ @Override public GatewaySender getGatewaySender(String name) { @@ -542,7 +542,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getGatewaySenders() + * @see org.apache.geode.cache.Cache#getGatewaySenders() */ @Override public Set getGatewaySenders() { @@ -550,7 +550,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getLockLease() + * @see org.apache.geode.cache.Cache#getLockLease() */ @Override public int getLockLease() { @@ -558,7 +558,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getLockTimeout() + * @see org.apache.geode.cache.Cache#getLockTimeout() */ @Override public int getLockTimeout() { @@ -566,7 +566,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getLoggerI18n() + * @see org.apache.geode.cache.Cache#getLoggerI18n() */ @Override @Deprecated @@ -575,7 +575,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getMembers() + * @see org.apache.geode.cache.Cache#getMembers() */ @Override public Set getMembers() { @@ -583,7 +583,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getMembers(com.gemstone.gemfire.cache.Region) + * @see org.apache.geode.cache.Cache#getMembers(org.apache.geode.cache.Region) */ @SuppressWarnings({"rawtypes"}) @Override @@ -592,7 +592,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getMessageSyncInterval() + * @see org.apache.geode.cache.Cache#getMessageSyncInterval() */ @Override public int getMessageSyncInterval() { @@ -600,7 +600,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getSearchTimeout() + * @see org.apache.geode.cache.Cache#getSearchTimeout() */ @Override public int getSearchTimeout() { @@ -608,7 +608,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getSecurityLoggerI18n() + * @see org.apache.geode.cache.Cache#getSecurityLoggerI18n() */ @Override @Deprecated @@ -617,7 +617,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#getSnapshotService() + * @see org.apache.geode.cache.Cache#getSnapshotService() */ @Override public CacheSnapshotService getSnapshotService() { @@ -625,7 +625,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#isServer() + * @see org.apache.geode.cache.Cache#isServer() */ @Override public boolean isServer() { @@ -633,7 +633,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#readyForEvents() + * @see org.apache.geode.cache.Cache#readyForEvents() */ @Override @Deprecated @@ -641,7 +641,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#setGatewayConflictResolver(com.gemstone.gemfire.cache.util.GatewayConflictResolver) + * @see org.apache.geode.cache.Cache#setGatewayConflictResolver(org.apache.geode.cache.util.GatewayConflictResolver) */ @Override public void setGatewayConflictResolver(GatewayConflictResolver arg0) { @@ -649,7 +649,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#setIsServer(boolean) + * @see org.apache.geode.cache.Cache#setIsServer(boolean) */ @Override public void setIsServer(boolean server) { @@ -657,7 +657,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#setLockLease(int) + * @see org.apache.geode.cache.Cache#setLockLease(int) */ @Override public void setLockLease(int arg0) { @@ -665,7 +665,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#setLockTimeout(int) + * @see org.apache.geode.cache.Cache#setLockTimeout(int) */ @Override public void setLockTimeout(int arg0) { @@ -673,7 +673,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#setMessageSyncInterval(int) + * @see org.apache.geode.cache.Cache#setMessageSyncInterval(int) */ @Override public void setMessageSyncInterval(int arg0) { @@ -681,7 +681,7 @@ public class StubCache implements Cache, ClientCache { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.Cache#setSearchTimeout(int) + * @see org.apache.geode.cache.Cache#setSearchTimeout(int) */ @Override public void setSearchTimeout(int arg0) { @@ -729,7 +729,7 @@ public class StubCache implements Cache, ClientCache { String indexName = (String) invocation.getArguments()[0]; String indexedExpression = (String) invocation.getArguments()[1]; String fromClause = (String) invocation.getArguments()[2]; - return mockIndex(indexName, com.gemstone.gemfire.cache.query.IndexType.FUNCTIONAL, indexedExpression, + return mockIndex(indexName, org.apache.geode.cache.query.IndexType.FUNCTIONAL, indexedExpression, fromClause, null); } }); @@ -741,7 +741,7 @@ public class StubCache implements Cache, ClientCache { String indexedExpression = (String) invocation.getArguments()[1]; String fromClause = (String) invocation.getArguments()[2]; String imports = (String) invocation.getArguments()[3]; - return mockIndex(indexName, com.gemstone.gemfire.cache.query.IndexType.FUNCTIONAL, indexedExpression, + return mockIndex(indexName, org.apache.geode.cache.query.IndexType.FUNCTIONAL, indexedExpression, fromClause, imports); } }); @@ -753,7 +753,7 @@ public class StubCache implements Cache, ClientCache { String indexedExpression = (String) invocation.getArguments()[1]; String fromClause = (String) invocation.getArguments()[2]; - return mockIndex(indexName, com.gemstone.gemfire.cache.query.IndexType.PRIMARY_KEY, indexedExpression, + return mockIndex(indexName, org.apache.geode.cache.query.IndexType.PRIMARY_KEY, indexedExpression, fromClause, null); } }); @@ -765,7 +765,7 @@ public class StubCache implements Cache, ClientCache { String indexedExpression = (String) invocation.getArguments()[1]; String fromClause = (String) invocation.getArguments()[2]; - return mockIndex(indexName, com.gemstone.gemfire.cache.query.IndexType.HASH, indexedExpression, + return mockIndex(indexName, org.apache.geode.cache.query.IndexType.HASH, indexedExpression, fromClause, null); } }); @@ -778,7 +778,7 @@ public class StubCache implements Cache, ClientCache { String fromClause = (String) invocation.getArguments()[2]; String imports = (String) invocation.getArguments()[3]; - return mockIndex(indexName, com.gemstone.gemfire.cache.query.IndexType.HASH, indexedExpression, + return mockIndex(indexName, org.apache.geode.cache.query.IndexType.HASH, indexedExpression, fromClause, imports); } }); @@ -787,15 +787,15 @@ public class StubCache implements Cache, ClientCache { } @SuppressWarnings({ "rawtypes", "unchecked", "unused" }) - Index mockIndex(String indexName, com.gemstone.gemfire.cache.query.IndexType indexType, String indexedExpression, + Index mockIndex(String indexName, org.apache.geode.cache.query.IndexType indexType, String indexedExpression, String fromClause, String imports){ Index idx = mock(Index.class); when(idx.getFromClause()).thenReturn(fromClause); when(idx.getIndexedExpression()).thenReturn(indexedExpression); when(idx.getName()).thenReturn(indexName); when(idx.getType()).thenReturn(indexType); - - + + if (fromClause != null && fromClause.length() >= 2) { Region region = mock(Region.class); String name = fromClause.substring(1).split(" ")[0]; diff --git a/src/test/java/org/springframework/data/gemfire/test/StubCacheServer.java b/src/test/java/org/springframework/data/gemfire/test/StubCacheServer.java index b2578227..1c5a84b2 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubCacheServer.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubCacheServer.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -15,12 +15,12 @@ package org.springframework.data.gemfire.test; import java.io.IOException; import java.util.Set; -import com.gemstone.gemfire.cache.ClientSession; -import com.gemstone.gemfire.cache.InterestRegistrationListener; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; -import com.gemstone.gemfire.cache.server.ServerLoadProbe; -import com.gemstone.gemfire.distributed.DistributedMember; +import org.apache.geode.cache.ClientSession; +import org.apache.geode.cache.InterestRegistrationListener; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.cache.server.ClientSubscriptionConfig; +import org.apache.geode.cache.server.ServerLoadProbe; +import org.apache.geode.distributed.DistributedMember; /** * @author David Turanski @@ -56,7 +56,7 @@ public class StubCacheServer implements CacheServer { private String[] groups; /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getPort() + * @see org.apache.geode.cache.server.CacheServer#getPort() */ @Override public int getPort() { @@ -64,7 +64,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setPort(int) + * @see org.apache.geode.cache.server.CacheServer#setPort(int) */ @Override public void setPort(int port) { @@ -72,7 +72,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getBindAddress() + * @see org.apache.geode.cache.server.CacheServer#getBindAddress() */ @Override public String getBindAddress() { @@ -80,7 +80,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setBindAddress(java.lang.String) + * @see org.apache.geode.cache.server.CacheServer#setBindAddress(java.lang.String) */ @Override public void setBindAddress(String address) { @@ -88,7 +88,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getHostnameForClients() + * @see org.apache.geode.cache.server.CacheServer#getHostnameForClients() */ @Override public String getHostnameForClients() { @@ -96,7 +96,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setHostnameForClients(java.lang.String) + * @see org.apache.geode.cache.server.CacheServer#setHostnameForClients(java.lang.String) */ @Override public void setHostnameForClients(String name) { @@ -104,7 +104,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setNotifyBySubscription(boolean) + * @see org.apache.geode.cache.server.CacheServer#setNotifyBySubscription(boolean) */ @Override @Deprecated @@ -113,7 +113,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getNotifyBySubscription() + * @see org.apache.geode.cache.server.CacheServer#getNotifyBySubscription() */ @Override @Deprecated @@ -122,7 +122,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setSocketBufferSize(int) + * @see org.apache.geode.cache.server.CacheServer#setSocketBufferSize(int) */ @Override public void setSocketBufferSize(int socketBufferSize) { @@ -130,7 +130,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getSocketBufferSize() + * @see org.apache.geode.cache.server.CacheServer#getSocketBufferSize() */ @Override public int getSocketBufferSize() { @@ -138,7 +138,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setMaximumTimeBetweenPings(int) + * @see org.apache.geode.cache.server.CacheServer#setMaximumTimeBetweenPings(int) */ @Override public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) { @@ -146,7 +146,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getMaximumTimeBetweenPings() + * @see org.apache.geode.cache.server.CacheServer#getMaximumTimeBetweenPings() */ @Override public int getMaximumTimeBetweenPings() { @@ -154,16 +154,16 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#start() + * @see org.apache.geode.cache.server.CacheServer#start() */ @Override public void start() throws IOException { isRunning = true; - + } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#isRunning() + * @see org.apache.geode.cache.server.CacheServer#isRunning() */ @Override public boolean isRunning() { @@ -171,7 +171,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#stop() + * @see org.apache.geode.cache.server.CacheServer#stop() */ @Override public void stop() { @@ -179,7 +179,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getMaxConnections() + * @see org.apache.geode.cache.server.CacheServer#getMaxConnections() */ @Override public int getMaxConnections() { @@ -187,7 +187,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setMaxConnections(int) + * @see org.apache.geode.cache.server.CacheServer#setMaxConnections(int) */ @Override public void setMaxConnections(int maxCons) { @@ -195,7 +195,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getMaxThreads() + * @see org.apache.geode.cache.server.CacheServer#getMaxThreads() */ @Override public int getMaxThreads() { @@ -203,7 +203,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setMaxThreads(int) + * @see org.apache.geode.cache.server.CacheServer#setMaxThreads(int) */ @Override public void setMaxThreads(int maxThreads) { @@ -211,7 +211,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getMaximumMessageCount() + * @see org.apache.geode.cache.server.CacheServer#getMaximumMessageCount() */ @Override public int getMaximumMessageCount() { @@ -219,7 +219,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setMaximumMessageCount(int) + * @see org.apache.geode.cache.server.CacheServer#setMaximumMessageCount(int) */ @Override public void setMaximumMessageCount(int maxMessageCount) { @@ -227,7 +227,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getMessageTimeToLive() + * @see org.apache.geode.cache.server.CacheServer#getMessageTimeToLive() */ @Override public int getMessageTimeToLive() { @@ -235,16 +235,16 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setMessageTimeToLive(int) + * @see org.apache.geode.cache.server.CacheServer#setMessageTimeToLive(int) */ @Override public void setMessageTimeToLive(int messageTimeToLive) { this.messageTimeToLive = messageTimeToLive; - + } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setGroups(java.lang.String[]) + * @see org.apache.geode.cache.server.CacheServer#setGroups(java.lang.String[]) */ @Override public void setGroups(String[] groups) { @@ -252,7 +252,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getGroups() + * @see org.apache.geode.cache.server.CacheServer#getGroups() */ @Override public String[] getGroups() { @@ -260,7 +260,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getLoadProbe() + * @see org.apache.geode.cache.server.CacheServer#getLoadProbe() */ @Override public ServerLoadProbe getLoadProbe() { @@ -268,7 +268,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setLoadProbe(com.gemstone.gemfire.cache.server.ServerLoadProbe) + * @see org.apache.geode.cache.server.CacheServer#setLoadProbe(org.apache.geode.cache.server.ServerLoadProbe) */ @Override public void setLoadProbe(ServerLoadProbe loadProbe) { @@ -276,7 +276,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getLoadPollInterval() + * @see org.apache.geode.cache.server.CacheServer#getLoadPollInterval() */ @Override public long getLoadPollInterval() { @@ -284,7 +284,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setLoadPollInterval(long) + * @see org.apache.geode.cache.server.CacheServer#setLoadPollInterval(long) */ @Override public void setLoadPollInterval(long loadPollInterval) { @@ -292,7 +292,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getClientSubscriptionConfig() + * @see org.apache.geode.cache.server.CacheServer#getClientSubscriptionConfig() */ @Override public ClientSubscriptionConfig getClientSubscriptionConfig() { @@ -300,7 +300,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getClientSession(com.gemstone.gemfire.distributed.DistributedMember) + * @see org.apache.geode.cache.server.CacheServer#getClientSession(org.apache.geode.distributed.DistributedMember) */ @Override public ClientSession getClientSession(DistributedMember member) { @@ -308,7 +308,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getClientSession(java.lang.String) + * @see org.apache.geode.cache.server.CacheServer#getClientSession(java.lang.String) */ @Override public ClientSession getClientSession(String durableClientId) { @@ -316,7 +316,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getAllClientSessions() + * @see org.apache.geode.cache.server.CacheServer#getAllClientSessions() */ @Override public Set getAllClientSessions() { @@ -324,25 +324,25 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#registerInterestRegistrationListener(com.gemstone.gemfire.cache.InterestRegistrationListener) + * @see org.apache.geode.cache.server.CacheServer#registerInterestRegistrationListener(org.apache.geode.cache.InterestRegistrationListener) */ @Override public void registerInterestRegistrationListener(InterestRegistrationListener listener) { // TODO Auto-generated method stub - + } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#unregisterInterestRegistrationListener(com.gemstone.gemfire.cache.InterestRegistrationListener) + * @see org.apache.geode.cache.server.CacheServer#unregisterInterestRegistrationListener(org.apache.geode.cache.InterestRegistrationListener) */ @Override public void unregisterInterestRegistrationListener(InterestRegistrationListener listener) { // TODO Auto-generated method stub - + } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getInterestRegistrationListeners() + * @see org.apache.geode.cache.server.CacheServer#getInterestRegistrationListeners() */ @Override public Set getInterestRegistrationListeners() { @@ -351,7 +351,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#getTcpNoDelay() + * @see org.apache.geode.cache.server.CacheServer#getTcpNoDelay() */ @Override public boolean getTcpNoDelay() { @@ -359,7 +359,7 @@ public class StubCacheServer implements CacheServer { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.server.CacheServer#setTcpNoDelay(boolean) + * @see org.apache.geode.cache.server.CacheServer#setTcpNoDelay(boolean) */ @Override public void setTcpNoDelay(final boolean tcpNoDelay) { diff --git a/src/test/java/org/springframework/data/gemfire/test/StubCacheTransactionManager.java b/src/test/java/org/springframework/data/gemfire/test/StubCacheTransactionManager.java index 25739ee2..ce8cc383 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubCacheTransactionManager.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubCacheTransactionManager.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -17,11 +17,11 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; -import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.CommitConflictException; -import com.gemstone.gemfire.cache.TransactionId; -import com.gemstone.gemfire.cache.TransactionListener; -import com.gemstone.gemfire.cache.TransactionWriter; +import org.apache.geode.cache.CacheTransactionManager; +import org.apache.geode.cache.CommitConflictException; +import org.apache.geode.cache.TransactionId; +import org.apache.geode.cache.TransactionListener; +import org.apache.geode.cache.TransactionWriter; /** @@ -35,7 +35,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { private TransactionWriter writer; /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#begin() + * @see org.apache.geode.cache.CacheTransactionManager#begin() */ @Override public void begin() { @@ -43,7 +43,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#commit() + * @see org.apache.geode.cache.CacheTransactionManager#commit() */ @Override public void commit() throws CommitConflictException { @@ -51,7 +51,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#rollback() + * @see org.apache.geode.cache.CacheTransactionManager#rollback() */ @Override public void rollback() { @@ -59,7 +59,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#suspend() + * @see org.apache.geode.cache.CacheTransactionManager#suspend() */ @Override public TransactionId suspend() { @@ -67,7 +67,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#resume(com.gemstone.gemfire.cache.TransactionId) + * @see org.apache.geode.cache.CacheTransactionManager#resume(org.apache.geode.cache.TransactionId) */ @Override public void resume(TransactionId transactionId) { @@ -75,7 +75,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#isSuspended(com.gemstone.gemfire.cache.TransactionId) + * @see org.apache.geode.cache.CacheTransactionManager#isSuspended(org.apache.geode.cache.TransactionId) */ @Override public boolean isSuspended(TransactionId transactionId) { @@ -83,7 +83,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#tryResume(com.gemstone.gemfire.cache.TransactionId) + * @see org.apache.geode.cache.CacheTransactionManager#tryResume(org.apache.geode.cache.TransactionId) */ @Override public boolean tryResume(TransactionId transactionId) { @@ -91,7 +91,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#tryResume(com.gemstone.gemfire.cache.TransactionId, long, java.util.concurrent.TimeUnit) + * @see org.apache.geode.cache.CacheTransactionManager#tryResume(org.apache.geode.cache.TransactionId, long, java.util.concurrent.TimeUnit) */ @Override public boolean tryResume(TransactionId transactionId, long time, TimeUnit unit) { @@ -99,7 +99,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#exists(com.gemstone.gemfire.cache.TransactionId) + * @see org.apache.geode.cache.CacheTransactionManager#exists(org.apache.geode.cache.TransactionId) */ @Override public boolean exists(TransactionId transactionId) { @@ -107,7 +107,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#exists() + * @see org.apache.geode.cache.CacheTransactionManager#exists() */ @Override public boolean exists() { @@ -115,7 +115,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#getTransactionId() + * @see org.apache.geode.cache.CacheTransactionManager#getTransactionId() */ @Override public TransactionId getTransactionId() { @@ -123,7 +123,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#getListener() + * @see org.apache.geode.cache.CacheTransactionManager#getListener() */ @Override @Deprecated @@ -132,7 +132,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#getListeners() + * @see org.apache.geode.cache.CacheTransactionManager#getListeners() */ @Override public TransactionListener[] getListeners() { @@ -140,7 +140,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#setListener(com.gemstone.gemfire.cache.TransactionListener) + * @see org.apache.geode.cache.CacheTransactionManager#setListener(org.apache.geode.cache.TransactionListener) */ @Override @Deprecated @@ -149,7 +149,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#addListener(com.gemstone.gemfire.cache.TransactionListener) + * @see org.apache.geode.cache.CacheTransactionManager#addListener(org.apache.geode.cache.TransactionListener) */ @Override public void addListener(TransactionListener aListener) { @@ -157,7 +157,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#removeListener(com.gemstone.gemfire.cache.TransactionListener) + * @see org.apache.geode.cache.CacheTransactionManager#removeListener(org.apache.geode.cache.TransactionListener) */ @Override public void removeListener(TransactionListener aListener) { @@ -165,7 +165,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#initListeners(com.gemstone.gemfire.cache.TransactionListener[]) + * @see org.apache.geode.cache.CacheTransactionManager#initListeners(org.apache.geode.cache.TransactionListener[]) */ @Override public void initListeners(TransactionListener[] newListeners) { @@ -173,7 +173,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#setWriter(com.gemstone.gemfire.cache.TransactionWriter) + * @see org.apache.geode.cache.CacheTransactionManager#setWriter(org.apache.geode.cache.TransactionWriter) */ @Override public void setWriter(TransactionWriter writer) { @@ -181,7 +181,7 @@ public class StubCacheTransactionManager implements CacheTransactionManager { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.CacheTransactionManager#getWriter() + * @see org.apache.geode.cache.CacheTransactionManager#getWriter() */ @Override public TransactionWriter getWriter() { diff --git a/src/test/java/org/springframework/data/gemfire/test/StubDiskStore.java b/src/test/java/org/springframework/data/gemfire/test/StubDiskStore.java index 007515f1..8d21339d 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubDiskStore.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubDiskStore.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -19,8 +19,8 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.DiskStoreFactory; +import org.apache.geode.cache.DiskStore; +import org.apache.geode.cache.DiskStoreFactory; /** * @author David Turanski @@ -52,7 +52,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setAllowForceCompaction(boolean) + * @see org.apache.geode.cache.DiskStoreFactory#setAllowForceCompaction(boolean) */ @Override public DiskStoreFactory setAllowForceCompaction(boolean allowForceCompaction) { @@ -61,7 +61,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setAutoCompact(boolean) + * @see org.apache.geode.cache.DiskStoreFactory#setAutoCompact(boolean) */ @Override public DiskStoreFactory setAutoCompact(boolean isAutoCompact) { @@ -70,7 +70,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setCompactionThreshold(int) + * @see org.apache.geode.cache.DiskStoreFactory#setCompactionThreshold(int) */ @Override public DiskStoreFactory setCompactionThreshold(int compactionThreshold) { @@ -79,7 +79,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setMaxOplogSize(long) + * @see org.apache.geode.cache.DiskStoreFactory#setMaxOplogSize(long) */ @Override public DiskStoreFactory setMaxOplogSize(long maxOplogSize) { @@ -88,7 +88,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setTimeInterval(long) + * @see org.apache.geode.cache.DiskStoreFactory#setTimeInterval(long) */ @Override public DiskStoreFactory setTimeInterval(long timeInterval) { @@ -97,7 +97,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setWriteBufferSize(int) + * @see org.apache.geode.cache.DiskStoreFactory#setWriteBufferSize(int) */ @Override public DiskStoreFactory setWriteBufferSize(int writeBufferSize) { @@ -106,7 +106,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setQueueSize(int) + * @see org.apache.geode.cache.DiskStoreFactory#setQueueSize(int) */ @Override public DiskStoreFactory setQueueSize(int queueSize) { @@ -115,7 +115,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setDiskDirs(java.io.File[]) + * @see org.apache.geode.cache.DiskStoreFactory#setDiskDirs(java.io.File[]) */ @Override public DiskStoreFactory setDiskDirs(File[] diskDirs) { @@ -124,7 +124,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setDiskDirsAndSizes(java.io.File[], int[]) + * @see org.apache.geode.cache.DiskStoreFactory#setDiskDirsAndSizes(java.io.File[], int[]) */ @Override public DiskStoreFactory setDiskDirsAndSizes(File[] diskDirs, int[] diskDirSizes) { @@ -134,7 +134,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setDiskUsageCriticalPercentage(float) + * @see org.apache.geode.cache.DiskStoreFactory#setDiskUsageCriticalPercentage(float) */ @Override public DiskStoreFactory setDiskUsageCriticalPercentage(final float diskUsageCriticalPercentage) { @@ -143,7 +143,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#setDiskUsageWarningPercentage(float) + * @see org.apache.geode.cache.DiskStoreFactory#setDiskUsageWarningPercentage(float) */ @Override public DiskStoreFactory setDiskUsageWarningPercentage(final float diskUsageWarningPercentage) { @@ -152,7 +152,7 @@ public class StubDiskStore implements DiskStoreFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.DiskStoreFactory#create(java.lang.String) + * @see org.apache.geode.cache.DiskStoreFactory#create(java.lang.String) */ @Override public DiskStore create(final String name) { diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java index 341ceb38..65bc9b78 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2013 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -22,18 +22,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import org.apache.geode.cache.wan.GatewayReceiver; +import org.apache.geode.cache.wan.GatewayReceiverFactory; +import org.apache.geode.cache.wan.GatewayTransportFilter; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; -import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; - /** * @author David Turanski * @author John Blum - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory + * @see org.apache.geode.cache.wan.GatewayReceiverFactory */ @SuppressWarnings("unused") public class StubGatewayReceiverFactory implements GatewayReceiverFactory { @@ -54,7 +53,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { private String hostnameForSenders; /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#setStartPort(int) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#setStartPort(int) */ @Override public GatewayReceiverFactory setStartPort(int startPort) { @@ -63,7 +62,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#setEndPort(int) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#setEndPort(int) */ @Override public GatewayReceiverFactory setEndPort(int endPort) { @@ -72,7 +71,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#setSocketBufferSize(int) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#setSocketBufferSize(int) */ @Override public GatewayReceiverFactory setSocketBufferSize(int socketBufferSize) { @@ -81,7 +80,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#setBindAddress(java.lang.String) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#setBindAddress(java.lang.String) */ @Override public GatewayReceiverFactory setBindAddress(String address) { @@ -90,7 +89,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#addGatewayTransportFilter(com.gemstone.gemfire.cache.wan.GatewayTransportFilter) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#addGatewayTransportFilter(org.apache.geode.cache.wan.GatewayTransportFilter) */ @Override public GatewayReceiverFactory addGatewayTransportFilter(GatewayTransportFilter filter) { @@ -99,7 +98,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#removeGatewayTransportFilter(com.gemstone.gemfire.cache.wan.GatewayTransportFilter) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#removeGatewayTransportFilter(org.apache.geode.cache.wan.GatewayTransportFilter) */ @Override public GatewayReceiverFactory removeGatewayTransportFilter(GatewayTransportFilter filter) { @@ -108,7 +107,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#setMaximumTimeBetweenPings(int) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#setMaximumTimeBetweenPings(int) */ @Override public GatewayReceiverFactory setMaximumTimeBetweenPings(int time) { @@ -117,8 +116,8 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#setHostnameForClients(String) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiver#getHost + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#setHostnameForClients(String) + * @see org.apache.geode.cache.wan.GatewayReceiver#getHost */ //@Override public GatewayReceiverFactory setHostnameForClients(final String name) { @@ -127,7 +126,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#setHostnameForSenders(String) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#setHostnameForSenders(String) */ @Override public GatewayReceiverFactory setHostnameForSenders(final String hostnameForSenders) { @@ -137,7 +136,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { /* * (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#setManualStart(boolean) + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#setManualStart(boolean) */ @Override public GatewayReceiverFactory setManualStart(final boolean manualStart) { @@ -151,7 +150,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { } /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory#create() + * @see org.apache.geode.cache.wan.GatewayReceiverFactory#create() */ @Override public GatewayReceiver create() { @@ -196,5 +195,4 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { return gatewayReceiver; } - } diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java index 60659cf9..00227c1b 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java @@ -19,22 +19,21 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; +import org.apache.geode.cache.wan.GatewayEventFilter; +import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter; +import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; +import org.apache.geode.cache.wan.GatewaySenderFactory; +import org.apache.geode.cache.wan.GatewayTransportFilter; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.gemstone.gemfire.cache.wan.GatewayEventFilter; -import com.gemstone.gemfire.cache.wan.GatewayEventSubstitutionFilter; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; -import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; - /** * The StubGatewaySenderFactory class for testing purposes. * * @author David Turanski * @author John Blum - * @see com.gemstone.gemfire.cache.wan.GatewaySenderFactory + * @see org.apache.geode.cache.wan.GatewaySenderFactory */ @SuppressWarnings({ "deprecation", "unused" }) public class StubGatewaySenderFactory implements GatewaySenderFactory { diff --git a/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java b/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java index da5c7a8e..a7930ce6 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubResourceManager.java @@ -20,9 +20,9 @@ package org.springframework.data.gemfire.test; import java.util.Collections; import java.util.Set; -import com.gemstone.gemfire.cache.control.RebalanceFactory; -import com.gemstone.gemfire.cache.control.RebalanceOperation; -import com.gemstone.gemfire.cache.control.ResourceManager; +import org.apache.geode.cache.control.RebalanceFactory; +import org.apache.geode.cache.control.RebalanceOperation; +import org.apache.geode.cache.control.ResourceManager; /** * The StubResourceManager class... diff --git a/src/test/java/org/springframework/data/gemfire/test/support/ClientServerIntegrationTestsSupport.java b/src/test/java/org/springframework/data/gemfire/test/support/ClientServerIntegrationTestsSupport.java index 09240ecc..69021418 100644 --- a/src/test/java/org/springframework/data/gemfire/test/support/ClientServerIntegrationTestsSupport.java +++ b/src/test/java/org/springframework/data/gemfire/test/support/ClientServerIntegrationTestsSupport.java @@ -25,14 +25,14 @@ import java.net.Socket; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import com.gemstone.gemfire.cache.server.CacheServer; +import org.apache.geode.cache.server.CacheServer; /** * The {@link ClientServerIntegrationTestsSupport} class is a abstract base class encapsulating common functionality * to support the implementation of GemFire client/server tests. * * @author John Blum - * @see com.gemstone.gemfire.cache.server.CacheServer + * @see org.apache.geode.cache.server.CacheServer * @see org.springframework.data.gemfire.test.support.SocketUtils * @see org.springframework.data.gemfire.test.support.ThreadUtils * @since 1.9.0 diff --git a/src/test/java/org/springframework/data/gemfire/test/support/DataSourceAdapter.java b/src/test/java/org/springframework/data/gemfire/test/support/DataSourceAdapter.java index a126ec39..57f30ed2 100644 --- a/src/test/java/org/springframework/data/gemfire/test/support/DataSourceAdapter.java +++ b/src/test/java/org/springframework/data/gemfire/test/support/DataSourceAdapter.java @@ -21,6 +21,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; import java.util.logging.Logger; + import javax.sql.DataSource; /** diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanTest.java index 0df6463c..1830229f 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueFactoryBeanTest.java @@ -27,15 +27,14 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory; +import org.apache.geode.cache.wan.GatewaySender; import org.junit.Test; import org.springframework.data.gemfire.TestUtils; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * The AsyncEventQueueFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the AsyncEventQueueFactoryBean class. @@ -45,10 +44,10 @@ import com.gemstone.gemfire.cache.wan.GatewaySender; * @see org.mockito.Mockito * @see org.springframework.data.gemfire.TestUtils * @see org.springframework.data.gemfire.wan.AsyncEventQueueFactoryBean - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.asyncqueue.AsyncEventListener + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory * @since 1.3.3 */ public class AsyncEventQueueFactoryBeanTest { diff --git a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java index ba39c75d..99fcc35a 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/AsyncEventQueueWithListenerIntegrationTest.java @@ -23,8 +23,13 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import java.util.List; + import javax.annotation.Resource; +import org.apache.geode.cache.asyncqueue.AsyncEvent; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.wan.GatewaySender; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; @@ -33,11 +38,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * The AsyncEventQueueWithListenerIntegrationTest class is a test suite of test cases testing the circular references * between an Async Event Queue and a registered AsyncEventListener that refers back to the Async Event Queue @@ -48,7 +48,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender; * @see org.junit.runner.RunWith * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue * @since 1.0.0 */ @RunWith(SpringJUnit4ClassRunner.class) @@ -104,9 +104,9 @@ public class AsyncEventQueueWithListenerIntegrationTest { * The QueueAsyncEventListener class is an implementation of the AsyncEventListener interface that contains * a reference to the AsyncEventQueue upon which it is registered. * - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEvent - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue + * @see org.apache.geode.cache.asyncqueue.AsyncEvent + * @see org.apache.geode.cache.asyncqueue.AsyncEventListener + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue */ @SuppressWarnings("unused") public static class TestAsyncEventListener implements AsyncEventListener { diff --git a/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java index a4b4cb08..9d84872b 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest.java @@ -22,21 +22,21 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.List; + import javax.annotation.Resource; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.asyncqueue.AsyncEvent; +import org.apache.geode.cache.asyncqueue.AsyncEventListener; +import org.apache.geode.cache.asyncqueue.AsyncEventQueue; +import org.apache.geode.cache.wan.GatewaySender; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener; -import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * The CachePartitionRegionWithConcurrentParallelAsyncEventQueueAndGatewaySenderIntegrationTest class is a test suite * of test cases testing the concurrent, parallel functionality configuration of GemFire AsyncEventQueues @@ -47,8 +47,8 @@ import com.gemstone.gemfire.cache.wan.GatewaySender; * @see org.junit.runner.RunWith * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner - * @see com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue - * @see com.gemstone.gemfire.cache.wan.GatewaySender + * @see org.apache.geode.cache.asyncqueue.AsyncEventQueue + * @see org.apache.geode.cache.wan.GatewaySender * @since 1.5.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java index 19e3f8ca..0f1539ab 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java @@ -25,19 +25,18 @@ import static org.mockito.Mockito.when; import java.util.Arrays; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.wan.GatewayReceiverFactory; +import org.apache.geode.cache.wan.GatewayTransportFilter; import org.junit.Test; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; -import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; - /** * The GatewayReceiverFactoryBeanTest class is a test suite of test cases testing the contract and functionality * of the GatewayReceiverFactoryBean class. * * @author John Blum * @see org.springframework.data.gemfire.wan.GatewayReceiverFactoryBean - * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory + * @see org.apache.geode.cache.wan.GatewayReceiverFactory * @since 1.5.0 */ public class GatewayReceiverFactoryBeanTest { diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java index f32c66d0..444a8a37 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java @@ -26,10 +26,9 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.cache.wan.GatewaySenderFactory; - +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.cache.wan.GatewaySenderFactory; import org.junit.Test; import org.springframework.data.gemfire.TestUtils; @@ -41,9 +40,9 @@ import org.springframework.data.gemfire.TestUtils; * @see org.junit.Test * @see org.mockito.Mockito * @see org.springframework.data.gemfire.wan.GatewaySenderFactoryBean - * @see com.gemstone.gemfire.cache.Cache - * @see com.gemstone.gemfire.cache.wan.GatewaySender - * @see com.gemstone.gemfire.cache.wan.GatewaySenderFactory + * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.wan.GatewaySender + * @see org.apache.geode.cache.wan.GatewaySenderFactory * @since 1.4.0 */ public class GatewaySenderFactoryBeanTest { diff --git a/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java index c9206e5c..51062f38 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/ManualGatewayReceiverStartIntegrationTest.java @@ -22,16 +22,16 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.IOException; + import javax.annotation.Resource; +import org.apache.geode.cache.wan.GatewayReceiver; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.test.GemfireTestApplicationContextInitializer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; - /** * The ManualGatewayReceiverStartIntegrationTest class is a test suite of test cases testing the manual start capability * of Gateway Receivers when configured with the Spring Data GemFire XML namespace. diff --git a/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java b/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java index 509eca43..fcb768ef 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java +++ b/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyConverterUnitTests.java @@ -20,8 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import com.gemstone.gemfire.cache.wan.GatewaySender; - +import org.apache.geode.cache.wan.GatewaySender; import org.junit.After; import org.junit.Rule; import org.junit.Test; @@ -33,7 +32,7 @@ import org.junit.rules.ExpectedException; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.wan.OrderPolicyConverter - * @see com.gemstone.gemfire.cache.util.Gateway.OrderPolicy + * @see org.apache.geode.cache.util.Gateway.OrderPolicy * @since 1.7.0 */ public class OrderPolicyConverterUnitTests { diff --git a/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java b/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java index bcb8fe96..1035618e 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/OrderPolicyTypeTest.java @@ -20,10 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import org.apache.geode.cache.wan.GatewaySender; import org.junit.Test; -import com.gemstone.gemfire.cache.wan.GatewaySender; - /** * The OrderPolicyTypeTest class is a test suite of test cases testing the contract and functionality * of the OrderPolicyType enum. @@ -31,7 +30,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender; * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.wan.OrderPolicyType - * @see com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy + * @see org.apache.geode.cache.wan.GatewaySender.OrderPolicy * @since 1.7.0 */ @SuppressWarnings("deprecation") diff --git a/src/test/resources/cache-with-declarable.xml b/src/test/resources/cache-with-declarable.xml index 4b644e1f..eecd69a3 100644 --- a/src/test/resources/cache-with-declarable.xml +++ b/src/test/resources/cache-with-declarable.xml @@ -1,12 +1,12 @@ - + java.lang.String org.springframework.data.gemfire.UserObject - + @@ -28,5 +28,5 @@ 1.0 - + diff --git a/src/test/resources/org/springframework/data/gemfire/config/AsyncEventQueueNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/AsyncEventQueueNamespaceTest-context.xml index 0a1bfc10..e9ae8f62 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/AsyncEventQueueNamespaceTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/AsyncEventQueueNamespaceTest-context.xml @@ -1,11 +1,13 @@ @@ -18,6 +20,8 @@ warning + + diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest-context.xml index c864c09b..71e763f0 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/xml/ClientCacheNamespaceTest-context.xml @@ -15,7 +15,7 @@ warning - + + p:name="One" p:timeout="60" p:action="#{T(org.apache.geode.cache.ExpirationAction).DESTROY}"/> + p:name="Two" p:timeout="120" p:action="#{T(org.apache.geode.cache.ExpirationAction).INVALIDATE}"/> diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest-context.xml index fd95b177..dd6593e7 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/xml/RegionExpirationAttributesNamespaceTest-context.xml @@ -43,14 +43,14 @@ + p:name="PartitionCustomExpiry" p:timeout="120" p:action="#{T(org.apache.geode.cache.ExpirationAction).INVALIDATE}"/> + p:name="LocalTtlCustomExpiry" p:timeout="180" p:action="#{T(org.apache.geode.cache.ExpirationAction).LOCAL_DESTROY}"/> @@ -58,7 +58,7 @@ - + diff --git a/src/test/resources/org/springframework/data/gemfire/config/xml/cache-using-pdx-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/xml/cache-using-pdx-ns.xml index e774ef83..a00d36ce 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/xml/cache-using-pdx-ns.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/xml/cache-using-pdx-ns.xml @@ -15,7 +15,7 @@ warning - + diff --git a/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml b/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml index ee0ff446..51a5d3c8 100644 --- a/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml +++ b/src/test/resources/org/springframework/data/gemfire/pdxdiskstore-config.xml @@ -18,7 +18,7 @@ --> - + diff --git a/src/test/resources/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml b/src/test/resources/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml index e455be48..608a6550 100644 --- a/src/test/resources/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/support/AnnotationBasedExpirationConfigurationIntegrationTest-context.xml @@ -14,7 +14,7 @@ 60 LOCAL_INVALIDATE - #{T(com.gemstone.gemfire.cache.ExpirationAction).INVALIDATE} + #{T(org.apache.geode.cache.ExpirationAction).INVALIDATE} #{T(org.springframework.data.gemfire.ExpirationActionType).DESTROY} @@ -28,9 +28,9 @@ - + - + diff --git a/template.mf b/template.mf index 0639dd52..25151251 100644 --- a/template.mf +++ b/template.mf @@ -8,7 +8,7 @@ Import-Template: javax.enterprise.*;version="[1.0,2.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.8.2, 2.0.0)";resolution:=optional, com.fasterxml.jackson.*;version="[2.4.1,3.0.0)";resolution:=optional, - com.gemstone.*;version="[8.0.0,9.0.0)", + org.apache.geode.*;version="[1.0.0,9.0.0)", org.slf4j.*;version="[1.7.0,2.0)", org.springframework.*;version="[4.0.6, 5.0.0)", org.springframework.data.*;version="[1.9.0,2.0.0)",