summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java26
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeParam.java122
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java17
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java74
4 files changed, 204 insertions, 35 deletions
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 bb04c335..60e7a166 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
@@ -3,6 +3,7 @@
* ONAP Portal SDK
* ===================================================================
* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
@@ -62,20 +63,19 @@ public class Node {
selectionList = new ArrayList<String>();
}
- public NodeInfo addNode(double longitude, double latitude, String nodeType, String nodeID,
- String nodeAttributes, int state, boolean moveable, boolean deleteable) {
- NodeInfo nodeInfo = new NodeInfo(nodeID);
- nodeInfo.geoCoordinate.longitude = longitude;
- nodeInfo.geoCoordinate.latitude = latitude;
- nodeInfo.setNodeType(nodeType);
- nodeInfo.setState(state);
- nodeInfo.setMoveable(moveable);
- nodeInfo.setDeleteable(deleteable);
- nodeInfo.initializeAttributes(nodeAttributes);
+ public NodeInfo addNode(NodeParam nodeParam) {
+ NodeInfo nodeInfo = new NodeInfo(nodeParam.getNodeID());
+ nodeInfo.geoCoordinate.longitude = nodeParam.getLongitude();
+ nodeInfo.geoCoordinate.latitude = nodeParam.getLatitude();
+ nodeInfo.setNodeType(nodeParam.getNodeType());
+ nodeInfo.setState(nodeParam.getState());
+ nodeInfo.setMoveable(nodeParam.isMoveable());
+ nodeInfo.setDeleteable(nodeParam.isDeleteable());
+ nodeInfo.initializeAttributes(nodeParam.getNodeAttributes());
- //if (nodeCollection.getNode(nodeInfo.getNodeID()+""+nodeInfo.getNodeType()) == null) {
- nodeCollection.addNode(nodeInfo);
- nodeIDSet.add(nodeID);
+ //if (nodeCollection.getNode(nodeInfo.getNodeID()+""+nodeInfo.getNodeType()) == null) {
+ nodeCollection.addNode(nodeInfo);
+ nodeIDSet.add(nodeParam.getNodeID());
/* }
else {
return nodeCollection.getNode(nodeType);
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeParam.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeParam.java
new file mode 100644
index 00000000..cdb4aca0
--- /dev/null
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeParam.java
@@ -0,0 +1,122 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ *
+ */
+package org.onap.portalsdk.analytics.gmap.node;
+
+public class NodeParam {
+
+ private double longitude;
+ private double latitude;
+ private String nodeType;
+ private String nodeID;
+ private String nodeAttributes;
+ private int state;
+ private boolean moveable;
+ private boolean deleteable;
+
+ public double getLongitude() {
+ return longitude;
+ }
+
+ public double getLatitude() {
+ return latitude;
+ }
+
+ public String getNodeType() {
+ return nodeType;
+ }
+
+ public String getNodeID() {
+ return nodeID;
+ }
+
+ public String getNodeAttributes() {
+ return nodeAttributes;
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public boolean isMoveable() {
+ return moveable;
+ }
+
+ public boolean isDeleteable() {
+ return deleteable;
+ }
+
+ public NodeParam setLongitude(double longitude) {
+ this.longitude = longitude;
+ return this;
+ }
+
+ public NodeParam setLatitude(double latitude) {
+ this.latitude = latitude;
+ return this;
+ }
+
+ public NodeParam setNodeType(String nodeType) {
+ this.nodeType = nodeType;
+ return this;
+ }
+
+ public NodeParam setNodeID(String nodeID) {
+ this.nodeID = nodeID;
+ return this;
+ }
+
+ public NodeParam setNodeAttributes(String nodeAttributes) {
+ this.nodeAttributes = nodeAttributes;
+ return this;
+ }
+
+ public NodeParam setState(int state) {
+ this.state = state;
+ return this;
+ }
+
+ public NodeParam setMoveable(boolean moveable) {
+ this.moveable = moveable;
+ return this;
+ }
+
+ public NodeParam setDeleteable(boolean deleteable) {
+ this.deleteable = deleteable;
+ return this;
+ }
+} \ No newline at end of file
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java
index e52d01b6..100525bc 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java
@@ -3,6 +3,7 @@
* ONAP Portal SDK
* ===================================================================
* Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
@@ -52,6 +53,7 @@ import org.onap.portalsdk.analytics.gmap.line.Line;
import org.onap.portalsdk.analytics.gmap.map.ColorProperties;
import org.onap.portalsdk.analytics.gmap.map.NovaMap;
import org.onap.portalsdk.analytics.gmap.node.Node;
+import org.onap.portalsdk.analytics.gmap.node.NodeParam;
import org.onap.portalsdk.analytics.xmlobj.MockitoTestSuite;
import org.springframework.test.util.ReflectionTestUtils;
@@ -81,9 +83,18 @@ public class SwingLayerTest {
novaMap.setShowLegend(true);
ReflectionTestUtils.setField(novaMap, "transform", new AffineTransform());
Node nodeObj = new Node(new NovaMap());
- nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true);
- nodeObj.addNode(13.14d, 10.11d, "nodeType", "nodeID", "type=international|year=2017", 13, true, true);
- nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true);
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.14d).setLatitude(10.11d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=international|year=2017").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true)
+ .setDeleteable(true));
novaMap.setNode(nodeObj);
swingLayer = new SwingLayer(novaMap);
BufferedImage image = new BufferedImage(novaMap.getBoundingBox().width, novaMap.getBoundingBox().height, BufferedImage.TYPE_INT_ARGB);
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java
index a6cd2933..bd46e25a 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java
@@ -3,6 +3,7 @@
* ONAP Portal SDK
* ===================================================================
* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd.
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
@@ -51,6 +52,7 @@ import org.mockito.Mockito;
import org.onap.portalsdk.analytics.gmap.map.ColorProperties;
import org.onap.portalsdk.analytics.gmap.map.NovaMap;
import org.onap.portalsdk.analytics.gmap.node.Node;
+import org.onap.portalsdk.analytics.gmap.node.NodeParam;
import org.springframework.test.util.ReflectionTestUtils;
public class NodeTest {
@@ -72,9 +74,12 @@ public class NodeTest {
Node nodeObj = new Node(new NovaMap());
Double longitude = 13.13d;
Double latitude =28.28d;
- NodeInfo nodeINfo = nodeObj.addNode(longitude, latitude, "nodeType", "nodeID", "nodeAttributes", 13, true, true);
+ NodeInfo nodeINfo = nodeObj.addNode(
+ new NodeParam().setLongitude(longitude).setLatitude(latitude).setNodeType("nodeType")
+ .setNodeID("nodeID").setNodeAttributes("nodeAttributes").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ assertNotNull(nodeINfo);
assertNotNull(nodeINfo);
-
assertEquals((Double)longitude,(Double)nodeINfo.geoCoordinate.longitude);
assertEquals((Double)latitude,(Double)nodeINfo.geoCoordinate.latitude);
assertEquals("nodeType",nodeINfo.getNodeType());
@@ -87,11 +92,19 @@ public class NodeTest {
public void testUpdateNumberCase1() {
Node nodeObj = new Node(new NovaMap());
-
- nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2018", 13, true, true);
- nodeObj.addNode(13.14d, 10.11d, "nodeType", "nodeID", "type=international|year=2018", 13, true, true);
- nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true);
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=domestic|year=2018").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.14d).setLatitude(10.11d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=international|year=2018").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true)
+ .setDeleteable(true));
nodeObj.updateNumberT1("year");
HashMap<String,NodeInfo> hashMap = nodeObj.getNodeCollection().getNodeCollection();
@@ -169,10 +182,18 @@ public class NodeTest {
novaMap.setColorProperties(new ColorProperties(novaMap));
ReflectionTestUtils.setField(novaMap, "transform", new AffineTransform());
Node nodeObj = new Node(novaMap);
- nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true);
- nodeObj.addNode(13.14d, 10.11d, "nodeType", "nodeID", "type=international|year=2017", 13, true, true);
- nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true);
-
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.14d).setLatitude(10.11d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=international|year=2017").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true)
+ .setDeleteable(true));
Point pointObj= new Point(3,3);
nodeObj.nodeExist(pointObj);
// assertNotNull(existNodeInfo);
@@ -185,9 +206,14 @@ public class NodeTest {
@Test
public void testGetNodeCollection() {
Node nodeObj = new Node(new NovaMap());
- nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true);
- nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true);
-
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true)
+ .setDeleteable(true));
nodeObj.getNodeCollection();
assertNotNull(nodeObj.getNodeCollection());
}
@@ -195,8 +221,14 @@ public class NodeTest {
@Test
public void testClearNodeIDSet() {
Node nodeObj = new Node(new NovaMap());
- nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true);
- nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true);
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true)
+ .setDeleteable(true));
nodeObj.clearNodeIDSet();
}
@@ -204,10 +236,15 @@ public class NodeTest {
public void testClearSelectionList() {
Node nodeObj = new Node(new NovaMap());
- nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true);
- nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true);
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true)
+ .setDeleteable(true));
+ nodeObj.addNode(
+ new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID")
+ .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true)
+ .setDeleteable(true));
nodeObj.clearSelectionList();
-
}
@Test
@@ -216,5 +253,4 @@ public class NodeTest {
nodeObj.clearSelectionList();
}
-
}