resolved comments

Author: itsankit-google

cloudsql-mysql-plugin/pom.xml

@@ -59,6 +59,7 @@
     <dependency>
       <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-data-pipeline2_2.11</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

cloudsql-mysql-plugin/src/main/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLConnectorConfig.java

@@ -29,8 +29,8 @@
  */
 public class CloudSQLMySQLConnectorConfig extends AbstractDBConnectorConfig {
 
-  private static final String JDBC_PROPERTY_CONNECT_TIMEOUT = "connectTimeout";
-  private static final String JDBC_PROPERTY_SOCKET_TIMEOUT = "socketTimeout";
+  private static final String JDBC_PROPERTY_CONNECT_TIMEOUT_MILLIS = "connectTimeout";
+  private static final String JDBC_PROPERTY_SOCKET_TIMEOUT_MILLIS = "socketTimeout";
 
   @Name(CloudSQLMySQLConstants.CONNECTION_NAME)
   @Description(
@@ -89,9 +89,8 @@ public String getConnectionString() {
   @Override
   public Properties getConnectionArgumentsProperties() {
     Properties properties = super.getConnectionArgumentsProperties();
-    // the unit below is milli-second
-    properties.put(JDBC_PROPERTY_CONNECT_TIMEOUT, "20000");
-    properties.put(JDBC_PROPERTY_SOCKET_TIMEOUT, "20000");
+    properties.put(JDBC_PROPERTY_CONNECT_TIMEOUT_MILLIS, "20000");
+    properties.put(JDBC_PROPERTY_SOCKET_TIMEOUT_MILLIS, "20000");
     return properties;
   }
 }

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

@@ -107,6 +107,7 @@ public Map<String, String> getDBSpecificArguments() {
     }
 
     @Override
+    @Nullable
     protected CloudSQLMySQLConnectorConfig getConnection() {
       return connection;
     }

cloudsql-mysql-plugin/src/test/java/io/cdap/plugin/cloudsql/mysql/CloudSQLMySQLConnectorTest.java

@@ -51,9 +51,13 @@ public static void doSetup() {
 
   @Test
   public void test() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException {
-    test(new CloudSQLMySQLConnector(
-      new CloudSQLMySQLConnectorConfig(username, password, JDBC_PLUGIN_NAME, connectionArguments, instanceType,
-                                       connectionName, database)), JDBC_DRIVER_CLASS_NAME,
-         CloudSQLMySQLConstants.PLUGIN_NAME);
+    test(
+      new CloudSQLMySQLConnector(
+        new CloudSQLMySQLConnectorConfig(username, password, JDBC_PLUGIN_NAME, connectionArguments, instanceType,
+                                         connectionName, database)
+      ),
+      JDBC_DRIVER_CLASS_NAME,
+      CloudSQLMySQLConstants.PLUGIN_NAME
+    );
   }
 }

cloudsql-postgresql-plugin/pom.xml

@@ -68,6 +68,7 @@
     <dependency>
       <groupId>io.cdap.cdap</groupId>
       <artifactId>cdap-data-pipeline2_2.11</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

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

@@ -147,6 +147,7 @@ public Map<String, String> getDBSpecificArguments() {
     }
 
     @Override
+    @Nullable
     protected CloudSQLPostgreSQLConnectorConfig getConnection() {
       return connection;
     }

cloudsql-postgresql-plugin/src/test/java/io/cdap/plugin/cloudsql/postgres/CloudSQLPostgreSQLConnectorTest.java

@@ -51,9 +51,13 @@ public static void doSetup() {
 
   @Test
   public void test() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException {
-    test(new CloudSQLPostgreSQLConnector(
-           new CloudSQLPostgreSQLConnectorConfig(username, password, JDBC_PLUGIN_NAME, connectionArguments,
-                                                 instanceType, connectionName, database)), JDBC_DRIVER_CLASS_NAME,
-         CloudSQLPostgreSQLConstants.PLUGIN_NAME);
+    test(
+      new CloudSQLPostgreSQLConnector(
+        new CloudSQLPostgreSQLConnectorConfig(username, password, JDBC_PLUGIN_NAME, connectionArguments, instanceType,
+                                              connectionName, database)
+      ),
+      JDBC_DRIVER_CLASS_NAME,
+      CloudSQLPostgreSQLConstants.PLUGIN_NAME
+    );
   }
 }