From 4318e71420b1a16af452638e7afd933938ff2fa8 Mon Sep 17 00:00:00 2001 From: Brian Hulette Date: Fri, 26 Feb 2021 14:55:57 -0800 Subject: [PATCH] switch to checkerframework nullness annotations in ExpansionServiceTest, remove testCompile --- sdks/java/expansion-service/build.gradle | 4 ---- .../beam/sdk/expansion/service/ExpansionServiceTest.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sdks/java/expansion-service/build.gradle b/sdks/java/expansion-service/build.gradle index 680381e0206e..ad2f7cfd67f7 100644 --- a/sdks/java/expansion-service/build.gradle +++ b/sdks/java/expansion-service/build.gradle @@ -44,10 +44,6 @@ dependencies { compile library.java.slf4j_api runtimeOnly library.java.slf4j_jdk14 testCompile library.java.junit - // TODO(BEAM-10632): Remove this. Currently Schema inference (used in - // ExpansionServiceTest) hits an NPE when checker is enabled and - // checkerframework is not in the classpath. - testCompile "org.checkerframework:checker:3.10.0" } task runExpansionService (type: JavaExec) { diff --git a/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java b/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java index f37cdbdefb56..860739d74421 100644 --- a/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java +++ b/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java @@ -31,7 +31,6 @@ import com.google.auto.service.AutoService; import com.google.auto.value.AutoValue; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.IOException; import java.util.Collections; import java.util.HashSet; @@ -60,6 +59,7 @@ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; +import org.checkerframework.checker.nullness.qual.Nullable; import org.hamcrest.Matchers; import org.junit.Test;