SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-25 12:04:41 +02:00
parent 76d7dfb5b3 b83caf4ac0
commit db5e16f998
36 changed files with 92 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/src/main/java/sample/SampleController.java
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) {

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/src/main/java/sample/SampleFeignApplication.java
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);

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleRibbonApplication.java
View File

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

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java
View File

@@ -49,7 +49,7 @@ public class SampleController
@Autowired
private SampleBackground controller;
private Random random = new Random();
final private Random random = new Random();
private int port;
@RequestMapping("/")

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleSleuthApplication.java
View File

@@ -31,8 +31,6 @@ import org.springframework.web.client.RestTemplate;
@EnableAsync
public class SampleSleuthApplication {
public static final String CLIENT_NAME = "testApp";
@Bean
public RestTemplate restTemplate() {
return new RestTemplate();

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java
View File

@@ -53,7 +53,7 @@ public abstract class AbstractIntegrationTest {
protected static final int POLL_INTERVAL = 1;
protected static final int TIMEOUT = 20;
protected RestTemplate restTemplate = new AssertingRestTemplate();
protected final RestTemplate restTemplate = new AssertingRestTemplate();
@Before
public void clearSpanBefore() {

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java
View File

@@ -48,7 +48,7 @@ public class SampleController
@Autowired
private SampleBackground controller;
private Random random = new Random();
private final Random random = new Random();
private int port;
@RequestMapping("/")

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java
View File

@@ -31,8 +31,6 @@ import org.springframework.web.client.RestTemplate;
@EnableAsync
public class SampleSleuthApplication {
public static final String CLIENT_NAME = "testApp";
@Bean
public RestTemplate restTemplate() {
return new RestTemplate();