aboutsummaryrefslogtreecommitdiffstats
path: root/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
diff options
context:
space:
mode:
Diffstat (limited to 'vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java')
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java16
1 files changed, 5 insertions, 11 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
index 2d57fe21..8d467de2 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestExceutor.java
@@ -130,11 +130,8 @@ public class LifecycleTestExceutor {
return result;
}
- String rawDataJson = ""; //TBD - Use Gson - jackson has security issue//JsonUtil.toJson(oLifeCycleTestReq);
-// if (null == rawDataJson) {
-// logger.error("Failed to convert LifeCycleTestReq object to Json String !!!");
-// return result;
-// }
+ String rawDataJson = "";
+ //TBD - Use Gson - jackson has security issue//JsonUtil.toJson(oLifeCycleTestReq);
RestResponse oResponse = RestfulClient.sendPostRequest(oMsbDetails.getDefaultServer().getHost(),
oMsbDetails.getDefaultServer().getPort(), CommonConstant.LifeCycleTest.LIFECYCLE_TEST_URL, rawDataJson);
@@ -156,12 +153,9 @@ public class LifecycleTestExceutor {
* @return valid(true) or invalid(false)
*/
private static boolean checkValidResponse(RestResponse rsp) {
- if ((null == rsp.getStatusCode()) || (null == rsp.getResult())
- || (RestConstant.RESPONSE_CODE_200 != rsp.getStatusCode()
- && RestConstant.RESPONSE_CODE_201 != rsp.getStatusCode())) {
- return false;
- }
- return true;
+ return ((null != rsp.getStatusCode()) && (null != rsp.getResult())
+ && (RestConstant.RESPONSE_CODE_200 == rsp.getStatusCode()
+ || RestConstant.RESPONSE_CODE_201 == rsp.getStatusCode()));
}
/**