Code Review
/
dmaap
/
dbcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Tests for DR_NodeResource & bugfixes
[dmaap/dbcapi.git]
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
resources
/
DR_NodeResource.java
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
(file)
--- 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 DR_NodeService dr_nodeService = new DR_NodeService();
private ResponseBuilder responseBuilder = new ResponseBuilder();
+ private RequiredChecker checker = new RequiredChecker();
@GET
@ApiOperation( value = "return DR_Node details",
@GET
@ApiOperation( value = "return DR_Node details",
@@
-88,8
+89,8
@@
public class DR_NodeResource extends BaseLoggingClass {
ApiService resp = new ApiService();
try {
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"));
} 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 {
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 ) {
} 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());
}
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
){
public Response deleteDr_Node(
@PathParam("fqdn") String name
){
-
ApiService resp = new ApiService();
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);
dr_nodeService.removeDr_Node(name, resp.getErr());
if ( resp.getErr().is2xx() ) {
return responseBuilder.success(NO_CONTENT.getStatusCode(), null);