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
Extract required(...) method
[dmaap/dbcapi.git]
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
dbcapi
/
resources
/
MR_ClusterResource.java
diff --git
a/src/main/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResource.java
b/src/main/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResource.java
index
50ab4db
..
598fcc2
100644
(file)
--- a/
src/main/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResource.java
+++ b/
src/main/java/org/onap/dmaap/dbcapi/resources/MR_ClusterResource.java
@@
-44,7
+44,6
@@
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
import org.onap.dmaap.dbcapi.model.ApiError;
import org.onap.dmaap.dbcapi.model.MR_Cluster;
import org.onap.dmaap.dbcapi.service.ApiService;
import org.onap.dmaap.dbcapi.model.ApiError;
import org.onap.dmaap.dbcapi.model.MR_Cluster;
import org.onap.dmaap.dbcapi.service.ApiService;
-import org.onap.dmaap.dbcapi.service.MR_ClientService;
import org.onap.dmaap.dbcapi.service.MR_ClusterService;
import org.onap.dmaap.dbcapi.service.MR_ClusterService;
@@
-55,8
+54,9
@@
import org.onap.dmaap.dbcapi.service.MR_ClusterService;
@Authorization
public class MR_ClusterResource extends BaseLoggingClass {
@Authorization
public class MR_ClusterResource extends BaseLoggingClass {
- MR_ClusterService mr_clusterService = new MR_ClusterService();
- MR_ClientService mr_clients = new MR_ClientService();
+ private MR_ClusterService mr_clusterService = new MR_ClusterService();
+ private ResponseBuilder responseBuilder = new ResponseBuilder();
+ private RequiredChecker checker = new RequiredChecker();
@GET
@ApiOperation( value = "return MR_Cluster details",
@GET
@ApiOperation( value = "return MR_Cluster details",
@@
-67,13
+67,11
@@
public class MR_ClusterResource extends BaseLoggingClass {
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response getMr_Clusters() {
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response getMr_Clusters() {
- ApiService resp = new ApiService();
-
List<MR_Cluster> clusters = mr_clusterService.getAllMr_Clusters();
GenericEntity<List<MR_Cluster>> list = new GenericEntity<List<MR_Cluster>>(clusters) {
};
List<MR_Cluster> clusters = mr_clusterService.getAllMr_Clusters();
GenericEntity<List<MR_Cluster>> list = new GenericEntity<List<MR_Cluster>>(clusters) {
};
- return resp.success(list);
+ return resp
onseBuilder
.success(list);
}
@POST
}
@POST
@@
-85,21
+83,20
@@
public class MR_ClusterResource extends BaseLoggingClass {
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response addMr_Cluster(
@ApiResponse( code = 400, message = "Error", response = ApiError.class )
})
public Response addMr_Cluster(
- MR_Cluster cluster
- ) {
+ MR_Cluster cluster) {
ApiService resp = new ApiService();
try {
ApiService resp = new ApiService();
try {
- resp.required( "dcaeLocationName", cluster.getDcaeLocationName(), "" );
-
resp.required( "fqdn", cluster.getFqdn(), ""
);
+ checker.required( "dcaeLocationName", cluster.getDcaeLocationName());
+
checker.required( "fqdn", cluster.getFqdn()
);
} catch( RequiredFieldException rfe ) {
} catch( RequiredFieldException rfe ) {
- return resp
.error(
);
+ return resp
onseBuilder.error(rfe.getApiError()
);
}
MR_Cluster mrc = mr_clusterService.addMr_Cluster(cluster, resp.getErr() );
if ( mrc != null && mrc.isStatusValid() ) {
}
MR_Cluster mrc = mr_clusterService.addMr_Cluster(cluster, resp.getErr() );
if ( mrc != null && mrc.isStatusValid() ) {
- return resp.success(Status.CREATED.getStatusCode(), mrc);
+ return resp
onseBuilder
.success(Status.CREATED.getStatusCode(), mrc);
}
}
- return resp
.error(
);
+ return resp
onseBuilder.error(resp.getErr()
);
}
}
@@
-119,17
+116,17
@@
public class MR_ClusterResource extends BaseLoggingClass {
ApiService resp = new ApiService();
try {
ApiService resp = new ApiService();
try {
-
resp.required( "fqdn", clusterId, ""
);
- resp.required( "dcaeLocationName", cluster.getDcaeLocationName(), "" );
+
checker.required( "fqdn", clusterId
);
+ checker.required( "dcaeLocationName", cluster.getDcaeLocationName());
} catch( RequiredFieldException rfe ) {
} catch( RequiredFieldException rfe ) {
- return resp
.error(
);
+ return resp
onseBuilder.error(rfe.getApiError()
);
}
cluster.setDcaeLocationName(clusterId);
MR_Cluster mrc = mr_clusterService.updateMr_Cluster(cluster, resp.getErr() );
if ( mrc != null && mrc.isStatusValid() ) {
}
cluster.setDcaeLocationName(clusterId);
MR_Cluster mrc = mr_clusterService.updateMr_Cluster(cluster, resp.getErr() );
if ( mrc != null && mrc.isStatusValid() ) {
- return resp.success(Status.CREATED.getStatusCode(), mrc);
+ return resp
onseBuilder
.success(Status.CREATED.getStatusCode(), mrc);
}
}
- return resp
.error(
);
+ return resp
onseBuilder.error(resp.getErr()
);
}
@DELETE
}
@DELETE
@@
-147,15
+144,15
@@
public class MR_ClusterResource extends BaseLoggingClass {
ApiService resp = new ApiService();
try {
ApiService resp = new ApiService();
try {
-
resp.required( "fqdn", id, ""
);
+
checker.required( "fqdn", id
);
} catch( RequiredFieldException rfe ) {
} catch( RequiredFieldException rfe ) {
- return resp
.error(
);
+ return resp
onseBuilder.error(rfe.getApiError()
);
}
mr_clusterService.removeMr_Cluster(id, resp.getErr() );
if ( resp.getErr().is2xx()) {
}
mr_clusterService.removeMr_Cluster(id, resp.getErr() );
if ( resp.getErr().is2xx()) {
- return resp.success(Status.NO_CONTENT.getStatusCode(), null);
+ return resp
onseBuilder
.success(Status.NO_CONTENT.getStatusCode(), null);
}
}
- return resp
.error(
);
+ return resp
onseBuilder.error(resp.getErr()
);
}
@GET
}
@GET
@@
-173,14
+170,14
@@
public class MR_ClusterResource extends BaseLoggingClass {
ApiService resp = new ApiService();
try {
ApiService resp = new ApiService();
try {
-
resp.required( "dcaeLocationName", id, ""
);
+
checker.required( "dcaeLocationName", id
);
} catch( RequiredFieldException rfe ) {
} catch( RequiredFieldException rfe ) {
- return resp
.error(
);
+ return resp
onseBuilder.error(rfe.getApiError()
);
}
MR_Cluster mrc = mr_clusterService.getMr_Cluster( id, resp.getErr() );
if ( mrc != null && mrc.isStatusValid() ) {
}
MR_Cluster mrc = mr_clusterService.getMr_Cluster( id, resp.getErr() );
if ( mrc != null && mrc.isStatusValid() ) {
- return resp.success(Status.CREATED.getStatusCode(), mrc);
+ return resp
onseBuilder
.success(Status.CREATED.getStatusCode(), mrc);
}
}
- return resp
.error(
);
+ return resp
onseBuilder.error(resp.getErr()
);
}
}
}
}