Some minor cleanups (open-telemetry#627)

bogdandrutu · web-flow · commit c24e4a963669 · 2019-10-23T19:48:40.000-07:00
Signed-off-by: Bogdan Drutu &lt;bogdandrutu@gmail.com&gt;
diff --git 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
@@ -26,7 +26,7 @@
  */
 @Immutable
 public class EmptyDistributedContext implements DistributedContext {
-  private static final Collection<Entry> EMPTY_COLLECTION = Collections.<Entry>emptyList();
+  private static final Collection<Entry> 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
@@ -89,7 +89,7 @@ public enum EntryTtl {
 
     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
@@ -203,7 +203,7 @@ public enum CanonicalCode {
 
     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
@@ -232,7 +232,6 @@ public Builder setIsSampled(boolean isSampled) {
         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
@@ -131,7 +131,6 @@ private Builder(Tracestate parent) {
      * @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 Builder set(String key, String value) {
      * @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
@@ -146,8 +146,7 @@ public <C> void inject(SpanContext spanContext, C carrier, Setter<C> setter) {
         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
@@ -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
@@ -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
@@ -44,7 +44,6 @@
 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";

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ javadoc {`
`42`	`42`	`})`
`43`	`43`	`for (subproject in subprojects_javadoc) {`
`44`	`44`	`if (subproject == project) {`
`45`		`- continue;`
	`45`	`+ continue`
`46`	`46`	`}`
`47`	`47`	`source subproject.javadoc.source`
`48`	`48`	`options.links subproject.javadoc.options.links.toArray(new String[0])`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public enum EntryTtl {`
`89`	`89`
`90`	`90`	`private final int hops;`
`91`	`91`
`92`		`- private EntryTtl(int hops) {`
	`92`	`+ EntryTtl(int hops) {`
`93`	`93`	`this.hops = hops;`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public enum CanonicalCode {`
`203`	`203`
`204`	`204`	`private final int value;`
`205`	`205`
`206`		`- private CanonicalCode(int value) {`
	`206`	`+ CanonicalCode(int value) {`
`207`	`207`	`this.value = value;`
`208`	`208`	`}`
`209`	`209`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,6 @@ public Builder setIsSampled(boolean isSampled) {`
`232`	`232`	`options = (byte) (options \| IS_SAMPLED);`
`233`	`233`	`} else {`
`234`	`234`	`options = (byte) (options & ~IS_SAMPLED);`
`235`		`- ;`
`236`	`235`	`}`
`237`	`236`	`return this;`
`238`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protobuf {`
`54`	`54`	`// generated Java directories as source folders.`
`55`	`55`	`idea {`
`56`	`56`	`module {`
`57`		`- sourceDirs += file("build/generated/source/proto/main/java");`
	`57`	`+ sourceDirs += file("build/generated/source/proto/main/java")`
`58`	`58`	`// If you have additional sourceSets and/or codegen plugins, add all of them`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protobuf {`
`36`	`36`	`// generated Java directories as source folders.`
`37`	`37`	`idea {`
`38`	`38`	`module {`
`39`		`- sourceDirs += file("build/generated/source/proto/main/java");`
	`39`	`+ sourceDirs += file("build/generated/source/proto/main/java")`
`40`	`40`	`// If you have additional sourceSets and/or codegen plugins, add all of them`
`41`	`41`	`}`
`42`	`42`	`}`