From 0f9c0df9e651bbcbdb3e4b8133f57abe2482cbec Mon Sep 17 00:00:00 2001 From: Zihmin Hoover Date: Fri, 22 Nov 2019 14:53:04 -0500 Subject: Add context sensitive logging to ConfigurationFactory.java Add context sensitive logging to ConfigurationFactory.java Change-Id: I950687870f2c9d9835ec6b04ccb73ef57c884152 Issue-ID: APPC-1782 Signed-off-by: Zihmin Hoover --- .../appc/configuration/ConfigurationFactory.java | 6 +++++- .../provider/src/test/resources/xml/.gitignore | 22 ---------------------- 2 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 appc-directed-graph/dg-loader/provider/src/test/resources/xml/.gitignore diff --git a/appc-core/appc-common-bundle/src/main/java/org/onap/appc/configuration/ConfigurationFactory.java b/appc-core/appc-common-bundle/src/main/java/org/onap/appc/configuration/ConfigurationFactory.java index 9ea5083fe..d66a3fe82 100644 --- a/appc-core/appc-common-bundle/src/main/java/org/onap/appc/configuration/ConfigurationFactory.java +++ b/appc-core/appc-common-bundle/src/main/java/org/onap/appc/configuration/ConfigurationFactory.java @@ -36,6 +36,7 @@ import java.util.Properties; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; +import org.apache.commons.lang3.StringUtils; import org.onap.appc.i18n.Msg; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -312,7 +313,10 @@ public final class ConfigurationFactory { } } for (String key : config.getProperties().stringPropertyNames()) { - logger.info(Msg.PROPERTY_VALUE, key, config.getProperty(key)); + if ((!StringUtils.containsIgnoreCase(key, "pass"))&&(!StringUtils.containsIgnoreCase(key, "secret"))) + logger.info(Msg.PROPERTY_VALUE, key, config.getProperty(key)); + else + logger.info(Msg.PROPERTY_VALUE, key, config.getProperty(key)); } } else { logger.info(Msg.NO_DEFAULTS_FOUND, DEFAULT_PROPERTIES); diff --git a/appc-directed-graph/dg-loader/provider/src/test/resources/xml/.gitignore b/appc-directed-graph/dg-loader/provider/src/test/resources/xml/.gitignore deleted file mode 100644 index 1570f9901..000000000 --- a/appc-directed-graph/dg-loader/provider/src/test/resources/xml/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -# ============LICENSE_START========================================== -# ONAP : APPC -# =================================================================== -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. -# =================================================================== -# -# Unless otherwise specified, all software contained herein is licensed -# under the Apache License, Version 2.0 (the License); -# you may not use this software 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. -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# ============LICENSE_END============================================ -Appc_UniTest.xml -- cgit 1.2.3-korg