Skip to content

Commit 4970405

Browse files
sgarg-CSsgarg-CS
committed
PLUGIN-1823: Remove instance variables from sub-class and change return types for overridden methods to base class
1 parent 5ef4f15 commit 4970405

File tree

25 files changed

+109
-104
lines changed

25 files changed

+109
-104
lines changed

‎cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLConnector.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import io.cdap.plugin.common.Constants;
3232
import io.cdap.plugin.common.ReferenceNames;
3333
import io.cdap.plugin.common.db.DBConnectorPath;
34+
import io.cdap.plugin.common.db.DBErrorDetailsProvider;
3435
import io.cdap.plugin.db.ConnectionConfig;
3536
import io.cdap.plugin.db.SchemaReader;
3637
import io.cdap.plugin.db.connector.AbstractDBSpecificConnector;
@@ -53,7 +54,6 @@ public class CloudSQLMySQLConnector extends AbstractDBSpecificConnector<MysqlDBR
5354

5455
public static final String NAME = CloudSQLMySQLConstants.PLUGIN_NAME;
5556
private final CloudSQLMySQLConnectorConfig config;
56-
private CloudSQLMySQLErrorDetailsProvider cloudSQLMySQLErrorDetailsProvider;
5757

5858
public CloudSQLMySQLConnector(CloudSQLMySQLConnectorConfig config) {
5959
super(config);
@@ -111,10 +111,10 @@ protected void setConnectorSpec(ConnectorSpecRequest request, DBConnectorPath pa
111111
}
112112

113113
@Override
114-
protected CloudSQLMySQLErrorDetailsProvider getErrorDetailsProvider() {
115-
if (cloudSQLMySQLErrorDetailsProvider == null) {
116-
cloudSQLMySQLErrorDetailsProvider = new CloudSQLMySQLErrorDetailsProvider();
114+
protected DBErrorDetailsProvider getErrorDetailsProvider() {
115+
if (dbErrorDetailsProvider == null) {
116+
dbErrorDetailsProvider = new CloudSQLMySQLErrorDetailsProvider();
117117
}
118-
return cloudSQLMySQLErrorDetailsProvider;
118+
return dbErrorDetailsProvider;
119119
}
120120
}

‎cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import io.cdap.plugin.common.Asset;
3636
import io.cdap.plugin.common.ConfigUtil;
3737
import io.cdap.plugin.common.LineageRecorder;
38+
import io.cdap.plugin.common.db.DBErrorDetailsProvider;
3839
import io.cdap.plugin.db.DBRecord;
3940
import io.cdap.plugin.db.config.AbstractDBSpecificSinkConfig;
4041
import io.cdap.plugin.db.sink.AbstractDBSink;
@@ -59,7 +60,6 @@ public class CloudSQLMySQLSink extends AbstractDBSink<CloudSQLMySQLSink.CloudSQL
5960

6061
private final CloudSQLMySQLSinkConfig cloudsqlMysqlSinkConfig;
6162
private static final Character ESCAPE_CHAR = '`';
62-
private CloudSQLMySQLErrorDetailsProvider cloudSQLMySQLErrorDetailsProvider;
6363

6464
public CloudSQLMySQLSink(CloudSQLMySQLSinkConfig cloudsqlMysqlSinkConfig) {
6565
super(cloudsqlMysqlSinkConfig);
@@ -111,11 +111,11 @@ protected String getErrorDetailsProviderClassName() {
111111
}
112112

113113
@Override
114-
protected CloudSQLMySQLErrorDetailsProvider getErrorDetailsProvider() {
115-
if (cloudSQLMySQLErrorDetailsProvider == null) {
116-
cloudSQLMySQLErrorDetailsProvider = new CloudSQLMySQLErrorDetailsProvider();
114+
protected DBErrorDetailsProvider getErrorDetailsProvider() {
115+
if (dbErrorDetailsProvider == null) {
116+
dbErrorDetailsProvider = new CloudSQLMySQLErrorDetailsProvider();
117117
}
118-
return cloudSQLMySQLErrorDetailsProvider;
118+
return dbErrorDetailsProvider;
119119
}
120120

121121
@Override

‎cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import io.cdap.plugin.common.Asset;
3232
import io.cdap.plugin.common.ConfigUtil;
3333
import io.cdap.plugin.common.LineageRecorder;
34+
import io.cdap.plugin.common.db.DBErrorDetailsProvider;
3435
import io.cdap.plugin.db.SchemaReader;
3536
import io.cdap.plugin.db.config.AbstractDBSpecificSourceConfig;
3637
import io.cdap.plugin.db.source.AbstractDBSource;
@@ -55,7 +56,6 @@
5556
public class CloudSQLMySQLSource extends AbstractDBSource<CloudSQLMySQLSource.CloudSQLMySQLSourceConfig> {
5657

5758
private final CloudSQLMySQLSourceConfig cloudsqlMysqlSourceConfig;
58-
private CloudSQLMySQLErrorDetailsProvider cloudSQLMySQLErrorDetailsProvider;
5959

6060
public CloudSQLMySQLSource(CloudSQLMySQLSourceConfig cloudsqlMysqlSourceConfig) {
6161
super(cloudsqlMysqlSourceConfig);
@@ -140,11 +140,11 @@ protected String getErrorDetailsProviderClassName() {
140140
}
141141

142142
@Override
143-
protected CloudSQLMySQLErrorDetailsProvider getErrorDetailsProvider() {
144-
if (cloudSQLMySQLErrorDetailsProvider == null) {
145-
cloudSQLMySQLErrorDetailsProvider = new CloudSQLMySQLErrorDetailsProvider();
143+
protected DBErrorDetailsProvider getErrorDetailsProvider() {
144+
if (dbErrorDetailsProvider == null) {
145+
dbErrorDetailsProvider = new CloudSQLMySQLErrorDetailsProvider();
146146
}
147-
return cloudSQLMySQLErrorDetailsProvider;
147+
return dbErrorDetailsProvider;
148148
}
149149

150150
/** CloudSQL MySQL source config. */

‎cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLConnector.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.cdap.plugin.common.Constants;
3131
import io.cdap.plugin.common.ReferenceNames;
3232
import io.cdap.plugin.common.db.DBConnectorPath;
33+
import io.cdap.plugin.common.db.DBErrorDetailsProvider;
3334
import io.cdap.plugin.common.db.DBPath;
3435
import io.cdap.plugin.db.SchemaReader;
3536
import io.cdap.plugin.db.connector.AbstractDBSpecificConnector;
@@ -52,7 +53,6 @@
5253
public class CloudSQLPostgreSQLConnector extends AbstractDBSpecificConnector<PostgresDBRecord> {
5354
public static final String NAME = CloudSQLPostgreSQLConstants.PLUGIN_NAME;
5455
private final CloudSQLPostgreSQLConnectorConfig config;
55-
private CloudSQLPostgreSQLErrorDetailsProvider cloudSQLPostgreSQLErrorDetailsProvider;
5656

5757
public CloudSQLPostgreSQLConnector(CloudSQLPostgreSQLConnectorConfig config) {
5858
super(config);
@@ -121,10 +121,10 @@ protected void setConnectorSpec(ConnectorSpecRequest request, DBConnectorPath pa
121121
}
122122

123123
@Override
124-
protected CloudSQLPostgreSQLErrorDetailsProvider getErrorDetailsProvider() {
125-
if (cloudSQLPostgreSQLErrorDetailsProvider == null) {
126-
cloudSQLPostgreSQLErrorDetailsProvider = new CloudSQLPostgreSQLErrorDetailsProvider();
124+
protected DBErrorDetailsProvider getErrorDetailsProvider() {
125+
if (dbErrorDetailsProvider == null) {
126+
dbErrorDetailsProvider = new CloudSQLPostgreSQLErrorDetailsProvider();
127127
}
128-
return cloudSQLPostgreSQLErrorDetailsProvider;
128+
return dbErrorDetailsProvider;
129129
}
130130
}

‎cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import io.cdap.plugin.common.ConfigUtil;
3737
import io.cdap.plugin.common.LineageRecorder;
3838
import io.cdap.plugin.common.batch.sink.SinkOutputFormatProvider;
39+
import io.cdap.plugin.common.db.DBErrorDetailsProvider;
3940
import io.cdap.plugin.db.DBRecord;
4041
import io.cdap.plugin.db.SchemaReader;
4142
import io.cdap.plugin.db.config.AbstractDBSpecificSinkConfig;
@@ -66,7 +67,6 @@ public class CloudSQLPostgreSQLSink extends AbstractDBSink<CloudSQLPostgreSQLSin
6667
private static final Character ESCAPE_CHAR = '"';
6768

6869
private final CloudSQLPostgreSQLSinkConfig cloudsqlPostgresqlSinkConfig;
69-
private CloudSQLPostgreSQLErrorDetailsProvider cloudSQLPostgreSQLErrorDetailsProvider;
7070

7171
public CloudSQLPostgreSQLSink(CloudSQLPostgreSQLSinkConfig cloudsqlPostgresqlSinkConfig) {
7272
super(cloudsqlPostgresqlSinkConfig);
@@ -155,11 +155,11 @@ protected String getErrorDetailsProviderClassName() {
155155
}
156156

157157
@Override
158-
protected CloudSQLPostgreSQLErrorDetailsProvider getErrorDetailsProvider() {
159-
if (cloudSQLPostgreSQLErrorDetailsProvider == null) {
160-
cloudSQLPostgreSQLErrorDetailsProvider = new CloudSQLPostgreSQLErrorDetailsProvider();
158+
protected DBErrorDetailsProvider getErrorDetailsProvider() {
159+
if (dbErrorDetailsProvider == null) {
160+
dbErrorDetailsProvider = new CloudSQLPostgreSQLErrorDetailsProvider();
161161
}
162-
return cloudSQLPostgreSQLErrorDetailsProvider;
162+
return dbErrorDetailsProvider;
163163
}
164164

165165
@Override

‎cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import io.cdap.plugin.common.Asset;
3232
import io.cdap.plugin.common.ConfigUtil;
3333
import io.cdap.plugin.common.LineageRecorder;
34+
import io.cdap.plugin.common.db.DBErrorDetailsProvider;
3435
import io.cdap.plugin.db.SchemaReader;
3536
import io.cdap.plugin.db.config.AbstractDBSpecificSourceConfig;
3637
import io.cdap.plugin.db.source.AbstractDBSource;
@@ -55,7 +56,6 @@ public class CloudSQLPostgreSQLSource
5556
extends AbstractDBSource<CloudSQLPostgreSQLSource.CloudSQLPostgreSQLSourceConfig> {
5657

5758
private final CloudSQLPostgreSQLSourceConfig cloudsqlPostgresqlSourceConfig;
58-
private CloudSQLPostgreSQLErrorDetailsProvider cloudSQLPostgreSQLErrorDetailsProvider;
5959

6060
public CloudSQLPostgreSQLSource(CloudSQLPostgreSQLSourceConfig cloudsqlPostgresqlSourceConfig) {
6161
super(cloudsqlPostgresqlSourceConfig);
@@ -99,11 +99,11 @@ protected String getErrorDetailsProviderClassName() {
9999
}
100100

101101
@Override
102-
protected CloudSQLPostgreSQLErrorDetailsProvider getErrorDetailsProvider() {
103-
if (cloudSQLPostgreSQLErrorDetailsProvider == null) {
104-
cloudSQLPostgreSQLErrorDetailsProvider = new CloudSQLPostgreSQLErrorDetailsProvider();
102+
protected DBErrorDetailsProvider getErrorDetailsProvider() {
103+
if (dbErrorDetailsProvider == null) {
104+
dbErrorDetailsProvider = new CloudSQLPostgreSQLErrorDetailsProvider();
105105
}
106-
return cloudSQLPostgreSQLErrorDetailsProvider;
106+
return dbErrorDetailsProvider;
107107
}
108108

109109
@Override

‎database-commons/src/main/java/io/cdap/plugin/db/action/AbstractDBArgumentSetter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class AbstractDBArgumentSetter extends Action {
4545
private static final String JDBC_PLUGIN_ID = "driver";
4646
private final ArgumentSetterConfig config;
4747
private final RetryPolicy<?> retryPolicy;
48-
private DBErrorDetailsProvider dbErrorDetailsProvider;
48+
protected DBErrorDetailsProvider dbErrorDetailsProvider;
4949

5050
public AbstractDBArgumentSetter(ArgumentSetterConfig config) {
5151
this.config = config;

‎database-commons/src/main/java/io/cdap/plugin/db/action/DBRun.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class DBRun {
3838
private final Class<? extends Driver> driverClass;
3939
private boolean enableAutoCommit;
4040
private final RetryPolicy<?> retryPolicy;
41-
private DBErrorDetailsProvider dbErrorDetailsProvider;
41+
protected DBErrorDetailsProvider dbErrorDetailsProvider;
4242

4343
public DBRun(QueryConfig config, Class<? extends Driver> driverClass, Boolean enableAutocommit) {
4444
this.config = config;

‎database-commons/src/main/java/io/cdap/plugin/db/connector/AbstractDBSpecificConnector.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public abstract class AbstractDBSpecificConnector<T extends DBWritable> extends
6161

6262
private final AbstractDBConnectorConfig config;
6363
private final RetryPolicy<?> retryPolicy;
64+
protected DBErrorDetailsProvider dbErrorDetailsProvider;
6465

6566
protected AbstractDBSpecificConnector(AbstractDBConnectorConfig config) {
6667
super(config);
@@ -130,7 +131,10 @@ public InputFormatProvider getInputFormatProvider(ConnectorContext context, Samp
130131
* @return DBErrorDetailsProvider instance
131132
*/
132133
protected DBErrorDetailsProvider getErrorDetailsProvider() {
133-
return new DBErrorDetailsProvider();
134+
if (dbErrorDetailsProvider == null) {
135+
dbErrorDetailsProvider = new DBErrorDetailsProvider();
136+
}
137+
return dbErrorDetailsProvider;
134138
}
135139

136140
protected Connection getConnection(DBConnectorPath path) {

‎database-commons/src/main/java/io/cdap/plugin/db/sink/AbstractDBSink.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public abstract class AbstractDBSink<T extends PluginConfig & DatabaseSinkConfig
9898
private ConnectionConfigAccessor configAccessor;
9999
private Configuration configuration;
100100
private final RetryPolicy<?> retryPolicy;
101-
private DBErrorDetailsProvider dbErrorDetailsProvider;
101+
protected DBErrorDetailsProvider dbErrorDetailsProvider;
102102

103103
public AbstractDBSink(T dbSinkConfig) {
104104
super(new ReferencePluginConfig(dbSinkConfig.getReferenceName()));

0 commit comments

Comments
 (0)