[beam] 02/03: [BEAM-6348] Reuse ValueProvider methods on method invocation on JdbcIO

[ie...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iemejia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 54341bd8d92dd97d3673b000bb3006ffd24913ca
Author: Ismaël Mejía <ie...@gmail.com>
AuthorDate: Wed Jan 9 11:43:55 2019 +0100

    [BEAM-6348] Reuse ValueProvider methods on method invocation on JdbcIO
---
 .../src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java
index 82872c8..a189123 100644
--- a/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java
+++ b/sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcIO.java
@@ -268,10 +268,7 @@ public class JdbcIO {
     public static DataSourceConfiguration create(String driverClassName, String url) {
       checkArgument(driverClassName != null, "driverClassName can not be null");
       checkArgument(url != null, "url can not be null");
-      return new AutoValue_JdbcIO_DataSourceConfiguration.Builder()
-          .setDriverClassName(ValueProvider.StaticValueProvider.of(driverClassName))
-          .setUrl(ValueProvider.StaticValueProvider.of(url))
-          .build();
+      return create(ValueProvider.StaticValueProvider.of(driverClassName), ValueProvider.StaticValueProvider.of(url));
     }
 
     public static DataSourceConfiguration create(
@@ -285,7 +282,7 @@ public class JdbcIO {
     }
 
     public DataSourceConfiguration withUsername(String username) {
-      return builder().setUsername(ValueProvider.StaticValueProvider.of(username)).build();
+      return withUsername(ValueProvider.StaticValueProvider.of(username));
     }
 
     public DataSourceConfiguration withUsername(ValueProvider<String> username) {
@@ -293,7 +290,7 @@ public class JdbcIO {
     }
 
     public DataSourceConfiguration withPassword(String password) {
-      return builder().setPassword(ValueProvider.StaticValueProvider.of(password)).build();
+      return withPassword(ValueProvider.StaticValueProvider.of(password));
     }
 
     public DataSourceConfiguration withPassword(ValueProvider<String> password) {
@@ -309,9 +306,7 @@ public class JdbcIO {
      */
     public DataSourceConfiguration withConnectionProperties(String connectionProperties) {
       checkArgument(connectionProperties != null, "connectionProperties can not be null");
-      return builder()
-          .setConnectionProperties(ValueProvider.StaticValueProvider.of(connectionProperties))
-          .build();
+      return withConnectionProperties(ValueProvider.StaticValueProvider.of(connectionProperties));
     }
 
     /** Same as {@link #withConnectionProperties(String)} but accepting a ValueProvider. */
@@ -722,7 +717,7 @@ public class JdbcIO {
     }
 
     public Write<T> withStatement(String statement) {
-      return toBuilder().setStatement(ValueProvider.StaticValueProvider.of(statement)).build();
+      return withStatement(ValueProvider.StaticValueProvider.of(statement));
     }
 
     public Write<T> withStatement(ValueProvider<String> statement) {