Merge "Sonar Major:Replace with the diamond operator ."
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 @@
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 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 @@
// 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) {
diff --git a/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java
index 825cbcb..6838719 100644
--- a/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java
+++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java
@@ -1,4 +1,4 @@
-/**
+ /**
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
@@ -133,7 +133,7 @@
// load list of models into a map, so we can later replace referenceIds with
// real Models
- HashMap<String, AbstractModelArtifact> versionIdToModelMap = new HashMap<String, AbstractModelArtifact>();
+ HashMap<String, AbstractModelArtifact> versionIdToModelMap = new HashMap<>();
for (Artifact art : models) {
AbstractModelArtifact ma = (AbstractModelArtifact) art;
versionIdToModelMap.put(ma.getUniqueIdentifier(), ma);