Changes for OpenJDK 11

[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..0a361ff 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
@@ -43,8 +43,6 @@ import javax.ws.rs.core.Response.Status;
 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.service.MR_ClientService;
 import org.onap.dmaap.dbcapi.service.MR_ClusterService;
 
 
@@ -55,8 +53,9 @@ import org.onap.dmaap.dbcapi.service.MR_ClusterService;
 @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", 
@@ -67,13 +66,11 @@ public class MR_ClusterResource extends BaseLoggingClass {
            @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) {
         };
-        return resp.success(list);
+        return responseBuilder.success(list);
        }
                
        @POST
@@ -84,22 +81,20 @@ public class MR_ClusterResource extends BaseLoggingClass {
            @ApiResponse( code = 200, message = "Success", response = MR_Cluster.class),
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
-       public Response  addMr_Cluster( 
-                       MR_Cluster cluster
-                       ) {
-               ApiService resp = new ApiService();
+       public Response  addMr_Cluster(MR_Cluster cluster) {
+               ApiError apiError = new ApiError();
 
                try {
-                       resp.required( "dcaeLocationName", cluster.getDcaeLocationName(), "" );  
-                       resp.required( "fqdn", cluster.getFqdn(), "" );
+                       checker.required( "dcaeLocationName", cluster.getDcaeLocationName());
+                       checker.required( "fqdn", cluster.getFqdn());
                } catch( RequiredFieldException rfe ) {
-                       return resp.error();
+                       return responseBuilder.error(rfe.getApiError());
                }
-               MR_Cluster mrc =  mr_clusterService.addMr_Cluster(cluster, resp.getErr() );
+               MR_Cluster mrc =  mr_clusterService.addMr_Cluster(cluster, apiError);
                if ( mrc != null && mrc.isStatusValid() ) {
-                       return resp.success(Status.CREATED.getStatusCode(), mrc);
+                       return responseBuilder.success(Status.CREATED.getStatusCode(), mrc);
                }
-               return resp.error();
+               return responseBuilder.error(apiError);
 
        }
                
@@ -112,24 +107,21 @@ public class MR_ClusterResource extends BaseLoggingClass {
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
        @Path("/{clusterId}")
-       public Response updateMr_Cluster( 
-                       @PathParam("clusterId") String clusterId, 
-                       MR_Cluster cluster
-                       ) {
-               ApiService resp = new ApiService();
+       public Response updateMr_Cluster(@PathParam("clusterId") String clusterId, MR_Cluster cluster) {
+               ApiError apiError = new ApiError();
 
                try {
-                       resp.required( "fqdn", clusterId, "" );
-                       resp.required( "dcaeLocationName", cluster.getDcaeLocationName(), "" );  
+                       checker.required( "fqdn", clusterId);
+                       checker.required( "dcaeLocationName", cluster.getDcaeLocationName());
                } catch( RequiredFieldException rfe ) {
-                       return resp.error();
+                       return responseBuilder.error(rfe.getApiError());
                }
                cluster.setDcaeLocationName(clusterId);
-               MR_Cluster mrc =  mr_clusterService.updateMr_Cluster(cluster, resp.getErr() );
+               MR_Cluster mrc =  mr_clusterService.updateMr_Cluster(cluster, apiError);
                if ( mrc != null && mrc.isStatusValid() ) {
-                       return resp.success(Status.CREATED.getStatusCode(), mrc);
+                       return responseBuilder.success(Status.CREATED.getStatusCode(), mrc);
                }
-               return resp.error();
+               return responseBuilder.error(apiError);
        }
                
        @DELETE
@@ -141,21 +133,19 @@ public class MR_ClusterResource extends BaseLoggingClass {
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
        @Path("/{clusterId}")
-       public Response deleteMr_Cluster( 
-                       @PathParam("clusterId") String id
-                       ){
-               ApiService resp = new ApiService();
+       public Response deleteMr_Cluster(@PathParam("clusterId") String id){
+               ApiError apiError = new ApiError();
 
                try {
-                       resp.required( "fqdn", id, "" );
+                       checker.required( "fqdn", id);
                } catch( RequiredFieldException rfe ) {
-                       return resp.error();
+                       return responseBuilder.error(rfe.getApiError());
                }
-               mr_clusterService.removeMr_Cluster(id, resp.getErr() );
-               if ( resp.getErr().is2xx()) {
-                       return resp.success(Status.NO_CONTENT.getStatusCode(), null);
+               mr_clusterService.removeMr_Cluster(id, apiError);
+               if (apiError.is2xx()) {
+                       return responseBuilder.success(Status.NO_CONTENT.getStatusCode(), null);
                } 
-               return resp.error();
+               return responseBuilder.error(apiError);
        }
 
        @GET
@@ -167,20 +157,18 @@ public class MR_ClusterResource extends BaseLoggingClass {
            @ApiResponse( code = 400, message = "Error", response = ApiError.class )
        })
        @Path("/{clusterId}")
-       public Response getMR_Cluster( 
-                       @PathParam("clusterId") String id
-                       ) {
-               ApiService resp = new ApiService();
+       public Response getMR_Cluster(@PathParam("clusterId") String id) {
+               ApiError apiError = new ApiError();
 
                try {
-                       resp.required( "dcaeLocationName", id, "" );
+                       checker.required( "dcaeLocationName", id);
                } catch( RequiredFieldException rfe ) {
-                       return resp.error();
+                       return responseBuilder.error(rfe.getApiError());
                }
-               MR_Cluster mrc =  mr_clusterService.getMr_Cluster( id, resp.getErr() );
+               MR_Cluster mrc =  mr_clusterService.getMr_Cluster(id, apiError);
                if ( mrc != null && mrc.isStatusValid() ) {
-                       return resp.success(Status.CREATED.getStatusCode(), mrc);
+                       return responseBuilder.success(Status.CREATED.getStatusCode(), mrc);
                }
-               return resp.error();
+               return responseBuilder.error(apiError);
        }
 }