From 516f7fbe31ad877fd0f70de69ab9bf0d34b6cc71 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 29 Nov 2017 17:59:11 +0100 Subject: [PATCH] Fixed log imports --- .../client/feign/issues/issue307/Issue307Tests.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue307/Issue307Tests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue307/Issue307Tests.java index cd3ed754a..cbda2dcaa 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue307/Issue307Tests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue307/Issue307Tests.java @@ -19,10 +19,11 @@ package org.springframework.cloud.sleuth.instrument.web.client.feign.issues.issu import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -43,8 +44,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; - import static org.assertj.core.api.BDDAssertions.then; public class Issue307Tests { @@ -70,7 +69,7 @@ public class Issue307Tests { @EnableCircuitBreaker class SleuthSampleApplication { - private static final Logger LOG = Logger.getLogger(SleuthSampleApplication.class.getName()); + private static final Logger LOG = LoggerFactory.getLogger(SleuthSampleApplication.class.getName()); @Autowired private RestTemplate restTemplate; @@ -93,13 +92,13 @@ class SleuthSampleApplication { @RequestMapping("/") public String home() { - LOG.log(Level.INFO, "you called home"); + LOG.info("you called home"); return "Hello World"; } @RequestMapping("/callhome") public String callHome() { - LOG.log(Level.INFO, "calling home"); + LOG.info("calling home"); return restTemplate.getForObject("http://localhost:" + port(), String.class); }