From 37ed86ed44e466409ac6d0ab425589377ab33c81 Mon Sep 17 00:00:00 2001 From: Krishnakumar Jinka Date: Sun, 2 Dec 2018 22:22:25 +0900 Subject: Fix sonar issue in node Fix issue reported by sonar on more than allowed params in method using a builder object. Issue-ID: PORTAL-481 Change-Id: I0b88f083253570aa1a1f1be2c8af2d2bb3334e50 Signed-off-by: krisjinka --- .../onap/portalsdk/analytics/gmap/node/Node.java | 26 ++--- .../portalsdk/analytics/gmap/node/NodeParam.java | 122 +++++++++++++++++++++ 2 files changed, 135 insertions(+), 13 deletions(-) create mode 100644 ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeParam.java (limited to 'ecomp-sdk/epsdk-analytics/src/main') 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(); } - 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 -- cgit 1.2.3-korg