Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-08-25 12:04:41 +02:00
36 changed files with 92 additions and 94 deletions

View File

@@ -31,9 +31,8 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class SampleController {
private Zipkin zipkin;
private Random random = new Random();
private final Zipkin zipkin;
private final Random random = new Random();
@Autowired
public SampleController(Zipkin zipkin) {

View File

@@ -34,7 +34,7 @@ import zipkin.Span;
@EnableFeignClients
public class SampleFeignApplication {
private static Log logger = LogFactory.getLog(SampleFeignApplication.class);
private static final Log logger = LogFactory.getLog(SampleFeignApplication.class);
public static void main(String[] args) {
SpringApplication.run(SampleFeignApplication.class, args);