X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fdatabase%2FDatabaseClass.java;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fdatabase%2FDatabaseClass.java;h=934b7bbc40239427d676d23f82f249f1fd13ee42;hb=2941d6a78d2eec8c6fb87d44e14f512b314e31f0;hp=11b0d15aa8885506401fdcd520f069669388c89f;hpb=536c6aabdfd2bcdc493501a9498fb8a97d208c0b;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/database/DatabaseClass.java b/src/main/java/org/onap/dmaap/dbcapi/database/DatabaseClass.java
index 11b0d15..934b7bb 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/database/DatabaseClass.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/database/DatabaseClass.java
@@ -200,22 +200,18 @@ public class DatabaseClass extends BaseLoggingClass {
 			mirrors = new HashMap<>();
 		}
 		dmaap.init(new Dmaap("0", "", "", "", "", "", "", ""));
-		// check for, and set up initial data, if it isn't already there
+		// force initial read from DB, if it exists
+		@SuppressWarnings("unused")
 		Dmaap dmx = dmaap.get();
-		if ("0".equals(dmx.getVersion())) {
-
-			dmx = new Dmaap("0", "", "", "", "", "", "", "");
-			dmx.setDmaapName(p.getProperty("DmaapName"));
-			dmx.setDrProvUrl("https://" + p.getProperty("DR.provhost", "notSet"));
-			dmx.setTopicNsRoot(p.getProperty("topicNsRoot"));
-			dmx.setBridgeAdminTopic("DCAE_MM_AGENT");
+		
+		// old code in this spot would read from properties file as part of init.
+		// but all those properties are now set via /dmaap API
 
-			dmaap.update(dmx);
-		}
 		} catch (Exception e) {
 			errorLogger.error("Error", e);
 			errorLogger.error(DmaapbcLogMessageEnum.DB_UPDATE_ERROR, e.getMessage());
 		}
+
 	}
 	
 	public static synchronized String getNextClientId() {