diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java index b1c4587f05..53f79ae2b6 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java @@ -97,27 +97,14 @@ public static CloudBigtableScanConfiguration buildExportConfig(ExportOptions opt options.getBigtableMaxVersions(), options.getBigtableFilter())); if (options.getBigtableReadRpcTimeoutMs() != null) { - ValueProvider.NestedValueProvider.of( - options.getBigtableReadRpcTimeoutMs(), - (Integer timeout) -> { - if (timeout != null) { - configBuilder.withConfiguration( - BigtableOptionsFactory.BIGTABLE_READ_RPC_TIMEOUT_MS_KEY, String.valueOf(timeout)); - } - return null; - }); + configBuilder.withConfiguration( + BigtableOptionsFactory.BIGTABLE_READ_RPC_TIMEOUT_MS_KEY, + options.getBigtableReadRpcTimeoutMs()); } if (options.getBigtableReadRpcAttemptTimeoutMs() != null) { - ValueProvider.NestedValueProvider.of( - options.getBigtableReadRpcAttemptTimeoutMs(), - (Integer timeout) -> { - if (timeout != null) { - configBuilder.withConfiguration( - BigtableOptionsFactory.BIGTABLE_READ_RPC_ATTEMPT_TIMEOUT_MS_KEY, - String.valueOf(timeout)); - } - return null; - }); + configBuilder.withConfiguration( + BigtableOptionsFactory.BIGTABLE_READ_RPC_ATTEMPT_TIMEOUT_MS_KEY, + options.getBigtableReadRpcAttemptTimeoutMs()); } return configBuilder.build(); } diff --git a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java index ba7001703b..b70eef5c7d 100644 --- a/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java +++ b/bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java @@ -181,16 +181,16 @@ public interface ExportOptions extends GcpOptions, GcsOptions { void setRetryIdleTimeout(boolean retryIdleTimeout); @Description("Read RPC timeout in milliseconds.") - ValueProvider getBigtableReadRpcTimeoutMs(); + ValueProvider getBigtableReadRpcTimeoutMs(); @SuppressWarnings("unused") - void setBigtableReadRpcTimeoutMs(ValueProvider readRpcTimeoutMs); + void setBigtableReadRpcTimeoutMs(ValueProvider readRpcTimeoutMs); @Description("Read RPC attempt timeout in milliseconds.") - ValueProvider getBigtableReadRpcAttemptTimeoutMs(); + ValueProvider getBigtableReadRpcAttemptTimeoutMs(); @SuppressWarnings("unused") - void setBigtableReadRpcAttemptTimeoutMs(ValueProvider readRpcAttemptTimeoutMs); + void setBigtableReadRpcAttemptTimeoutMs(ValueProvider readRpcAttemptTimeoutMs); } public static void main(String[] args) {