summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-analytics/src/main/java
diff options
context:
space:
mode:
authorLorraine Welch <lb2391@att.com>2020-05-06 19:06:39 +0000
committerGerrit Code Review <gerrit@onap.org>2020-05-06 19:06:39 +0000
commit88d2cb0063364261052b64748374250295b9c531 (patch)
treec3c5b286294c53250e2e6bb141da8603f5db7de3 /ecomp-sdk/epsdk-analytics/src/main/java
parent03abc05e6217274f557ec4987aa8e8bd34b2f4a4 (diff)
parent53ae6cba73ac5616471943ebab84b35f4d09aff2 (diff)
Merge "lowred some code smells"
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java')
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/line/LineInfo.java6
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/ColorProperties.java2
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java8
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeCollection.java4
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeInfo.java11
5 files changed, 15 insertions, 16 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/line/LineInfo.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/line/LineInfo.java
index 26f33a35..47e3ad54 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/line/LineInfo.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/line/LineInfo.java
@@ -67,7 +67,7 @@ public class LineInfo {
public LineInfo(String nodeID1, String nodeID2) {
this.nodeID1 = nodeID1;
this.nodeID2 = nodeID2;
- lineAttributes = new HashMap<String, String>();
+ lineAttributes = new HashMap<>();
}
public LineInfo clone() {
@@ -167,7 +167,7 @@ public class LineInfo {
public List<String> getAttributeKeys() {
Set<String> keySet = lineAttributes.keySet();
- List<String> keys = new ArrayList<String>(keySet.size());
+ List<String> keys = new ArrayList<>(keySet.size());
Iterator<String> iter = keySet.iterator();
while (iter.hasNext()) {
@@ -183,7 +183,7 @@ public class LineInfo {
public List<String> getAttributeInternalKeys() {
Set<String> keySet = lineAttributes.keySet();
- List<String> internalKeys = new ArrayList<String>();
+ List<String> internalKeys = new ArrayList<>();
Iterator<String> iter = keySet.iterator();
while (iter.hasNext()) {
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/ColorProperties.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/ColorProperties.java
index 5ce752a7..6e1d7e24 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/ColorProperties.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/map/ColorProperties.java
@@ -51,7 +51,7 @@ public class ColorProperties {
public ColorProperties(NovaMap map) {
this.map = map;
- colorProperties = new HashMap<String, Object>();
+ colorProperties = new HashMap<>();
}
public void setColor(String type, String color) {
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java
index 60e7a166..4764ef50 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java
@@ -59,8 +59,8 @@ public class Node {
public Node(NovaMap map) {
this.map = map;
nodeCollection = new NodeCollection();
- nodeIDSet = new HashSet<String>();
- selectionList = new ArrayList<String>();
+ nodeIDSet = new HashSet<>();
+ selectionList = new ArrayList<>();
}
public NodeInfo addNode(NodeParam nodeParam) {
@@ -121,7 +121,7 @@ public class Node {
public Set<Integer> getUniqueNumberT1(String currentYearMonth) {
HashMap<String,NodeInfo> hashMap = this.nodeCollection.getNodeCollection();
Set set = hashMap.entrySet();
- Set<Integer> numberT1Set = new TreeSet<Integer>();
+ Set<Integer> numberT1Set = new TreeSet<>();
for (Iterator iterator = set.iterator(); iterator.hasNext();) {
Map.Entry entry = (Map.Entry) iterator.next();
@@ -172,7 +172,7 @@ public class Node {
}
if (existNodeInfo == null) {
- existNodeInfo = new ArrayList<NodeInfo>();
+ existNodeInfo = new ArrayList<>();
}
existNodeInfo.add(nodeInfo);
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeCollection.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeCollection.java
index 5c3f938a..e630f52c 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeCollection.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeCollection.java
@@ -53,8 +53,8 @@ public class NodeCollection {
private HashMap<String,NodeInfo> nodeCollection;
public NodeCollection() {
- selectedNode = new HashSet<String>();
- nodeCollection = new HashMap<String,NodeInfo>(20000);
+ selectedNode = new HashSet<>();
+ nodeCollection = new HashMap<>(20000);
}
public void addSelectedNode(String nodeID) {
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeInfo.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeInfo.java
index 611debc3..8f4473ce 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeInfo.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeInfo.java
@@ -64,8 +64,8 @@ public class NodeInfo {
public NodeInfo(String nodeID) {
this.nodeID = nodeID;
- lineIDS = new ArrayList<String>();
- nodeAttributes = new TreeMap<String, String>();
+ lineIDS = new ArrayList<>();
+ nodeAttributes = new TreeMap<>();
geoCoordinate = new GeoCoordinate();
}
@@ -117,7 +117,7 @@ public class NodeInfo {
}
public List<String> cloneLineIDS() {
- List<String> lineIDS = new ArrayList<String>();
+ List<String> lineIDS = new ArrayList<>();
for (String lineID : this.lineIDS) {
lineIDS.add(lineID);
@@ -171,8 +171,7 @@ public class NodeInfo {
}
public String getAttribute(String key) {
- String value = nodeAttributes.get(key);
- return value;
+ return nodeAttributes.get(key);
}
public void initializeAttributes(Map<String, String> nodeAttributes) {
@@ -212,7 +211,7 @@ public class NodeInfo {
public List<String> getAttributeKeys() {
Set<String> keySet = nodeAttributes.keySet();
- List<String> keys = new ArrayList<String>(keySet.size());
+ List<String> keys = new ArrayList<>(keySet.size());
Iterator<String> iter = keySet.iterator();
while (iter.hasNext()) {