fix: fix ExportJob timeout options (#4537)

* fix: fix ExportJob timeout options

* fix

Author: mutianf

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();
   }

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<Integer> getBigtableReadRpcTimeoutMs();
+    ValueProvider<String> getBigtableReadRpcTimeoutMs();
 
     @SuppressWarnings("unused")
-    void setBigtableReadRpcTimeoutMs(ValueProvider<Integer> readRpcTimeoutMs);
+    void setBigtableReadRpcTimeoutMs(ValueProvider<String> readRpcTimeoutMs);
 
     @Description("Read RPC attempt timeout in milliseconds.")
-    ValueProvider<Integer> getBigtableReadRpcAttemptTimeoutMs();
+    ValueProvider<String> getBigtableReadRpcAttemptTimeoutMs();
 
     @SuppressWarnings("unused")
-    void setBigtableReadRpcAttemptTimeoutMs(ValueProvider<Integer> readRpcAttemptTimeoutMs);
+    void setBigtableReadRpcAttemptTimeoutMs(ValueProvider<String> readRpcAttemptTimeoutMs);
   }
 
   public static void main(String[] args) {