From c24e4a963669cfd044d7478a801e8f170faba4fe Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 23 Oct 2019 19:48:40 -0700 Subject: [PATCH] Some minor cleanups (#627) Signed-off-by: Bogdan Drutu --- all/build.gradle | 2 +- .../distributedcontext/EmptyDistributedContext.java | 2 +- .../io/opentelemetry/distributedcontext/EntryMetadata.java | 2 +- api/src/main/java/io/opentelemetry/trace/Status.java | 2 +- api/src/main/java/io/opentelemetry/trace/TraceFlags.java | 1 - api/src/main/java/io/opentelemetry/trace/Tracestate.java | 2 -- .../io/opentelemetry/trace/propagation/HttpTraceContext.java | 3 +-- exporters/jaeger/build.gradle | 2 +- proto/build.gradle | 2 +- .../java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java | 1 - 10 files changed, 7 insertions(+), 12 deletions(-) diff --git a/all/build.gradle b/all/build.gradle index f333f98050..2dda052ce7 100644 --- a/all/build.gradle +++ b/all/build.gradle @@ -42,7 +42,7 @@ javadoc { }) for (subproject in subprojects_javadoc) { if (subproject == project) { - continue; + continue } source subproject.javadoc.source options.links subproject.javadoc.options.links.toArray(new String[0]) diff --git a/api/src/main/java/io/opentelemetry/distributedcontext/EmptyDistributedContext.java b/api/src/main/java/io/opentelemetry/distributedcontext/EmptyDistributedContext.java index a83e9fb1c1..46bef8ea36 100644 --- a/api/src/main/java/io/opentelemetry/distributedcontext/EmptyDistributedContext.java +++ b/api/src/main/java/io/opentelemetry/distributedcontext/EmptyDistributedContext.java @@ -26,7 +26,7 @@ import javax.annotation.concurrent.Immutable; */ @Immutable public class EmptyDistributedContext implements DistributedContext { - private static final Collection EMPTY_COLLECTION = Collections.emptyList(); + private static final Collection EMPTY_COLLECTION = Collections.emptyList(); /** * Returns the single instance of the {@link EmptyDistributedContext} class. diff --git a/api/src/main/java/io/opentelemetry/distributedcontext/EntryMetadata.java b/api/src/main/java/io/opentelemetry/distributedcontext/EntryMetadata.java index e699d3969f..ce90a76d9f 100644 --- a/api/src/main/java/io/opentelemetry/distributedcontext/EntryMetadata.java +++ b/api/src/main/java/io/opentelemetry/distributedcontext/EntryMetadata.java @@ -89,7 +89,7 @@ public abstract class EntryMetadata { private final int hops; - private EntryTtl(int hops) { + EntryTtl(int hops) { this.hops = hops; } diff --git a/api/src/main/java/io/opentelemetry/trace/Status.java b/api/src/main/java/io/opentelemetry/trace/Status.java index 2ed1d49282..e82e528e11 100644 --- a/api/src/main/java/io/opentelemetry/trace/Status.java +++ b/api/src/main/java/io/opentelemetry/trace/Status.java @@ -203,7 +203,7 @@ public final class Status { private final int value; - private CanonicalCode(int value) { + CanonicalCode(int value) { this.value = value; } diff --git a/api/src/main/java/io/opentelemetry/trace/TraceFlags.java b/api/src/main/java/io/opentelemetry/trace/TraceFlags.java index 068e88c827..c22b6d2a46 100644 --- a/api/src/main/java/io/opentelemetry/trace/TraceFlags.java +++ b/api/src/main/java/io/opentelemetry/trace/TraceFlags.java @@ -232,7 +232,6 @@ public final class TraceFlags { options = (byte) (options | IS_SAMPLED); } else { options = (byte) (options & ~IS_SAMPLED); - ; } return this; } diff --git a/api/src/main/java/io/opentelemetry/trace/Tracestate.java b/api/src/main/java/io/opentelemetry/trace/Tracestate.java index 59723ca843..6a485bbe8b 100644 --- a/api/src/main/java/io/opentelemetry/trace/Tracestate.java +++ b/api/src/main/java/io/opentelemetry/trace/Tracestate.java @@ -131,7 +131,6 @@ public abstract class Tracestate { * @return this. * @since 0.1.0 */ - @SuppressWarnings("nullness") public Builder set(String key, String value) { // Initially create the Entry to validate input. Entry entry = Entry.create(key, value); @@ -158,7 +157,6 @@ public abstract class Tracestate { * @return this. * @since 0.1.0 */ - @SuppressWarnings("nullness") public Builder remove(String key) { Utils.checkNotNull(key, "key"); if (entries == null) { diff --git a/api/src/main/java/io/opentelemetry/trace/propagation/HttpTraceContext.java b/api/src/main/java/io/opentelemetry/trace/propagation/HttpTraceContext.java index ef13439792..68141144ea 100644 --- a/api/src/main/java/io/opentelemetry/trace/propagation/HttpTraceContext.java +++ b/api/src/main/java/io/opentelemetry/trace/propagation/HttpTraceContext.java @@ -146,8 +146,7 @@ public class HttpTraceContext implements HttpTextFormat { String listMember = listMembers[i]; int index = listMember.indexOf(TRACESTATE_KEY_VALUE_DELIMITER); checkArgument(index != -1, "Invalid tracestate list-member format."); - tracestateBuilder.set( - listMember.substring(0, index), listMember.substring(index + 1, listMember.length())); + tracestateBuilder.set(listMember.substring(0, index), listMember.substring(index + 1)); } return SpanContext.create(traceId, spanId, traceFlags, tracestateBuilder.build()); } catch (IllegalArgumentException e) { diff --git a/exporters/jaeger/build.gradle b/exporters/jaeger/build.gradle index c964b8df7d..2bbd9ced23 100644 --- a/exporters/jaeger/build.gradle +++ b/exporters/jaeger/build.gradle @@ -54,7 +54,7 @@ protobuf { // generated Java directories as source folders. idea { module { - sourceDirs += file("build/generated/source/proto/main/java"); + sourceDirs += file("build/generated/source/proto/main/java") // If you have additional sourceSets and/or codegen plugins, add all of them } } diff --git a/proto/build.gradle b/proto/build.gradle index dbb49cb6b5..4542590385 100644 --- a/proto/build.gradle +++ b/proto/build.gradle @@ -36,7 +36,7 @@ protobuf { // generated Java directories as source folders. idea { module { - sourceDirs += file("build/generated/source/proto/main/java"); + sourceDirs += file("build/generated/source/proto/main/java") // If you have additional sourceSets and/or codegen plugins, add all of them } } diff --git a/sdk/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java b/sdk/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java index 578802a218..06c42b7603 100644 --- a/sdk/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java +++ b/sdk/src/test/java/io/opentelemetry/sdk/trace/SpanBuilderSdkTest.java @@ -44,7 +44,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; /** Unit tests for {@link SpanBuilderSdk}. */ -@SuppressWarnings("deprecation") @RunWith(JUnit4.class) public class SpanBuilderSdkTest { private static final String SPAN_NAME = "span_name";