Contribute code that was missed in Amsterdam

[dmaap/dbcapi.git] / src / main / java / org / onap / dmaap / dbcapi / service / TopicService.java

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
index 244fe37..7082b9b 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
@@ -94,7 +94,9 @@ public class TopicService extends BaseLoggingClass {
 
        public Topic addTopic( Topic topic, ApiError err ) {
                logger.info( "Entry: addTopic");
 
        public Topic addTopic( Topic topic, ApiError err ) {
                logger.info( "Entry: addTopic");

-               String nFqtn =  Topic.genFqtn( topic.getTopicName() );
+               logger.info( "Topic name=" + topic.getTopicName() + " fqtnStyle=" + topic.getFqtnStyle() );
+               String nFqtn =  topic.genFqtn();
+               logger.info( "FQTN=" + nFqtn );

                if ( getTopic( nFqtn, err ) != null ) {
                        String t = "topic already exists: " + nFqtn;
                        logger.info( t );
                if ( getTopic( nFqtn, err ) != null ) {
                        String t = "topic already exists: " + nFqtn;
                        logger.info( t );


@@ -104,7 +106,7 @@ public class TopicService extends BaseLoggingClass {
                        return null;
                }
                err.reset();  // err filled with NOT_FOUND is expected case, but don't want to litter...
                        return null;
                }
                err.reset();  // err filled with NOT_FOUND is expected case, but don't want to litter...

-               logger.info( "fqtn: " + nFqtn );
+

                topic.setFqtn( nFqtn );
 
                AafService aaf = new AafService(ServiceType.AAF_TopicMgr);
                topic.setFqtn( nFqtn );
 
                AafService aaf = new AafService(ServiceType.AAF_TopicMgr);