SGF-154 - Remove dependency cycles in function execution packages

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;

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;

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;

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;

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 {

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

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

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

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

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;

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;
  
 /**
  *