Prod fixes August 21st

changes required for unit tests to pass again
Changes sniro homing BB license demand to be a named array per sniro
defect.
boolean checks must now account for null
fixed compilation issues in code
updated tests and removed primatives from bbobjects
upgraded to A&AI dependency with Boolean

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

6 files changed, 9 insertions, 12 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java
index 801314b2ae..eac6c0a8b7 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/BBPojoTest.java
@@ -21,7 +21,6 @@
 package org.onap.so.bpmn.servicedecomposition;
 
 import org.junit.Test;
-import org.onap.so.BaseTest;
 
 import com.openpojo.reflection.PojoClass;
 import com.openpojo.reflection.PojoClassFilter;
@@ -30,12 +29,13 @@ import com.openpojo.reflection.filters.FilterPackageInfo;
 import com.openpojo.validation.Validator;
 import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.NoPrimitivesRule;
 import com.openpojo.validation.rule.impl.SerializableMustHaveSerialVersionUIDRule;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
 
 
-public class BBPojoTest extends BaseTest{
+public class BBPojoTest {
 	private PojoClassFilter filterTestClasses = new FilterTestClasses();
 
 	@Test
@@ -52,6 +52,7 @@ public class BBPojoTest extends BaseTest{
 				.with(new GetterMustExistRule())
 				.with(new SetterTester())
 				.with(new GetterTester())
+				.with(new NoPrimitivesRule())
 				.with(new SerializableMustHaveSerialVersionUIDRule())
 				.build();
 		validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses, new FilterNonConcrete());
@@ -62,4 +63,4 @@ public class BBPojoTest extends BaseTest{
 			return !pojoClass.getSourcePath().contains("/test-classes/");
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
index 0abbb2dbe2..c18dcf5cfa 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
@@ -79,7 +79,7 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class BBInputSetupMapperLayerTest {
-	@InjectMocks
+	
 	BBInputSetupMapperLayer bbInputSetupMapperLayer = new BBInputSetupMapperLayer();
 
 	ObjectMapper mapper = new ObjectMapper();
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
index a821d69754..489163b23a 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@ -425,7 +425,7 @@ public class BBInputSetupTest {
 
 		doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
 		doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
-				project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+				project, owningEntity, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
 				executeBB.getBuildingBlock().getBpmnFlowName());
 		doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
 				executeBB, requestAction, customer);
@@ -475,7 +475,7 @@ public class BBInputSetupTest {
 		doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
 		doReturn(serviceSubscription).when(SPY_bbInputSetup).getServiceSubscription(requestDetails, customer);
 		doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
-				project, owningEntity, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+				project, owningEntity, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
 				executeBB.getBuildingBlock().getBpmnFlowName());
 		doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
 				executeBB, requestAction,customer);
@@ -518,7 +518,7 @@ public class BBInputSetupTest {
 		doReturn(customer).when(SPY_bbInputSetup).getCustomerAndServiceSubscription(requestDetails, resourceId);
 		doReturn(serviceSubscription).when(SPY_bbInputSetup).getServiceSubscription(requestDetails, customer);
 		doReturn(serviceInstance).when(SPY_bbInputSetup).getALaCarteServiceInstance(service, requestDetails, customer,
-				null, null, lookupKeyMap, resourceId, executeBB.isaLaCarte(),
+				null, null, lookupKeyMap, resourceId, Boolean.TRUE.equals(executeBB.isaLaCarte()),
 				executeBB.getBuildingBlock().getBpmnFlowName());
 		doReturn(expected).when(SPY_bbInputSetup).populateGBBWithSIAndAdditionalInfo(requestDetails, serviceInstance,
 				executeBB, requestAction,customer);
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
index e4c8a8f59b..cd9cf06029 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/GenericVnfExpected.json
@@ -8,7 +8,6 @@
 		"vf-module-id":"vfModuleId",
 		"vf-module-name":"vfModuleName",
 		"orchestration-status":"PRECREATED",
-		"cascaded":false,
 		"heat-stack-id":"heatStackId",
 		"contrail-service-instance-fqdn":"contrailServiceInstanceFqdn",
 		"module-index":1,"selflink":"selflink",
@@ -19,7 +18,6 @@
 	"volume-groups":[],
 	"line-of-business":null,
 	"platform":null,
-	"cascaded":false,
 	"cloud-params":{},
 	"cloud-context":null,
 	"solution":null,
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json
index a7e2ade10b..c6c5c790a8 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/ModelInfoCollection.json
@@ -5,6 +5,5 @@
 	"collection-function":"function",
 	"collection-role":"role",
 	"collection-type":"type",
-	"description":"description",
-	"quantity":0
+	"description":"description"
 }
\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json
index f807276773..bcc565dc75 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/VolumeGroup.json
@@ -4,6 +4,5 @@
 	"vnf-type":"vnfType",	
 	"orchestration-status":"PRECREATED",	
 	"cloud-params":{},	
-	"cascaded":false,
 	"heat-stack-id":"heatStackId"
 }