sonar fix:Adaptor service bug fixes

adaptor/Cbam2DriverResponseConverter.java
file name: Driver2CbamRequestConverter.java

Change-Id: I1e022a227671f26aea4e73e8f530e73be913cf0e
Issue-ID: VFC-812
Signed-off-by: ajay priyadarshi <ajay.priyadarshi@ril.com>

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java
index c153095..6034b55 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java
@@ -155,11 +155,11 @@ public class Cbam2DriverResponseConverter {
 
                if (OperationType.INSTANTIATE == oper.getOperationType()) {
                        double instantiateProgress = (nowTime - jobInfo.getOperateStartTime())
-                                       / adaptorEnv.getInstantiateTimeInterval();
+                                       / (double)(adaptorEnv.getInstantiateTimeInterval());
                        initialProgress = (int) (instantiateProgress + initialProgress);
                } else if (OperationType.TERMINATE == oper.getOperationType()) {
                        double terminateProgress = (nowTime - jobInfo.getOperateStartTime())
-                                       / adaptorEnv.getTerminateTimeInterval();
+                                       / (double)(adaptorEnv.getTerminateTimeInterval());
                        initialProgress = (int) (terminateProgress + initialProgress);
                } else {
                        initialProgress = 0;

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
index 493033c..8c60cc6 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
@@ -54,11 +54,11 @@ public class Driver2CbamRequestConverter {
        }
 
        public CBAMInstantiateVnfRequest instantiateRequestConvert(InstantiateVnfRequest driverRequest,
-                       NslcmGrantVnfResponse nslc, GrantInfo grant, VimComputeResourceFlavour vimco) throws Exception {
-        Gson gson = new Gson();
+                       NslcmGrantVnfResponse nslc, GrantInfo grant, VimComputeResourceFlavour vimco) throws IOException{
+               Gson gson = new Gson();
                String inputJson = readcbamInputInfoFromJsonFile();
                CBAMInstantiateVnfRequest request = gson.fromJson(inputJson, CBAMInstantiateVnfRequest.class);
-               
+
                return request;
        }