Code Review
/
ccsdk
/
sli
/
plugins.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Sonar Fix: RestapiCallNode.java
[ccsdk/sli/plugins.git]
/
restapi-call-node
/
provider
/
src
/
main
/
java
/
org
/
onap
/
ccsdk
/
sli
/
plugins
/
restapicall
/
XmlJsonUtil.java
diff --git
a/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
b/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
index
8a0ca8d
..
4712b42
100644
(file)
--- a/
restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
+++ b/
restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java
@@
-272,7
+272,7
@@
public final class XmlJsonUtil {
return sb.toString();
}
return sb.toString();
}
- public static String removeEmptyStructJson(String s) {
+ public static String removeEmptyStructJson(String
template, String
s) {
int k = 0;
while (k < s.length()) {
boolean curly = true;
int k = 0;
while (k < s.length()) {
boolean curly = true;
@@
-304,8
+304,13
@@
public final class XmlJsonUtil {
if (i5 < 0)
i5 = s.length();
if (i5 < 0)
i5 = s.length();
- s = s.substring(0, i4) + s.substring(i5);
- k = 0;
+ /*If template mandates empty construct to be present, those should not be removed.*/
+ if ((template != null) && template.contains(s.substring(i4))) {
+ k = i1 + 1;
+ } else {
+ s = s.substring(0, i4) + s.substring(i5);
+ k = 0;
+ }
} else
k = i1 + 1;
} else
} else
k = i1 + 1;
} else