diff options
Diffstat (limited to 'vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding')
5 files changed, 42 insertions, 41 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 25ca4edc..181495c0 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 @@ -54,7 +54,7 @@ public class FunctionTestExceutor { String funcTestId = null; String packagePath = onBoradFuncTestReq.getPackagePath() + File.separator + onBoradFuncTestReq.getPackageName(); - logger.info("Package file path Function test:" + packagePath); + logger.info("Package file path Function test:{}" , packagePath); // Validate package path if (!FileUtil.validatePath(packagePath)) { @@ -87,13 +87,13 @@ public class FunctionTestExceutor { } funcTestId = rsp.getResult(); - logger.info("Response for Function Test :", funcTestId); + logger.info("Response for Function Test :{}", funcTestId); return funcTestId.replaceAll("\"", ""); } catch (NumberFormatException e) { - logger.error("Invalid port number :", oMsbDetails.getDefaultServer().getPort()); + logger.error("Invalid port number :{}", oMsbDetails.getDefaultServer().getPort()); } catch (FileNotFoundException exp) { - logger.error("File not found Exception for file:", onBoradFuncTestReq.getPackagePath()); + logger.error("File not found Exception for file:{}", onBoradFuncTestReq.getPackagePath()); logger.error("File not found Exception for :", exp); } catch (IOException e) { logger.error("IOException:", e); @@ -119,17 +119,17 @@ public class FunctionTestExceutor { return result; } - logger.info("GetTestResultsByFuncTestKey for Function Test Results for :" + key); + logger.info("GetTestResultsByFuncTestKey for Function Test Results for :{}" , key); RestResponse rspGet = RestfulClient.get(oMsbDetails.getDefaultServer().getHost(), Integer.parseInt(oMsbDetails.getDefaultServer().getPort()), CommonConstant.FunctionTest.FUNCTEST_RESULT_URL + key); if (!checkValidResponse(rspGet)) { - logger.error("Failed to convert String Json Response to TestResults list:" + rspGet.getResult()); + logger.error("Failed to convert String Json Response to TestResults list:{}" , rspGet.getResult()); return result; } result = rspGet.getResult(); - logger.info("Function Test Results for Key:" + key + "Response:" + rspGet.getResult()); + logger.info("Function Test Results for Key:{} Response:{}" , key , rspGet.getResult()); return result; } @@ -147,7 +147,7 @@ public class FunctionTestExceutor { return result; } - logger.info("ExecuteFunctionTest Test request Received:" + strJsonRequest); + logger.info("ExecuteFunctionTest Test request Received:{}" , strJsonRequest); MsbDetails oMsbDetails = MsbDetailsHolder.getMsbDetails(); if (null == oMsbDetails) { @@ -155,17 +155,17 @@ public class FunctionTestExceutor { return result; } - logger.info("GetTestResultsByFuncTestKey for Function Test Results for :" + strJsonRequest); + logger.info("GetTestResultsByFuncTestKey for Function Test Results for :{}" , strJsonRequest); RestResponse rspGet = RestfulClient.sendPostRequest(oMsbDetails.getDefaultServer().getHost(), oMsbDetails.getDefaultServer().getPort(), CommonConstant.FunctionTest.FUNCTEST_RESULT_URL, strJsonRequest); if (!checkValidResponse(rspGet)) { - logger.error("Failed to convert String Json Response to TestResults list:" + rspGet.getResult()); + logger.error("Failed to convert String Json Response to TestResults list:{}" , rspGet.getResult()); return result; } result = rspGet.getResult(); - logger.info("ExecuteFunctionTest Function Test Result: " + rspGet.getResult()); + logger.info("ExecuteFunctionTest Function Test Result: {}" , rspGet.getResult()); return result; } 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 3ffb1bab..c48b3887 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 @@ -48,8 +48,8 @@ public class FunctionTestHook { */ public int exec(OnBoradingRequest onBoradingReq) { - logger.info("OnboradingRequest received for Package:" + onBoradingReq.getCsarId() + " Path:" - + onBoradingReq.getPackagePath()); + logger.info("OnboradingRequest received for Package:{} Path:{}", onBoradingReq.getCsarId() + , onBoradingReq.getPackagePath()); buildResultPath(onBoradingReq); @@ -60,8 +60,8 @@ public class FunctionTestHook { // STEP 1:Check Package Exists // --------------------------- if (!FileUtil.checkFileExists(onBoradingReq.getPackagePath())) { - logger.error("Package Not Found at Path:" + onBoradingReq.getPackagePath() + ", Package Id:" - + onBoradingReq.getCsarId()); + logger.error("Package Not Found at Path:{} Package Id:{}" , onBoradingReq.getPackagePath() + , onBoradingReq.getCsarId()); oFuncTestResult.setOperFinished(true); oFuncTestResult.setOperStatus(EnumResult.FAIL.getIndex()); buildFuncTestResponse(oFuncTestResult, CommonConstant.FunctionTest.FUNCTEST_PACKAGE_EXISTS, @@ -123,10 +123,10 @@ public class FunctionTestHook { return null; } - logger.info("Function Test results request for Package:" + packageData.getCsarId()); + logger.info("Function Test results request for Package:{}" , packageData.getCsarId()); ResultKey keydata = getFuncTestResultKey(packageData); if ((null == keydata) || (keydata.getKey().isEmpty())) { - logger.error("Function Test key Not Found for Package Id:", packageData.getCsarId()); + logger.error("Function Test key Not Found for Package Id:{}", packageData.getCsarId()); return null; } return FunctionTestExceutor.getTestResultsByFuncTestKey(keydata.getKey()); @@ -147,8 +147,8 @@ public class FunctionTestHook { filePath.append(File.separator); filePath.append("functestResultKey.json"); - logger.debug("Function test Results Key for Package Id:" + onBoradingReq.getCsarId() + ", Key:" + resultKey - + " Path" + filePath.toString()); + logger.debug("Function test Results Key for Package Id:{} Key:{} Path{}" , onBoradingReq.getCsarId(), resultKey + , filePath); ResultKey oResultKey = new ResultKey(); oResultKey.setCsarId(onBoradingReq.getCsarId()); @@ -167,8 +167,9 @@ public class FunctionTestHook { // STore Results to DB(Currently we will make JSON and Store JSON to // Package Path) // ------------------------------------------------------------------------------- - logger.debug("Function test Status for Package Id:" + oFuncTestResult.getCsarId() + ", Result:" - + ToolUtil.objectToString(oFuncTestResult)); + String jsonoFuncTestResult = ToolUtil.objectToString(oFuncTestResult); + logger.debug("Function test Status for Package Id:{} Result:{}" ,oFuncTestResult.getCsarId() + , jsonoFuncTestResult); StringBuilder filePath = new StringBuilder(getResultStorePath()); filePath.append(File.separator); @@ -218,7 +219,7 @@ public class FunctionTestHook { filePath.append(File.separator); filePath.append("functionTest.json"); - logger.info("On Boarding Status for Package Id:" + packageData.getCsarId() + ", Result Path:" + filePath); + logger.info("On Boarding Status for Package Id:{} Result Path:{}" ,packageData.getCsarId(), filePath); return (OnBoardingResult) FileUtil.readJsonDatafFromFile(filePath.toString(), OnBoardingResult.class); } @@ -230,7 +231,7 @@ public class FunctionTestHook { fileName.append(File.separator); fileName.append("functestResultKey.json"); - logger.info("Func Test Result key for Package Id:" + packageData.getCsarId() + ", Result Path:" + fileName); + logger.info("Func Test Result key for Package Id:{} Result Path:{}" , packageData.getCsarId(),fileName); return (ResultKey) FileUtil.readJsonDatafFromFile(fileName.toString(), ResultKey.class); } 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 bf6d2879..4d2e074b 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 @@ -16,7 +16,6 @@ package org.onap.vnfsdk.marketplace.onboarding.hooks.validatelifecycle; import java.io.File; -import java.io.IOException; import java.util.Map; import org.apache.http.entity.ContentType; @@ -55,7 +54,7 @@ public class LifecycleTestExceutor { @SuppressWarnings("unchecked") public static String uploadPackageToCatalouge(OnBoradingRequest onBoradFuncTestReq) { String packagePath = onBoradFuncTestReq.getPackagePath() + File.separator + onBoradFuncTestReq.getPackageName(); - logger.info("Package file path uploadPackageToCatalouge:" + packagePath); + logger.info("Package file path uploadPackageToCatalouge:{}" , packagePath); String catalougeCsarId = null; @@ -87,14 +86,14 @@ public class LifecycleTestExceutor { Integer.parseInt(oMsbDetails.getDefaultServer().getPort()), CommonConstant.CATALOUGE_UPLOAD_URL, builder.build()); if (!checkValidResponse(rsp)) { - logger.error("Failed to upload package to catalouge:" + rsp.getStatusCode()); + logger.error("Failed to upload package to catalouge:{}" , rsp.getStatusCode()); return catalougeCsarId; } - logger.info("Response for uploadPackageToCatalouge :" + rsp.getResult()); + logger.info("Response for uploadPackageToCatalouge :{}" , rsp.getResult()); catalougeCsarId = getCsarIdValue(rsp.getResult()); - logger.info("CSARID for uploadPackageToCatalouge :" + catalougeCsarId); + logger.info("CSARID for uploadPackageToCatalouge :{}" , catalougeCsarId); return catalougeCsarId; } @@ -105,7 +104,7 @@ public class LifecycleTestExceutor { * oLifeCycleTestReq * @return result of the test or null (in case of failure) */ - public static String execlifecycleTest(OnBoradingRequest onBoradFuncTestReq, LifeCycleTestReq oLifeCycleTestReq) { + public static String execlifecycleTest(OnBoradingRequest onBoradFuncTestReq, LifeCycleTestReq oLifeCycleTestReq) { //NOSONAR String result = null; if ((null == onBoradFuncTestReq.getPackagePath()) || (null == onBoradFuncTestReq.getPackageName())) { @@ -114,7 +113,7 @@ public class LifecycleTestExceutor { } String packagePath = onBoradFuncTestReq.getPackagePath() + File.separator + onBoradFuncTestReq.getPackageName(); - logger.info("Package file path Function test:" + packagePath); + logger.info("Package file path Function test:{}" , packagePath); // Validate package path if (!FileUtil.validatePath(packagePath)) { @@ -135,12 +134,12 @@ public class LifecycleTestExceutor { oMsbDetails.getDefaultServer().getPort(), CommonConstant.LifeCycleTest.LIFECYCLE_TEST_URL, rawDataJson); if (!checkValidResponse(oResponse)) { - logger.error("execlifecycleTest response is faliure :" + oResponse.getStatusCode()); + logger.error("execlifecycleTest response is faliure :{}" , oResponse.getStatusCode()); return result; } result = oResponse.getResult(); - logger.info("Response execlifecycleTest :" + oResponse.getResult()); + logger.info("Response execlifecycleTest :{}" , oResponse.getResult()); return result; } diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestHook.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestHook.java index 5526d380..7fe8d12d 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestHook.java +++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/hooks/validatelifecycle/LifecycleTestHook.java @@ -46,8 +46,8 @@ public class LifecycleTestHook { * @return */ public int exec(OnBoradingRequest onBoradingReq) { - logger.info("OnboardingRequest Lifecycle Request received for Package:" + onBoradingReq.getCsarId() + " Path:" - + onBoradingReq.getPackagePath()); + logger.info("OnboardingRequest Lifecycle Request received for Package:{} Path:{}" , onBoradingReq.getCsarId() + , onBoradingReq.getPackagePath()); // STEP 1: Validate Input and Build result // --------------------------------------------------------- @@ -126,8 +126,9 @@ public class LifecycleTestHook { // STore Results to DB(Currently we will make JSON and Store JSON to // Package Path) // ------------------------------------------------------------------------------- - logger.info("Lifecycle test Status for Package Id:" + oFuncTestResult.getCsarId() + ", Result:" - + ToolUtil.objectToString(oFuncTestResult)); + String jsonoFuncTestResult = ToolUtil.objectToString(oFuncTestResult); + logger.info("Lifecycle test Status for Package Id:{} Result:{}" , oFuncTestResult.getCsarId() + , jsonoFuncTestResult); String filePath = getResultStorePath() + File.separator + oFuncTestResult.getCsarId() + File.separator + "lifecycleTest.json"; FileUtil.writeJsonDatatoFile(filePath, oFuncTestResult); @@ -166,8 +167,8 @@ public class LifecycleTestHook { String filePath = getResultStorePath() + File.separator + onBoradingReq.getCsarId() + File.separator + "lifecycleTestResultKey.json"; - logger.debug("Function test Results Key for Package Id:" + onBoradingReq.getCsarId() + ", Key:" + resultKey - + " Path" + filePath); + logger.debug("Function test Results Key for Package Id:{} Key:{} Path{}" , onBoradingReq.getCsarId(), resultKey + , filePath); ResultKey oResultKey = new ResultKey(); oResultKey.setCsarId(onBoradingReq.getCsarId()); diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/onboardmanager/OnBoardingHandler.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/onboardmanager/OnBoardingHandler.java index b7cfdc1c..c79e7b6b 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/onboardmanager/OnBoardingHandler.java +++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/onboarding/onboardmanager/OnBoardingHandler.java @@ -53,7 +53,7 @@ public final class OnBoardingHandler { LifecycleTestHook oLifecycleTestHook = new LifecycleTestHook(); int iLifeCycleResponse = oLifecycleTestHook.exec(onBoardingReq); if (EnumResult.SUCCESS.getIndex() != iLifeCycleResponse) { - logger.error("Onboarding failed for Package Id during Lifecycle Test:" + onBoardingReq.getCsarId()); + logger.error("Onboarding failed for Package Id during Lifecycle Test:{}" , onBoardingReq.getCsarId()); // Note: We need to continue even if life cycle test fails as this // test is not mandatory } @@ -63,7 +63,7 @@ public final class OnBoardingHandler { FunctionTestHook oFunctionTestHook = new FunctionTestHook(); int iFuncTestResponse = oFunctionTestHook.exec(onBoardingReq); if (EnumResult.SUCCESS.getIndex() != iFuncTestResponse) { - logger.error("Onboarding failed for Package Id during Function Test:" + onBoardingReq.getCsarId()); + logger.error("Onboarding failed for Package Id during Function Test:{}" , onBoardingReq.getCsarId()); // Note: We need to continue even if function test fails as this // test is not mandatory } @@ -72,7 +72,7 @@ public final class OnBoardingHandler { try { PackageManager.getInstance().updateDownloadCount(onBoardingReq.getCsarId()); } catch (Exception e) { - logger.error("Download count update failed for Package:" + onBoardingReq.getPackagePath(), e); + logger.error("Download count update failed for Package:{}" , onBoardingReq.getPackagePath(), e); } } |