X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FTopicResource.java;h=95f9d331cb69bf62ef27d1b8dc3638c8bf6af86e;hb=1611944a45491e2b8f00606b0aac2cdb0de8dde8;hp=0f99fb624d5a824e288bca9de1fd3d5c873768fe;hpb=a05efb7b7b3cfc77f5e3fda11e8434834829f56a;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 0f99fb6..95f9d33 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/TopicResource.java
@@ -44,9 +44,11 @@ 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;
 import org.onap.dmaap.dbcapi.service.ApiService;
 import org.onap.dmaap.dbcapi.service.TopicService;
+import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 @Path("/topics")
 @Api( value= "topics", description = "Endpoint for retreiving MR Topics" )
@@ -54,8 +56,14 @@ import org.onap.dmaap.dbcapi.service.TopicService;
 @Produces(MediaType.APPLICATION_JSON)
 @Authorization
 public class TopicResource extends BaseLoggingClass {
-
+	private static FqtnType defaultTopicStyle;
 	TopicService mr_topicService = new TopicService();
+	
+	public TopicResource() {
+		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
+		defaultTopicStyle = FqtnType.Validator( p.getProperty("MR.topicStyle", "FQTN_LEGACY_FORMAT"));
+		logger.info( "Setting defaultTopicStyle=" + defaultTopicStyle );
+	}
 		
 	@GET
 	@ApiOperation( value = "return Topic details", 
@@ -104,11 +112,15 @@ public class TopicResource extends BaseLoggingClass {
 		if ( t == null || t == ReplicationType.REPLICATION_NOT_SPECIFIED ) {
 			topic.setReplicationCase( mr_topicService.reviewTopic(topic));
 		} 
-		
+		FqtnType ft = topic.getFqtnStyle();
+		if ( ft == null || ft == FqtnType.FQTN_NOT_SPECIFIED ) {
+			logger.info( "setting defaultTopicStyle=" + defaultTopicStyle + " for topic " + topic.getTopicName() );
+			topic.setFqtnStyle( defaultTopicStyle );
+		}
 		topic.setLastMod();
 		
 		Topic mrc =  mr_topicService.addTopic(topic, check.getErr());
-		if ( mrc != null && mrc.isStatusValid() ) {
+		if ( mrc != null && check.getErr().is2xx() ) {
 			return check.success(Status.CREATED.getStatusCode(), mrc);
 		}
 		return check.error();