Remove useless UnsupportedOperationExceptions

[bgpcep.git] / testtool-util / src / main / java / org / opendaylight / protocol / util / InetSocketAddressUtil.java

diff --git a/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java b/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java
index 5b977b40e28f0fbe5fea87dc10dd95f087138bee..df52cfb27a58e7801c608cf5ee86a0a3c6f1cade 100644 (file)
--- a/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java
+++ b/testtool-util/src/main/java/org/opendaylight/protocol/util/InetSocketAddressUtil.java
@@ -5,27 +5,31 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.net.HostAndPort;
 import java.net.InetSocketAddress;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
- * Created as a util for test tools
+ * Created as a util for test tools.
  */
 public final class InetSocketAddressUtil {
     private static final String SEPARATOR = ",";
+    private static final List<String> ASSIGNED_IPS = new ArrayList<>();
+    private static final List<Integer> ASSIGNED_PORTS = new ArrayList<>();
 
     private InetSocketAddressUtil() {
-        throw new UnsupportedOperationException();
+        // Hidden on purpose
     }
 
     public static List<InetSocketAddress> parseAddresses(final String address, final int defaultPort) {
-        return Lists.transform(Arrays.asList(address.split(SEPARATOR)), input -> getInetSocketAddress(input, defaultPort));
+        return Arrays.asList(address.split(SEPARATOR)).stream()
+                .map(input -> getInetSocketAddress(input, defaultPort)).collect(Collectors.toList());
     }
 
     public static List<InetSocketAddress> parseAddresses(final String address) {
@@ -39,12 +43,17 @@ public final class InetSocketAddressUtil {
     public static InetSocketAddress getInetSocketAddress(final String hostPortString, final Integer defaultPort) {
         final HostAndPort hostAndPort = HostAndPort.fromString(hostPortString);
         if (defaultPort != null) {
-            return new InetSocketAddress(hostAndPort.getHostText(), hostAndPort.getPortOrDefault(defaultPort));
+            return new InetSocketAddress(hostAndPort.getHost(), hostAndPort.getPortOrDefault(defaultPort));
         }
-        return new InetSocketAddress(hostAndPort.getHostText(), hostAndPort.getPort());
+        return new InetSocketAddress(hostAndPort.getHost(), hostAndPort.getPort());
     }
 
-    public static InetSocketAddress getRandomLoopbackInetSocketAddress(final int port) {
+    public static synchronized InetSocketAddress getRandomLoopbackInetSocketAddress(final int port) {
+        String newIp;
+        do {
+            newIp = getRandomLoopbackIpAddress();
+        } while (ASSIGNED_IPS.contains(newIp));
+        ASSIGNED_IPS.add(newIp);
         return new InetSocketAddress(getRandomLoopbackIpAddress(), port);
     }
 
@@ -53,19 +62,24 @@ public final class InetSocketAddressUtil {
     }
 
     /**
-     * Generate a random high range port number
+     * Generate a random high range port number.
      *
-     * @return A port number range from 10000 to 50000
+     * @return A port number range from 20000 to 60000
      */
-    public static int getRandomPort() {
-        final int randPort = 10000 + (int) Math.round(40000 * Math.random());
-        return randPort;
+    public static synchronized int getRandomPort() {
+        int port;
+        do {
+            port = 20000 + (int) Math.round(40000 * Math.random());
+        } while (ASSIGNED_PORTS.contains(port));
+        ASSIGNED_PORTS.add(port);
+        return port;
     }
 
     /**
-     * Generate a random loopback ip address
+     * Generate a random loopback ip address.
      * IP address range: 127.50.50.50 ~ 127.250.250.250
      * We did not utilize the whole 127./8 range to avoid using common addresses like 127.0.0.1
+     *
      * @return Generated random loopback IP address
      */
     public static String getRandomLoopbackIpAddress() {