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=8091ac300e514cd1748c4dfad661fd09fba461d1;hpb=a05efb7b7b3cfc77f5e3fda11e8434834829f56a;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 8091ac3..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
@@ -38,7 +38,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
 
 import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
 import org.onap.dmaap.dbcapi.model.ApiError;
@@ -46,6 +45,9 @@ import org.onap.dmaap.dbcapi.model.DR_Node;
 import org.onap.dmaap.dbcapi.service.ApiService;
 import org.onap.dmaap.dbcapi.service.DR_NodeService;
 
+import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+import static javax.ws.rs.core.Response.Status.NO_CONTENT;
+
 @Path("/dr_nodes")
 @Api( value= "dr_nodes", description = "Endpoint for a Data Router Node server" )
 @Consumes(MediaType.APPLICATION_JSON)
@@ -53,7 +55,9 @@ import org.onap.dmaap.dbcapi.service.DR_NodeService;
 @Authorization
 public class DR_NodeResource extends BaseLoggingClass {
 
-	DR_NodeService dr_nodeService = new DR_NodeService();
+	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", 
@@ -64,13 +68,11 @@ public class DR_NodeResource extends BaseLoggingClass {
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	public Response getDr_Nodes() {
-		ApiService resp = new ApiService();
-
 		List<DR_Node> nodes = dr_nodeService.getAllDr_Nodes();
 
 		GenericEntity<List<DR_Node>> list = new GenericEntity<List<DR_Node>>(nodes) {
         };
-        return resp.success(list);
+        return responseBuilder.success(list);
 	}
 	
 	@POST
@@ -87,20 +89,17 @@ 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 ) {
-			resp.setCode(Status.BAD_REQUEST.getStatusCode());
-			resp.setMessage("missing required field");
-			resp.setFields("dcaeLocation, fqdn");
-			
-			return resp.error();
+			return responseBuilder.error(new ApiError(BAD_REQUEST.getStatusCode(),
+					"missing required field", "dcaeLocation, fqdn"));
 		}
 		DR_Node nNode = dr_nodeService.addDr_Node(node, resp.getErr());
 		if ( resp.getErr().is2xx()) {
-			return resp.success(nNode);
+			return responseBuilder.success(nNode);
 		}
-		return resp.error();
+		return responseBuilder.error(resp.getErr());
 	}
 	
 	@PUT
@@ -119,17 +118,18 @@ 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 resp.error();	
+			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());
 		if ( resp.getErr().is2xx()) {
-			return resp.success(nNode);
+			return responseBuilder.success(nNode);
 		}
-		return resp.error();
+		return responseBuilder.error(resp.getErr());
 	}
 	
 	@DELETE
@@ -144,20 +144,13 @@ 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 resp.error();	
-		}
 		dr_nodeService.removeDr_Node(name, resp.getErr());
 		if ( resp.getErr().is2xx() ) {
-			return resp.success(Status.NO_CONTENT.getStatusCode(), null);
+			return responseBuilder.success(NO_CONTENT.getStatusCode(), null);
 		}
-		return resp.error();
+		return responseBuilder.error(resp.getErr());
 	}
 
 	@GET
@@ -176,8 +169,8 @@ public class DR_NodeResource extends BaseLoggingClass {
 
 		DR_Node nNode = dr_nodeService.getDr_Node( name, resp.getErr() );
 		if ( resp.getErr().is2xx() ) {
-			return resp.success(nNode);
+			return responseBuilder.success(nNode);
 		}
-		return resp.error();
+		return responseBuilder.error(resp.getErr());
 	}
 }