From c4efe038f0a604a59331c69b34a415514a98a7df Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Thu, 28 Mar 2019 15:43:40 -0400 Subject: Fix logging dependency conflict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 Signed-off-by: prathamesh morde --- .../service/ApplicationRegistrationService.java | 6 +++--- .../controllerblueprints/service/AutoResourceMappingService.java | 6 +++--- .../cds/controllerblueprints/service/SchemaGeneratorService.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'ms/controllerblueprints/modules/service/src/main/java/org') diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/ApplicationRegistrationService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/ApplicationRegistrationService.java index 1e7109262..51484ff6c 100644 --- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/ApplicationRegistrationService.java +++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/ApplicationRegistrationService.java @@ -17,10 +17,10 @@ package org.onap.ccsdk.cds.controllerblueprints.service; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; import org.apache.commons.collections.CollectionUtils; import org.onap.ccsdk.cds.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -30,7 +30,7 @@ import java.util.List; @Component @SuppressWarnings("unused") public class ApplicationRegistrationService { - private static EELFLogger log = EELFManager.getInstance().getLogger(ApplicationRegistrationService.class); + private static Logger log = LoggerFactory.getLogger(ApplicationRegistrationService.class); @Value("#{'${resourceSourceMappings}'.split(',')}") private List resourceSourceMappings; diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/AutoResourceMappingService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/AutoResourceMappingService.java index c04c0dcf4..b9eff7624 100644 --- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/AutoResourceMappingService.java +++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/AutoResourceMappingService.java @@ -17,8 +17,6 @@ package org.onap.ccsdk.cds.controllerblueprints.service; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; import com.google.common.base.Preconditions; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -30,6 +28,8 @@ import org.onap.ccsdk.cds.controllerblueprints.resource.dict.utils.ResourceDicti import org.onap.ccsdk.cds.controllerblueprints.service.domain.ResourceDictionary; import org.onap.ccsdk.cds.controllerblueprints.service.model.AutoMapResponse; import org.onap.ccsdk.cds.controllerblueprints.service.repository.ResourceDictionaryRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -48,7 +48,7 @@ import java.util.Map; @SuppressWarnings("unused") public class AutoResourceMappingService { - private static EELFLogger log = EELFManager.getInstance().getLogger(AutoResourceMappingService.class); + private static Logger log = LoggerFactory.getLogger(AutoResourceMappingService.class); private ResourceDictionaryRepository dataDictionaryRepository; diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/SchemaGeneratorService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/SchemaGeneratorService.java index 6c09ef8cd..7d4d93b3d 100644 --- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/SchemaGeneratorService.java +++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/SchemaGeneratorService.java @@ -16,8 +16,6 @@ package org.onap.ccsdk.cds.controllerblueprints.service; -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; import com.google.common.base.Preconditions; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -29,6 +27,8 @@ import org.onap.ccsdk.cds.controllerblueprints.service.common.SwaggerGenerator; import java.util.HashMap; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * SchemaGeneratorService.java Purpose: Provide Service to generate service template input schema definition and Sample @@ -39,7 +39,7 @@ import java.util.Map; */ @Deprecated public class SchemaGeneratorService { - private static EELFLogger log = EELFManager.getInstance().getLogger(SchemaGeneratorService.class); + private static Logger log = LoggerFactory.getLogger(SchemaGeneratorService.class); private Map dataTypes; -- cgit 1.2.3-korg