[camel] branch CAMEL-13853 updated: CAMEL-13853: AvailablePortFinder now delegates the port selection to OS

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/CAMEL-13853 by this push:
     new 4672cd8  CAMEL-13853: AvailablePortFinder now delegates the port selection to OS
4672cd8 is described below

commit 4672cd86909154532e0db1a995ee45dc48e3d591
Author: Jan Bednář <ma...@janbednar.eu>
AuthorDate: Mon Aug 12 22:40:58 2019 +0200

    CAMEL-13853: AvailablePortFinder now delegates the port selection to OS
---
 .../main/java/org/apache/camel/test/AvailablePortFinder.java   |  5 ++---
 .../java/org/apache/camel/test/AvailablePortFinderTest.java    | 10 +++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
index 0d78fdf..9861ce7 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
@@ -17,10 +17,9 @@
 package org.apache.camel.test;
 
 import java.io.IOException;
-import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
-import java.util.NoSuchElementException;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
index 976cabc..2356bfd 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.test;
 
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.MulticastSocket;
 import java.net.ServerSocket;
 
 import org.junit.jupiter.api.Test;
@@ -31,7 +35,7 @@ public class AvailablePortFinderTest {
         int p1 = AvailablePortFinder.getNextAvailable();
         ServerSocket socket = new ServerSocket(p1);
         int p2 = AvailablePortFinder.getNextAvailable();
-        Assert.assertFalse("Port " + p1 + " Port2 " + p2, p1 == p2);
+        assertFalse(p1 == p2, "Port " + p1 + " Port2 " + p2);
         socket.close();
     }
 
@@ -40,7 +44,7 @@ public class AvailablePortFinderTest {
         int p1 = AvailablePortFinder.getNextAvailable();
         DatagramSocket socket = new DatagramSocket(p1);
         int p2 = AvailablePortFinder.getNextAvailable();
-        Assert.assertFalse("Port " + p1 + " Port2 " + p2, p1 == p2);
+        assertFalse(p1 == p2, "Port " + p1 + " Port2 " + p2);
         socket.close();
     }
 
@@ -51,7 +55,7 @@ public class AvailablePortFinderTest {
         socket.setReuseAddress(false); // true is default for MulticastSocket, we wan to fail if port is occupied
         socket.bind(new InetSocketAddress(InetAddress.getLocalHost(), p1));
         int p2 = AvailablePortFinder.getNextAvailable();
-        Assert.assertFalse("Port " + p1 + " Port2 " + p2, p1 == p2);
+        assertFalse(p1 == p2, "Port " + p1 + " Port2 " + p2);
         socket.close();
     }