Tests for DR_NodeResource & bugfixes

Change-Id: I7e1767b63e3cd091718bbf1d0d38e5232b7ae7e9
Issue-ID: DMAAP-1149
Signed-off-by: piotr.karas <piotr.karas@nokia.com>

3 files changed, 21 insertions, 11 deletions

diff --git a/src/main/java/org/onap/dmaap/dbcapi/model/DR_Node.java b/src/main/java/org/onap/dmaap/dbcapi/model/DR_Node.java
index a85f040..4b2ef90 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/model/DR_Node.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/model/DR_Node.java
@@ -21,6 +21,7 @@
 package org.onap.dmaap.dbcapi.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Objects;
 
 @XmlRootElement
 public class DR_Node extends DmaapObject {
@@ -75,4 +76,19 @@ public class DR_Node extends DmaapObject {
 		this.version = version;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+		DR_Node dr_node = (DR_Node) o;
+		return Objects.equals(fqdn, dr_node.fqdn) &&
+				Objects.equals(dcaeLocationName, dr_node.dcaeLocationName) &&
+				Objects.equals(hostName, dr_node.hostName) &&
+				Objects.equals(version, dr_node.version);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(fqdn, dcaeLocationName, hostName, version);
+	}
 }
diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/DR_NodeResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/DR_NodeResource.java
index 49dc69a..d29f353 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/DR_NodeResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/DR_NodeResource.java
@@ -118,10 +118,11 @@ public class DR_NodeResource extends BaseLoggingClass {
 		ApiService resp = new ApiService();
 
 		try {
-			checker.required( "dcaeLocation", name);
+			checker.required( "dcaeLocation", node.getDcaeLocationName());
 			checker.required( "fqdn", node.getFqdn());
 		} catch ( RequiredFieldException rfe ) {
-			return responseBuilder.error(rfe.getApiError());
+			return responseBuilder.error(new ApiError(BAD_REQUEST.getStatusCode(),
+					"missing required field", "dcaeLocation, fqdn"));
 		}
 		node.setFqdn(name);
 		DR_Node nNode = dr_nodeService.updateDr_Node(node, resp.getErr());
@@ -143,15 +144,8 @@ public class DR_NodeResource extends BaseLoggingClass {
 	public Response deleteDr_Node( 
 			@PathParam("fqdn") String name
 			){
-
 		ApiService resp = new ApiService();
 
-		try {
-			checker.required( "fqdn", name);
-		} catch ( RequiredFieldException rfe ) {
-			logger.debug( rfe.getApiError().toString() );
-			return responseBuilder.error(rfe.getApiError());
-		}
 		dr_nodeService.removeDr_Node(name, resp.getErr());
 		if ( resp.getErr().is2xx() ) {
 			return responseBuilder.success(NO_CONTENT.getStatusCode(), null);
diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java
index b478dca..9181154 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java
@@ -215,11 +215,11 @@ public class DR_NodeService extends BaseLoggingClass {
 	}
 	
 	public DR_Node updateDr_Node( DR_Node node, ApiError apiError ) {
-		DR_Node old = dr_nodes.get( node );
+		DR_Node old = dr_nodes.get( node.getFqdn() );
 		if ( old == null ) {
 			apiError.setCode(Status.NOT_FOUND.getStatusCode());
 			apiError.setFields( "fqdn");
-			apiError.setMessage( "Node " + node + " does not exist");
+			apiError.setMessage( "Node " + node.getFqdn() + " does not exist");
 			return null;
 		}
 		node.setLastMod();