Fix test issues and conditionally extract results when executing on single member.

Resolves gh-37.

spring-data-geode/src/main/java/org/springframework/data/gemfire/function/execution/GemfireFunctionProxyFactoryBean.java

@@ -19,7 +19,8 @@ import java.util.stream.StreamSupport;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.data.gemfire.function.annotation.OnServers;
+import org.springframework.data.gemfire.function.annotation.OnMember;
+import org.springframework.data.gemfire.function.annotation.OnServer;
 import org.springframework.data.gemfire.support.AbstractFactoryBeanSupport;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
@@ -126,13 +127,14 @@ public class GemfireFunctionProxyFactoryBean extends AbstractFactoryBeanSupport<
 			.getMethodMetadata(method)
 			.getFunctionId();
 
-		return isFunctionExecutionForAllServers(method)
-			? template.execute(functionId, args)
-			: template.executeAndExtract(functionId, args);
+		return isFunctionExecutedOnSingleServerOrSingleMember(method)
+			? template.executeAndExtract(functionId, args)
+			: template.execute(functionId, args);
 	}
 
-	private boolean isFunctionExecutionForAllServers(Method method) {
-		return method.getDeclaringClass().isAnnotationPresent(OnServers.class);
+	protected boolean isFunctionExecutedOnSingleServerOrSingleMember(@NonNull Method method) {
+		return method.getDeclaringClass().isAnnotationPresent(OnServer.class)
+			|| method.getDeclaringClass().isAnnotationPresent(OnMember.class);
 	}
 
 	protected Object resolveResult(MethodInvocation invocation, Object result) {

spring-data-geode/src/test/java/org/springframework/data/gemfire/function/execution/onservers/FunctionsReturnResultsFromAllServersIntegrationTests.java

@@ -18,47 +18,39 @@ package org.springframework.data.gemfire.function.execution.onservers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.statistics.StatisticsManager;
-
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.data.gemfire.config.annotation.CacheServerApplication;
 import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
+import org.springframework.data.gemfire.function.annotation.GemfireFunction;
 import org.springframework.data.gemfire.function.config.EnableGemfireFunctionExecutions;
+import org.springframework.data.gemfire.function.config.EnableGemfireFunctions;
+import org.springframework.data.gemfire.function.sample.AllServersAdminFunctions;
+import org.springframework.data.gemfire.function.sample.Metric;
+import org.springframework.data.gemfire.function.sample.SingleServerAdminFunctions;
 import org.springframework.data.gemfire.process.ProcessWrapper;
 import org.springframework.data.gemfire.test.support.ClientServerIntegrationTestsSupport;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @author Patrick Johnson
  */
 @SuppressWarnings("unused")
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = FunctionsReturnResultsFromAllServersIntegrationTests.GeodeClientConfiguration.class)
-@Ignore
+@ContextConfiguration(classes = FunctionsReturnResultsFromAllServersIntegrationTests.TestConfiguration.class)
 public class FunctionsReturnResultsFromAllServersIntegrationTests extends ClientServerIntegrationTestsSupport {
 
-	private static final int PORT_1 = 40407;
-	private static final int PORT_2 = 40403;
+	private static final int NUMBER_OF_METRICS = 10;
 
 	private static ProcessWrapper gemfireServer1;
 	private static ProcessWrapper gemfireServer2;
@@ -72,15 +64,21 @@ public class FunctionsReturnResultsFromAllServersIntegrationTests extends Client
 	@BeforeClass
 	public static void startGemFireServer() throws Exception {
 
-		gemfireServer1 = run(MetricsFunctionServerProcess.class,
-				String.format("-D%s=%d", GEMFIRE_CACHE_SERVER_PORT_PROPERTY, PORT_1));
+		final int port1 = findAvailablePort();
 
-		waitForServerToStart(DEFAULT_HOSTNAME, PORT_1);
+		gemfireServer1 = run(MetricsFunctionServerConfiguration.class,
+				String.format("-D%s=%d", GEMFIRE_CACHE_SERVER_PORT_PROPERTY, port1));
 
-		gemfireServer2 = run(MetricsFunctionServerProcess.class,
-				String.format("-D%s=%d", GEMFIRE_CACHE_SERVER_PORT_PROPERTY, PORT_2));
+		waitForServerToStart(DEFAULT_HOSTNAME, port1);
 
-		waitForServerToStart(DEFAULT_HOSTNAME, PORT_2);
+		final int port2 = findAvailablePort();
+
+		gemfireServer2 = run(MetricsFunctionServerConfiguration.class,
+				String.format("-D%s=%d", GEMFIRE_CACHE_SERVER_PORT_PROPERTY, port2));
+
+		waitForServerToStart(DEFAULT_HOSTNAME, port2);
+
+		System.setProperty(GEMFIRE_POOL_SERVERS_PROPERTY, String.format("%s[%d],%s[%d]", DEFAULT_HOSTNAME, port1, DEFAULT_HOSTNAME, port2));
 	}
 
 	@AfterClass
@@ -93,81 +91,42 @@ public class FunctionsReturnResultsFromAllServersIntegrationTests extends Client
 	public void executeFunctionOnAllServers() {
 		List<List<Metric>> metrics = allServersAdminFunctions.getAllMetrics();
 		assertThat(metrics.size()).isEqualTo(2);
+		assertThat(metrics.get(0).size()).isEqualTo(NUMBER_OF_METRICS);
+		assertThat(metrics.get(1).size()).isEqualTo(NUMBER_OF_METRICS);
 	}
 
 	@Test
 	public void executeFunctionOnSingleServer() {
 		List<Metric> metrics = singleServerAdminFunctions.getAllMetrics();
-		assertThat(metrics.size()).isEqualTo(672);
+		assertThat(metrics.size()).isEqualTo(NUMBER_OF_METRICS);
 	}
 
-	@ClientCacheApplication(servers = {
-		@ClientCacheApplication.Server(port = PORT_1),
-		@ClientCacheApplication.Server(port = PORT_2)}
-	)
+	@ClientCacheApplication
 	@EnableGemfireFunctionExecutions(basePackageClasses = AllServersAdminFunctions.class)
-	static class GeodeClientConfiguration { }
-
-	static class MetricsFunctionServerProcess {
-
-		private static final int DEFAULT_CACHE_SERVER_PORT = 40404;
-
-		private static final String CACHE_SERVER_PORT_PROPERTY = "spring.data.gemfire.cache.server.port";
-		private static final String GEMFIRE_NAME = "MetricsServer" + getCacheServerPort();
-
-		public static void main(String[] args) throws Exception {
-			registerFunctions(startCacheServer(newGemFireCache()));
-		}
-
-		private static Cache newGemFireCache() {
-
-			return new CacheFactory()
-					.set("name", GEMFIRE_NAME)
-					.create();
-		}
-
-		private static Cache startCacheServer(Cache gemfireCache) throws IOException {
-			CacheServer cacheServer = gemfireCache.addCacheServer();
-			cacheServer.setPort(getCacheServerPort());
-			cacheServer.start();
-			return gemfireCache;
-		}
-
-		private static int getCacheServerPort() {
-			return Integer.getInteger(CACHE_SERVER_PORT_PROPERTY, DEFAULT_CACHE_SERVER_PORT);
-		}
-
-		private static Cache registerFunctions(Cache gemfireCache) {
-
-			FunctionService.registerFunction(new GetAllMetricsFunction());
-
-			return gemfireCache;
-		}
+	@EnableTransactionManagement
+	static class TestConfiguration {
 	}
 
-	static class GetAllMetricsFunction implements Function<List<Metric>> {
+	@CacheServerApplication
+	@EnableGemfireFunctions
+	public static class MetricsFunctionServerConfiguration {
 
-		private final InternalDistributedSystem system =
-				(InternalDistributedSystem) CacheFactory.getAnyInstance().getDistributedSystem();
+		public static void main(String[] args) {
 
-		@Override
-		public void execute(FunctionContext context) {
-			List<Metric> allMetrics = new ArrayList<>();
-			StatisticsManager statisticsManager = system.getStatisticsManager();
-			for (Statistics statistics : statisticsManager.getStatsList()) {
-				StatisticsType statisticsType = statistics.getType();
-				for (StatisticDescriptor descriptor : statisticsType.getStatistics()) {
-					String statName = descriptor.getName();
-					Metric metric = new Metric(statName, statistics.get(statName), statisticsType.getName(), statistics.getTextId());
-					allMetrics.add(metric);
-				}
-			}
-			context.getResultSender().lastResult(allMetrics);
+			AnnotationConfigApplicationContext applicationContext =
+					new AnnotationConfigApplicationContext(MetricsFunctionServerConfiguration.class);
+
+			applicationContext.registerShutdownHook();
 		}
 
-		@Override
-		public String getId() {
-			return getClass().getSimpleName();
+		@GemfireFunction(id = "GetAllMetricsFunction", hasResult = true)
+		public List<Metric> getMetrics() {
+			List<Metric> allMetrics = new ArrayList<>();
+			for (int i = 0; i < NUMBER_OF_METRICS; i++) {
+				Metric metric = new Metric("statName" + i, i, "statCat" + i, "statType" + i);
+				allMetrics.add(metric);
+			}
+			return allMetrics;
 		}
 	}
 }

spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/AllServersAdminFunctions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.data.gemfire.function.execution.onservers;
+package org.springframework.data.gemfire.function.sample;
 
 import java.util.List;
 

spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/Metric.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.data.gemfire.function.execution.onservers;
+package org.springframework.data.gemfire.function.sample;
 
 import java.io.Serializable;
 

spring-data-geode/src/test/java/org/springframework/data/gemfire/function/sample/SingleServerAdminFunctions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.springframework.data.gemfire.function.execution.onservers;
+package org.springframework.data.gemfire.function.sample;
 
 import org.springframework.data.gemfire.function.annotation.FunctionId;
 import org.springframework.data.gemfire.function.annotation.OnServer;