X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FTopicResource.java;h=5f027aa2369de3f91449fe2edd727def55a7d074;hb=956361f657eda468d5980249db6b155c472f5f85;hp=8ed255883f669235adfb0e12dac19a0fa47f89cf;hpb=87bf9245434ad317ea39a84a0099233197f3d7c2;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 8ed2558..5f027aa 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.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.DR_Pub;
 import org.onap.dmaap.dbcapi.model.ReplicationType;
 import org.onap.dmaap.dbcapi.model.FqtnType;
 import org.onap.dmaap.dbcapi.model.Topic;
@@ -58,11 +57,16 @@ import org.onap.dmaap.dbcapi.util.DmaapConfig;
 @Authorization
 public class TopicResource extends BaseLoggingClass {
 	private static FqtnType defaultTopicStyle;
+	private static String defaultPartitionCount;
+	private static String defaultReplicationCount;
 	TopicService mr_topicService = new TopicService();
 	
 	public TopicResource() {
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
-		defaultTopicStyle = FqtnType.Validator( p.getProperty("MR.topicStyle", "FQTN_LEGACY_FORMAT"));
+ 		defaultTopicStyle = FqtnType.Validator( p.getProperty("MR.topicStyle", "FQTN_LEGACY_FORMAT"));
+		defaultPartitionCount = p.getProperty( "MR.partitionCount", "2");
+		defaultReplicationCount = p.getProperty( "MR.replicationCount", "1");
+		
 		logger.info( "Setting defaultTopicStyle=" + defaultTopicStyle );
 	}
 		
@@ -71,7 +75,7 @@ public class TopicResource extends BaseLoggingClass {
 	notes = "Returns array of  `Topic` objects.", 
 	response = Topic.class)
 	@ApiResponses( value = {
-	    @ApiResponse( code = 200, message = "Success", response = DR_Pub.class),
+	    @ApiResponse( code = 200, message = "Success", response = Topic.class),
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	public Response getTopics() {
@@ -91,7 +95,7 @@ public class TopicResource extends BaseLoggingClass {
 	notes = "Create  `Topic` object.", 
 	response = Topic.class)
 	@ApiResponses( value = {
-	    @ApiResponse( code = 200, message = "Success", response = DR_Pub.class),
+	    @ApiResponse( code = 200, message = "Success", response = Topic.class),
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	public Response  addTopic( 
@@ -119,6 +123,14 @@ public class TopicResource extends BaseLoggingClass {
 			logger.info( "setting defaultTopicStyle=" + defaultTopicStyle + " for topic " + topic.getTopicName() );
 			topic.setFqtnStyle( defaultTopicStyle );
 		}
+		String pc = topic.getPartitionCount();
+		if ( pc == null ) {
+			topic.setPartitionCount(defaultPartitionCount);
+		}
+		String rc = topic.getReplicationCount();
+		if ( rc == null ) {
+			topic.setReplicationCount(defaultReplicationCount);
+		}
 		topic.setLastMod();
 		Boolean flag = false;
 		if (useExisting != null) {
@@ -137,7 +149,7 @@ public class TopicResource extends BaseLoggingClass {
 	notes = "Update a  `Topic` object, identified by topicId", 
 	response = Topic.class)
 	@ApiResponses( value = {
-	    @ApiResponse( code = 200, message = "Success", response = DR_Pub.class),
+	    @ApiResponse( code = 200, message = "Success", response = Topic.class),
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	@Path("/{topicId}")
@@ -157,7 +169,7 @@ public class TopicResource extends BaseLoggingClass {
 	notes = "Delete a  `Topic` object, identified by topicId", 
 	response = Topic.class)
 	@ApiResponses( value = {
-	    @ApiResponse( code = 204, message = "Success", response = DR_Pub.class),
+	    @ApiResponse( code = 204, message = "Success", response = Topic.class),
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	@Path("/{topicId}")
@@ -186,7 +198,7 @@ public class TopicResource extends BaseLoggingClass {
 	notes = "Retrieve a  `Topic` object, identified by topicId", 
 	response = Topic.class)
 	@ApiResponses( value = {
-	    @ApiResponse( code = 200, message = "Success", response = DR_Pub.class),
+	    @ApiResponse( code = 200, message = "Success", response = Topic.class),
 	    @ApiResponse( code = 400, message = "Error", response = ApiError.class )
 	})
 	@Path("/{topicId}")