X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FMR_ClusterResource.java;h=0a361ffbb9d39eef49742aeb6c747c6c11608708;hb=ea44032b89d04201924f7ca1551cb33ed49b947e;hp=5d2d379d946494ee5156932417065a407ff25cca;hpb=cee37b37655ed5a52078e37c7da51c887e2d73e5;p=dmaap%2Fdbcapi.git

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 5d2d379..0a361ff 100644
--- 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,7 +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_ClusterService;
 
 
@@ -56,6 +55,7 @@ public class MR_ClusterResource extends BaseLoggingClass {
 
 	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", 
@@ -81,21 +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 responseBuilder.error(resp.getErr());
+			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 responseBuilder.success(Status.CREATED.getStatusCode(), mrc);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 
 	}
 		
@@ -108,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 responseBuilder.error(resp.getErr());
+			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 responseBuilder.success(Status.CREATED.getStatusCode(), mrc);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 		
 	@DELETE
@@ -137,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 responseBuilder.error(resp.getErr());
+			return responseBuilder.error(rfe.getApiError());
 		}
-		mr_clusterService.removeMr_Cluster(id, resp.getErr() );
-		if ( resp.getErr().is2xx()) {
+		mr_clusterService.removeMr_Cluster(id, apiError);
+		if (apiError.is2xx()) {
 			return responseBuilder.success(Status.NO_CONTENT.getStatusCode(), null);
 		} 
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 
 	@GET
@@ -163,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 responseBuilder.error(resp.getErr());
+			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 responseBuilder.success(Status.CREATED.getStatusCode(), mrc);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 }