Refactor MockServer to use ephemeral port and remove TestSocketUtils dependency

Author: making

src/test/java/am/ik/blog/MockConfig.java

@@ -8,7 +8,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.DynamicPropertyRegistrar;
-import org.springframework.test.util.TestSocketUtils;
 
 @TestConfiguration(proxyBeanMethods = false)
 public class MockConfig {
@@ -24,8 +23,7 @@ InstantSource testClock() {
 
 	@Bean
 	MockServer mockServer() {
-		int availableTcpPort = TestSocketUtils.findAvailableTcpPort();
-		MockServer mockServer = new MockServer(availableTcpPort);
+		MockServer mockServer = new MockServer(0);
 		mockServer.run();
 		return mockServer;
 	}

src/test/java/am/ik/blog/mockserver/MockServer.java

@@ -23,8 +23,6 @@ public class MockServer implements AutoCloseable {
 
 	private final List<Rule> rules = new ArrayList<>();
 
-	private final int port;
-
 	private final HttpContext context;
 
 	private Response fallbackResponse = Response.notFound();
@@ -36,7 +34,6 @@ public MockServer(int port) {
 		catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
-		this.port = port;
 		this.context = this.server.createContext("/", new MockHandler());
 		this.server.setExecutor(Executors.newSingleThreadExecutor());
 	}
@@ -46,7 +43,7 @@ public void addFilter(Filter filter) {
 	}
 
 	public int port() {
-		return port;
+		return this.server.getAddress().getPort();
 	}
 
 	public MockServer GET(String path, Function<Request, Response> responseFunction) {