X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FJSONUtilities.java;h=2d4e22b348164af495358931e9afacdf8de2be6a;hb=29c4f8051e4fc856cd84b97e31f445f65f7e497d;hp=886a85c7a326615ceb0a675a760f27bb480f64ec;hpb=e4b20cc6f7c31f48ddd0de5bcd054b09a35cd510;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/JSONUtilities.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/JSONUtilities.java
index 886a85c7..2d4e22b3 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/JSONUtilities.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/JSONUtilities.java
@@ -7,9 +7,9 @@
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
  * * You may obtain a copy of the License at
- * * 
+ * *
  *  *      http://www.apache.org/licenses/LICENSE-2.0
- * * 
+ * *
  *  * Unless required by applicable law or agreed to in writing, software
  * * distributed under the License is distributed on an "AS IS" BASIS,
  * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,6 +24,8 @@
 
 package org.onap.dmaap.datarouter.provisioning.utils;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Collection;
@@ -35,42 +37,48 @@ import java.util.Collection;
  * @version $Id: JSONUtilities.java,v 1.1 2013/04/26 21:00:26 eby Exp $
  */
 public class JSONUtilities {
-	/**
-	 * Does the String <i>v</i> represent a valid Internet address (with or without a
-	 * mask length appended).
-	 * @param v the string to check
-	 * @return true if valid, false otherwise
-	 */
-	public static boolean validIPAddrOrSubnet(String v) {
-		String[] pp = { v, "" };
-		if (v.indexOf('/') > 0)
-			pp = v.split("/");
-		try {
-			InetAddress addr = InetAddress.getByName(pp[0]);
-			if (pp[1].length() > 0) {
-				// check subnet mask
-				int mask = Integer.parseInt(pp[1]);
-				if (mask > (addr.getAddress().length * 8))
-					return false;
-			}
-			return true;
-		} catch (UnknownHostException e) {
-			return false;
-		}
-	}
-	/**
-	 * Build a JSON array from a collection of Strings.
-	 * @param coll the collection
-	 * @return a String containing a JSON array
-	 */
-	public static String createJSONArray(Collection<String> coll) {
-		StringBuilder sb = new StringBuilder("[");
-		String pfx = "\n";
-		for (String t : coll) {
-			sb.append(pfx).append("  \"").append(t).append("\"");
-			pfx = ",\n";
-		}
-		sb.append("\n]\n");
-		return sb.toString();
-	}
+
+    private static final EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");
+    /**
+     * Does the String <i>v</i> represent a valid Internet address (with or without a
+     * mask length appended).
+     *
+     * @param v the string to check
+     * @return true if valid, false otherwise
+     */
+    public static boolean validIPAddrOrSubnet(String v) {
+        String[] pp = {v, ""};
+        if (v.indexOf('/') > 0)
+            pp = v.split("/");
+        try {
+            InetAddress addr = InetAddress.getByName(pp[0]);
+            if (pp[1].length() > 0) {
+                // check subnet mask
+                int mask = Integer.parseInt(pp[1]);
+                if (mask > (addr.getAddress().length * 8))
+                    return false;
+            }
+            return true;
+        } catch (UnknownHostException e) {
+            intlogger.error("PROV0001: " + e.getMessage(), e);
+            return false;
+        }
+    }
+
+    /**
+     * Build a JSON array from a collection of Strings.
+     *
+     * @param coll the collection
+     * @return a String containing a JSON array
+     */
+    public static String createJSONArray(Collection<String> coll) {
+        StringBuilder sb = new StringBuilder("[");
+        String pfx = "\n";
+        for (String t : coll) {
+            sb.append(pfx).append("  \"").append(t).append("\"");
+            pfx = ",\n";
+        }
+        sb.append("\n]\n");
+        return sb.toString();
+    }
 }