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 --- .../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 +++-- 53 files changed, 476 insertions(+), 461 deletions(-) (limited to 'common/onap-common-configuration-management/onap-configuration-management-test/src') 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 -- cgit 1.2.3-korg