X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FDmaapService.java;h=3ea44ccc469f0d677a5578c0c42db95c8fdfb103;hb=ece3a625175df4d74d890d67f584560630e9ed33;hp=e2bc379da925e30ec159a2364a80bbc1563ea77e;hpb=7a368c449d32a779157332ca7d06219efaf4fc4d;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
index e2bc379..3ea44cc 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java
@@ -3,6 +3,8 @@
  * org.onap.dmaap
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,16 +23,6 @@
 package org.onap.dmaap.dbcapi.service;
 
 import java.util.ArrayList;
-
-
-
-
-
-
-
-
-
-
 import org.onap.dmaap.dbcapi.aaf.AafService;
 import org.onap.dmaap.dbcapi.aaf.DmaapGrant;
 import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
@@ -57,7 +49,7 @@ public class DmaapService  extends BaseLoggingClass  {
 	
 	String topicFactory; // = "org.openecomp.dcae.dmaap.topicFactory";
 	String topicMgrRole; // = "org.openecomp.dmaapBC.TopicMgr";
-	String dcaeTopicNs; // = "org.openecomp.dcae.dmaap";
+	
 	private boolean multiSite;
 	
 	
@@ -65,14 +57,14 @@ public class DmaapService  extends BaseLoggingClass  {
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
 		topicFactory = p.getProperty("MR.TopicFactoryNS", "MR.topicFactoryNS.not.set");
 		topicMgrRole = p.getProperty("MR.TopicMgrRole", "MR.TopicMgrRole.not.set" );
-		dcaeTopicNs = dmaapholder.get().getTopicNsRoot();
+
 		multiSite = "true".equalsIgnoreCase(p.getProperty("MR.multisite", "true"));
 		noEnvironmentPrefix = p.getProperty( "AAF.NoEnvironmentPrefix", "org.onap");
 		
 		logger.info( "DmaapService settings: " + 
 				" topicFactory=" + topicFactory +
 				" topicMgrRole=" + topicMgrRole +
-				" dcaeTopicNs=" + dcaeTopicNs +
+				
 				" multisite=" + multiSite +
 				" noEnvironmentPrefix=" + noEnvironmentPrefix
 				);
@@ -92,10 +84,10 @@ public class DmaapService  extends BaseLoggingClass  {
 
 			nd.setLastMod();
 			dmaapholder.update(nd);
-
+			
 			AafService aaf = new AafService( ServiceType.AAF_Admin);
 			ApiPolicy apiPolicy = new ApiPolicy();
-			if ( apiPolicy.getUseAuthClass() ) {
+			if ( apiPolicy.isPermissionClassSet() ) {
 				ApiPerms p = new ApiPerms();
 				p.setEnvMap();
 			}
@@ -136,8 +128,9 @@ public class DmaapService  extends BaseLoggingClass  {
 		if ( ! dmaap.isStatusValid()  || ! nd.getDmaapName().equals(dmaap.getDmaapName()) || dmaap.getVersion().equals( "0") ) {
 			nd.setLastMod();
 			dmaapholder.update(nd);  //need to set this so the following perms will pick up any new vals.
+			//dcaeTopicNs = dmaapholder.get().getTopicNsRoot();
 			ApiPolicy apiPolicy = new ApiPolicy();
-			if ( apiPolicy.getUseAuthClass()) {
+			if ( apiPolicy.isPermissionClassSet()) {
 				ApiPerms p = new ApiPerms();
 				p.setEnvMap();
 			}
@@ -166,6 +159,8 @@ public class DmaapService  extends BaseLoggingClass  {
 	public String getTopicPerm( String val ) {
 		Dmaap dmaap = dmaapholder.get();
 		String nsRoot = dmaap.getTopicNsRoot();
+		if ( nsRoot == null ) { return null; }
+		
 		String t;
 		// in ONAP Casablanca, we assume no distinction of environments reflected in topic namespace
 		if ( nsRoot.startsWith(noEnvironmentPrefix) ) {
@@ -190,7 +185,7 @@ public class DmaapService  extends BaseLoggingClass  {
 
 	private boolean setTopicMgtPerms( Dmaap nd, AafService aaf ){
 		String[] actions = { "create", "destroy" };
-		String instance = ":" + dcaeTopicNs + "." + nd.getDmaapName() + ".mr.topic:" + dcaeTopicNs + "." + nd.getDmaapName();
+		String instance = ":" + nd.getTopicNsRoot() + "." + nd.getDmaapName() + ".mr.topic:" + nd.getTopicNsRoot() + "." + nd.getDmaapName();
 		
 		for( String action : actions ) {
 
@@ -210,7 +205,7 @@ public class DmaapService  extends BaseLoggingClass  {
 			}
 		}
 		
-		String t = dcaeTopicNs +"." + nd.getDmaapName() + ".mr.topic";
+		String t = nd.getTopicNsRoot() +"." + nd.getDmaapName() + ".mr.topic";
 		String[] s = { "view", "pub", "sub" };
 		actions = s;
 		instance = "*";
@@ -279,18 +274,20 @@ public class DmaapService  extends BaseLoggingClass  {
 		clients.add( nClient );
 	
 		// initialize Topic
-		Topic mmaTopic = new Topic();
+		Topic mmaTopic = new Topic().init();
 		mmaTopic.setTopicName(dmaap.getBridgeAdminTopic());
 		mmaTopic.setClients(clients);
 		mmaTopic.setOwner("BusController");
 		mmaTopic.setTopicDescription("topic reserved for MirrorMaker Administration");
 		mmaTopic.setTnxEnabled("false");
+		mmaTopic.setPartitionCount("1");  // a single partition should guarantee message order
+		
 		
 		ApiError err = new ApiError();
 		TopicService svc = new TopicService();
 		try {
 			@SuppressWarnings("unused")
-			Topic nTopic = svc.addTopic(mmaTopic, err);
+			Topic nTopic = svc.addTopic(mmaTopic, err, true);
 			if ( err.is2xx() || err.getCode() == 409 ) {
 				return false;
 			}