diff options
| author |   st782s <statta@research.att.com> | 2018-11-14 12:45:55 -0500 |
|---|---|---|
| committer | st782s <statta@research.att.com> | 2018-11-14 15:01:37 -0500 |
| commit | cacb64c5ed4f2c67965aba7d44148c61568dc2bc (patch) | |
| tree | 9259384750eda7a26a34f85e217db0f5a36d7811 /mdbc-server/src/main/java | |
| parent | f63139f3b6d16611cea21c7b3754b2cba833378e (diff) | |
Remove unwanted Trigger creation
Issue-ID: MUSIC-186
Change-Id: I81863e57912d72360676e7d38ed414da4c9e8b17
Signed-off-by: st782s <statta@research.att.com>
Diffstat (limited to 'mdbc-server/src/main/java')
4 files changed, 9 insertions, 2 deletions
diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/Configuration.java b/mdbc-server/src/main/java/org/onap/music/mdbc/Configuration.java index f876548..6bda739 100644 --- a/mdbc-server/src/main/java/org/onap/music/mdbc/Configuration.java +++ b/mdbc-server/src/main/java/org/onap/music/mdbc/Configuration.java @@ -21,7 +21,7 @@ package org.onap.music.mdbc; public class Configuration { /** The property name to use to connect to cassandra*/ - public static final String KEY_CASSANDRA_URL = "CASSANDRA_URL"; + public static final String KEY_CASSANDRA_URL = "cassandra.host"; /** The property name to use to enable/disable the MusicSqlManager entirely. */ public static final String KEY_DISABLED = "disabled"; /** The property name to use to select the DB 'mixin'. */ diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/MusicSqlManager.java b/mdbc-server/src/main/java/org/onap/music/mdbc/MusicSqlManager.java index 50c307e..d44d907 100755 --- a/mdbc-server/src/main/java/org/onap/music/mdbc/MusicSqlManager.java +++ b/mdbc-server/src/main/java/org/onap/music/mdbc/MusicSqlManager.java @@ -142,6 +142,7 @@ public class MusicSqlManager { logger.debug(EELFLoggerDelegate.applicationLogger, "synchronizing tables:" + set1); for (String tableName : set1) { // This map will be filled in if this table was previously discovered + tableName = tableName.toUpperCase(); if (!table_set.contains(tableName) && !dbi.getReservedTblNames().contains(tableName)) { logger.info(EELFLoggerDelegate.applicationLogger, "New table discovered: "+tableName); try { diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/StateManager.java b/mdbc-server/src/main/java/org/onap/music/mdbc/StateManager.java index b8a4540..2e47726 100644 --- a/mdbc-server/src/main/java/org/onap/music/mdbc/StateManager.java +++ b/mdbc-server/src/main/java/org/onap/music/mdbc/StateManager.java @@ -29,6 +29,7 @@ import org.onap.music.mdbc.mixins.MusicInterface; import org.onap.music.mdbc.mixins.MusicMixin; import org.onap.music.mdbc.tables.TxCommitProgress; +import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -78,6 +79,11 @@ public class StateManager { this.info = info; this.transactionInfo = new TxCommitProgress(); //\fixme this is not really used, delete! + try { + info.load(this.getClass().getClassLoader().getResourceAsStream("music.properties")); + } catch (IOException e) { + logger.error(EELFLoggerDelegate.errorLogger, e.getMessage()); + } String cassandraUrl = info.getProperty(Configuration.KEY_CASSANDRA_URL, Configuration.CASSANDRA_URL_DEFAULT); String mixin = info.getProperty(Configuration.KEY_MUSIC_MIXIN_NAME, Configuration.MUSIC_MIXIN_DEFAULT); init(mixin, cassandraUrl); diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/CassandraMixin.java b/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/CassandraMixin.java index 0e8da81..a1f325e 100755 --- a/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/CassandraMixin.java +++ b/mdbc-server/src/main/java/org/onap/music/mdbc/mixins/CassandraMixin.java @@ -88,7 +88,7 @@ public class CassandraMixin implements MusicInterface { /** The property name to use for the comma-separated list of replica IDs. */ public static final String KEY_REPLICAS = "replica_ids"; /** The property name to use to identify the IP address for Cassandra. */ - public static final String KEY_MUSIC_ADDRESS = "music_address"; + public static final String KEY_MUSIC_ADDRESS = "cassandra.host"; /** The property name to use to provide the replication factor for Cassandra. */ public static final String KEY_MUSIC_RFACTOR = "music_rfactor"; /** The property name to use to provide the replication factor for Cassandra. */ |