Merge "change to diamond operator"

1 files changed, 36 insertions, 35 deletions

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 e5ec7e6e..d89a36e1 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
@@ -32,7 +32,7 @@ import org.onap.vnfsdk.marketplace.onboarding.entity.ResultKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class FunctionTestHook 
+public class FunctionTestHook
 {
     private static final Logger logger = LoggerFactory.getLogger(FunctionTestHook.class);
 
@@ -42,26 +42,26 @@ public class FunctionTestHook
      * @return
      */
     public int exec(OnBoradingRequest onBoradingReq)
-    {       
+    {
         logger.info("OnboradingRequest received for Package:" + onBoradingReq.getCsarId() + " Path:"+ onBoradingReq.getPackagePath());
 
         buildResultPath(onBoradingReq);
-        
+
         OnBoardingResult oFuncTestResult = new OnBoardingResult();
         buildFunctResponse(onBoradingReq,oFuncTestResult);
         updateResult(oFuncTestResult);
 
         //STEP 1:Check Package Exists
-        //---------------------------      
+        //---------------------------
         if(!FileUtil.checkFileExists(onBoradingReq.getPackagePath()))
         {
-            logger.info("Package Not Found at Path:" + onBoradingReq.getPackagePath() + ", Package Id:" + onBoradingReq.getCsarId());                      
+            logger.info("Package Not Found at Path:" + onBoradingReq.getPackagePath() + ", Package Id:" + onBoradingReq.getCsarId());
             oFuncTestResult.setOperFinished(true);
             oFuncTestResult.setOperStatus(EnumResult.FAIL.getIndex());
             buildFuncTestResponse(oFuncTestResult,CommonConstant.functionTest.FUNCTEST_PACKAGE_EXISTS,EnumOperationStatus.FAILED.getIndex());
-            updateResult(oFuncTestResult);            
+            updateResult(oFuncTestResult);
             return EnumResult.FAIL.getIndex();
-        }       
+        }
 
         buildFuncTestResponse(oFuncTestResult,CommonConstant.functionTest.FUNCTEST_PACKAGE_EXISTS,EnumOperationStatus.SUCCESS.getIndex());
         updateResult(oFuncTestResult);
@@ -70,13 +70,13 @@ public class FunctionTestHook
         //---------------------------------------
         String functestResultKey = FunctionTestExceutor.execFunctionTest(onBoradingReq);
         if(null == functestResultKey)
-        {          
+        {
             oFuncTestResult.setOperFinished(true);
-            oFuncTestResult.setOperStatus(EnumResult.FAIL.getIndex());            
+            oFuncTestResult.setOperStatus(EnumResult.FAIL.getIndex());
             buildFuncTestResponse(oFuncTestResult,CommonConstant.functionTest.FUNCTEST_EXEC,EnumOperationStatus.FAILED.getIndex());
-            updateResult(oFuncTestResult);           
+            updateResult(oFuncTestResult);
             return EnumResult.FAIL.getIndex();
-        }       
+        }
 
         oFuncTestResult.setOperFinished(true);
         oFuncTestResult.setOperStatus(EnumResult.SUCCESS.getIndex());
@@ -87,15 +87,15 @@ public class FunctionTestHook
         //-------------------------------------------------
         storeFuncTestResultKey(onBoradingReq,functestResultKey);
 
-        return (oFuncTestResult.getOperStatus() == EnumResult.SUCCESS.getIndex()) 
+        return (oFuncTestResult.getOperStatus() == EnumResult.SUCCESS.getIndex())
                 ? EnumResult.SUCCESS.getIndex() : EnumResult.FAIL.getIndex();
     }
 
     /**
-     * 
+     *
      * @param onBoradingReq
      */
-    private void buildResultPath(OnBoradingRequest onBoradingReq) 
+    private void buildResultPath(OnBoradingRequest onBoradingReq)
     {
         String filePath = getResultStorePath() + File.separator + onBoradingReq.getCsarId();
         if(!FileUtil.checkFileExists(filePath))
@@ -105,11 +105,11 @@ public class FunctionTestHook
     }
 
     /**
-     * 
+     *
      * @param packageData
      * @return
      */
-    public static String getFuncTestResults(PackageData packageData) 
+    public static String getFuncTestResults(PackageData packageData)
     {
         logger.info("Function Test results request for Package:" + packageData.getCsarId());
         ResultKey keydata = getFuncTestResultKey(packageData);
@@ -117,7 +117,7 @@ public class FunctionTestHook
         {
             logger.info("Function Test key Not Found for Package Id:",packageData.getCsarId());
             return null;
-        }        
+        }
         return  FunctionTestExceutor.getTestResultsByFuncTestKey(keydata.getKey());
     }
 
@@ -126,14 +126,14 @@ public class FunctionTestHook
      * @param onBoradingReq
      * @param resultKey
      */
-    private void storeFuncTestResultKey(OnBoradingRequest onBoradingReq,String resultKey) 
+    private void storeFuncTestResultKey(OnBoradingRequest onBoradingReq,String resultKey)
     {
         //Currently we will make JSON and Store JSON to Package Path)
         //-------------------------------------------------------------------------------
-        String filePath = getResultStorePath() + File.separator + onBoradingReq.getCsarId() + File.separator + "functestResultKey.json";        
+        String filePath = getResultStorePath() + File.separator + onBoradingReq.getCsarId() + File.separator + "functestResultKey.json";
 
         logger.info("Function test Results Key for Package Id:" + onBoradingReq.getCsarId() + ", Key:" + resultKey + " Path" + filePath);
-        
+
         ResultKey oResultKey = new ResultKey();
         oResultKey.setCsarId(onBoradingReq.getCsarId());
         oResultKey.setOperTypeId(CommonConstant.functionTest.FUNCTEST_OPERTYPE_ID);
@@ -146,12 +146,12 @@ public class FunctionTestHook
      * Store Function test Execution Results
      * @param oFuncTestResult
      */
-    private void updateResult(OnBoardingResult oFuncTestResult) 
-    {   
+    private void updateResult(OnBoardingResult oFuncTestResult)
+    {
         //STore Results to DB(Currently we will make JSON and Store JSON to Package Path)
         //-------------------------------------------------------------------------------
         logger.info("Function test Status for Package Id:" + oFuncTestResult.getCsarId() + ", Result:" + ToolUtil.objectToString(oFuncTestResult));
-        String filePath = getResultStorePath()  + File.separator  + oFuncTestResult.getCsarId() + File.separator + "functionTest.json";        
+        String filePath = getResultStorePath()  + File.separator  + oFuncTestResult.getCsarId() + File.separator + "functionTest.json";
         FileUtil.writeJsonDatatoFile(filePath,oFuncTestResult);
     }
 
@@ -160,7 +160,7 @@ public class FunctionTestHook
      * @param onBoradingReq
      * @param oFuncTestResult
      */
-    private void buildFunctResponse(OnBoradingRequest onBoradingReq, OnBoardingResult oFuncTestResult) 
+    private void buildFunctResponse(OnBoradingRequest onBoradingReq, OnBoardingResult oFuncTestResult)
     {
         oFuncTestResult.setOperFinished(false);
         oFuncTestResult.setCsarId(onBoradingReq.getCsarId());
@@ -174,36 +174,36 @@ public class FunctionTestHook
         functTesExec.setOperId(CommonConstant.functionTest.FUNCTEST_EXEC);
         functTesExec.setStatus(EnumOperationStatus.NOTSTARTED.getIndex());
 
-        List<OnBoardingOperResult> operResult = new ArrayList<OnBoardingOperResult>();
+        List<OnBoardingOperResult> operResult = new ArrayList<>();
         operResult.add(oPackageExists);
-        operResult.add(functTesExec); 
+        operResult.add(functTesExec);
 
         oFuncTestResult.setOperResult(operResult);
     }
 
-    public static OnBoardingResult getOnBoardingResult(PackageData packageData) 
+    public static OnBoardingResult getOnBoardingResult(PackageData packageData)
     {
-        String filePath = getResultStorePath()  + File.separator + packageData.getCsarId() +File.separator + "functionTest.json"; 
+        String filePath = getResultStorePath()  + File.separator + packageData.getCsarId() +File.separator + "functionTest.json";
         logger.info("On Boarding Status for Package Id:" + packageData.getCsarId() + ", Result Path:" + filePath);
 
         return (OnBoardingResult)FileUtil.readJsonDatafFromFile(filePath,OnBoardingResult.class);
     }
 
-    private static ResultKey getFuncTestResultKey(PackageData packageData) 
+    private static ResultKey getFuncTestResultKey(PackageData packageData)
     {
         String fileName = getResultStorePath() + File.separator + packageData.getCsarId() + File.separator + "functestResultKey.json";
-        
+
         logger.info("Func Test Result key for Package Id:" + packageData.getCsarId() + ", Result Path:" + fileName);
-        return (ResultKey) FileUtil.readJsonDatafFromFile(fileName,ResultKey.class);       
+        return (ResultKey) FileUtil.readJsonDatafFromFile(fileName,ResultKey.class);
     }
-    
-    private static String getResultStorePath() 
+
+    private static String getResultStorePath()
     {
         return org.onap.vnfsdk.marketplace.filemanage.http.ToolUtil.getHttpServerAbsolutePath();
     }
 
-    private void buildFuncTestResponse(OnBoardingResult oFuncTestResult, String opreKey, int operStatusVal) 
-    {        
+    private void buildFuncTestResponse(OnBoardingResult oFuncTestResult, String opreKey, int operStatusVal)
+    {
         List<OnBoardingOperResult>  operStatusList = oFuncTestResult.getOperResult();
         for(OnBoardingOperResult operObj: operStatusList)
         {
@@ -215,3 +215,4 @@ public class FunctionTestHook
         }
     }
 }
+