From d9be3792397945e4ff7d05e4ee5402c93507a9cd Mon Sep 17 00:00:00 2001 From: dheeraj-kholia-cs Date: Fri, 24 Jan 2025 17:34:01 +0530 Subject: [PATCH 1/4] PLUGIN-1851 Corrected the error message --- .../src/main/java/io/cdap/plugin/util/CloudSQLUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java index 11595ac06..2efc2168d 100644 --- a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java +++ b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java @@ -51,7 +51,7 @@ public static void checkConnectionName( failureCollector .addFailure( "Connection Name must be in the format :: to connect to " - + "a public CloudSQL PostgreSQL instance.", null) + + "a public CloudSQL MySQL instance.", null) .withConfigProperty(CONNECTION_NAME); } } else { @@ -59,7 +59,7 @@ public static void checkConnectionName( failureCollector .addFailure( "Enter the internal IP address of the Compute Engine VM cloudsql proxy " - + "is running on, to connect to a private CloudSQL PostgreSQL instance.", null) + + "is running on, to connect to a private CloudSQL MySQL instance.", null) .withConfigProperty(CONNECTION_NAME); } } From 99009fc28e9d3ed457642c7286f88fa7390c6690 Mon Sep 17 00:00:00 2001 From: dheeraj-kholia-cs Date: Mon, 27 Jan 2025 11:03:00 +0530 Subject: [PATCH 2/4] PLUGIN-1851 Corrected the error message --- .../cloudsql/mysql/CloudSQLMySQLAction.java | 4 ++- .../cloudsql/mysql/CloudSQLMySQLSink.java | 4 ++- .../cloudsql/mysql/CloudSQLMySQLSource.java | 4 ++- .../postgres/CloudSQLPostgreSQLAction.java | 4 ++- .../postgres/CloudSQLPostgreSQLSink.java | 4 ++- .../postgres/CloudSQLPostgreSQLSource.java | 4 ++- .../io/cdap/plugin/util/CloudSQLUtil.java | 10 +++--- .../main/java/io/cdap/plugin/util/DbType.java | 34 +++++++++++++++++++ 8 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 database-commons/src/main/java/io/cdap/plugin/util/DbType.java diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java index 0608edb75..b51685ba9 100644 --- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java +++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java @@ -28,6 +28,7 @@ import io.cdap.plugin.db.action.AbstractDBAction; import io.cdap.plugin.db.action.QueryConfig; import io.cdap.plugin.util.CloudSQLUtil; +import io.cdap.plugin.util.DbType; import java.util.Map; import javax.annotation.Nullable; @@ -55,7 +56,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { CloudSQLUtil.checkConnectionName( failureCollector, cloudsqlMysqlActionConfig.instanceType, - cloudsqlMysqlActionConfig.connectionName); + cloudsqlMysqlActionConfig.connectionName, + DbType.MYSQL.getDisplayName()); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java index da1414ff3..357b0e7dd 100644 --- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java +++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java @@ -41,6 +41,7 @@ import io.cdap.plugin.mysql.MysqlDBRecord; import io.cdap.plugin.util.CloudSQLUtil; import io.cdap.plugin.util.DBUtils; +import io.cdap.plugin.util.DbType; import java.util.ArrayList; import java.util.Collections; @@ -74,7 +75,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { CloudSQLUtil.checkConnectionName( failureCollector, cloudsqlMysqlSinkConfig.connection.getInstanceType(), - cloudsqlMysqlSinkConfig.connection.getConnectionName()); + cloudsqlMysqlSinkConfig.connection.getConnectionName(), + DbType.MYSQL.getDisplayName()); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java index 8273169c0..a72120088 100644 --- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java +++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java @@ -38,6 +38,7 @@ import io.cdap.plugin.mysql.MysqlSchemaReader; import io.cdap.plugin.util.CloudSQLUtil; import io.cdap.plugin.util.DBUtils; +import io.cdap.plugin.util.DbType; import org.apache.hadoop.mapreduce.lib.db.DBWritable; import java.util.Collections; @@ -70,7 +71,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { CloudSQLUtil.checkConnectionName( failureCollector, cloudsqlMysqlSourceConfig.connection.getInstanceType(), - cloudsqlMysqlSourceConfig.connection.getConnectionName()); + cloudsqlMysqlSourceConfig.connection.getConnectionName(), + DbType.MYSQL.getDisplayName()); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java index 1a3f8ad7b..a0f4813b7 100644 --- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java +++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java @@ -28,6 +28,7 @@ import io.cdap.plugin.db.action.AbstractDBAction; import io.cdap.plugin.db.action.QueryConfig; import io.cdap.plugin.util.CloudSQLUtil; +import io.cdap.plugin.util.DbType; import java.util.Map; import javax.annotation.Nullable; @@ -55,7 +56,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { CloudSQLUtil.checkConnectionName( failureCollector, cloudsqlPostgresqlActionConfig.instanceType, - cloudsqlPostgresqlActionConfig.connectionName); + cloudsqlPostgresqlActionConfig.connectionName, + DbType.POSTGRESQL.getDisplayName()); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java index 65b86366c..863ca66ff 100644 --- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java +++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java @@ -47,6 +47,7 @@ import io.cdap.plugin.postgres.PostgresSchemaReader; import io.cdap.plugin.util.CloudSQLUtil; import io.cdap.plugin.util.DBUtils; +import io.cdap.plugin.util.DbType; import java.util.ArrayList; import java.util.Collections; @@ -81,7 +82,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { CloudSQLUtil.checkConnectionName( failureCollector, cloudsqlPostgresqlSinkConfig.connection.getInstanceType(), - cloudsqlPostgresqlSinkConfig.connection.getConnectionName()); + cloudsqlPostgresqlSinkConfig.connection.getConnectionName(), + DbType.POSTGRESQL.getDisplayName()); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java index e32651a9a..6ab4bd5a7 100644 --- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java +++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java @@ -38,6 +38,7 @@ import io.cdap.plugin.postgres.PostgresSchemaReader; import io.cdap.plugin.util.CloudSQLUtil; import io.cdap.plugin.util.DBUtils; +import io.cdap.plugin.util.DbType; import org.apache.hadoop.mapreduce.lib.db.DBWritable; import java.util.Collections; @@ -70,7 +71,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { CloudSQLUtil.checkConnectionName( failureCollector, cloudsqlPostgresqlSourceConfig.connection.getInstanceType(), - cloudsqlPostgresqlSourceConfig.connection.getConnectionName()); + cloudsqlPostgresqlSourceConfig.connection.getConnectionName(), + DbType.POSTGRESQL.getDisplayName()); } super.configurePipeline(pipelineConfigurer); diff --git a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java index 2efc2168d..2100ee324 100644 --- a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java +++ b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java @@ -40,7 +40,7 @@ public class CloudSQLUtil { * @param connectionName Connection Name for the CloudSQL instance */ public static void checkConnectionName( - FailureCollector failureCollector, String instanceType, String connectionName) { + FailureCollector failureCollector, String instanceType, String connectionName, String dbType) { if (PUBLIC_INSTANCE.equalsIgnoreCase(instanceType)) { Pattern connectionNamePattern = @@ -50,16 +50,16 @@ public static void checkConnectionName( if (!matcher.matches()) { failureCollector .addFailure( - "Connection Name must be in the format :: to connect to " - + "a public CloudSQL MySQL instance.", null) + String.format("Connection Name must be in the format :: to connect to " + + "a public %s instance.", dbType), null) .withConfigProperty(CONNECTION_NAME); } } else { if (!InetAddresses.isInetAddress(connectionName)) { failureCollector .addFailure( - "Enter the internal IP address of the Compute Engine VM cloudsql proxy " - + "is running on, to connect to a private CloudSQL MySQL instance.", null) + String.format("Enter the internal IP address of the Compute Engine VM cloudsql proxy " + + "is running on, to connect to a private %s instance.", dbType), null) .withConfigProperty(CONNECTION_NAME); } } diff --git a/database-commons/src/main/java/io/cdap/plugin/util/DbType.java b/database-commons/src/main/java/io/cdap/plugin/util/DbType.java new file mode 100644 index 000000000..b018187e8 --- /dev/null +++ b/database-commons/src/main/java/io/cdap/plugin/util/DbType.java @@ -0,0 +1,34 @@ +/* + * Copyright © 2025 Cask Data, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package io.cdap.plugin.util; + +/** + * Enum for type of CloudSQL DB. + */ +public enum DbType { + MYSQL("CloudSQL MySQL"), + POSTGRESQL("CloudSQL PostgreSQL"); + + private final String displayName; + + DbType(String displayName) { + this.displayName = displayName; + } + + public String getDisplayName() { + return displayName; + } +} From 1ec50e893f530b222534084baef04604f513a95b Mon Sep 17 00:00:00 2001 From: dheeraj-kholia-cs Date: Mon, 27 Jan 2025 12:04:43 +0530 Subject: [PATCH 3/4] Used string literal instead of enum --- .../cloudsql/mysql/CloudSQLMySQLAction.java | 3 +- .../cloudsql/mysql/CloudSQLMySQLSink.java | 3 +- .../cloudsql/mysql/CloudSQLMySQLSource.java | 3 +- .../postgres/CloudSQLPostgreSQLAction.java | 3 +- .../postgres/CloudSQLPostgreSQLSink.java | 3 +- .../postgres/CloudSQLPostgreSQLSource.java | 3 +- .../io/cdap/plugin/util/CloudSQLUtil.java | 3 ++ .../main/java/io/cdap/plugin/util/DbType.java | 34 ------------------- 8 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 database-commons/src/main/java/io/cdap/plugin/util/DbType.java diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java index b51685ba9..770dd9030 100644 --- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java +++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLAction.java @@ -28,7 +28,6 @@ import io.cdap.plugin.db.action.AbstractDBAction; import io.cdap.plugin.db.action.QueryConfig; import io.cdap.plugin.util.CloudSQLUtil; -import io.cdap.plugin.util.DbType; import java.util.Map; import javax.annotation.Nullable; @@ -57,7 +56,7 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { failureCollector, cloudsqlMysqlActionConfig.instanceType, cloudsqlMysqlActionConfig.connectionName, - DbType.MYSQL.getDisplayName()); + CloudSQLUtil.CLOUDSQL_MYSQL); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java index 357b0e7dd..6cd1b0031 100644 --- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java +++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSink.java @@ -41,7 +41,6 @@ import io.cdap.plugin.mysql.MysqlDBRecord; import io.cdap.plugin.util.CloudSQLUtil; import io.cdap.plugin.util.DBUtils; -import io.cdap.plugin.util.DbType; import java.util.ArrayList; import java.util.Collections; @@ -76,7 +75,7 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { failureCollector, cloudsqlMysqlSinkConfig.connection.getInstanceType(), cloudsqlMysqlSinkConfig.connection.getConnectionName(), - DbType.MYSQL.getDisplayName()); + CloudSQLUtil.CLOUDSQL_MYSQL); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java index a72120088..201360c67 100644 --- a/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java +++ b/cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLSource.java @@ -38,7 +38,6 @@ import io.cdap.plugin.mysql.MysqlSchemaReader; import io.cdap.plugin.util.CloudSQLUtil; import io.cdap.plugin.util.DBUtils; -import io.cdap.plugin.util.DbType; import org.apache.hadoop.mapreduce.lib.db.DBWritable; import java.util.Collections; @@ -72,7 +71,7 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { failureCollector, cloudsqlMysqlSourceConfig.connection.getInstanceType(), cloudsqlMysqlSourceConfig.connection.getConnectionName(), - DbType.MYSQL.getDisplayName()); + CloudSQLUtil.CLOUDSQL_MYSQL); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java index a0f4813b7..5b13759f6 100644 --- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java +++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLAction.java @@ -28,7 +28,6 @@ import io.cdap.plugin.db.action.AbstractDBAction; import io.cdap.plugin.db.action.QueryConfig; import io.cdap.plugin.util.CloudSQLUtil; -import io.cdap.plugin.util.DbType; import java.util.Map; import javax.annotation.Nullable; @@ -57,7 +56,7 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { failureCollector, cloudsqlPostgresqlActionConfig.instanceType, cloudsqlPostgresqlActionConfig.connectionName, - DbType.POSTGRESQL.getDisplayName()); + CloudSQLUtil.CLOUDSQL_POSTGRESQL); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java index 863ca66ff..060b67f82 100644 --- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java +++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSink.java @@ -47,7 +47,6 @@ import io.cdap.plugin.postgres.PostgresSchemaReader; import io.cdap.plugin.util.CloudSQLUtil; import io.cdap.plugin.util.DBUtils; -import io.cdap.plugin.util.DbType; import java.util.ArrayList; import java.util.Collections; @@ -83,7 +82,7 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { failureCollector, cloudsqlPostgresqlSinkConfig.connection.getInstanceType(), cloudsqlPostgresqlSinkConfig.connection.getConnectionName(), - DbType.POSTGRESQL.getDisplayName()); + CloudSQLUtil.CLOUDSQL_POSTGRESQL); } super.configurePipeline(pipelineConfigurer); diff --git a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java index 6ab4bd5a7..db3f2d708 100644 --- a/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java +++ b/cloudsql-postgresql-plugin/src/main/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLSource.java @@ -38,7 +38,6 @@ import io.cdap.plugin.postgres.PostgresSchemaReader; import io.cdap.plugin.util.CloudSQLUtil; import io.cdap.plugin.util.DBUtils; -import io.cdap.plugin.util.DbType; import org.apache.hadoop.mapreduce.lib.db.DBWritable; import java.util.Collections; @@ -72,7 +71,7 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) { failureCollector, cloudsqlPostgresqlSourceConfig.connection.getInstanceType(), cloudsqlPostgresqlSourceConfig.connection.getConnectionName(), - DbType.POSTGRESQL.getDisplayName()); + CloudSQLUtil.CLOUDSQL_POSTGRESQL); } super.configurePipeline(pipelineConfigurer); diff --git a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java index 2100ee324..ad3ff986b 100644 --- a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java +++ b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java @@ -31,6 +31,9 @@ public class CloudSQLUtil { public static final String INSTANCE_TYPE = "instanceType"; public static final String PUBLIC_INSTANCE = "public"; public static final String PRIVATE_INSTANCE = "private"; + public static final String CLOUDSQL_POSTGRESQL = "CloudSQL PostgreSQL"; + public static final String CLOUDSQL_MYSQL = "CloudSQL MySQL"; + /** * Utility method to check the Connection Name format of a CloudSQL instance. diff --git a/database-commons/src/main/java/io/cdap/plugin/util/DbType.java b/database-commons/src/main/java/io/cdap/plugin/util/DbType.java deleted file mode 100644 index b018187e8..000000000 --- a/database-commons/src/main/java/io/cdap/plugin/util/DbType.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright © 2025 Cask Data, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package io.cdap.plugin.util; - -/** - * Enum for type of CloudSQL DB. - */ -public enum DbType { - MYSQL("CloudSQL MySQL"), - POSTGRESQL("CloudSQL PostgreSQL"); - - private final String displayName; - - DbType(String displayName) { - this.displayName = displayName; - } - - public String getDisplayName() { - return displayName; - } -} From beaf72b7b13c2ef55f738ee51249d74a94df74b1 Mon Sep 17 00:00:00 2001 From: dheeraj-kholia-cs Date: Mon, 27 Jan 2025 15:01:47 +0530 Subject: [PATCH 4/4] refactored code --- .../src/main/java/io/cdap/plugin/util/CloudSQLUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java index ad3ff986b..f704f2ad5 100644 --- a/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java +++ b/database-commons/src/main/java/io/cdap/plugin/util/CloudSQLUtil.java @@ -41,9 +41,10 @@ public class CloudSQLUtil { * @param failureCollector {@link FailureCollector} for the pipeline * @param instanceType CloudSQL instance type * @param connectionName Connection Name for the CloudSQL instance + * @param databaseType Type of CloudSQL instance- CloudSQL PostgreSQL, CLoudSQL MySQL */ public static void checkConnectionName( - FailureCollector failureCollector, String instanceType, String connectionName, String dbType) { + FailureCollector failureCollector, String instanceType, String connectionName, String databaseType) { if (PUBLIC_INSTANCE.equalsIgnoreCase(instanceType)) { Pattern connectionNamePattern = @@ -54,7 +55,7 @@ public static void checkConnectionName( failureCollector .addFailure( String.format("Connection Name must be in the format :: to connect to " - + "a public %s instance.", dbType), null) + + "a public %s instance.", databaseType), null) .withConfigProperty(CONNECTION_NAME); } } else { @@ -62,7 +63,7 @@ public static void checkConnectionName( failureCollector .addFailure( String.format("Enter the internal IP address of the Compute Engine VM cloudsql proxy " - + "is running on, to connect to a private %s instance.", dbType), null) + + "is running on, to connect to a private %s instance.", databaseType), null) .withConfigProperty(CONNECTION_NAME); } }