diff options
| author |   Liam Fallon <liam.fallon@est.tech> | 2019-12-01 11:33:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-01 11:33:44 +0000 |
| commit | 58c44ae81489deca05f57812c19f25c3897fe57a (patch) | |
| tree | bb0ebc57462111e6e69a489bfb294858397b9e20 /ONAP-REST/src/main/java/org | |
| parent | 9e5b3e8b65dcfc7f8ce5eb7970cc3b547ea09393 (diff) | |
| parent | c93be26e9a39501d260a70e4f2d6dbe95e8f5061 (diff) | |
Merge "Unit/SONAR/Checkstyle in ONAP-REST"
Diffstat (limited to 'ONAP-REST/src/main/java/org')
| -rw-r--r-- | ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java index adb8995c5..e8c0b55a3 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java @@ -378,15 +378,11 @@ public class PolicyValidation { valid = false; } } else if ("PROPERTIES".equals(configType)) { - if (!PolicyUtils.isPropValid(configBodyData) || "".equals(configBodyData)) { + if (!PolicyUtils.isPropValid(configBodyData)) { responseString.append( "Config Body: Property data is not valid" + HTML_ITALICS_LNBREAK); valid = false; } - } else if ("OTHER".equals(configType) && ("".equals(configBodyData))) { - responseString.append( - "Config Body: Config Body Should not be Empty" + HTML_ITALICS_LNBREAK); - valid = false; } } } else { @@ -490,7 +486,7 @@ public class PolicyValidation { } } else { responseString.append( - "<b>D2/Virtualized Services</b>:<i>Select atleast one D2/Virtualized Services" + "<b>D2/Virtualized Services</b>:<i>Select at least one D2/Virtualized Services" + HTML_ITALICS_LNBREAK); valid = false; } @@ -606,7 +602,7 @@ public class PolicyValidation { } } else { responseString.append( - "<b>D2/Virtualized Services</b>: <i>Select atleast one D2/Virtualized Services" + "<b>D2/Virtualized Services</b>: <i>Select at least one D2/Virtualized Services" + HTML_ITALICS_LNBREAK); responseString.append( "<b>vPRO Actions</b>: <i>vPRO Actions is required" + HTML_ITALICS_LNBREAK); |