Introducing proper abstract in the code

Author: Samrat002

flink-connector-aws/flink-connector-redshift/src/main/java/org/apache/flink/connector/redshift/internal/connection/RedshiftJdbcConnectionProvider.java

@@ -18,8 +18,7 @@
 package org.apache.flink.connector.redshift.internal.connection;
 
 import org.apache.flink.annotation.Internal;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.redshift.config.RedshiftSinkConfigConstants;
+import org.apache.flink.connector.redshift.options.InternalRedshiftConfigOptions;
 import org.apache.flink.util.FlinkRuntimeException;
 
 import com.amazon.redshift.core.BaseConnection;
@@ -47,10 +46,10 @@ public class RedshiftJdbcConnectionProvider implements RedshiftConnectionProvide
 
     private transient BaseConnection connection;
 
-    private final Configuration options;
+    private final InternalRedshiftConfigOptions connectionProperties;
 
-    public RedshiftJdbcConnectionProvider(Configuration config) {
-        this.options = config;
+    public RedshiftJdbcConnectionProvider(InternalRedshiftConfigOptions configOptions) {
+        this.connectionProperties = configOptions;
     }
 
     @Override
@@ -59,9 +58,9 @@ public BaseConnection getConnection() {
             try {
                 connection =
                         createConnection(
-                                options.getString(RedshiftSinkConfigConstants.HOSTNAME),
-                                options.getInteger(RedshiftSinkConfigConstants.PORT),
-                                options.getString(RedshiftSinkConfigConstants.DATABASE_NAME));
+                                connectionProperties.getHostName(),
+                                connectionProperties.getPort(),
+                                connectionProperties.getDatabaseName());
             } catch (SQLException e) {
                 throw new FlinkRuntimeException(e);
             }
@@ -81,8 +80,8 @@ private BaseConnection createConnection(String hostname, int portNumber, String
             throw new SQLException(e);
         }
 
-        final String username = options.getString(RedshiftSinkConfigConstants.USERNAME);
-        final String password = options.getString(RedshiftSinkConfigConstants.PASSWORD);
+        final String username = connectionProperties.getUserName();
+        final String password = connectionProperties.getPassword();
         if (username != null
                 && !username.matches("")
                 && password != null
@@ -98,8 +97,7 @@ private BaseConnection createConnection(String hostname, int portNumber, String
 
     @Override
     public boolean isConnectionValid() throws SQLException {
-        return connection.isValid(
-                (int) options.get(RedshiftSinkConfigConstants.TIMEOUT).getSeconds());
+        return connection.isValid((int) connectionProperties.getTimeout().getSeconds());
     }
 
     @Override
@@ -110,9 +108,9 @@ public BaseConnection getOrEstablishConnection() throws SQLException {
         }
         connection =
                 createConnection(
-                        options.getString(RedshiftSinkConfigConstants.HOSTNAME),
-                        options.getInteger(RedshiftSinkConfigConstants.PORT),
-                        options.getString(RedshiftSinkConfigConstants.DATABASE_NAME));
+                        connectionProperties.getHostName(),
+                        connectionProperties.getPort(),
+                        connectionProperties.getDatabaseName());
         return connection;
     }
 
@@ -135,9 +133,9 @@ public BaseConnection reestablishConnection() throws SQLException {
         closeConnection();
         connection =
                 createConnection(
-                        options.getString(RedshiftSinkConfigConstants.HOSTNAME),
-                        options.getInteger(RedshiftSinkConfigConstants.PORT),
-                        options.getString(RedshiftSinkConfigConstants.DATABASE_NAME));
+                        connectionProperties.getHostName(),
+                        connectionProperties.getPort(),
+                        connectionProperties.getDatabaseName());
         return connection;
     }
 }

flink-connector-aws/flink-connector-redshift/src/main/java/org/apache/flink/connector/redshift/internal/executor/RedshiftUploadBatchExecutor.java renamed to flink-connector-aws/flink-connector-redshift/src/main/java/org/apache/flink/connector/redshift/internal/executor/RedshiftCopyModeBatchExecutor.java

@@ -18,19 +18,16 @@
 
 package org.apache.flink.connector.redshift.internal.executor;
 
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.redshift.config.RedshiftSinkConfigConstants;
 import org.apache.flink.connector.redshift.converter.RedshiftRowConverter;
 import org.apache.flink.connector.redshift.internal.connection.RedshiftConnectionProvider;
 import org.apache.flink.connector.redshift.internal.statement.RedshiftStatement;
 import org.apache.flink.connector.redshift.mode.copy.RedshiftCopyModeRowConverterImpl;
+import org.apache.flink.connector.redshift.options.InternalRedshiftConfigOptions;
 import org.apache.flink.connector.redshift.util.S3Util;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.table.types.logical.LogicalType;
 import org.apache.flink.util.FlinkRuntimeException;
 
-import com.amazon.redshift.core.BaseConnection;
-import com.amazon.redshift.jdbc.RedshiftConnectionImpl;
 import com.amazon.redshift.jdbc.RedshiftPreparedStatement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,10 +38,10 @@
 import java.util.List;
 
 /** Executor for Redshift Upload batch Operation. */
-public class RedshiftUploadBatchExecutor implements RedshiftExecutor {
+public class RedshiftCopyModeBatchExecutor implements RedshiftExecutor {
     private static final long serialVersionUID = 1L;
 
-    private static final Logger LOG = LoggerFactory.getLogger(RedshiftUploadBatchExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RedshiftCopyModeBatchExecutor.class);
 
     private final int maxRetries;
 
@@ -68,35 +65,27 @@ public class RedshiftUploadBatchExecutor implements RedshiftExecutor {
 
     private transient RedshiftConnectionProvider connectionProvider;
 
-    public RedshiftUploadBatchExecutor(
-            String[] fieldNames, LogicalType[] fieldTypes, Configuration options) {
-        this.tableName = options.getString(RedshiftSinkConfigConstants.TABLE_NAME);
+    public RedshiftCopyModeBatchExecutor(
+            String[] fieldNames, LogicalType[] fieldTypes, InternalRedshiftConfigOptions options) {
+        this.tableName = options.getTableName();
         this.fieldNames = fieldNames;
-        this.maxRetries = options.getInteger(RedshiftSinkConfigConstants.MAX_RETIRES);
+        this.maxRetries = options.getMaxRetries();
         this.csvData = new ArrayList<>();
         this.s3Client = S3Client.create();
         this.copyRowConverter = new RedshiftCopyModeRowConverterImpl(fieldTypes);
 
-        this.tempS3Uri =
-                S3Util.getS3UriWithFileName(options.getString(RedshiftSinkConfigConstants.S3_URI));
-        this.iamRoleArn = options.getString(RedshiftSinkConfigConstants.IAM_ROLE_ARN);
+        this.tempS3Uri = S3Util.getS3UriWithFileName(options.getS3Uri());
+        this.iamRoleArn = options.getIamRoleArn();
     }
 
     @Override
-    public void prepareStatement(BaseConnection connection) throws SQLException {
-        sql = RedshiftStatement.getTableCopyStatement(tableName, tempS3Uri, fieldNames, iamRoleArn);
-        if (connection instanceof RedshiftConnectionImpl) {
-            RedshiftConnectionImpl redshiftConnection = (RedshiftConnectionImpl) connection;
-            statement = (RedshiftPreparedStatement) redshiftConnection.prepareStatement(sql);
-        }
-    }
-
-    @Override
-    public void prepareStatement(RedshiftConnectionProvider connectionProvider)
+    public void prepareStatements(RedshiftConnectionProvider connectionProvider)
             throws SQLException {
-        this.connectionProvider = connectionProvider;
+        sql = RedshiftStatement.getTableCopyStatement(tableName, tempS3Uri, fieldNames, iamRoleArn);
         try {
-            prepareStatement(connectionProvider.getOrEstablishConnection());
+            statement =
+                    (RedshiftPreparedStatement)
+                            connectionProvider.getOrEstablishConnection().prepareStatement(sql);
         } catch (ClassNotFoundException e) {
             throw new FlinkRuntimeException(e);
         }

flink-connector-aws/flink-connector-redshift/src/main/java/org/apache/flink/connector/redshift/internal/executor/RedshiftUploadUpsertExecutor.java renamed to flink-connector-aws/flink-connector-redshift/src/main/java/org/apache/flink/connector/redshift/internal/executor/RedshiftCopyModeUpsertExecutor.java

@@ -18,18 +18,15 @@
 
 package org.apache.flink.connector.redshift.internal.executor;
 
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.connector.redshift.config.RedshiftSinkConfigConstants;
 import org.apache.flink.connector.redshift.converter.RedshiftRowConverter;
 import org.apache.flink.connector.redshift.internal.connection.RedshiftConnectionProvider;
 import org.apache.flink.connector.redshift.internal.statement.RedshiftStatement;
 import org.apache.flink.connector.redshift.mode.copy.RedshiftCopyModeRowConverterImpl;
+import org.apache.flink.connector.redshift.options.InternalRedshiftConfigOptions;
 import org.apache.flink.connector.redshift.util.S3Util;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.table.types.logical.LogicalType;
-import org.apache.flink.util.FlinkRuntimeException;
 
-import com.amazon.redshift.core.BaseConnection;
 import com.amazon.redshift.jdbc.RedshiftConnectionImpl;
 import com.amazon.redshift.jdbc.RedshiftPreparedStatement;
 import org.slf4j.Logger;
@@ -43,11 +40,11 @@
 import java.util.function.Function;
 
 /** Executor for Redshift Upload Upsert Operation. */
-public class RedshiftUploadUpsertExecutor implements RedshiftExecutor {
+public class RedshiftCopyModeUpsertExecutor implements RedshiftExecutor {
 
     private static final long serialVersionUID = 1L;
 
-    private static final Logger LOG = LoggerFactory.getLogger(RedshiftUploadUpsertExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RedshiftCopyModeUpsertExecutor.class);
 
     private final int maxRetries;
 
@@ -87,43 +84,43 @@ public class RedshiftUploadUpsertExecutor implements RedshiftExecutor {
 
     private final transient S3Client s3Client;
 
-    private RedshiftConnectionProvider connectionProvider;
-
-    public RedshiftUploadUpsertExecutor(
+    public RedshiftCopyModeUpsertExecutor(
             String[] fieldNames,
             String[] keyFields,
             LogicalType[] fieldTypes,
             RedshiftRowConverter deleteConverter,
             Function<RowData, RowData> deleteExtractor,
-            Configuration options) {
+            InternalRedshiftConfigOptions options) {
 
-        this.maxRetries = options.getInteger(RedshiftSinkConfigConstants.MAX_RETIRES);
+        this.maxRetries = options.getMaxRetries();
         this.fieldNames = fieldNames;
         this.keyFields = keyFields;
         this.deleteConverter = deleteConverter;
         this.deleteExtractor = deleteExtractor;
         this.csvInsertData = new ArrayList<>();
         this.csvUpdateData = new ArrayList<>();
 
-        this.tableName = options.getString(RedshiftSinkConfigConstants.TABLE_NAME);
-        this.iamRoleArn = options.getString(RedshiftSinkConfigConstants.IAM_ROLE_ARN);
+        this.tableName = options.getTableName();
+        this.iamRoleArn = options.getIamRoleArn();
         this.s3Client = S3Client.create();
         this.copyRowConverter = new RedshiftCopyModeRowConverterImpl(fieldTypes);
         this.stageTableName = "_" + tableName + "_stage";
-        this.tempS3Uri =
-                S3Util.getS3UriWithFileName(options.getString(RedshiftSinkConfigConstants.S3_URI));
+        this.tempS3Uri = S3Util.getS3UriWithFileName(options.getS3Uri());
     }
 
     @Override
-    public void prepareStatement(BaseConnection connection) throws SQLException {
+    public void prepareStatements(RedshiftConnectionProvider connectionProvider)
+            throws SQLException {
         final String createTableSql =
                 RedshiftStatement.getCreateTempTableAsStatement(tableName, stageTableName);
         final String insertSql =
-                RedshiftStatement.getInsertFromStageTable(tableName, stageTableName, fieldNames);
+                RedshiftStatement.getInsertFromStageTableStatement(
+                        tableName, stageTableName, fieldNames);
         deleteSql = RedshiftStatement.getDeleteStatement(tableName, keyFields);
         final String deleteFromStageSql =
-                RedshiftStatement.getDeleteFromStageTable(tableName, stageTableName, keyFields);
-        final String truncateSql = RedshiftStatement.getTruncateTable(stageTableName);
+                RedshiftStatement.getDeleteFromStageTableStatement(
+                        tableName, stageTableName, keyFields);
+        final String truncateSql = RedshiftStatement.getTruncateTableStatement(stageTableName);
         copyInsertSql =
                 RedshiftStatement.getTableCopyStatement(
                         tableName, tempS3Uri, fieldNames, iamRoleArn);
@@ -141,27 +138,16 @@ public void prepareStatement(BaseConnection connection) throws SQLException {
                         deleteFromStageSql,
                         insertSql,
                         "END;");
-        if (connection instanceof RedshiftConnectionImpl) {
-            RedshiftConnectionImpl redshiftConnection = (RedshiftConnectionImpl) connection;
-            insertStatement =
-                    (RedshiftPreparedStatement) redshiftConnection.prepareStatement(copyInsertSql);
-            updateTrxStatement =
-                    (RedshiftPreparedStatement)
-                            redshiftConnection.prepareStatement(updateTransactionSql);
-            deleteStatement =
-                    (RedshiftPreparedStatement) redshiftConnection.prepareStatement(deleteSql);
-        }
-    }
 
-    @Override
-    public void prepareStatement(RedshiftConnectionProvider connectionProvider)
-            throws SQLException {
-        this.connectionProvider = connectionProvider;
-        try {
-            prepareStatement(connectionProvider.getOrEstablishConnection());
-        } catch (ClassNotFoundException e) {
-            throw new FlinkRuntimeException(e);
-        }
+        RedshiftConnectionImpl redshiftConnection =
+                (RedshiftConnectionImpl) connectionProvider.getConnection();
+        insertStatement =
+                (RedshiftPreparedStatement) redshiftConnection.prepareStatement(copyInsertSql);
+        updateTrxStatement =
+                (RedshiftPreparedStatement)
+                        redshiftConnection.prepareStatement(updateTransactionSql);
+        deleteStatement =
+                (RedshiftPreparedStatement) redshiftConnection.prepareStatement(deleteSql);
     }
 
     @Override
@@ -230,7 +216,7 @@ public void closeStatement() {
 
     @Override
     public String getName() {
-        return "redshift-upload-upsert-executor";
+        return "redshift-copy-mode-upsert-executor";
     }
 
     @Override
@@ -247,8 +233,6 @@ public String toString() {
                 + '\''
                 + ", maxRetries="
                 + maxRetries
-                + ", connectionProvider="
-                + connectionProvider
                 + '}';
     }
 }