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/modules/service/src/test/kotlin/org/onap | |
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/modules/service/src/test/kotlin/org/onap')
2 files changed, 4 insertions, 4 deletions
diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt index 741431840..e55f2a511 100644 --- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt +++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/ModelTypeServiceTest.kt @@ -16,7 +16,6 @@ package org.onap.ccsdk.cds.controllerblueprints.service -import com.att.eelf.configuration.EELFManager import kotlinx.coroutines.runBlocking import org.junit.Assert import org.junit.FixMethodOrder @@ -28,6 +27,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils import org.onap.ccsdk.cds.controllerblueprints.service.domain.ModelType import org.onap.ccsdk.cds.controllerblueprints.service.handler.ModelTypeHandler +import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.test.annotation.Commit @@ -48,7 +48,7 @@ class ModelTypeServiceTest { internal var modelName = "test-datatype" - private val log = EELFManager.getInstance().getLogger(ModelTypeServiceTest::class.java) + private val log = LoggerFactory.getLogger(ModelTypeServiceTest::class.java) @Test @Commit diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt index 610c9d033..4af8851a5 100644 --- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt +++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ModelTypeControllerTest.kt @@ -16,7 +16,6 @@ package org.onap.ccsdk.cds.controllerblueprints.service.controller -import com.att.eelf.configuration.EELFManager import org.junit.Assert import org.junit.FixMethodOrder import org.junit.Test @@ -26,6 +25,7 @@ import org.onap.ccsdk.cds.controllerblueprints.TestApplication import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils import org.onap.ccsdk.cds.controllerblueprints.service.domain.ModelType +import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest import org.springframework.test.annotation.Commit @@ -38,7 +38,7 @@ import org.springframework.test.context.junit4.SpringRunner @FixMethodOrder(MethodSorters.NAME_ASCENDING) class ModelTypeControllerTest { - private val log = EELFManager.getInstance().getLogger(ModelTypeControllerTest::class.java)!! + private val log = LoggerFactory.getLogger(ModelTypeControllerTest::class.java)!! @Autowired internal var modelTypeController: ModelTypeController? = null |