From 9e9467fac03e28e88bbbffdc8cd83810ea926a4d Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 6 Aug 2020 15:50:33 +0200 Subject: [PATCH] Fix port discovery in GCF test --- .../adapter/gcp/integration/LocalServerTestSupport.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java index ea5bd3acd..15b9b6c26 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java @@ -32,7 +32,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; import com.google.cloud.functions.invoker.runner.Invoker; import com.google.gson.Gson; @@ -42,6 +41,7 @@ import org.springframework.cloud.function.adapter.gcp.FunctionInvoker; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; +import org.springframework.util.SocketUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -59,8 +59,6 @@ final public class LocalServerTestSupport { private static final String SERVER_READY_STRING = "Started ServerConnector"; - private static AtomicInteger nextPort = new AtomicInteger(55555); - private LocalServerTestSupport() { } @@ -86,7 +84,7 @@ final public class LocalServerTestSupport { static ServerProcess startServer(Class springApplicationMainClass, String function) throws InterruptedException, IOException { - int port = nextPort.getAndIncrement(); + int port = SocketUtils.findAvailableTcpPort(); String signatureType = "http"; String target = FunctionInvoker.class.getCanonicalName();