From 372aa6d83035fb6d0bda2a2a8acaf0ce1825d4ba Mon Sep 17 00:00:00 2001 From: Kristen Kozak Date: Wed, 13 Jun 2018 16:28:51 -0700 Subject: Error Prone: 2.2.0 -> 2.3.1 This commit contains several other changes as part of the upgrade: - Use -XepAllDisabledChecksAsWarnings to enable all available warnings so that we don't need to enable each warning explicitly. - Remove explicit suppression of warnings in generated code, since -XepDisableWarningsInGeneratedCode is now sufficient to suppress all warnings in AutoValue and Protocol Buffer generated classes. - Remove a suppression of "ConstructorLeaksThis", since https://github.com/google/error-prone/pull/789 was fixed. - Fix a few occurrences of "FieldCanBeFinal". --- .../src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java | 2 +- .../implcore/trace/export/InProcessRunningSpanStoreImplTest.java | 2 +- .../java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'impl_core') diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java index a7cdb553..1804130c 100644 --- a/impl_core/src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java @@ -47,7 +47,7 @@ import org.mockito.MockitoAnnotations; public class SpanBuilderImplTest { private static final String SPAN_NAME = "MySpanName"; private SpanBuilderImpl.Options spanBuilderOptions; - private TraceParams alwaysSampleTraceParams = + private final TraceParams alwaysSampleTraceParams = TraceParams.DEFAULT.toBuilder().setSampler(Samplers.alwaysSample()).build(); private final TestClock testClock = TestClock.create(); private final RandomHandler randomHandler = new FakeRandomHandler(); diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImplTest.java index e81df48e..85db0868 100644 --- a/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImplTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImplTest.java @@ -51,7 +51,7 @@ public class InProcessRunningSpanStoreImplTest { private final StartEndHandler startEndHandler = new StartEndHandlerImpl( sampledSpansServiceExporter, activeSpansExporter, null, new SimpleEventQueue()); - private EnumSet recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS); + private final EnumSet recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS); private SpanImpl createSpan(String spanName) { final SpanContext spanContext = diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java index 9b471352..d99776d1 100644 --- a/impl_core/src/test/java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java @@ -60,7 +60,7 @@ public class SpanExporterImplTest { SpanContext.create( TraceId.generateRandomId(random), SpanId.generateRandomId(random), TraceOptions.DEFAULT); private final RunningSpanStoreImpl runningSpanStore = new InProcessRunningSpanStoreImpl(); - private EnumSet recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS); + private final EnumSet recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS); private final TestHandler serviceHandler = new TestHandler(); @Mock private Handler mockServiceHandler; -- cgit v1.2.3