diff options
Diffstat (limited to 'vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks')
3 files changed, 12 insertions, 21 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutor.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutor.java index 4d7f0162..25ca4edc 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutor.java +++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestExceutor.java @@ -176,12 +176,9 @@ public class FunctionTestExceutor { * @return valid or invalid */ 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())); } private static HttpEntity buildRequest(InputStream inputStream) { diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestHook.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestHook.java index 234892b2..3ffb1bab 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestHook.java +++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/functiontest/FunctionTestHook.java @@ -141,7 +141,7 @@ public class FunctionTestHook { private void storeFuncTestResultKey(OnBoradingRequest onBoradingReq, String resultKey) { // Currently we will make JSON and Store JSON to Package Path) // ------------------------------------------------------------------------------- - StringBuffer filePath = new StringBuffer(getResultStorePath()); + StringBuilder filePath = new StringBuilder(getResultStorePath()); filePath.append(File.separator); filePath.append(onBoradingReq.getCsarId()); filePath.append(File.separator); @@ -170,7 +170,7 @@ public class FunctionTestHook { logger.debug("Function test Status for Package Id:" + oFuncTestResult.getCsarId() + ", Result:" + ToolUtil.objectToString(oFuncTestResult)); - StringBuffer filePath = new StringBuffer(getResultStorePath()); + StringBuilder filePath = new StringBuilder(getResultStorePath()); filePath.append(File.separator); filePath.append(oFuncTestResult.getCsarId()); filePath.append(File.separator); @@ -212,7 +212,7 @@ public class FunctionTestHook { return null; } - StringBuffer filePath = new StringBuffer(getResultStorePath()); + StringBuilder filePath = new StringBuilder(getResultStorePath()); filePath.append(File.separator); filePath.append(packageData.getCsarId()); filePath.append(File.separator); @@ -224,7 +224,7 @@ public class FunctionTestHook { } private static ResultKey getFuncTestResultKey(PackageData packageData) { - StringBuffer fileName = new StringBuffer(getResultStorePath()); + StringBuilder fileName = new StringBuilder(getResultStorePath()); fileName.append(File.separator); fileName.append(packageData.getCsarId()); fileName.append(File.separator); 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())); } /** |