diff options
2 files changed, 59 insertions, 1 deletions
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 9431e12585..520852ee1f 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 @@ -24,10 +24,14 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import javax.servlet.annotation.WebListener; import org.onap.config.api.ConfigurationManager; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; @WebListener public class ContextListener implements ServletContextListener { + private static final Logger LOGGER = LoggerFactory.getLogger(ContextListener.class); + @Override public void contextInitialized(ServletContextEvent arg0) { ConfigurationManager.lookup(); @@ -38,7 +42,7 @@ public class ContextListener implements ServletContextListener { try { ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName(MBEAN_NAME)); } catch (Exception exception) { - exception.printStackTrace(); + LOGGER.error("Unregistering bean '{}' failed.", MBEAN_NAME, exception); } } } diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ConfigurationQueryTest.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ConfigurationQueryTest.java new file mode 100644 index 0000000000..7a468ce7f5 --- /dev/null +++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/test/java/org/onap/config/test/ConfigurationQueryTest.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2019 Samsung. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.config.test; + +import org.junit.Test; +import org.onap.config.type.ConfigurationQuery; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class ConfigurationQueryTest { + private static String TENANT = "OPENECOMP"; + private static String NAMESPACE = "tetsNamepspace"; + private static String KEY = "testKey"; + + @Test + public void testConfigurationQueryBuild() { + // given + ConfigurationQuery configurationQuery = new ConfigurationQuery(); + + // when + configurationQuery = configurationQuery + .externalLookup(true) + .fallback(true) + .latest(true) + .nodeSpecific(true) + .namespace(NAMESPACE) + .tenant(TENANT) + .key(KEY); + + // then + assertEquals(TENANT.toUpperCase(), configurationQuery.getTenant()); + assertEquals(NAMESPACE.toUpperCase(), configurationQuery.getNamespace()); + assertEquals(KEY, configurationQuery.getKey()); + assertTrue(configurationQuery.isExternalLookup()); + assertTrue(configurationQuery.isFallback()); + assertTrue(configurationQuery.isLatest()); + assertTrue(configurationQuery.isNodeSpecific()); + } +} |