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 d47735c2..90570c9b 100644 --- a/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java +++ b/src/main/java/org/springframework/data/gemfire/function/FunctionContextInjectingArgumentResolver.java @@ -18,9 +18,8 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.data.gemfire.function.config.Filter; -import org.springframework.data.gemfire.function.config.GemfireFunctionUtils; -import org.springframework.data.gemfire.function.config.RegionData; +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; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionUtils.java b/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java similarity index 97% rename from src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionUtils.java rename to src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java index 18fb22cf..cbb52f2b 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionUtils.java +++ b/src/main/java/org/springframework/data/gemfire/function/GemfireFunctionUtils.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -20,7 +20,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.data.gemfire.function.PojoFunctionWrapper; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctionExecutions.java b/src/main/java/org/springframework/data/gemfire/function/annotation/EnableGemfireFunctionExecutions.java similarity index 94% rename from src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctionExecutions.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/EnableGemfireFunctionExecutions.java index 123175c4..5e0c6787 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctionExecutions.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/EnableGemfireFunctionExecutions.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -21,6 +21,7 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.Import; +import org.springframework.data.gemfire.function.config.FunctionExecutionBeanDefinitionRegistrar; /** * Enables classpath scanning for interfaces annotated as GemFire function executions (function invocations). diff --git a/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctions.java b/src/main/java/org/springframework/data/gemfire/function/annotation/EnableGemfireFunctions.java similarity index 89% rename from src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctions.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/EnableGemfireFunctions.java index 8f2f1ea7..b61be779 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/EnableGemfireFunctions.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/EnableGemfireFunctions.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -20,6 +20,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.context.annotation.Import; +import org.springframework.data.gemfire.function.config.GemfireFunctionPostBeanProcessorRegistrar; /** * diff --git a/src/main/java/org/springframework/data/gemfire/function/config/Filter.java b/src/main/java/org/springframework/data/gemfire/function/annotation/Filter.java similarity index 95% rename from src/main/java/org/springframework/data/gemfire/function/config/Filter.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/Filter.java index 4be8c100..b0bd86e3 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/Filter.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/Filter.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionId.java b/src/main/java/org/springframework/data/gemfire/function/annotation/FunctionId.java similarity index 94% rename from src/main/java/org/springframework/data/gemfire/function/config/FunctionId.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/FunctionId.java index ee84a429..19d19b84 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/FunctionId.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/FunctionId.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunction.java b/src/main/java/org/springframework/data/gemfire/function/annotation/GemfireFunction.java similarity index 96% rename from src/main/java/org/springframework/data/gemfire/function/config/GemfireFunction.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/GemfireFunction.java index d0a25c03..a709022b 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunction.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/GemfireFunction.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnMember.java b/src/main/java/org/springframework/data/gemfire/function/annotation/OnMember.java similarity index 95% rename from src/main/java/org/springframework/data/gemfire/function/config/OnMember.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/OnMember.java index 77296b39..58430cbb 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/OnMember.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/OnMember.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnMembers.java b/src/main/java/org/springframework/data/gemfire/function/annotation/OnMembers.java similarity index 95% rename from src/main/java/org/springframework/data/gemfire/function/config/OnMembers.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/OnMembers.java index fa762991..3bc9dc39 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/OnMembers.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/OnMembers.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnRegion.java b/src/main/java/org/springframework/data/gemfire/function/annotation/OnRegion.java similarity index 95% rename from src/main/java/org/springframework/data/gemfire/function/config/OnRegion.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/OnRegion.java index 79af1b59..0cbb3b6e 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/OnRegion.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/OnRegion.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnServer.java b/src/main/java/org/springframework/data/gemfire/function/annotation/OnServer.java similarity index 95% rename from src/main/java/org/springframework/data/gemfire/function/config/OnServer.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/OnServer.java index 17054542..b2020fe5 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/OnServer.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/OnServer.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/OnServers.java b/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java similarity index 95% rename from src/main/java/org/springframework/data/gemfire/function/config/OnServers.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java index 602072e1..e3257965 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/OnServers.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/OnServers.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/RegionData.java b/src/main/java/org/springframework/data/gemfire/function/annotation/RegionData.java similarity index 95% rename from src/main/java/org/springframework/data/gemfire/function/config/RegionData.java rename to src/main/java/org/springframework/data/gemfire/function/annotation/RegionData.java index d2a7b2e5..133829c9 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/RegionData.java +++ b/src/main/java/org/springframework/data/gemfire/function/annotation/RegionData.java @@ -10,7 +10,7 @@ * 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.config; +package org.springframework.data.gemfire.function.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java b/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java index e3001a1f..949252a3 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/AbstractFunctionExecutionConfigurationSource.java @@ -24,6 +24,11 @@ import org.springframework.context.annotation.ClassPathScanningCandidateComponen import org.springframework.context.annotation.ScannedGenericBeanDefinition; import org.springframework.core.io.ResourceLoader; import org.springframework.core.type.filter.TypeFilter; +import org.springframework.data.gemfire.function.annotation.OnMember; +import org.springframework.data.gemfire.function.annotation.OnMembers; +import org.springframework.data.gemfire.function.annotation.OnRegion; +import org.springframework.data.gemfire.function.annotation.OnServer; +import org.springframework.data.gemfire.function.annotation.OnServers; /** * Annotation based configuration source for function executions diff --git a/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java b/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java index a75d002c..efa2818c 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java @@ -27,6 +27,7 @@ import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.core.type.filter.AssignableTypeFilter; import org.springframework.core.type.filter.TypeFilter; +import org.springframework.data.gemfire.function.annotation.EnableGemfireFunctionExecutions; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionBuilderFactory.java b/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionBuilderFactory.java index fcb65d99..55fff666 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionBuilderFactory.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionBuilderFactory.java @@ -12,6 +12,12 @@ */ package org.springframework.data.gemfire.function.config; +import org.springframework.data.gemfire.function.annotation.OnMember; +import org.springframework.data.gemfire.function.annotation.OnMembers; +import org.springframework.data.gemfire.function.annotation.OnRegion; +import org.springframework.data.gemfire.function.annotation.OnServer; +import org.springframework.data.gemfire.function.annotation.OnServers; + /** * * Maps the annotation type to the corresponding function execution bean definition builder diff --git a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java b/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java index 7c0eb452..2d25b9db 100644 --- a/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java +++ b/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java @@ -19,6 +19,8 @@ import java.util.Map; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.data.gemfire.function.GemfireFunctionUtils; +import org.springframework.data.gemfire.function.annotation.GemfireFunction; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java b/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java index 28990265..c3a0225e 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/FunctionExecutionMethodMetadata.java @@ -16,7 +16,7 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import org.springframework.data.gemfire.function.config.FunctionId; +import org.springframework.data.gemfire.function.annotation.FunctionId; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionExecutionMethodMetadata.java b/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionExecutionMethodMetadata.java index f904cb35..d88e87e1 100644 --- a/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionExecutionMethodMetadata.java +++ b/src/main/java/org/springframework/data/gemfire/function/execution/OnRegionExecutionMethodMetadata.java @@ -15,8 +15,8 @@ package org.springframework.data.gemfire.function.execution; import java.lang.reflect.Method; import java.util.Set; -import org.springframework.data.gemfire.function.config.Filter; -import org.springframework.data.gemfire.function.config.GemfireFunctionUtils; +import org.springframework.data.gemfire.function.GemfireFunctionUtils; +import org.springframework.data.gemfire.function.annotation.Filter; 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 3f981e3b..e6d9b859 100644 --- a/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java +++ b/src/test/java/org/springframework/data/gemfire/function/FunctionArgumentResolverTest.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Set; import org.junit.Test; -import org.springframework.data.gemfire.function.config.Filter; -import org.springframework.data.gemfire.function.config.RegionData; +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; 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 cd9c1728..a6b82e0d 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 @@ -23,6 +23,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; +import org.springframework.data.gemfire.function.annotation.Filter; +import org.springframework.data.gemfire.function.annotation.GemfireFunction; +import org.springframework.data.gemfire.function.annotation.RegionData; import org.springframework.stereotype.Component; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; 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 655760d3..546a153b 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 @@ -24,6 +24,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; +import org.springframework.data.gemfire.function.annotation.EnableGemfireFunctionExecutions; import org.springframework.data.gemfire.function.execution.GemfireOnServerFunctionTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; 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 afda9bf8..026123b5 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 @@ -22,6 +22,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.data.gemfire.TestUtils; +import org.springframework.data.gemfire.function.annotation.EnableGemfireFunctionExecutions; import org.springframework.data.gemfire.function.config.two.TestOnRegionFunction; import org.springframework.data.gemfire.function.execution.GemfireOnRegionFunctionTemplate; import org.springframework.data.gemfire.function.execution.OnRegionFunctionProxyFactoryBean; diff --git a/src/test/java/org/springframework/data/gemfire/function/config/one/TestFunctionExecution.java b/src/test/java/org/springframework/data/gemfire/function/config/one/TestFunctionExecution.java index 7cec4426..50156749 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/one/TestFunctionExecution.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/one/TestFunctionExecution.java @@ -14,9 +14,9 @@ package org.springframework.data.gemfire.function.config.one; import java.util.Set; -import org.springframework.data.gemfire.function.config.Filter; -import org.springframework.data.gemfire.function.config.FunctionId; -import org.springframework.data.gemfire.function.config.OnMember; +import org.springframework.data.gemfire.function.annotation.Filter; +import org.springframework.data.gemfire.function.annotation.FunctionId; +import org.springframework.data.gemfire.function.annotation.OnMember; @OnMember public interface TestFunctionExecution { diff --git a/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnRegionFunction.java b/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnRegionFunction.java index e49bd32d..5912dff8 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnRegionFunction.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnRegionFunction.java @@ -14,9 +14,9 @@ package org.springframework.data.gemfire.function.config.three; import java.util.Set; -import org.springframework.data.gemfire.function.config.Filter; -import org.springframework.data.gemfire.function.config.FunctionId; -import org.springframework.data.gemfire.function.config.OnRegion; +import org.springframework.data.gemfire.function.annotation.Filter; +import org.springframework.data.gemfire.function.annotation.FunctionId; +import org.springframework.data.gemfire.function.annotation.OnRegion; /** * @author David Turanski diff --git a/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnServerFunction.java b/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnServerFunction.java index cf7fa7ef..5c0335da 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnServerFunction.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/three/TestClientOnServerFunction.java @@ -14,9 +14,9 @@ package org.springframework.data.gemfire.function.config.three; import java.util.Set; -import org.springframework.data.gemfire.function.config.Filter; -import org.springframework.data.gemfire.function.config.FunctionId; -import org.springframework.data.gemfire.function.config.OnServer; +import org.springframework.data.gemfire.function.annotation.Filter; +import org.springframework.data.gemfire.function.annotation.FunctionId; +import org.springframework.data.gemfire.function.annotation.OnServer; /** * @author David Turanski diff --git a/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction.java b/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction.java index f677331a..525bc4af 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction.java @@ -14,9 +14,9 @@ package org.springframework.data.gemfire.function.config.two; import java.util.Set; -import org.springframework.data.gemfire.function.config.Filter; -import org.springframework.data.gemfire.function.config.FunctionId; -import org.springframework.data.gemfire.function.config.OnRegion; +import org.springframework.data.gemfire.function.annotation.Filter; +import org.springframework.data.gemfire.function.annotation.FunctionId; +import org.springframework.data.gemfire.function.annotation.OnRegion; /** * @author David Turanski diff --git a/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction2.java b/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction2.java index cb67900c..c4630ac5 100644 --- a/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction2.java +++ b/src/test/java/org/springframework/data/gemfire/function/config/two/TestOnRegionFunction2.java @@ -14,9 +14,9 @@ package org.springframework.data.gemfire.function.config.two; import java.util.Set; -import org.springframework.data.gemfire.function.config.Filter; -import org.springframework.data.gemfire.function.config.FunctionId; -import org.springframework.data.gemfire.function.config.OnServer; +import org.springframework.data.gemfire.function.annotation.Filter; +import org.springframework.data.gemfire.function.annotation.FunctionId; +import org.springframework.data.gemfire.function.annotation.OnServer; /** * @author David Turanski 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 9659a8be..4e87ff5f 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 @@ -32,8 +32,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.gemfire.ForkUtil; import org.springframework.data.gemfire.fork.SpringCacheServerProcess; -import org.springframework.data.gemfire.function.config.GemfireFunction; -import org.springframework.data.gemfire.function.config.RegionData; +import org.springframework.data.gemfire.function.annotation.GemfireFunction; +import org.springframework.data.gemfire.function.annotation.RegionData; import org.springframework.stereotype.Component; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanTests.java b/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanTests.java index 577ac5a6..ac77dd8c 100644 --- a/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanTests.java +++ b/src/test/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBeanTests.java @@ -33,7 +33,7 @@ import java.util.Map; import org.aopalliance.intercept.MethodInvocation; import org.junit.Before; import org.junit.Test; -import org.springframework.data.gemfire.function.config.FunctionId; +import org.springframework.data.gemfire.function.annotation.FunctionId; /** *