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=f00113624f1614bb23cad2f3c1e9fde201ab2c55;hb=ea44032b89d04201924f7ca1551cb33ed49b947e;hp=029222e4b60468b7039630caa6eebd2ac197f2e2;hpb=3a647d5a400d5e929b314e10ff99aea9cd779c61;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..f001136 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
@@ -42,7 +42,6 @@ import javax.ws.rs.core.Response;
 import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
 import org.onap.dmaap.dbcapi.model.ApiError;
 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;
@@ -57,6 +56,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", 
@@ -82,23 +82,22 @@ public class DR_NodeResource extends BaseLoggingClass {
 	    @ApiResponse( code = 200, message = "Success", response = DR_Node.class),
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
-	public Response addDr_Node( 
-			DR_Node node
-			) {
-		ApiService resp = new ApiService();
+	public Response addDr_Node(DR_Node node) {
+
+		ApiError apiError = new ApiError();
 
 		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"));
 		}
-		DR_Node nNode = dr_nodeService.addDr_Node(node, resp.getErr());
-		if ( resp.getErr().is2xx()) {
+		DR_Node nNode = dr_nodeService.addDr_Node(node, apiError);
+		if (apiError.is2xx()) {
 			return responseBuilder.success(nNode);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 	
 	@PUT
@@ -110,24 +109,23 @@ public class DR_NodeResource extends BaseLoggingClass {
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	@Path("/{fqdn}")
-	public Response updateDr_Node( 
-			@PathParam("fqdn") String name, 
-			DR_Node node
-			) {
-		ApiService resp = new ApiService();
+	public Response updateDr_Node(@PathParam("fqdn") String name, DR_Node node) {
+
+		ApiError apiError = new ApiError();
 
 		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());
-		if ( resp.getErr().is2xx()) {
+		DR_Node nNode = dr_nodeService.updateDr_Node(node, apiError);
+		if (apiError.is2xx()) {
 			return responseBuilder.success(nNode);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 	
 	@DELETE
@@ -140,22 +138,16 @@ public class DR_NodeResource extends BaseLoggingClass {
 	})
 	@Path("/{fqdn}")
 	public Response deleteDr_Node( 
-			@PathParam("fqdn") String name
-			){
+			@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() ) {
+		ApiError apiError = new ApiError();
+
+		dr_nodeService.removeDr_Node(name, apiError);
+		if (apiError.is2xx()) {
 			return responseBuilder.success(NO_CONTENT.getStatusCode(), null);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 
 	@GET
@@ -167,15 +159,14 @@ public class DR_NodeResource extends BaseLoggingClass {
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	@Path("/{fqdn}")
-	public Response get( 
-			@PathParam("fqdn") String name
-			) {
-		ApiService resp = new ApiService();
+	public Response get(@PathParam("fqdn") String name) {
+
+		ApiError apiError = new ApiError();
 
-		DR_Node nNode = dr_nodeService.getDr_Node( name, resp.getErr() );
-		if ( resp.getErr().is2xx() ) {
+		DR_Node nNode = dr_nodeService.getDr_Node( name, apiError );
+		if (apiError.is2xx()) {
 			return responseBuilder.success(nNode);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 }