X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FDR_SubResource.java;h=2fa6ccdd44d0446d75a114125bfdeb71cfc56182;hb=ea44032b89d04201924f7ca1551cb33ed49b947e;hp=01ac0590535d3340ab3de9708dcb6a19ec2e78e9;hpb=672890f7bcb936426ee5b1c577350496b3c9313d;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/DR_SubResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/DR_SubResource.java
index 01ac059..2fa6ccd 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/DR_SubResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/DR_SubResource.java
@@ -22,6 +22,7 @@
 
 package org.onap.dmaap.dbcapi.resources;
 
+import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,7 +43,6 @@ import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
 import org.onap.dmaap.dbcapi.model.ApiError;
 import org.onap.dmaap.dbcapi.model.DR_Sub;
 import org.onap.dmaap.dbcapi.model.Feed;
-import org.onap.dmaap.dbcapi.service.ApiService;
 import org.onap.dmaap.dbcapi.service.DR_SubService;
 import org.onap.dmaap.dbcapi.service.FeedService;
 
@@ -62,6 +62,7 @@ import static javax.ws.rs.core.Response.Status.CREATED;
 public class DR_SubResource extends BaseLoggingClass {
 
 	private ResponseBuilder responseBuilder = new ResponseBuilder();
+	private RequiredChecker checker = new RequiredChecker();
 		
 	@GET
 	@ApiOperation( value = "return DR_Sub details", 
@@ -88,52 +89,56 @@ public class DR_SubResource extends BaseLoggingClass {
 	    @ApiResponse( code = 200, message = "Success", response = DR_Sub.class),
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
-	public Response addDr_Sub( 
-			DR_Sub sub
-			) {
-	
-		ApiService resp = new ApiService();
+	public Response addDr_Sub(DR_Sub sub) {
+
+		ApiError apiError = new ApiError();
 		FeedService feeds = new FeedService();
 		Feed fnew = null;
 		try {
-			resp.required( "feedId", sub.getFeedId(), "");
+			checker.required( "feedId", sub.getFeedId());
 		} catch ( RequiredFieldException rfe ) {
 			try {
-				resp.required( "feedName", sub.getFeedName(), "");
+				checker.required( "feedName", sub.getFeedName());
 			}catch ( RequiredFieldException rfe2 ) {
-				logger.debug( resp.toString() );
-				return responseBuilder.error(resp.getErr());
+				logger.debug( rfe2.getApiError().toString() );
+				return responseBuilder.error(rfe2.getApiError());
 			}
 			// if we found a FeedName instead of a FeedId then try to look it up.
 			List<Feed> nfeeds =  feeds.getAllFeeds( sub.getFeedName(), sub.getFeedVersion(), "equals");
-			if ( nfeeds.size() != 1 ) {
+			if ( nfeeds.isEmpty() ) {
+				apiError.setCode(Status.NOT_FOUND.getStatusCode());
+				apiError.setFields("feedName");
+				return responseBuilder.error(apiError);
+			} else if (nfeeds.size() > 1) {
 				logger.debug( "Attempt to match "+ sub.getFeedName() + " ver="+sub.getFeedVersion() + " matched " + nfeeds.size() );
-				return responseBuilder.error(resp.getErr());
+				apiError.setCode(Status.CONFLICT.getStatusCode());
+				apiError.setFields("feedName");
+				return responseBuilder.error(apiError);
 			}
-			fnew = nfeeds.get(0);
+			fnew = Iterables.getOnlyElement(nfeeds);
 		}
 			
 		try {
-			resp.required( "dcaeLocationName", sub.getDcaeLocationName(), "");
+			checker.required( "dcaeLocationName", sub.getDcaeLocationName());
 		} catch ( RequiredFieldException rfe ) {
-			logger.debug( resp.toString() );
-			return responseBuilder.error(resp.getErr());
+			logger.debug( rfe.getApiError().toString() );
+			return responseBuilder.error(rfe.getApiError());
 		}
 		// we may have fnew already if located by FeedName
 		if ( fnew == null ) {
-			fnew = feeds.getFeed( sub.getFeedId(), resp.getErr() );
+			fnew = feeds.getFeed( sub.getFeedId(), apiError);
 		}
 		if ( fnew == null ) {
 			logger.warn( "Specified feed " + sub.getFeedId() + " or " + sub.getFeedName() + " not known to Bus Controller");
-			resp.setCode(Status.NOT_FOUND.getStatusCode());
-			return responseBuilder.error(resp.getErr());
+			apiError.setCode(Status.NOT_FOUND.getStatusCode());
+			return responseBuilder.error(apiError);
 		}
 		DR_SubService dr_subService = new DR_SubService( fnew.getSubscribeURL());
 		ArrayList<DR_Sub> subs = fnew.getSubs();
 		logger.info( "num existing subs before = " + subs.size() );
-		DR_Sub snew = dr_subService.addDr_Sub(sub, resp.getErr() );
-		if ( ! resp.getErr().is2xx() ) {
-			return responseBuilder.error(resp.getErr());
+		DR_Sub snew = dr_subService.addDr_Sub(sub, apiError);
+		if (!apiError.is2xx()) {
+			return responseBuilder.error(apiError);
 		}
 		subs.add( snew );
 		logger.info( "num existing subs after = " + subs.size() );
@@ -153,36 +158,33 @@ public class DR_SubResource extends BaseLoggingClass {
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	@Path("/{subId}")
-	public Response updateDr_Sub( 
-			@PathParam("subId") String name, 
-			DR_Sub sub
-			) {
+	public Response updateDr_Sub(@PathParam("subId") String name, DR_Sub sub) {
 
-		ApiService resp = new ApiService();
+		ApiError apiError = new ApiError();
 
 		try {
-			resp.required( "subId", name, "");
-			resp.required( "feedId", sub.getFeedId(), "");
-			resp.required( "dcaeLocationName", sub.getDcaeLocationName(), "");
+			checker.required( "subId", name);
+			checker.required( "feedId", sub.getFeedId());
+			checker.required( "dcaeLocationName", sub.getDcaeLocationName());
 	
 		} catch ( RequiredFieldException rfe ) {
-			logger.debug( resp.toString() );
-			return responseBuilder.error(resp.getErr());
+			logger.debug( rfe.getApiError().toString() );
+			return responseBuilder.error(rfe.getApiError());
 		}
 		FeedService feeds = new FeedService();
-		Feed fnew = feeds.getFeed( sub.getFeedId(), resp.getErr() );
+		Feed fnew = feeds.getFeed(sub.getFeedId(), apiError);
 		if ( fnew == null ) {
 			logger.warn( "Specified feed " + sub.getFeedId() + " not known to Bus Controller");
-			return responseBuilder.error(resp.getErr());
+			return responseBuilder.error(apiError);
 		}
 
 		DR_SubService dr_subService = new DR_SubService();
 		sub.setSubId(name);
-		DR_Sub nsub = dr_subService.updateDr_Sub(sub, resp.getErr() );
+		DR_Sub nsub = dr_subService.updateDr_Sub(sub, apiError);
 		if ( nsub != null && nsub.isStatusValid() ) {
 			return responseBuilder.success(nsub);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 		
 	@DELETE
@@ -194,22 +196,20 @@ public class DR_SubResource extends BaseLoggingClass {
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	@Path("/{subId}")
-	public Response deleteDr_Sub( 
-			@PathParam("subId") String id
-			){
+	public Response deleteDr_Sub(@PathParam("subId") String id){
 
-		ApiService resp = new ApiService();
+		ApiError apiError = new ApiError();
 
 		try {
-			resp.required( "subId", id, "");
+			checker.required( "subId", id);
 		} catch ( RequiredFieldException rfe ) {
-			logger.debug( resp.toString() );
-			return responseBuilder.error(resp.getErr());
+			logger.debug( rfe.getApiError().toString() );
+			return responseBuilder.error(rfe.getApiError());
 		}
 		DR_SubService dr_subService = new DR_SubService();
-		dr_subService.removeDr_Sub(id, resp.getErr() );
-		if ( ! resp.getErr().is2xx() ) {
-			return responseBuilder.error(resp.getErr());
+		dr_subService.removeDr_Sub(id, apiError);
+		if (!apiError.is2xx() ) {
+			return responseBuilder.error(apiError);
 		}
 		return responseBuilder.success(Status.NO_CONTENT.getStatusCode(), null );
 	}
@@ -223,22 +223,21 @@ public class DR_SubResource extends BaseLoggingClass {
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	@Path("/{subId}")
-	public Response get( 
-			@PathParam("subId") String id
-			) {
-		ApiService resp = new ApiService();
+	public Response get(@PathParam("subId") String id) {
+
+		ApiError apiError = new ApiError();
 
 		try {
-			resp.required( "subId", id, "");
+			checker.required( "subId", id);
 		} catch ( RequiredFieldException rfe ) {
-			logger.debug( resp.toString() );
-			return responseBuilder.error(resp.getErr());
+			logger.debug( rfe.getApiError().toString() );
+			return responseBuilder.error(rfe.getApiError());
 		}
 		DR_SubService dr_subService = new DR_SubService();
-		DR_Sub sub =  dr_subService.getDr_Sub( id, resp.getErr() );
+		DR_Sub sub =  dr_subService.getDr_Sub(id, apiError);
 		if ( sub != null && sub.isStatusValid() ) {
 			return responseBuilder.success(sub);
 		}
-		return responseBuilder.error(resp.getErr());
+		return responseBuilder.error(apiError);
 	}
 }