From b4746359150e51cc9e8bfa2281739ae0fd614f93 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Thu, 17 Jul 2014 11:40:41 +0200 Subject: [PATCH] SONAR-4898 - Moved NetworkUtils to sonar-process --- .../main/java/org/sonar/process}/NetworkUtils.java | 14 ++++---------- .../java/org/sonar/process}/NetworkUtilsTest.java | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) rename {sonar-start/src/main/java/org/sonar/start => server/sonar-process/src/main/java/org/sonar/process}/NetworkUtils.java (82%) rename {sonar-start/src/test/java/org/sonar/start => server/sonar-process/src/test/java/org/sonar/process}/NetworkUtilsTest.java (98%) diff --git a/sonar-start/src/main/java/org/sonar/start/NetworkUtils.java b/server/sonar-process/src/main/java/org/sonar/process/NetworkUtils.java similarity index 82% rename from sonar-start/src/main/java/org/sonar/start/NetworkUtils.java rename to server/sonar-process/src/main/java/org/sonar/process/NetworkUtils.java index e0c1caa5a46..a037ce0113a 100644 --- a/sonar-start/src/main/java/org/sonar/start/NetworkUtils.java +++ b/server/sonar-process/src/main/java/org/sonar/process/NetworkUtils.java @@ -17,18 +17,16 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.start; +package org.sonar.process; import java.io.IOException; import java.net.ServerSocket; -class NetworkUtils { +public class NetworkUtils { - static private int lastPort = -1; - - static int freePort() { + public static int freePort() { try { - ServerSocket s = new ServerSocket(lastPort + 1); + ServerSocket s = new ServerSocket(0); int port = s.getLocalPort(); s.close(); return port; @@ -36,8 +34,4 @@ class NetworkUtils { throw new IllegalStateException("Can not find an open network port", e); } } - - private static boolean isValidPort(int port) { - return port > 1023; - } } diff --git a/sonar-start/src/test/java/org/sonar/start/NetworkUtilsTest.java b/server/sonar-process/src/test/java/org/sonar/process/NetworkUtilsTest.java similarity index 98% rename from sonar-start/src/test/java/org/sonar/start/NetworkUtilsTest.java rename to server/sonar-process/src/test/java/org/sonar/process/NetworkUtilsTest.java index 11cf6ee8267..09f6a597209 100644 --- a/sonar-start/src/test/java/org/sonar/start/NetworkUtilsTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/NetworkUtilsTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.start; +package org.sonar.process; import org.junit.Test; -- 2.39.5