X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FTopicResource.java;h=96b6a4ab8049cd914e1049a158b695473cb06de1;hb=31cbc922a7971a5f20d5790a1fbbd6b38a49af13;hp=5f027aa2369de3f91449fe2edd727def55a7d074;hpb=956361f657eda468d5980249db6b155c472f5f85;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
index 5f027aa..96b6a4a 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
@@ -50,6 +50,8 @@ import org.onap.dmaap.dbcapi.service.ApiService;
 import org.onap.dmaap.dbcapi.service.TopicService;
 import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
+import static javax.ws.rs.core.Response.Status.CREATED;
+
 @Path("/topics")
 @Api( value= "topics", description = "Endpoint for retreiving MR Topics" )
 @Consumes(MediaType.APPLICATION_JSON)
@@ -59,7 +61,9 @@ public class TopicResource extends BaseLoggingClass {
 	private static FqtnType defaultTopicStyle;
 	private static String defaultPartitionCount;
 	private static String defaultReplicationCount;
-	TopicService mr_topicService = new TopicService();
+	private TopicService mr_topicService = new TopicService();
+	private ResponseBuilder responseBuilder = new ResponseBuilder();
+	private RequiredChecker checker = new RequiredChecker();
 	
 	public TopicResource() {
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
@@ -79,20 +83,20 @@ public class TopicResource extends BaseLoggingClass {
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	public Response getTopics() {
-
-		ApiService check = new ApiService();
-
 		List<Topic> allTopics = mr_topicService.getAllTopics();
 		
 		GenericEntity<List<Topic>> list = new GenericEntity<List<Topic>>(allTopics) {
 		        };
-		return check.success(list);
+		return responseBuilder.success(list);
 		
 	}
 		
 	@POST
-	@ApiOperation( value = "return Topic details", 
-	notes = "Create  `Topic` object.", 
+	@ApiOperation( value = "Create a Topic object", 
+	notes = "Create  `Topic` object."
+			+ "For convenience, the message body may populate the `clients` array, in which case each entry will be added as an `MR_Client`."
+			+ "  Beginning in ONAP Dublin Release, dbcapi will create two AAF Roles by default, one each for the publisher and subscriber per topic."
+			+ "  MR_Clients can then specify an AAF Identity to be added to the appropriate default Role, avoiding the need to create Role(s) in advance.", 
 	response = Topic.class)
 	@ApiResponses( value = {
 	    @ApiResponse( code = 200, message = "Success", response = Topic.class),
@@ -106,12 +110,12 @@ public class TopicResource extends BaseLoggingClass {
 		ApiService check = new ApiService();
 
 		try {
-			check.required( "topicName", topic.getTopicName(), "^\\S+$" );  //no white space allowed in topicName
-			check.required( "topicDescription", topic.getTopicDescription(), "" );
-			check.required( "owner", topic.getOwner(), "" );
+			checker.required( "topicName", topic.getTopicName(), "^\\S+$" );  //no white space allowed in topicName
+			checker.required( "topicDescription", topic.getTopicDescription());
+			checker.required( "owner", topic.getOwner());
 		} catch( RequiredFieldException rfe ) {
-			logger.error("Error", rfe);
-			return check.error();
+			logger.error("Error", rfe.getApiError());
+			return responseBuilder.error(rfe.getApiError());
 		}
 		
 		ReplicationType t = topic.getReplicationCase();
@@ -139,9 +143,9 @@ public class TopicResource extends BaseLoggingClass {
 		
 		Topic mrc =  mr_topicService.addTopic(topic, check.getErr(), flag);
 		if ( mrc != null && check.getErr().is2xx() ) {
-			return check.success(Status.CREATED.getStatusCode(), mrc);
+			return responseBuilder.success(CREATED.getStatusCode(), mrc);
 		}
-		return check.error();
+		return responseBuilder.error(check.getErr());
 	}
 	
 	@PUT
@@ -161,7 +165,7 @@ public class TopicResource extends BaseLoggingClass {
 		check.setCode(Status.BAD_REQUEST.getStatusCode());
 		check.setMessage( "Method /PUT not supported for /topics");
 		
-		return check.error();
+		return responseBuilder.error(check.getErr());
 	}
 		
 	@DELETE
@@ -179,17 +183,17 @@ public class TopicResource extends BaseLoggingClass {
 		ApiService check = new ApiService();
 
 		try {
-			check.required( "fqtn", id, "" );
+			checker.required( "fqtn", id);
 		} catch( RequiredFieldException rfe ) {
-			logger.error("Error", rfe);
-			return check.error();
+			logger.error("Error", rfe.getApiError());
+			return responseBuilder.error(rfe.getApiError());
 		}
 		
 		mr_topicService.removeTopic(id, check.getErr());
 		if ( check.getErr().is2xx()) {
-			return check.success(Status.NO_CONTENT.getStatusCode(), null);
+			return responseBuilder.success(Status.NO_CONTENT.getStatusCode(), null);
 		} 
-		return check.error();
+		return responseBuilder.error(check.getErr());
 	}
 	
 
@@ -209,15 +213,15 @@ public class TopicResource extends BaseLoggingClass {
 		ApiService check = new ApiService();
 
 		try {
-			check.required( "topicName", id, "^\\S+$" );  //no white space allowed in topicName
+			checker.required( "topicName", id, "^\\S+$" );  //no white space allowed in topicName
 		} catch( RequiredFieldException rfe ) {
-			logger.error("Error", rfe);
-			return check.error();
+			logger.error("Error", rfe.getApiError());
+			return responseBuilder.error(rfe.getApiError());
 		}
 		Topic mrc =  mr_topicService.getTopic( id, check.getErr() );
 		if ( mrc == null ) {
-			return check.error();
+			return responseBuilder.error(check.getErr());
 		}
-		return check.success(mrc);
+		return responseBuilder.success(mrc);
 		}
 }