From 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 29 Jul 2018 16:13:45 +0300 Subject: re base code Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando --- .../onap-configuration-management-api/pom.xml | 23 +-- .../onap-configuration-management-cli/pom.xml | 98 +++++----- .../org/onap/config/cli/app/Configuration.java | 6 +- .../org/onap/config/gui/app/Configuration.java | 32 +--- .../onap-configuration-management-core/pom.xml | 213 +++++++++++---------- .../java/org/onap/config/ConfigurationUtils.java | 11 +- .../onap/config/impl/AggregateConfiguration.java | 3 +- .../org/onap/config/impl/CliConfigurationImpl.java | 38 ++-- .../config/impl/ConfigurationChangeNotifier.java | 3 +- .../onap/config/impl/ConfigurationDataSource.java | 7 +- .../org/onap/config/impl/ConfigurationFilter.java | 4 +- .../org/onap/config/impl/ConfigurationImpl.java | 4 +- .../onap/config/impl/ConfigurationRepository.java | 10 +- .../java/org/onap/config/impl/ContextListener.java | 7 +- .../org/onap/config/ConfigurationUtilsTest.java | 4 +- .../onap-configuration-management-test/pom.xml | 87 ++++----- .../src/test/java/org/onap/config/TestCMSuite.java | 23 +-- .../onap/config/test/CLIFallbackAndLookupTest.java | 10 +- .../test/java/org/onap/config/test/CLITest.java | 10 +- .../onap/config/test/ConfigSourceLocationTest.java | 12 +- .../onap/config/test/DynamicConfigurationTest.java | 8 +- .../onap/config/test/FallbackToGlobalNSTest.java | 8 +- .../onap/config/test/GlobalAndNSConfigTest.java | 8 +- .../onap/config/test/JAVAPropertiesConfigTest.java | 2 +- .../java/org/onap/config/test/JSONConfigTest.java | 2 +- .../config/test/LoadOrderMergeAndOverrideTest.java | 4 +- .../org/onap/config/test/ModeAsConfigPropTest.java | 8 +- .../onap/config/test/MultiTenancyConfigTest.java | 8 +- .../org/onap/config/test/NodeSpecificCLITest.java | 8 +- .../config/test/NotificationForNodeConfigTest.java | 8 +- .../config/test/NotificationOnPropValTest.java | 8 +- .../test/ResourceChangeNotificationTest.java | 14 +- .../config/test/UnregisterNotificationTest.java | 8 +- .../onap/config/test/ValidateDefaultModeTest.java | 6 +- .../onap/config/test/ValidateNodeConfigTest.java | 8 +- .../java/org/onap/config/test/XMLConfigTest.java | 2 +- .../java/org/onap/config/test/YAMLConfigTest.java | 2 +- .../test/java/org/onap/config/util/TestUtil.java | 10 +- .../src/test/resources/CLI/config.json | 16 +- .../src/test/resources/CLI/config.xml | 30 +-- .../src/test/resources/CLIFallback/config.json | 16 +- .../src/test/resources/CLIFallback/config.xml | 30 +-- .../resources/DynamicConfiguration/config.json | 16 +- .../test/resources/DynamicConfiguration/config.xml | 30 +-- .../test/resources/FallbackToGlobalNS/config.json | 17 +- .../test/resources/FallbackToGlobalNS/config.xml | 30 +-- .../test/resources/GlobalAndNSConfig/config.json | 19 +- .../test/resources/GlobalAndNSConfig/config.xml | 26 +-- .../test/resources/JSONConfiguration/config-M.json | 30 +-- .../test/resources/JSONConfiguration/config-O.json | 20 +- .../test/resources/JSONConfiguration/config-U.json | 20 +- .../test/resources/JSONConfiguration/config.json | 54 +++--- .../MergeStrategyAsConfigProp/config.json | 17 +- .../resources/MergeStrategyAsConfigProp/config.xml | 26 +-- .../NotificationForNodeConfig/config.json | 20 +- .../resources/NotificationForNodeConfig/config.xml | 30 +-- .../resources/NotificationOnPropVal/config.json | 17 +- .../resources/NotificationOnPropVal/config.xml | 32 ++-- .../resources/SourceLocation/appjarconfig.json | 19 +- .../test/resources/SourceLocation/appjarconfig.xml | 30 +-- .../resources/UnregisterNotification/config.json | 17 +- .../resources/UnregisterNotification/config.xml | 32 ++-- .../ValidateDefaultMode/config-defaultmode.json | 12 +- .../test/resources/XMLConfiguration/config-M.xml | 32 ++-- .../test/resources/XMLConfiguration/config-O.xml | 22 +-- .../test/resources/XMLConfiguration/config-U.xml | 22 +-- .../src/test/resources/XMLConfiguration/config.xml | 42 ++-- .../resources/fallback/config-fallback-merge.xml | 24 +-- .../fallback/config-fallback-override.json | 12 +- .../onap-common-configuration-management/pom.xml | 35 ++-- 70 files changed, 752 insertions(+), 770 deletions(-) (limited to 'common/onap-common-configuration-management') diff --git a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml index 61b6cb0614..83a8215851 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-api/pom.xml @@ -1,15 +1,16 @@ - - 4.0.0 + + 4.0.0 - onap-configuration-management-api - onap-configuration-management-api + onap-configuration-management-api + onap-configuration-management-api - - onap-common-configuration-management - org.onap.sdc.common - 1.3.0-SNAPSHOT - .. - + + onap-common-configuration-management + org.onap.sdc.common + 1.3.0-SNAPSHOT + .. + diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml index f242fcc5d9..a6caa37e10 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-cli/pom.xml @@ -1,55 +1,57 @@ - - 4.0.0 + + 4.0.0 - org.onap.sdc.common - onap-configuration-management-cli - onap-configuration-management-cli + org.onap.sdc.common + onap-configuration-management-cli + onap-configuration-management-cli - - onap-common-configuration-management - org.onap.sdc.common - 1.2.0-SNAPSHOT - .. - + + onap-common-configuration-management + org.onap.sdc.common + 1.2.0-SNAPSHOT + .. + - - - org.onap.sdc.common - onap-configuration-management-api - ${project.version} - - - tools - tools - 1.8 - true - - + + + org.onap.sdc.common + onap-configuration-management-api + ${project.version} + + + tools + tools + 1.8 + true + + - - - - org.apache.maven.plugins - maven-shade-plugin - 1.5 - - - package - - shade - - - - - org.onap.config.gui.app.Configuration - - - - - - + + + + org.apache.maven.plugins + maven-shade-plugin + 1.5 + + + package + + shade + + + + + org.onap.config.gui.app.Configuration + + + + + + - + diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java index d1a93f0041..03bd4a02e9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/cli/app/Configuration.java @@ -1,17 +1,15 @@ package org.onap.config.cli.app; -import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; -import java.util.HashMap; -import java.util.Map; - import javax.management.JMX; import javax.management.MBeanServerConnection; import javax.management.ObjectName; import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; +import java.util.HashMap; +import java.util.Map; /** * The type Configuration. diff --git a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java index fa7cf5b77a..f51d04b68c 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-cli/src/main/java/org/onap/config/gui/app/Configuration.java @@ -5,26 +5,12 @@ import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.VirtualMachineDescriptor; import org.onap.config.api.ConfigurationManager; -import java.awt.BorderLayout; -import java.awt.Button; -import java.awt.CardLayout; -import java.awt.Checkbox; -import java.awt.CheckboxGroup; -import java.awt.Choice; -import java.awt.Dialog; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.GraphicsDevice; -import java.awt.GraphicsEnvironment; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.GridLayout; -import java.awt.Label; -import java.awt.Panel; -import java.awt.ScrollPane; -import java.awt.TextArea; -import java.awt.TextField; -import java.awt.Toolkit; +import javax.management.JMX; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.management.remote.JMXConnector; +import javax.management.remote.JMXConnectorFactory; +import javax.management.remote.JMXServiceURL; import java.awt.event.ItemEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -34,12 +20,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.management.JMX; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; /** diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml index c610307494..40693df779 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-core/pom.xml @@ -1,112 +1,113 @@ - - 4.0.0 + + 4.0.0 - onap-configuration-management-core - onap-configuration-management-core + onap-configuration-management-core + onap-configuration-management-core - - onap-common-configuration-management - org.onap.sdc.common - 1.3.0-SNAPSHOT - .. - + + onap-common-configuration-management + org.onap.sdc.common + 1.3.0-SNAPSHOT + .. + - - - com.fasterxml.jackson.core - jackson-databind - 2.5.4 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - org.apache.commons - commons-configuration2 - 2.1 - - - commons-logging - commons-logging - 1.2 - - - commons-beanutils - commons-beanutils - ${commons.beanutils.version} - - - org.apache.commons - commons-lang3 - 3.3.2 - - - com.github.adejanovski - cassandra-jdbc-wrapper - 3.1.0 - - - org.apache.commons - commons-dbcp2 - 2.0 - - - org.apache.commons - commons-pool2 - 2.4.2 - - - commons-io - commons-io - ${commons.io.version} - - - net.sf.corn - corn-cps - 1.1.7 - - - com.sun - tools - - - - - com.virtlink.commons - commons-configuration2-jackson - 0.6.1 - - - org.apache.logging.log4j - log4j-core - 2.7 - - - org.onap.sdc.common - onap-configuration-management-api - ${project.version} - - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - - - com.fasterxml.jackson.core - jackson-annotations - 2.8.1 - - - junit - junit - test - ${junit.version} - + + + com.fasterxml.jackson.core + jackson-databind + 2.5.4 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + org.apache.commons + commons-configuration2 + 2.1 + + + commons-logging + commons-logging + 1.2 + + + commons-beanutils + commons-beanutils + ${commons.beanutils.version} + + + org.apache.commons + commons-lang3 + 3.3.2 + + + com.github.adejanovski + cassandra-jdbc-wrapper + 3.1.0 + + + org.apache.commons + commons-dbcp2 + 2.0 + + + org.apache.commons + commons-pool2 + 2.4.2 + + + commons-io + commons-io + ${commons.io.version} + + + net.sf.corn + corn-cps + 1.1.7 + + + com.sun + tools + + + + + com.virtlink.commons + commons-configuration2-jackson + 0.6.1 + + + org.apache.logging.log4j + log4j-core + 2.7 + + + org.onap.sdc.common + onap-configuration-management-api + ${project.version} + + + javax.servlet + javax.servlet-api + ${servlet-api.version} + provided + + + com.fasterxml.jackson.core + jackson-annotations + 2.8.1 + + + junit + junit + test + ${junit.version} + - + diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java index 53baaec2cf..db64f7f7fc 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java @@ -26,7 +26,7 @@ import org.onap.config.impl.AgglomerateConfiguration; import org.onap.config.impl.ConfigurationDataSource; import org.onap.config.type.ConfigurationMode; import org.onap.config.type.ConfigurationType; - + import javax.sql.DataSource; import java.io.File; import java.lang.reflect.Field; @@ -67,6 +67,11 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import static com.google.common.collect.ImmutableMap.builder; import static java.util.Optional.ofNullable; @@ -74,6 +79,10 @@ import static org.onap.config.api.Hint.EXTERNAL_LOOKUP; import static org.onap.config.api.Hint.LATEST_LOOKUP; import static org.onap.config.api.Hint.NODE_SPECIFIC; + +import static com.google.common.collect.ImmutableMap.builder; +import static org.onap.config.api.Hint.*; + /** * The type Configuration utils. */ diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java index c8d76d9bd9..7698d3f8ec 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/AggregateConfiguration.java @@ -5,7 +5,6 @@ import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.tree.MergeCombiner; import org.apache.commons.configuration2.tree.OverrideCombiner; import org.apache.commons.configuration2.tree.UnionCombiner; -import static org.onap.config.Constants.LOAD_ORDER_KEY; import org.onap.config.ConfigurationUtils; import org.onap.config.type.ConfigurationMode; @@ -14,6 +13,8 @@ import java.net.URL; import java.util.HashMap; import java.util.*; +import static org.onap.config.Constants.LOAD_ORDER_KEY; + /** * The type Aggregate configuration. */ diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java index 53ebf2943b..6663c85805 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/CliConfigurationImpl.java @@ -1,43 +1,27 @@ package org.onap.config.impl; -import static org.onap.config.Constants.DB_NAMESPACE; -import static org.onap.config.Constants.DEFAULT_NAMESPACE; -import static org.onap.config.Constants.DEFAULT_TENANT; -import static org.onap.config.Constants.KEY_ELEMENTS_DELEMETER; -import static org.onap.config.Constants.LOAD_ORDER_KEY; -import static org.onap.config.Constants.MBEAN_NAME; -import static org.onap.config.Constants.MODE_KEY; -import static org.onap.config.Constants.NAMESPACE_KEY; +import org.apache.commons.configuration2.*; +import org.onap.config.ConfigurationUtils; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.api.Hint; +import org.onap.config.type.ConfigurationQuery; +import org.onap.config.type.ConfigurationUpdate; import java.io.File; import java.io.PrintWriter; +import java.util.*; import java.lang.management.ManagementFactory; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; + import javax.management.MBeanServer; import javax.management.MBeanServerDelegate; import javax.management.MBeanServerNotification; import javax.management.Notification; import javax.management.ObjectName; import javax.management.StandardMBean; -import org.apache.commons.configuration2.CombinedConfiguration; -import org.apache.commons.configuration2.CompositeConfiguration; -import org.apache.commons.configuration2.Configuration; -import org.apache.commons.configuration2.FileBasedConfiguration; -import org.apache.commons.configuration2.PropertiesConfiguration; -import org.onap.config.ConfigurationUtils; -import org.onap.config.Constants; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.api.Hint; -import org.onap.config.type.ConfigurationQuery; -import org.onap.config.type.ConfigurationUpdate; + +import static org.onap.config.Constants.*; /** * The type Cli configuration. diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java index 015634b1cd..88c71c14e0 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationChangeNotifier.java @@ -5,7 +5,7 @@ import org.onap.config.Constants; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; import org.onap.config.api.Hint; - + import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; @@ -37,6 +37,7 @@ import javax.management.MBeanServerConnection; import javax.management.ObjectName; + /** * The type Configuration change notifier. */ diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java index ea9c61f635..64fd22e431 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationDataSource.java @@ -5,13 +5,8 @@ import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.lang3.StringUtils; import org.onap.config.ConfigurationUtils; import org.onap.config.Constants; - +import java.util.*; import java.sql.Driver; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.ServiceLoader; -import java.util.Set; /** * The type Configuration data source. diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java index 9df69ed1d7..2956943f7e 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationFilter.java @@ -3,6 +3,7 @@ package org.onap.config.impl; import org.onap.config.Constants; import org.onap.config.api.Configuration; +import javax.servlet.annotation.WebFilter; import java.io.IOException; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -10,7 +11,8 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; + + @WebFilter("/") public class ConfigurationFilter implements Filter { diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java index 7faf3ee8cf..00725b1165 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java @@ -1,7 +1,5 @@ package org.onap.config.impl; -import static org.onap.config.ConfigurationUtils.getConfigurationRepositoryKey; - import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.DatabaseConfiguration; import org.onap.config.ConfigurationUtils; @@ -26,6 +24,8 @@ import java.util.Map; import java.util.Set; import java.util.function.Predicate; +import static org.onap.config.ConfigurationUtils.getConfigurationRepositoryKey; + /** * The type Configuration. */ diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java index 1c3bc1313f..953f793b9d 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationRepository.java @@ -12,15 +12,7 @@ import org.onap.config.Constants; import java.io.File; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * The type Configuration repository. diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java index cf87db936d..cc31e775b7 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ContextListener.java @@ -1,13 +1,14 @@ package org.onap.config.impl; -import static org.onap.config.Constants.MBEAN_NAME; +import org.onap.config.api.ConfigurationManager; -import java.lang.management.ManagementFactory; import javax.management.ObjectName; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; -import org.onap.config.api.ConfigurationManager; +import java.lang.management.ManagementFactory; + +import static org.onap.config.Constants.MBEAN_NAME; @WebListener public class ContextListener implements ServletContextListener { diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java index 90966fccf6..707573640b 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/ConfigurationUtilsTest.java @@ -5,9 +5,7 @@ import org.junit.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ConfigurationUtilsTest { @Test diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml index 64ed8a84b1..700513ea5d 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/pom.xml @@ -1,48 +1,49 @@ - - 4.0.0 + + 4.0.0 - onap-configuration-management-test - onap-configuration-management-test + onap-configuration-management-test + onap-configuration-management-test - - onap-common-configuration-management - org.onap.sdc.common - 1.3.0-SNAPSHOT - .. - + + onap-common-configuration-management + org.onap.sdc.common + 1.3.0-SNAPSHOT + .. + - - - org.onap.sdc.common - onap-configuration-management-core - ${project.version} - - - junit - junit - ${junit.version} - test - - + + + org.onap.sdc.common + onap-configuration-management-core + ${project.version} + + + junit + junit + ${junit.version} + test + + - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mvn.surefire.version} - - true - - ${project.basedir}/src/test/resources - ${user.home}/TestResources - - - **/TestCMSuite.java - - - - - + + + + org.apache.maven.plugins + maven-surefire-plugin + ${mvn.surefire.version} + + true + + ${project.basedir}/src/test/resources + ${user.home}/TestResources + + + **/TestCMSuite.java + + + + + diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java index de265c7281..59df849571 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/TestCMSuite.java @@ -1,30 +1,9 @@ package org.onap.config; -import org.onap.config.test.CLIFallbackAndLookupTest; -import org.onap.config.test.CLITest; -import org.onap.config.test.ConfigSourceLocationTest; -import org.onap.config.test.DynamicConfigurationTest; -import org.onap.config.test.FallbackConfigTest; -import org.onap.config.test.FallbackToGlobalNSTest; -import org.onap.config.test.GlobalAndNSConfigTest; -import org.onap.config.test.JAVAPropertiesConfigTest; -import org.onap.config.test.JSONConfigTest; -import org.onap.config.test.LoadOrderMergeAndOverrideTest; -import org.onap.config.test.ModeAsConfigPropTest; -import org.onap.config.test.MultiTenancyConfigTest; -import org.onap.config.test.NodeSpecificCLITest; -import org.onap.config.test.NotificationForNodeConfigTest; -import org.onap.config.test.NotificationOnPropValTest; -import org.onap.config.test.ResourceChangeNotificationTest; -import org.onap.config.test.UnregisterNotificationTest; -import org.onap.config.test.ValidateDefaultModeTest; -import org.onap.config.test.ValidateNodeConfigTest; -import org.onap.config.test.XMLConfigTest; -import org.onap.config.test.YAMLConfigTest; -import org.onap.config.test.*; import org.junit.AfterClass; import org.junit.runner.RunWith; import org.junit.runners.Suite; +import org.onap.config.test.*; /** * Created by sheetalm on 10/25/2016. diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java index 1e345aee3d..d5990c8dac 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLIFallbackAndLookupTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.Constants; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.TestUtil; -import org.junit.Assert; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import javax.management.JMX; import javax.management.MBeanServerConnection; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java index de863efe5b..18b9c2650b 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/CLITest.java @@ -1,14 +1,14 @@ package org.onap.config.test; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.Constants; -import org.onap.config.api.ConfigurationChangeListener; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.Constants; +import org.onap.config.api.ConfigurationChangeListener; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import javax.management.JMX; import javax.management.MBeanServerConnection; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java index 6751a5cc31..c997e09f8e 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ConfigSourceLocationTest.java @@ -1,19 +1,19 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; -import java.util.Properties; import java.io.OutputStream; -import java.io.FileOutputStream; +import java.util.Properties; /** * Created by sheetalm on 10/14/2016. diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java index 86422d2361..166ba63fab 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/DynamicConfigurationTest.java @@ -1,14 +1,14 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; import org.onap.config.api.DynamicConfiguration; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java index 14d74fb040..b70247b040 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/FallbackToGlobalNSTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java index a0bb51a73f..e4a511064e 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/GlobalAndNSConfigTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java index ab47765a1c..994bd7260b 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JAVAPropertiesConfigTest.java @@ -1,9 +1,9 @@ package org.onap.config.test; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java index b3fcb730fb..bf6ea5c243 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/JSONConfigTest.java @@ -1,9 +1,9 @@ package org.onap.config.test; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java index 244511cbf0..d179edfcfb 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/LoadOrderMergeAndOverrideTest.java @@ -1,7 +1,5 @@ package org.onap.config.test; -import static org.onap.config.util.TestUtil.writeFile; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -13,6 +11,8 @@ import org.onap.config.util.TestUtil; import java.io.IOException; +import static org.onap.config.util.TestUtil.writeFile; + /** * Scenario * Check loadorder for merge and overide. Higher loadorder takes precedence for override diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java index 17130d37c1..7c93af0cf1 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ModeAsConfigPropTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import java.io.IOException; import java.util.ArrayList; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java index 8cdd634794..5765c4de2f 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/MultiTenancyConfigTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.ConfigTestConstant; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java index 41745d36ff..9bd5788532 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NodeSpecificCLITest.java @@ -1,13 +1,13 @@ package org.onap.config.test; -import org.onap.config.util.ConfigTestConstant; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Test; import org.onap.config.Constants; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Test; import javax.management.JMX; import javax.management.MBeanServerConnection; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java index 55af6900a6..1486522ca7 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationForNodeConfigTest.java @@ -1,14 +1,14 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java index c7b93b019a..ca8e812ef4 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/NotificationOnPropValTest.java @@ -1,14 +1,14 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java index 54bd339f29..4547e49d95 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ResourceChangeNotificationTest.java @@ -1,20 +1,18 @@ package org.onap.config.test; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.onap.config.util.ConfigTestConstant; - -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; +import org.onap.config.util.TestUtil; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; /** * Scenario 7 diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java index cdfcfdf22d..687df0e935 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/UnregisterNotificationTest.java @@ -1,14 +1,14 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationChangeListener; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java index f9ce9a37ed..3711322056 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateDefaultModeTest.java @@ -1,12 +1,12 @@ package org.onap.config.test; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.onap.config.util.ConfigTestConstant; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; +import org.onap.config.util.ConfigTestConstant; import java.io.IOException; import java.util.ArrayList; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java index e4f3a84b05..c3f8719de9 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/ValidateNodeConfigTest.java @@ -1,13 +1,13 @@ package org.onap.config.test; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.onap.config.api.Configuration; import org.onap.config.api.ConfigurationManager; import org.onap.config.util.ConfigTestConstant; import org.onap.config.util.TestUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; import java.io.File; import java.io.FileOutputStream; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java index ae6fc3e7b1..22832d378c 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/XMLConfigTest.java @@ -1,9 +1,9 @@ package org.onap.config.test; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java index 46240402f4..f0e7ec54f7 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/test/YAMLConfigTest.java @@ -1,9 +1,9 @@ package org.onap.config.test; -import org.onap.config.util.TestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.onap.config.util.TestUtil; import java.io.IOException; diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java index 83f0371c33..59078c2edb 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/java/org/onap/config/util/TestUtil.java @@ -1,16 +1,16 @@ package org.onap.config.util; -import org.onap.config.ConfigurationUtils; -import org.onap.config.api.Configuration; -import org.onap.config.api.ConfigurationManager; -import org.junit.Assert; - import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; +import org.onap.config.ConfigurationUtils; +import org.onap.config.api.Configuration; +import org.onap.config.api.ConfigurationManager; + /** * Created by sheetalm on 10/13/2016. */ diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json index 5d98a327db..6fb2d5e786 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.json @@ -1,8 +1,12 @@ { - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config":{"namespace": "OPENECOMP:CLI", "mergeStrategy": "union"} - + "artifact": { + "name": { + "minlength": "6" + }, + "extension": "pdf,tgz,xls" + }, + "_config": { + "namespace": "OPENECOMP:CLI", + "mergeStrategy": "union" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml index 2f09871bd5..4f01b69ead 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLI/config.xml @@ -1,18 +1,18 @@ - - - 28 - - gz,tgz - Base64 - deleted - - true - - <_config> - OPENECOMP:CLI - merge - - + + + 28 + + gz,tgz + Base64 + deleted + + true + + <_config> + OPENECOMP:CLI + merge + + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json index a1db251671..00c1555526 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.json @@ -1,8 +1,12 @@ { - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config":{"namespace": "OPENECOMP:CLIFallback", "mergeStrategy": "union"} - + "artifact": { + "name": { + "minlength": "6" + }, + "extension": "pdf,tgz,xls" + }, + "_config": { + "namespace": "OPENECOMP:CLIFallback", + "mergeStrategy": "union" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml index 4c46762cdd..696f73f68a 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/CLIFallback/config.xml @@ -1,18 +1,18 @@ - - - 28 - - gz,tgz - Base64 - deleted - - true - - <_config> - OPENECOMP:CLIFallback - merge - - + + + 28 + + gz,tgz + Base64 + deleted + + true + + <_config> + OPENECOMP:CLIFallback + merge + + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json index c909fe8466..7075a6a531 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.json @@ -1,8 +1,12 @@ { - - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config": {"namespace": "DynamicConfiguration", "mergeStrategy": "union"} + "artifact": { + "name": { + "minlength": "6" + }, + "extension": "pdf,tgz,xls" + }, + "_config": { + "namespace": "DynamicConfiguration", + "mergeStrategy": "union" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml index 3f046e232b..4ad707d21f 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/DynamicConfiguration/config.xml @@ -1,18 +1,18 @@ - - - 28 - - gz,tgz - Base64 - deleted - - true - - <_config> - DynamicConfiguration - merge - - + + + 28 + + gz,tgz + Base64 + deleted + + true + + <_config> + DynamicConfiguration + merge + + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json index 6f3d68ab75..165e318d38 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.json @@ -1,9 +1,12 @@ { - - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config":{"namespace": "FallbackToGlobalNS" , "mergeStrategy": "union"} - + "artifact": { + "name": { + "minlength": "6" + }, + "extension": "pdf,tgz,xls" + }, + "_config": { + "namespace": "FallbackToGlobalNS", + "mergeStrategy": "union" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml index 9a881ab4a7..9e45acf8d4 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/FallbackToGlobalNS/config.xml @@ -1,19 +1,19 @@ - - - 28 - - gz,tgz - Base64 - deleted - - true - - - <_config> - FallbackToGlobalNS - merge - + + + 28 + + gz,tgz + Base64 + deleted + + true + + + <_config> + FallbackToGlobalNS + merge + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json index e59e65855c..26a5fcac0e 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.json @@ -1,10 +1,13 @@ { - - "artifact": { - "name": { "minlength": "6" }, - "maxsize": "1048", - "extension": "pdf,tgz,xls" - }, - "_config": { "mergeStrategy": "union","namespace":"GlobalAndNSConfig" } - + "artifact": { + "name": { + "minlength": "6" + }, + "maxsize": "1048", + "extension": "pdf,tgz,xls" + }, + "_config": { + "mergeStrategy": "union", + "namespace": "GlobalAndNSConfig" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml index d8292c167e..427766bfac 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/GlobalAndNSConfig/config.xml @@ -1,16 +1,16 @@ - - - 28 - - gz,tgz - - true - - - <_config> - GlobalAndNSConfig - merge - + + + 28 + + gz,tgz + + true + + + <_config> + GlobalAndNSConfig + merge + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json index 9c335724bc..eb657ec497 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-M.json @@ -1,16 +1,18 @@ { - - "artifact": { - "name": { "maxlength": "28" }, - "maxsize": "1048576", - "extension": "gz,tgz", - "supportedencryption": "Base64", - "status": "deleted", - "mandatory": { "name": "true" } - }, - "_config": { - "namespace": "JSONConfig", - "mergeStrategy": "merge" - } - + "artifact": { + "name": { + "maxlength": "28" + }, + "maxsize": "1048576", + "extension": "gz,tgz", + "supportedencryption": "Base64", + "status": "deleted", + "mandatory": { + "name": "true" + } + }, + "_config": { + "namespace": "JSONConfig", + "mergeStrategy": "merge" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json index c324fc777c..a397a1bcd5 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-O.json @@ -1,11 +1,13 @@ { - "artifact": { - "name": { "allowedChar": "a-zA-Z_0-9" }, - "encoded": "true", - "consumer": "appc,catalog" - }, - "_config": { - "namespace": "JSONConfig", - "mergeStrategy": "override" - } + "artifact": { + "name": { + "allowedChar": "a-zA-Z_0-9" + }, + "encoded": "true", + "consumer": "appc,catalog" + }, + "_config": { + "namespace": "JSONConfig", + "mergeStrategy": "override" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json index 05a7e2d7ff..18fbfb3670 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config-U.json @@ -1,11 +1,13 @@ { - "artifact": { - "name": { "minlength": "6" }, - "maxsize": "1048", - "extension": "pdf,tgz,xls" - }, - "_config": { - "namespace": "JSONConfig", - "mergeStrategy": "union" - } + "artifact": { + "name": { + "minlength": "6" + }, + "maxsize": "1048", + "extension": "pdf,tgz,xls" + }, + "_config": { + "namespace": "JSONConfig", + "mergeStrategy": "union" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json index 0538ba1717..1bb4e330b1 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/JSONConfiguration/config.json @@ -1,30 +1,28 @@ { - "artifact": { - "name": { - "maxlength": "14", - "allowedChar": "a-zA-Z", - "allowedchar": "a-zA-Z" - }, - "extension": [ - "pdf", - "zip,xml" - - ], - "supportedEncryption": [ - "Base64", - "MD5" - ], - "status": [ - "deleted", - "Deleted" - ], - "persistLocation": "/opt/spool,${sys:user.home}/asdc", - "jsonSchema": "@GeneratorList.json", - "xmlSchema": "@${env:path}/myschema.json", - "consumerAPPC": "${artifact.consumer}" - - }, - "_config": { - "namespace": "JSONConfig" - } + "artifact": { + "name": { + "maxlength": "14", + "allowedChar": "a-zA-Z", + "allowedchar": "a-zA-Z" + }, + "extension": [ + "pdf", + "zip,xml" + ], + "supportedEncryption": [ + "Base64", + "MD5" + ], + "status": [ + "deleted", + "Deleted" + ], + "persistLocation": "/opt/spool,${sys:user.home}/asdc", + "jsonSchema": "@GeneratorList.json", + "xmlSchema": "@${env:path}/myschema.json", + "consumerAPPC": "${artifact.consumer}" + }, + "_config": { + "namespace": "JSONConfig" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json index 7c6d552b82..5540296ee4 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.json @@ -1,8 +1,13 @@ { - "artifact": { - "name": { "minlength": "6" }, - "maxsize": "1048", - "extension": "pdf,tgz,xls" - }, - "_config": { "mergeStrategy": "union" , "namespace":"ModeAsConfigProp" } + "artifact": { + "name": { + "minlength": "6" + }, + "maxsize": "1048", + "extension": "pdf,tgz,xls" + }, + "_config": { + "mergeStrategy": "union", + "namespace": "ModeAsConfigProp" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml index 2d05d2724c..74a999a0a5 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/MergeStrategyAsConfigProp/config.xml @@ -1,16 +1,16 @@ - - - 28 - - gz,tgz - - true - - - <_config> - ModeAsConfigProp - merge - + + + 28 + + gz,tgz + + true + + + <_config> + ModeAsConfigProp + merge + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json index 0d6395af4f..cc6a033b70 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.json @@ -1,12 +1,12 @@ { - - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - "_config":{ - "namespace": "NotificationForNodeConfig", - "mergestrategy": "union" - } - + "artifact": { + "name": { + "minlength": "6" + }, + "extension": "pdf,tgz,xls" + }, + "_config": { + "namespace": "NotificationForNodeConfig", + "mergestrategy": "union" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml index 20768aa949..7448cb0444 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationForNodeConfig/config.xml @@ -1,18 +1,18 @@ - - - 28 - - gz,tgz - Base64 - deleted - - true - - - <_config> - NotificationForNodeConfig - merge - + + + 28 + + gz,tgz + Base64 + deleted + + true + + + <_config> + NotificationForNodeConfig + merge + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json index fc7f2347aa..1027e072cc 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.json @@ -1,9 +1,12 @@ { - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - - "_config": { "mergeStrategy": "union","namespace":"NotificationOnPropVal" } - + "artifact": { + "name": { + "minlength": "6" + }, + "extension": "pdf,tgz,xls" + }, + "_config": { + "mergeStrategy": "union", + "namespace": "NotificationOnPropVal" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml index e3a24fbc32..cb88bb3363 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/NotificationOnPropVal/config.xml @@ -1,18 +1,18 @@ - - - 28 - - gz,tgz - Base64 - deleted - - true - - - <_config> - NotificationOnPropVal - merge - - \ No newline at end of file + + + 28 + + gz,tgz + Base64 + deleted + + true + + + <_config> + NotificationOnPropVal + merge + + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json index 42c6be91b9..0a955a1396 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.json @@ -1,10 +1,13 @@ { - - "artifact": { - "name": { "minlength": "6" }, - "maxsize": "1048", - "extension": "pdf,tgz,xls" - }, - "_config": { "mergeStrategy": "union","namespace":"SourceLocation" } - + "artifact": { + "name": { + "minlength": "6" + }, + "maxsize": "1048", + "extension": "pdf,tgz,xls" + }, + "_config": { + "mergeStrategy": "union", + "namespace": "SourceLocation" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml index 1162af576e..11add8c624 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/SourceLocation/appjarconfig.xml @@ -1,19 +1,19 @@ - - - 28 - - 1048576 - gz,tgz - Base64 - deleted - - true - - + + + 28 + + 1048576 + gz,tgz + Base64 + deleted + + true + + <_config> - SourceLocation - merge - + SourceLocation + merge + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json index 3e0464016d..998bba0e34 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.json @@ -1,9 +1,12 @@ { - "artifact": { - "name": { "minlength": "6" }, - "extension": "pdf,tgz,xls" - }, - - "_config": { "mergeStrategy": "union","namespace":"UnregisterNotification" } - + "artifact": { + "name": { + "minlength": "6" + }, + "extension": "pdf,tgz,xls" + }, + "_config": { + "mergeStrategy": "union", + "namespace": "UnregisterNotification" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml index 1153658161..7f929af1bd 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/UnregisterNotification/config.xml @@ -1,18 +1,18 @@ - - - 28 - - gz,tgz - Base64 - deleted - - true - - - <_config> - UnregisterNotification - merge - - \ No newline at end of file + + + 28 + + gz,tgz + Base64 + deleted + + true + + + <_config> + UnregisterNotification + merge + + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json index 72833024c4..19ca08fd1d 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/ValidateDefaultMode/config-defaultmode.json @@ -1,8 +1,8 @@ { - "artifact": { - "name": { - "minlength": "6" - }, - "extension": "pdf,tgz,xls" - } + "artifact": { + "name": { + "minlength": "6" + }, + "extension": "pdf,tgz,xls" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml index 320e53348d..ef9d2e37de 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-M.xml @@ -1,19 +1,19 @@ - - - 28 - - 1048576 - gz,tgz - Base64 - deleted - - true - - - <_config> - XMLConfig - merge - + + + 28 + + 1048576 + gz,tgz + Base64 + deleted + + true + + + <_config> + XMLConfig + merge + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml index 508c920b83..868e2013bf 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-O.xml @@ -1,14 +1,14 @@ - - - a-zA-Z_0-9 - - true - appc,catalog - - <_config> - XMLConfig - override - + + + a-zA-Z_0-9 + + true + appc,catalog + + <_config> + XMLConfig + override + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml index 962bd342f3..6d0192c142 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config-U.xml @@ -1,14 +1,14 @@ - - - 6 - - 1048 - pdf,tgz,xls - - <_config> - XMLConfig - union - + + + 6 + + 1048 + pdf,tgz,xls + + <_config> + XMLConfig + union + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml index 2fff65b2e0..5c6151f880 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/XMLConfiguration/config.xml @@ -1,25 +1,25 @@ - - - 14 - a-zA-Z - a-zA-Z - - - pdf - zip,xml + + + 14 + a-zA-Z + a-zA-Z + + + pdf + zip,xml - Base64 - MD5 - deleted - Deleted - /opt/spool,${sys:user.home}/asdc - @GeneratorList.json - @${env:path}/myschema.json - ${artifact.consumer} - - <_config> - XMLConfig - + Base64 + MD5 + deleted + Deleted + /opt/spool,${sys:user.home}/asdc + @GeneratorList.json + @${env:path}/myschema.json + ${artifact.consumer} + + <_config> + XMLConfig + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml index 3595efd87b..7872097491 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-merge.xml @@ -1,15 +1,15 @@ - - - 28 - - 1048576 - gz,tgz - Base64 - deleted - - true - - + + + 28 + + 1048576 + gz,tgz + Base64 + deleted + + true + + \ No newline at end of file diff --git a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json index dd6087b70c..7cdc7632e6 100644 --- a/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json +++ b/common/onap-common-configuration-management/onap-configuration-management-test/src/test/resources/fallback/config-fallback-override.json @@ -1,7 +1,9 @@ { - "artifact": { - "name": { "allowedChar": "a-zA-Z_0-9" }, - "encoded": "true", - "consumer": "appc,catalog" - } + "artifact": { + "name": { + "allowedChar": "a-zA-Z_0-9" + }, + "encoded": "true", + "consumer": "appc,catalog" + } } \ No newline at end of file diff --git a/common/onap-common-configuration-management/pom.xml b/common/onap-common-configuration-management/pom.xml index 6c11bdf30c..2367531784 100644 --- a/common/onap-common-configuration-management/pom.xml +++ b/common/onap-common-configuration-management/pom.xml @@ -1,22 +1,23 @@ - - 4.0.0 + + 4.0.0 - onap-common-configuration-management - onap-common-configuration-management - pom + onap-common-configuration-management + onap-common-configuration-management + pom - - org.onap.sdc.common - onap-common-lib - 1.3.0-SNAPSHOT - .. - + + org.onap.sdc.common + onap-common-lib + 1.3.0-SNAPSHOT + .. + - - onap-configuration-management-api - onap-configuration-management-core - onap-configuration-management-test - + + onap-configuration-management-api + onap-configuration-management-core + onap-configuration-management-test + -- cgit 1.2.3-korg