Delomboking

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleBackground.java

@@ -16,14 +16,13 @@
 
 package sample;
 
-import lombok.SneakyThrows;
+import java.util.Random;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.sleuth.Tracer;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import java.util.Random;
-
 /**
  * @author Spencer Gibb
  */
@@ -35,9 +34,8 @@ public class SampleBackground {
 	@Autowired
 	private Random random;
 
-	@SneakyThrows
 	@Async
-	public void background() {
+	public void background() throws InterruptedException {
 		int millis = this.random.nextInt(1000);
 		Thread.sleep(millis);
 		this.tracer.addTag("background-sleep-millis", String.valueOf(millis));

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java

@@ -19,6 +19,7 @@ package sample;
 import java.util.Random;
 import java.util.concurrent.Callable;
 
+import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
 import org.springframework.cloud.sleuth.Span;
@@ -31,16 +32,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * @author Spencer Gibb
  */
-@Slf4j
 @RestController
 public class SampleController implements
 ApplicationListener<EmbeddedServletContainerInitializedEvent> {
+
+	private static final Logger log = org.slf4j.LoggerFactory
+			.getLogger(SampleController.class);
+
 	@Autowired
 	private RestTemplate restTemplate;
 	@Autowired
@@ -53,9 +54,8 @@ ApplicationListener<EmbeddedServletContainerInitializedEvent> {
 	private Random random;
 	private int port;
 
-	@SneakyThrows
 	@RequestMapping("/")
-	public String hi() {
+	public String hi() throws InterruptedException {
 		Thread.sleep(this.random.nextInt(1000));
 		log.info("Home page");
 		String s = this.restTemplate.getForObject("http://localhost:" + this.port
@@ -78,15 +78,14 @@ ApplicationListener<EmbeddedServletContainerInitializedEvent> {
 	}
 
 	@RequestMapping("/async")
-	public String async() {
+	public String async() throws InterruptedException {
 		log.info("async");
 		this.controller.background();
 		return "ho";
 	}
 
-	@SneakyThrows
 	@RequestMapping("/hi2")
-	public String hi2() {
+	public String hi2() throws InterruptedException {
 		log.info("hi2");
 		int millis = this.random.nextInt(1000);
 		Thread.sleep(millis);
@@ -94,9 +93,8 @@ ApplicationListener<EmbeddedServletContainerInitializedEvent> {
 		return "hi2";
 	}
 
-	@SneakyThrows
 	@RequestMapping("/traced")
-	public String traced() {
+	public String traced() throws InterruptedException {
 		Span span = this.tracer.startTrace(new SpanName("http", "customTraceEndpoint"),
 				new AlwaysSampler());
 		int millis = this.random.nextInt(1000);
@@ -110,9 +108,8 @@ ApplicationListener<EmbeddedServletContainerInitializedEvent> {
 		return "traced/" + s;
 	}
 
-	@SneakyThrows
 	@RequestMapping("/start")
-	public String start() {
+	public String start() throws InterruptedException {
 		int millis = this.random.nextInt(1000);
 		log.info("Sleeping for {} millis", millis);
 		Thread.sleep(millis);

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java

@@ -16,6 +16,7 @@
 
 package sample;
 
+import org.slf4j.Logger;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -24,17 +25,17 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * @author Spencer Gibb
  */
 @SpringBootApplication
 @EnableAspectJAutoProxy(proxyTargetClass = true)
 @EnableAsync
-@Slf4j
 public class SampleZipkinApplication {
 
+	private static final Logger log = org.slf4j.LoggerFactory
+			.getLogger(SampleZipkinApplication.class);
+
 	public static void main(String[] args) {
 		SpringApplication.run(SampleZipkinApplication.class, args);
 	}

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java

@@ -20,6 +20,7 @@ import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.WebIntegrationTest;
@@ -33,8 +34,6 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import integration.ZipkinTests.WaitUntilZipkinIsUpConfig;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
 import sample.SampleZipkinApplication;
 import tools.AbstractIntegrationTest;
 import zipkin.server.ZipkinServer;
@@ -73,10 +72,12 @@ public class ZipkinTests extends AbstractIntegrationTest {
 	}
 
 	@Configuration
-	@Slf4j
 	public static class WaitUntilZipkinIsUpConfig {
+
+		private static final Logger log = org.slf4j.LoggerFactory
+				.getLogger(WaitUntilZipkinIsUpConfig.class);
+
 		@Bean
-		@SneakyThrows
 		public ZipkinSpanReporter spanCollector(final ZipkinProperties zipkin,
 				final SpanReporterService spanReporterService) {
 			await().until(new Runnable() {