Default fromPreload to false if no

Correct JUnit test data for default from-preload value
Default fromPreload to false if no requestParameters are available.

Change-Id: I20846871958226740e4a5dee90c8e31ff3bdfddf
Issue-ID: SO-1572
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java
index d7a9ff1..7632831 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapper.java
@@ -139,7 +139,7 @@ public class GeneralTopologyObjectMapper {
                        vfModuleInformation.setFromPreload(requestContext.getRequestParameters().getUsePreload());                      
                }
                else {
-                       vfModuleInformation.setFromPreload(null);
+                       vfModuleInformation.setFromPreload(false);
                }
                
                return vfModuleInformation;

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java
index c039e30..bf2cd34 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GeneralTopologyObjectMapperTest.java
@@ -361,7 +361,7 @@ public class GeneralTopologyObjectMapperTest  extends TestDataSetup {
                assertNull(gcRequestInput.getOnapModelInformation());
                assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
                assertNotNull(gcRequestInput.getVfModuleId());
-               assertNull(gcRequestInput.getFromPreload());
+               assertFalse(gcRequestInput.getFromPreload());
        }
        
        @Test
@@ -385,7 +385,7 @@ public class GeneralTopologyObjectMapperTest  extends TestDataSetup {
                assertNull(gcRequestInput.getOnapModelInformation());
                assertEquals(vfModule.getVfModuleId(),gcRequestInput.getVfModuleId());
                assertNotNull(gcRequestInput.getVfModuleId());
-               assertNull(gcRequestInput.getFromPreload());
+               assertFalse(gcRequestInput.getFromPreload());
        }
        
        @Test

diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationUnassign.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationUnassign.json
index f06d72a..cecb4c1 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationUnassign.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/genericResourceApiVfModuleOperationInformationUnassign.json
@@ -22,7 +22,7 @@
   },
   "vf-module-information" : {    
     "vf-module-id" : "testVfModuleId",
-    "from-preload": null  
+    "from-preload": false  
  },
   "vnf-information" : {    
     "vnf-id" : "testVnfId",