move parseInetSocketAddress from CommonUtils to NetworkUtils

Alluxio · Jul 17, 2015 · fe7e38e · fe7e38e
1 parent dd2a5a9
commit fe7e38e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/common/src/main/java/tachyon/master/MasterClient.java b/common/src/main/java/tachyon/master/MasterClient.java
@@ -289,7 +289,7 @@ private synchronized InetSocketAddress getMasterAddress() {
             mTachyonConf.get(Constants.ZOOKEEPER_LEADER_PATH, null));
     try {
       String temp = leaderInquireClient.getMasterAddress();
-      return CommonUtils.parseInetSocketAddress(temp);
+      return NetworkUtils.parseInetSocketAddress(temp);
     } catch (IOException e) {
       LOG.error(e.getMessage(), e);
       throw Throwables.propagate(e);

diff --git a/common/src/main/java/tachyon/util/CommonUtils.java b/common/src/main/java/tachyon/util/CommonUtils.java
@@ -328,24 +328,6 @@ public static String parametersToString(Object... objs) {
     return sb.toString();
   }
 
-  /**
-   * Parse InetSocketAddress from a String
-   *
-   * @param address
-   * @return InetSocketAddress of the String
-   * @throws IOException
-   */
-  public static InetSocketAddress parseInetSocketAddress(String address) throws IOException {
-    if (address == null) {
-      return null;
-    }
-    String[] strArr = address.split(":");
-    if (strArr.length != 2) {
-      throw new IOException("Invalid InetSocketAddress " + address);
-    }
-    return new InetSocketAddress(strArr[0], Integer.parseInt(strArr[1]));
-  }
-
   /**
    * Parse a String size to Bytes.
    *

diff --git a/common/src/main/java/tachyon/util/NetworkUtils.java b/common/src/main/java/tachyon/util/NetworkUtils.java
@@ -260,4 +260,22 @@ public static InetSocketAddress getLocalWorkerAddress(TachyonConf conf) {
     int workerPort = conf.getInt(Constants.WORKER_PORT, Constants.DEFAULT_WORKER_PORT);
     return new InetSocketAddress(workerHostname, workerPort);
   }
+
+  /**
+   * Parse InetSocketAddress from a String
+   *
+   * @param address
+   * @return InetSocketAddress of the String
+   * @throws IOException
+   */
+  public static InetSocketAddress parseInetSocketAddress(String address) throws IOException {
+    if (address == null) {
+      return null;
+    }
+    String[] strArr = address.split(":");
+    if (strArr.length != 2) {
+      throw new IOException("Invalid InetSocketAddress " + address);
+    }
+    return new InetSocketAddress(strArr[0], Integer.parseInt(strArr[1]));
+  }
 }