diff options
author | 2019-03-28 15:43:40 -0400 | |
---|---|---|
committer | 2019-03-29 13:56:34 -0400 | |
commit | c4efe038f0a604a59331c69b34a415514a98a7df (patch) | |
tree | e99f07a1b926e8fe7bdcf5b13aa2f9c191797158 /ms/controllerblueprints/application/src | |
parent | c16b2a0a18a8fc8a1c6936cded56827620012968 (diff) |
Fix logging dependency conflict
- use spring logging framework
- get rid of EELF
- do not get sl4fj transitivly
Change-Id: I1d47749b53dca2f3a815a2d9898b7a0388725655
Issue-ID: SDNC-710
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Signed-off-by: prathamesh morde <prathamesh.morde@bell.ca>
Diffstat (limited to 'ms/controllerblueprints/application/src')
3 files changed, 9 insertions, 9 deletions
diff --git a/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/ControllerBlueprintsApplication.java b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/ControllerBlueprintsApplication.java index 29d2eb7c7..df979c6b3 100644 --- a/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/ControllerBlueprintsApplication.java +++ b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/ControllerBlueprintsApplication.java @@ -16,8 +16,8 @@ package org.onap.ccsdk.cds.controllerblueprints; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -32,7 +32,7 @@ import org.springframework.web.reactive.config.EnableWebFlux; @ComponentScan(basePackages = {"org.onap.ccsdk.cds.controllerblueprints"}) @EnableAutoConfiguration public class ControllerBlueprintsApplication { - private static EELFLogger log = EELFManager.getInstance().getLogger(ControllerBlueprintsApplication.class); + private static Logger log = LoggerFactory.getLogger(ControllerBlueprintsApplication.class); public static void main(String[] args) { log.info("****** Starting Controlled Blueprints Application ******"); diff --git a/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/security/ApplicationSecurityConfigurerAdapter.java b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/security/ApplicationSecurityConfigurerAdapter.java index 131ff015d..d992dd945 100644 --- a/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/security/ApplicationSecurityConfigurerAdapter.java +++ b/ms/controllerblueprints/application/src/main/java/org/onap/ccsdk/cds/controllerblueprints/security/ApplicationSecurityConfigurerAdapter.java @@ -16,8 +16,8 @@ package org.onap.ccsdk.cds.controllerblueprints.security; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; @@ -37,7 +37,7 @@ public class ApplicationSecurityConfigurerAdapter { @Value("${basic-auth.hashed-pwd}") private String userHashedPassword; - private static EELFLogger log = EELFManager.getInstance().getLogger(ApplicationSecurityConfigurerAdapter.class); + private static Logger log = LoggerFactory.getLogger(ApplicationSecurityConfigurerAdapter.class); @Bean public SecurityWebFilterChain springWebFilterChain(ServerHttpSecurity http) throws Exception { diff --git a/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/VersionSplitTest.java b/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/VersionSplitTest.java index 71597afc4..9688b26b1 100644 --- a/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/VersionSplitTest.java +++ b/ms/controllerblueprints/application/src/test/java/org/onap/ccsdk/apps/controllerblueprints/VersionSplitTest.java @@ -16,11 +16,11 @@ package org.onap.ccsdk.cds.controllerblueprints;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
import org.apache.commons.lang3.StringUtils;
import org.junit.Assert;
import org.junit.Test;
+import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
@@ -29,7 +29,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; * @author Brinda Santh
*/
public class VersionSplitTest {
- private static EELFLogger log = EELFManager.getInstance().getLogger(VersionSplitTest.class);
+ private static Logger log = LoggerFactory.getLogger(VersionSplitTest.class); @Test
public void testVersionSplit() {
|