Add APPC LCM Interface

The LCM model code and service provider code is implemented.
This model code is now used for the vCPE use case scenario.

The vFW use case is still using the legacy APPC API as
request by APPC for Policy to use in R1. The APPC
service provider now generates a demo legacy APPC
request with pg-streams.

An A&AI named query is implemented for the vFW use case.
The code for obtaining the generic-vnf.vnf-id is not
in use until we set up the A&AI simulator to work
without having cyclical depenncies inside the POMs.

JUnits for the vFW and vCPE use cases are now supported.
These JUnits test the complete flow of each scenario.

A&AI testing is not supported in the JUnit test yet.
These JUnits use a target type of VM as VNF is not
supported yet. This will be changed when the Target
Lock supports VNF.

Amended to fix Sonar blockers.

Issue-ID: POLICY-104
Change-Id: I46869c5fd5094919da55ad563d608fe6d4b6fea7
Signed-off-by: Daniel Cruz <dc443y@att.com>

4 files changed, 5 insertions, 5 deletions

diff --git a/controlloop/common/model-impl/appc/pom.xml b/controlloop/common/model-impl/appc/pom.xml
index ae6ff0f5f..fc99a19ed 100644
--- a/controlloop/common/model-impl/appc/pom.xml
+++ b/controlloop/common/model-impl/appc/pom.xml
@@ -33,7 +33,7 @@
 		<groupId>junit</groupId>
 		<artifactId>junit</artifactId>
 		<version>4.12</version>
-		<scope>provided</scope>
+		<scope>test</scope>
 	</dependency>
 	<dependency>
 		<groupId>com.google.code.gson</groupId>
diff --git a/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java b/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
index 4df25ecc5..1e92744ef 100644
--- a/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
+++ b/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
@@ -36,8 +36,8 @@ public class CommonHeader implements Serializable {
 	public String	OriginatorID;
 	public UUID	RequestID;
 	public String	SubRequestID;
-	public Collection<String>	RequestTrack = new ArrayList<String>();
-	public Collection<Map<String, String>> Flags = new ArrayList<Map<String, String>>();
+	public Collection<String>	RequestTrack = new ArrayList<>();
+	public Collection<Map<String, String>> Flags = new ArrayList<>();
 	
 	public CommonHeader() {
 		
diff --git a/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java b/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java
index fbf0d8ee5..a9634a7b2 100644
--- a/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java
+++ b/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/Request.java
@@ -32,7 +32,7 @@ public class Request implements Serializable{
 	public String				Action;
 	public String				TargetID;
 	public String				ObjectID;
-	public Map<String, Object>	Payload = new HashMap<String, Object>();
+	public Map<String, Object>	Payload = new HashMap<>();
 	
 	public Request() {
 		
diff --git a/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java b/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java
index f9f494625..0aeb1d483 100644
--- a/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java
+++ b/controlloop/common/model-impl/appc/src/main/java/org/onap/policy/appc/Response.java
@@ -30,7 +30,7 @@ public class Response implements Serializable {
 
 	public CommonHeader CommonHeader;
 	public ResponseStatus Status = new ResponseStatus();
-	public Map<String, Object> Payload = new HashMap<String, Object>();
+	public Map<String, Object> Payload = new HashMap<>();
 	
 	public Response() {