Skip to content

Commit 29b1680

Browse files
committed
Revert #38256 partially (AutoValueSubclassLeaked)
1 parent a375d6c commit 29b1680

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,6 +1532,7 @@ class BeamModulePlugin implements Plugin<Project> {
15321532
def disabledChecks = [
15331533
// TODO(https://github.com/apache/beam/issues/20955): Enable errorprone checks
15341534
"AutoValueImmutableFields",
1535+
"AutoValueSubclassLeaked",
15351536
"ComparableType",
15361537
"DoNotMockAutoValue",
15371538
"EmptyBlockTag",

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTranslation.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public TypedRead<?> fromConfigRow(Row configRow, PipelineOptions options) {
217217
(updateCompatibilityBeamVersion != null) ? updateCompatibilityBeamVersion : "2.53.0";
218218

219219
try {
220-
BigQueryIO.TypedRead.Builder builder = BigQueryIO.TypedRead.builder();
220+
BigQueryIO.TypedRead.Builder builder = new AutoValue_BigQueryIO_TypedRead.Builder<>();
221221

222222
String jsonTableRef = configRow.getString("json_table_ref");
223223
if (jsonTableRef != null) {
@@ -378,9 +378,7 @@ public static class ReadRegistrar implements TransformPayloadTranslatorRegistrar
378378
public Map<? extends Class<? extends PTransform>, ? extends TransformPayloadTranslator>
379379
getTransformPayloadTranslators() {
380380
return ImmutableMap.<Class<? extends PTransform>, TransformPayloadTranslator>builder()
381-
.put(
382-
BigQueryIO.read(BigQueryIO.TableRowParser.INSTANCE).getClass(),
383-
new BigQueryIOReadTranslator())
381+
.put(AutoValue_BigQueryIO_TypedRead.class, new BigQueryIOReadTranslator())
384382
.build();
385383
}
386384
}
@@ -617,7 +615,7 @@ public Write<?> fromConfigRow(Row configRow, PipelineOptions options) {
617615
(updateCompatibilityBeamVersion != null) ? updateCompatibilityBeamVersion : "2.53.0";
618616

619617
try {
620-
BigQueryIO.Write.Builder builder = BigQueryIO.Write.builder();
618+
BigQueryIO.Write.Builder builder = new AutoValue_BigQueryIO_Write.Builder<>();
621619

622620
String jsonTableRef = configRow.getString("json_table_ref");
623621
if (jsonTableRef != null) {
@@ -930,7 +928,7 @@ public static class WriteRegistrar implements TransformPayloadTranslatorRegistra
930928
public Map<? extends Class<? extends PTransform>, ? extends TransformPayloadTranslator>
931929
getTransformPayloadTranslators() {
932930
return ImmutableMap.<Class<? extends PTransform>, TransformPayloadTranslator>builder()
933-
.put(BigQueryIO.write().getClass(), new BigQueryIOWriteTranslator())
931+
.put(AutoValue_BigQueryIO_Write.class, new BigQueryIOWriteTranslator())
934932
.build();
935933
}
936934
}

0 commit comments

Comments
 (0)