* 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.
package org.onap.ccsdk.sli.plugins.restapicall;
+import java.util.List;
+import java.util.Map;
import javax.ws.rs.core.MultivaluedMap;
public class HttpResponse {
public String message;
public String body;
public MultivaluedMap<String, String> headers;
+ public Map<String, List<String>> headers2;
}
* 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
checkNotNull(s, "Input should not be null.");
try {
- JSONObject json = new JSONObject(s);
+ JSONObject json = null;
+ //support top level list in json response
+ if (s.startsWith("[")) {
+ JSONArray jsonArr = new JSONArray(s);
+ json = jsonArr.getJSONObject(0);
+ } else {
+ json = new JSONObject(s);
+ }
+
Map<String, Object> wm = new HashMap<>();
Iterator<String> ii = json.keys();
while (ii.hasNext()) {
*/
package org.onap.ccsdk.sli.plugins.restapicall;
+
public class RetryPolicy {
private String[] hostnames;
private Integer maximumRetries;
-
private int position;
-
private int retryCount;
+
public RetryPolicy(String[] hostnames, Integer maximumRetries) {
- this.hostnames = hostnames;
- this.maximumRetries = maximumRetries;
-
- this.position = 0;
-
- this.retryCount = 0;
+ this.hostnames = hostnames;
+ this.maximumRetries = maximumRetries;
+ this.position = 0;
+ this.retryCount = 0;
+
}
+
public Integer getMaximumRetries() {
- return maximumRetries;
+ return maximumRetries;
}
+
public int getRetryCount() {
- return retryCount;
+ return retryCount;
}
+
public Boolean shouldRetry() {
- return retryCount < maximumRetries + 1;
+ return retryCount < maximumRetries + 1;
}
+
public String getRetryMessage() {
- return retryCount + " retry attempts were made out of " + maximumRetries + " maximum retry attempts.";
+ return retryCount + " retry attempts were made out of " + maximumRetries + " maximum retry attempts.";
}
public String getNextHostName() throws RetryException {
- retryCount++;
- position++;
-
- if (position > hostnames.length - 1) {
- position = 0;
- }
- return hostnames[position];
+ retryCount++;
+ position++;
+ if (position > hostnames.length - 1) {
+ position = 0;
}
-}
\ No newline at end of file
+ return hostnames[position];
+ }
+
+}
* 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.
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static Object createStructure(Map<String, String> flatmap, String var) {
if (flatmap.containsKey(var)) {
- if (var.endsWith("_length") || var.endsWith("].key"))
+ if (var.endsWith("_length") || var.endsWith("].key")) {
return null;
+ }
return flatmap.get(var);
}
Map<String, Object> mm = new HashMap<>();
- for (String k : flatmap.keySet())
+ for (String k : flatmap.keySet()) {
if (k.startsWith(var + ".")) {
int i1 = k.indexOf('.', var.length() + 1);
int i2 = k.indexOf('[', var.length() + 1);
int i3 = k.length();
- if (i1 > 0 && i1 < i3)
+ if (i1 > 0 && i1 < i3) {
i3 = i1;
- if (i2 > 0 && i2 < i3)
+ }
+ if (i2 > 0 && i2 < i3) {
i3 = i2;
+ }
String k1 = k.substring(var.length() + 1, i3);
String var1 = k.substring(0, i3);
if (!mm.containsKey(k1)) {
Object str = createStructure(flatmap, var1);
- if (str != null && (!(str instanceof String) || ((String) str).trim().length() > 0))
+ if (str != null && (!(str instanceof String) || ((String) str).trim().length() > 0)) {
mm.put(k1, str);
+ }
}
}
- if (!mm.isEmpty())
+ }
+ if (!mm.isEmpty()) {
return mm;
+ }
boolean arrayFound = false;
- for (String k : flatmap.keySet())
+ for (String k : flatmap.keySet()) {
if (k.startsWith(var + "[")) {
arrayFound = true;
break;
}
+ }
if (arrayFound) {
List<Object> ll = new ArrayList<>();
for (int i = 0; i < length; i++) {
Object v = createStructure(flatmap, var + '[' + i + ']');
- if (v == null)
+ if (v == null) {
break;
+ }
ll.add(v);
}
- if (!ll.isEmpty())
+ if (!ll.isEmpty()) {
return ll;
+ }
}
return null;
@SuppressWarnings("unchecked")
private static String generateXml(Object o, int indent, boolean escape) {
- if (o == null)
+ if (o == null) {
return null;
+ }
- if (o instanceof String)
- return escape ? escapeXml((String) o) : (String) o;;
+ if (o instanceof String) {
+ return escape ? escapeXml((String) o) : (String) o;
+ };
if (o instanceof Map) {
StringBuilder ss = new StringBuilder();
Map<String, Object> mm = (Map<String, Object>) o;
- for (Map.Entry<String, Object> entry: mm.entrySet()) {
+ for (Map.Entry<String, Object> entry : mm.entrySet()) {
Object v = entry.getValue();
String key = entry.getKey();
if (v instanceof String) {
return null;
}
-
private static String generateJson(Object o, boolean escape, boolean quotes) {
- if (o == null)
+ if (o == null) {
return null;
+ }
+ if (o instanceof String && ((String) o).length() == 0) {
+ return null;
+ }
StringBuilder ss = new StringBuilder();
generateJson(ss, o, 0, false, escape, quotes);
private static void generateJson(StringBuilder ss, Object o, int indent, boolean padFirst, boolean escape, boolean quotes) {
if (o instanceof String) {
String s = escape ? escapeJson((String) o) : (String) o;
- if (padFirst)
+ if (padFirst) {
ss.append(pad(indent));
+ }
if (quotes) {
ss.append('"').append(s).append('"');
} else {
if (o instanceof Map) {
Map<String, Object> mm = (Map<String, Object>) o;
- if (padFirst)
+ if (padFirst) {
ss.append(pad(indent));
+ }
ss.append("{\n");
boolean first = true;
for (Map.Entry<String, Object> entry : mm.entrySet()) {
- if (!first)
+ if (!first) {
ss.append(",\n");
+ }
first = false;
Object v = entry.getValue();
String key = entry.getKey();
if (o instanceof List) {
List<Object> ll = (List<Object>) o;
- if (padFirst)
+ if (padFirst) {
ss.append(pad(indent));
+ }
ss.append("[\n");
boolean first = true;
for (Object o1 : ll) {
- if (!first)
+ if (!first) {
ss.append(",\n");
+ }
first = false;
generateJson(ss, o1, indent + 1, true, escape, quotes);
int i11 = s.indexOf('}', k);
int i12 = s.indexOf(']', k);
int i1 = -1;
- if (i11 < 0)
+ if (i11 < 0) {
i1 = i12;
- else if (i12 < 0)
+ } else if (i12 < 0) {
i1 = i11;
- else
+ } else {
i1 = i11 < i12 ? i11 : i12;
- if (i1 < 0)
+ }
+ if (i1 < 0) {
break;
+ }
int i2 = s.lastIndexOf(',', i1);
if (i2 < 0) {
if (i11 < 0) {
i1 = i12;
curly = false;
- } else if (i12 < 0)
+ } else if (i12 < 0) {
i1 = i11;
- else
- if (i11 < i12)
- i1 = i11;
- else {
- i1 = i12;
- curly = false;
- }
+ } else if (i11 < i12) {
+ i1 = i11;
+ } else {
+ i1 = i12;
+ curly = false;
+ }
if (i1 >= 0) {
int i2 = curly ? s.indexOf('}', i1) : s.indexOf(']', i1);
String value = s.substring(i1 + 1, i2);
if (value.trim().length() == 0) {
int i4 = s.lastIndexOf('\n', i1);
- if (i4 < 0)
+ if (i4 < 0) {
i4 = 0;
+ }
int i5 = s.indexOf('\n', i2);
- if (i5 < 0)
+ if (i5 < 0) {
i5 = s.length();
+ }
+
/*If template mandates empty construct to be present, those should not be removed.*/
- if ((template != null) && template.contains(s.substring(i4))) {
+ if (template != null && template.contains(s.substring(i4))) {
k = i1 + 1;
} else {
s = s.substring(0, i4) + s.substring(i5);
k = 0;
}
- } else
+ } else {
k = i1 + 1;
- } else
+ }
+ } else {
break;
- } else
+ }
+ } else {
break;
+ }
}
return s;
int k = 0;
while (k < s.length()) {
int i1 = s.indexOf('<', k);
- if (i1 < 0 || i1 == s.length() - 1)
+ if (i1 < 0 || i1 == s.length() - 1) {
break;
+ }
char c1 = s.charAt(i1 + 1);
if (c1 == '?' || c1 == '!') {
}
int i4 = s.lastIndexOf('\n', i1);
- if (i4 < 0)
+ if (i4 < 0) {
i4 = 0;
+ }
int i5 = s.indexOf('\n', i3);
- if (i5 < 0)
+ if (i5 < 0) {
i5 = s.length();
+ }
s = s.substring(0, i4) + s.substring(i5);
k = 0;
private static String pad(int n) {
StringBuilder s = new StringBuilder();
- for (int i = 0; i < n; i++)
+ for (int i = 0; i < n; i++) {
s.append(Character.toString('\t'));
+ }
return s.toString();
}
}
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.XMLConstants;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.slf4j.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.XMLReader;
public final class XmlParser {
Handler handler = new Handler(listNameList);
try {
- SAXParserFactory factory = SAXParserFactory.newInstance();
- SAXParser saxParser = factory.newSAXParser();
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+ spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
InputStream in = new ByteArrayInputStream(s.getBytes());
+ SAXParser saxParser = spf.newSAXParser();
saxParser.parse(in, handler);
+
} catch (ParserConfigurationException | IOException | SAXException | NumberFormatException e) {
throw new SvcLogicException("Unable to convert XML to properties" + e.getLocalizedMessage(), e);
}
log.info(ss);
}
+ public void testRemoveEmptyStructJson1() {
+ String xmlin = "{\n" +
+ " \"policyName\" : \"default-domain.ECOM_Tenant_DND.ECOM_Tenant_DND_mtn6_HngwOamNetVto." +
+ "HNGWOAMNETVTO.OAM_landing-network-role_policy_05\",\n" +
+ " \"policyConfigType\": \"MicroService\",\n" +
+ " \"ecompName\": \"SDNC\",\n" +
+ " \"configBody\": \"{\\\"service\\\": \\\"NetworkPolicy\\\"," +
+ "\\\"location\\\": \\\"Search\\\",\\\"uuid\\\": \\\"Search\\\"," +
+ "\\\"policyName\\\": \\\"default-domain.ECOM_Tenant_DND.ECOM_Tenant_DND_mtn6_HngwOamNetVto." +
+ "HNGWOAMNETVTO.OAM_landing-network-role_policy_05\\\"," +
+ "\\\"description\\\": \\\"default-domain.ECOM_Tenant_DND.ECOM_Tenant_DND_mtn6_HngwOamNetVto." +
+ "HNGWOAMNETVTO.OAM_landing-network-role_policy_05\\\",\\\"configName\\\": \\\"Search\\\"," +
+ "\\\"templateVersion\\\": \\\"1607\\\",\\\"version\\\": \\\"1.3.0.1\\\"," +
+ "\\\"priority\\\": \\\"2\\\",\\\"policyScope\\\": \\\"SDNC\\\",\\\"riskType\\\": \\\"low\\\"," +
+ "\\\"riskLevel\\\": \\\"2\\\",\\\"guard\\\": \\\"True\\\",\\\"content\\\":{ " +
+ "\\\"network-policy\\\": { \\\"display_name\\\": \\\"default-domain.ECOM_Tenant_DND." +
+ "ECOM_Tenant_DND_mtn6_HngwOamNetVto.HNGWOAMNETVTO.OAM_landing-network-role_policy_05\\\", " +
+ "\\\"fq_name\\\": [ \\\"default-domain\\\", " +
+ "\\\"ECOM_Tenant_DND\\\", \\\"default-domain." +
+ "ECOM_Tenant_DND.ECOM_Tenant_DND_mtn6_HngwOamNetVto." +
+ "HNGWOAMNETVTO.OAM_landing-network-role_policy_05\\\" ], " +
+ "\\\"id_perms\\\": { \\\"user_visible\\\": true }, " +
+ "\\\"parent_type\\\": \\\"project\\\", \\\"network_policy_entries\\\": { " +
+ "\\\"policy_rule\\\": [ { " +
+ "\\\"action_list\\\": { \\\"apply_service\\\": [ " +
+ "\\\"testfqdn\\\" ], " +
+ "\\\"gateway_name\\\": null, \\\"qos_action\\\": null, " +
+ "\\\"log\\\": false , \\\"mirror_to\\\": null, " +
+ "\\\"simple_action\\\": null }, " +
+ "\\\"ethertype\\\": null, \\\"application\\\": [], " +
+ "\\\"direction\\\": \\\"<>\\\", \\\"dst_addresses\\\": [ " +
+ "{ \\\"network_policy\\\": null, " +
+ "\\\"security_group\\\": null, " +
+ "\\\"subnet\\\": null, \\\"virtual_network\\\": " +
+ "\\\"default-domain:ECOM_Tenant_DND:ECOM_Tenant_DND_int_HngwOamNetVto." +
+ "HNGWOAMNETVTO.OAM_net_10\\\" } ], " +
+ "\\\"dst_ports\\\": [ { " +
+ "\\\"end_port\\\": -1, \\\"start_port\\\": -1 " +
+ "} ], \\\"protocol\\\": \\\"any\\\", " +
+ "\\\"src_addresses\\\": [ { " +
+ "\\\"network_policy\\\": null, " +
+ "\\\"security_group\\\": null, " +
+ "\\\"subnet\\\": null, \\\"virtual_network\\\": " +
+ "\\\"default-domain:ECOM_Tenant_DND:ECOM_Tenant_DND_int_HngwOamNetVto." +
+ "HNGWOAMNETVTO.OAM_net_9\\\" } ], " +
+ "\\\"src_ports\\\": [ { " +
+ "\\\"end_port\\\": -1, " +
+ "\\\"start_port\\\": -1 } ] } " +
+ "] } }}}\"\n" +
+ "}";
+
+ String xmloutexpected = xmlin;
+
+ String xmlout = XmlJsonUtil.removeEmptyStructJson(null, xmlin);
+ log.info(xmlout);
+
+ Assert.assertEquals(xmloutexpected, xmlout);
+ }
+
@Test
public void testRemoveEmptyStructXml() {
String xmlin = "" +
"run-id": ${tmp.sdn-circuit-req-row[${1}].run-id},
"hostname": ${tmp.sdn-circuit-req-row[${1}].hostname},
"algo-request-reason": ${tmp.sdn-circuit-req-row[${1}].algo-request-reason}
+ "test-empty-value": ${tmp.sdn-circuit-req-row[${1}].test-empty-value}
},
}
]
Code Review / ccsdk / sli / plugins.git / commitdiff