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=915aa6100dcb1d020c71adb837132c5faa32b102;hb=refs%2Fchanges%2F23%2F60023%2F3;hp=886a85c7a326615ceb0a675a760f27bb480f64ec;hpb=13639e1b05d8c8b5b1e9efd543573834501aefaa;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..915aa610 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. @@ -35,42 +35,45 @@ 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 v 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 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(); - } + /** + * Does the String v 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 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(); + } }