X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FDR_NodeResource.java;h=d29f353a882133e5450cee3caf95168c78bb3359;hb=ad7fb12850f0c9b17e32c9904f63e83ae5ee6264;hp=029222e4b60468b7039630caa6eebd2ac197f2e2;hpb=cee37b37655ed5a52078e37c7da51c887e2d73e5;p=dmaap%2Fdbcapi.git

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 029222e..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
@@ -57,6 +57,7 @@ public class DR_NodeResource extends BaseLoggingClass {
 
 	private DR_NodeService dr_nodeService = new DR_NodeService();
 	private ResponseBuilder responseBuilder = new ResponseBuilder();
+	private RequiredChecker checker = new RequiredChecker();
 	
 	@GET
 	@ApiOperation( value = "return DR_Node details", 
@@ -88,8 +89,8 @@ public class DR_NodeResource extends BaseLoggingClass {
 		ApiService resp = new ApiService();
 
 		try {
-			resp.required( "dcaeLocation", node.getDcaeLocationName(), "");
-			resp.required( "fqdn", node.getFqdn(), "");
+			checker.required( "dcaeLocation", node.getDcaeLocationName());
+			checker.required( "fqdn", node.getFqdn());
 		} catch ( RequiredFieldException rfe ) {
 			return responseBuilder.error(new ApiError(BAD_REQUEST.getStatusCode(),
 					"missing required field", "dcaeLocation, fqdn"));
@@ -117,10 +118,11 @@ public class DR_NodeResource extends BaseLoggingClass {
 		ApiService resp = new ApiService();
 
 		try {
-			resp.required( "dcaeLocation", name, "");
-			resp.required( "fqdn", node.getFqdn(), "");
+			checker.required( "dcaeLocation", node.getDcaeLocationName());
+			checker.required( "fqdn", node.getFqdn());
 		} catch ( RequiredFieldException rfe ) {
-			return responseBuilder.error(resp.getErr());
+			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());
@@ -142,15 +144,8 @@ public class DR_NodeResource extends BaseLoggingClass {
 	public Response deleteDr_Node( 
 			@PathParam("fqdn") String name
 			){
-
 		ApiService resp = new ApiService();
 
-		try {
-			resp.required( "fqdn", name, "");
-		} catch ( RequiredFieldException rfe ) {
-			logger.debug( resp.toString() );
-			return responseBuilder.error(resp.getErr());
-		}
 		dr_nodeService.removeDr_Node(name, resp.getErr());
 		if ( resp.getErr().is2xx() ) {
 			return responseBuilder.success(NO_CONTENT.getStatusCode(), null);