From 933cdbd4c20f18fe47f253bd721baf6ae996e906 Mon Sep 17 00:00:00 2001 From: vempo Date: Thu, 25 Oct 2018 19:27:22 +0300 Subject: Code formatting of configuration framework Fixed code formatting, removed meaningless Javadoc comments, added copyright headers, minor (and safe) static analysis fixes. Change-Id: I3eda1f242905da5b80e024cf30a69ff59381fc43 Issue-ID: SDC-1867 Signed-off-by: vempo --- .../resources/GlobalAndNSConfig/config.properties | 2 +- .../resources/SourceLocation/appjarconfig.properties | 2 +- .../src/test/resources/config-system.properties | 19 ------------------- 3 files changed, 2 insertions(+), 21 deletions(-) (limited to 'common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources') diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties index bd1d9fdfea..b00c4fcd10 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/GlobalAndNSConfig/config.properties @@ -1,7 +1,7 @@ artifact.name.maxlength=14 artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64, MD5 -artifact.name.allowedChar=a-zA-Z +artifact.name.allowedChar=a-zA-Z artifact.status=Deleted artifact.persistLocation=/opt/spool, ${sys:user.home}/asdc artifact.jsonSchema=@GeneratorsList.json diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties index 26fcc599b7..03d9080c94 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/SourceLocation/appjarconfig.properties @@ -3,7 +3,7 @@ artifact.maxsize= artifact.extension=pdf, zip, xml artifact.supportedEncryption=Base64 artifact.supportedEncryption=MD5 -artifact.name.allowedChar=a-zA-Z +artifact.name.allowedChar=a-zA-Z artifact.name.allowedchar=a-zA-Z artifact.status=deleted artifact.status=Deleted diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties index cfe91e6c7d..f8222a3e0c 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/resources/config-system.properties @@ -1,22 +1,3 @@ -driverClassName=com.github.adejanovski.cassandra.jdbc.CassandraDriver -jdbcURL=jdbc:${dbname}://${dbhost}:${dbport}/${configdb} -dbuser= -dbpassword= -config.Table=configuration -config.monitor.Table=configuration_change -configKey=key -configValue=value -configNameColumn=name -configdb=dox -dbhost= -dbport=9042 -dbname=cassandra -createtablecql=create table if not exists ${configdb}.${config.Table} (name text\, key text\, value text\, PRIMARY KEY (name\, key)) with clustering order by (key asc) -createmonitoringtablecql=create table if not exists ${configdb}.${config.monitor.Table} (name text\, changed_when bigint\, key text\, old_value text\, new_value text\, PRIMARY KEY (name\, changed_when)) with clustering order by (changed_when desc) -insertconfigurationchangecql=insert into ${configdb}.${config.monitor.Table} (name\, changed_when\, key\, old_value\, new_value) values(?\, ?\, ?\, ?\, ?) -fetchkeysql=select ${configKey} from ${config.Table} where ${configNameColumn}=? -fetchlastchangecql=select changed_when from ${configdb}.${config.monitor.Table} where name=? limit 1 -fetchnamescql=select distinct name from ${configdb}.${config.Table} config.size.max=100 config.refresh.interval=30000 event.fetch.delay=5000 \ No newline at end of file -- cgit 1.2.3-korg