From: Steven Blimkie <Steven.Blimkie@amdocs.com>
Date: Wed, 17 Jan 2018 14:30:30 +0000 (+0000)
Subject: Merge "Sonar Major:Replace the type specification."
X-Git-Tag: v1.2.0~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8600ac5f2830edc1f1c549c70808226ac84186ef;hp=57eeee82bf5dcd9e81a3af15febb6053508889fe;p=aai%2Fmodel-loader.git

Merge "Sonar Major:Replace the type specification."
---

diff --git a/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java b/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java
index a942cf6..4571345 100644
--- a/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java
+++ b/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java
@@ -36,7 +36,7 @@ public abstract class AbstractModelArtifact extends Artifact {
 		 
   private String modelNamespace;
   private String modelNamespaceVersion;
-	private Set<String> referencedModelIds = new HashSet<String>(); 
+	private Set<String> referencedModelIds = new HashSet<>(); 
 
 	public AbstractModelArtifact(ArtifactType type) {
 	  super(type);
diff --git a/src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java b/src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java
index 0d34908..6d263a2 100644
--- a/src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java
+++ b/src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.onap.aai.modelloader.entity.Artifact;
 
+@FunctionalInterface
 public interface IModelParser {
   public List<Artifact> parse(byte[] artifactPayload, String artifactName);
 }
diff --git a/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java
index 47d93e7..3a5b543 100644
--- a/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java
+++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java
@@ -57,7 +57,7 @@ public class ModelArtifactHandler extends ArtifactHandler {
     
     // Push the ordered list of model artifacts to A&AI.  If one fails, we need to roll back
     // the changes.
-    List<AbstractModelArtifact> completedModels = new ArrayList<AbstractModelArtifact>();
+    List<AbstractModelArtifact> completedModels = new ArrayList<>();
     AaiRestClient aaiClient = new AaiRestClient(config);
 
     for (Artifact art : sortedModelArtifacts) {