X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdbcapi.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FDR_NodeResource.java;h=d29f353a882133e5450cee3caf95168c78bb3359;hp=49dc69a855b758140c436ee318c9dd16aaa0f903;hb=ad7fb12850f0c9b17e32c9904f63e83ae5ee6264;hpb=81352e8c9570dc8e442ca61edfb991d34b62eb08 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);