Address build warnings (#455)

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
jaegertracing · Jun 18, 2018 · 8b87ab7 · 8b87ab7
1 parent 4f1c0b9
commit 8b87ab7
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -143,6 +143,7 @@ subprojects {
     }
 
     dependencies {
+        annotationProcessor 'org.projectlombok:lombok:1.16.18'
         compileOnly 'org.projectlombok:lombok:1.16.18'
         compileOnly 'org.codehaus.mojo:animal-sniffer-annotations:1.16'
     }

diff --git a/jaeger-core/src/main/java/io/jaegertracing/Configuration.java b/jaeger-core/src/main/java/io/jaegertracing/Configuration.java
@@ -421,8 +421,8 @@ public static CodecConfiguration fromEnv() {
                 addCodec(codecs, Format.Builtin.TEXT_MAP, new TextMapCodec(false));
                 break;
               case B3:
-                addCodec(codecs, Format.Builtin.HTTP_HEADERS, new B3TextMapCodec());
-                addCodec(codecs, Format.Builtin.TEXT_MAP, new B3TextMapCodec());
+                addCodec(codecs, Format.Builtin.HTTP_HEADERS, new B3TextMapCodec.Builder().build());
+                addCodec(codecs, Format.Builtin.TEXT_MAP, new B3TextMapCodec.Builder().build());
                 break;
               default:
                 log.error("Unhandled propagation format '" + format + "'");

diff --git a/jaeger-core/src/test/java/io/jaegertracing/ConfigurationTest.java b/jaeger-core/src/test/java/io/jaegertracing/ConfigurationTest.java
@@ -368,8 +368,9 @@ public void testDefaultCodecs() {
     assertInjectExtract(configuration.getTracer(), Builtin.HTTP_HEADERS, spanContext, false);
   }
 
+  @SuppressWarnings("unchecked")
   private <C> void assertInjectExtract(io.opentracing.Tracer tracer, Format<C> format, SpanContext contextToInject,
-      boolean injectMapIsEmpty) {
+                                       boolean injectMapIsEmpty) {
     HashMap<String, String> injectMap = new HashMap<>();
     tracer.inject(contextToInject, format, (C)new TextMapInjectAdapter(injectMap));
     assertEquals(injectMapIsEmpty, injectMap.isEmpty());

diff --git a/jaeger-core/src/test/java/io/jaegertracing/TracerTest.java b/jaeger-core/src/test/java/io/jaegertracing/TracerTest.java
@@ -17,7 +17,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 

diff --git a/jaeger-core/src/test/java/io/jaegertracing/propagation/B3TextMapCodecResiliencyTest.java b/jaeger-core/src/test/java/io/jaegertracing/propagation/B3TextMapCodecResiliencyTest.java
@@ -27,7 +27,7 @@
 @RunWith(DataProviderRunner.class)
 public class B3TextMapCodecResiliencyTest {
 
-  private B3TextMapCodec sut = new B3TextMapCodec();
+  private B3TextMapCodec sut = new B3TextMapCodec.Builder().build();
 
   @DataProvider
   public static Object[][] maliciousInputs() {

diff --git a/jaeger-core/src/test/java/io/jaegertracing/propagation/B3TextMapCodecTest.java b/jaeger-core/src/test/java/io/jaegertracing/propagation/B3TextMapCodecTest.java
@@ -37,7 +37,7 @@
 public class B3TextMapCodecTest {
   static final byte SAMPLED = 1;
 
-  B3TextMapCodec b3Codec = new B3TextMapCodec();
+  B3TextMapCodec b3Codec = new B3TextMapCodec.Builder().build();
 
   @Test
   public void downgrades128BitTraceIdToLower64Bits() throws Exception {

diff --git a/jaeger-zipkin/src/test/java/io/jaegertracing/zipkin/reporters/ZipkinV2ReporterTest.java b/jaeger-zipkin/src/test/java/io/jaegertracing/zipkin/reporters/ZipkinV2ReporterTest.java
@@ -28,6 +28,7 @@
 import org.junit.Test;
 import zipkin.junit.ZipkinRule;
 import zipkin2.codec.Encoding;
+import zipkin2.reporter.AsyncReporter;
 import zipkin2.reporter.Sender;
 import zipkin2.reporter.urlconnection.URLConnectionSender;
 
@@ -36,7 +37,7 @@ public class ZipkinV2ReporterTest {
   @Rule public ZipkinRule zipkinRule = new ZipkinRule();
 
   Sender sender;
-  zipkin2.reporter.AsyncReporter zipkinReporter;
+  AsyncReporter<zipkin2.Span> zipkinReporter;
   Reporter reporter;
   Tracer tracer;