From: Venkata Harish K Kajur <vk250x@att.com>
Date: Mon, 27 Feb 2017 14:56:43 +0000 (+0000)
Subject: Update to use proper syntax generic instanstiation
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2799b7cc8669ab0aa925a01efc573d046149dd8a;p=aai%2Faai-service.git

Update to use proper syntax generic instanstiation

Change-Id: I76ce6cf7fb6ade87beac8718c1ee54246eba3adb
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---

diff --git a/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/DbMeth.java b/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/DbMeth.java
index 978cb57..0bacf5d 100644
--- a/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/DbMeth.java
+++ b/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/DbMeth.java
@@ -2233,7 +2233,7 @@ public class DbMeth{
 			nodeTypeFilter = true;
 		}  
 		
-		ArrayList <String> excludeVidList = new <String> ArrayList ();
+		ArrayList <String> excludeVidList = new ArrayList<String>();
 		if( DbEdgeRules.CanBeRecursiveNT.containsKey(startNodeNT) && excludeRecurComingIn ){
 			// If we're starting on a nodeType that supports recursion, then find any connected
 			// nodes that are coming from IN edges so we can exclude them later.
diff --git a/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/DbSearchWithTags.java b/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/DbSearchWithTags.java
index 5ab8134..c8de403 100644
--- a/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/DbSearchWithTags.java
+++ b/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/DbSearchWithTags.java
@@ -406,7 +406,7 @@ public class DbSearchWithTags{
 		  Iterable <?> verts = thisLevelVertex.query().direction(Direction.OUT).has(edgeTag,true).vertices();
 		  Iterator <?> vertI = verts.iterator();
 		  
-		  ArrayList <TitanVertex> nodeList = new <TitanVertex> ArrayList ();
+		  ArrayList <TitanVertex> nodeList = new ArrayList<TitanVertex>();
 		  while( vertI != null && vertI.hasNext() ){
         	  TitanVertex tmpVert = (TitanVertex) vertI.next();
         	  nodeList.add(tmpVert);
@@ -522,7 +522,7 @@ public class DbSearchWithTags{
 		  Iterator <?> vertI = verts.iterator();
 		  
 		  //int levelNodeCount = 0;
-		  ArrayList <TitanVertex> nodeList = new <TitanVertex> ArrayList ();
+		  ArrayList <TitanVertex> nodeList = new ArrayList<TitanVertex>();
 		  while( vertI != null && vertI.hasNext() ){
 			  TitanVertex tmpVert = (TitanVertex) vertI.next();
 			  String nodeType = tmpVert.<String>property("aai-node-type").orElse(null);
diff --git a/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/UpdateEdgeTags.java b/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/UpdateEdgeTags.java
index a9090ef..51928e0 100644
--- a/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/UpdateEdgeTags.java
+++ b/ajsc-aai/src/main/java/org/openecomp/aai/dbgen/UpdateEdgeTags.java
@@ -68,7 +68,7 @@ public class UpdateEdgeTags {
 		HashMap <String,Object> edgeRuleHash = new HashMap <String,Object>();
 		HashMap <String,Object> edgeRulesFullHash = new HashMap <String,Object>();
 		HashMap <String,Object> edgeRuleLabelToKeyHash = new HashMap <String,Object>();
-		ArrayList <String> labelMapsToMultipleKeys = new <String> ArrayList ();
+		ArrayList <String> labelMapsToMultipleKeys = new ArrayList<String>();
 		
     	int tagCount = DbEdgeRules.EdgeInfoMap.size();
 		// Loop through all the edge-rules make sure they look right and