chore: try removing R2dbc changes

Author: kgala2

r2dbc/mariadb/src/test/java/com/google/cloud/sql/core/R2dbcMariadbIntegrationTests.java

@@ -45,7 +45,6 @@ public class R2dbcMariadbIntegrationTests {
   private static final String DB_NAME = System.getenv("MYSQL_DB");
   private static final String DB_USER = System.getenv("MYSQL_USER");
   private static final String DB_PASSWORD = System.getenv("MYSQL_PASS");
-  private static final String IP_TYPE = System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
 
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
 
@@ -65,7 +64,7 @@ public void setUpPool() {
     // Set up URL parameters
     String r2dbcURL =
         String.format(
-            "r2dbc:gcp:mariadb://%s:%s@%s/%s?cloudSqlIpType=%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME, IP_TYPE);
+            "r2dbc:gcp:mariadb://%s:%s@%s/%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME);
 
     // Initialize connection pool
     ConnectionFactory connectionFactory = ConnectionFactories.get(r2dbcURL);

r2dbc/mysql/src/test/java/com/google/cloud/sql/core/R2dbcMysqlIntegrationTests.java

@@ -45,7 +45,6 @@ public class R2dbcMysqlIntegrationTests {
   private static final String DB_NAME = System.getenv("MYSQL_DB");
   private static final String DB_USER = System.getenv("MYSQL_USER");
   private static final String DB_PASSWORD = System.getenv("MYSQL_PASS");
-  private static final String IP_TYPE = System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
 
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
 
@@ -65,7 +64,7 @@ public void setUpPool() {
     // Set up URL parameters
     String r2dbcURL =
         String.format(
-            "r2dbc:gcp:mysql://%s:%s@%s/%s?cloudSqlIpType=%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME, IP_TYPE);
+            "r2dbc:gcp:mysql://%s:%s@%s/%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME);
 
     // Initialize connection pool
     ConnectionFactory connectionFactory = ConnectionFactories.get(r2dbcURL);

r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresIntegrationTests.java

@@ -42,7 +42,6 @@ public class R2dbcPostgresIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_USER");
   private static final String DB_PASSWORD = System.getenv("POSTGRES_PASS");
-  private static final String IP_TYPE = System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("POSTGRES_USER", "POSTGRES_PASS", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -63,7 +62,7 @@ public void setUpPool() {
     // Set up URL parameters
     String r2dbcURL =
         String.format(
-            "r2dbc:gcp:postgres://%s:%s@%s/%s?cloudSqlIpType=%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME, IP_TYPE);
+            "r2dbc:gcp:postgres://%s:%s@%s/%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME);
 
     // Initialize connection pool
     ConnectionFactory connectionFactory = ConnectionFactories.get(r2dbcURL);

r2dbc/postgres/src/test/java/com/google/cloud/sql/core/R2dbcPostgresPoolRemoteValidationIntegrationTests.java

@@ -43,7 +43,6 @@ public class R2dbcPostgresPoolRemoteValidationIntegrationTests {
   private static final String DB_NAME = System.getenv("POSTGRES_DB");
   private static final String DB_USER = System.getenv("POSTGRES_USER");
   private static final String DB_PASSWORD = System.getenv("POSTGRES_PASS");
-  private static final String IP_TYPE = System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
   private static final ImmutableList<String> requiredEnvVars =
       ImmutableList.of("POSTGRES_USER", "POSTGRES_PASS", "POSTGRES_DB", "POSTGRES_CONNECTION_NAME");
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
@@ -64,7 +63,7 @@ public void setUpPool() {
     // Set up URL parameters
     String r2dbcURL =
         String.format(
-            "r2dbc:gcp:postgres://%s:%s@%s/%s?cloudSqlIpType=%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME, IP_TYPE);
+            "r2dbc:gcp:postgres://%s:%s@%s/%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME);
 
     // Initialize connection pool with REMOTE validation
     ConnectionFactory connectionFactory = ConnectionFactories.get(r2dbcURL);

r2dbc/sqlserver/src/test/java/com/google/cloud/sql/core/R2dbcSqlserverIntegrationTests.java

@@ -45,7 +45,6 @@ public class R2dbcSqlserverIntegrationTests {
   private static final String DB_NAME = System.getenv("SQLSERVER_DB");
   private static final String DB_USER = System.getenv("SQLSERVER_USER");
   private static final String DB_PASSWORD = System.getenv("SQLSERVER_PASS");
-  private static final String IP_TYPE = System.getenv("IP_TYPE") == null ? "PUBLIC" : System.getenv("IP_TYPE");
 
   @Rule public Timeout globalTimeout = new Timeout(80, TimeUnit.SECONDS);
 
@@ -65,7 +64,7 @@ public void setUpPool() {
     // Set up URL parameters
     String r2dbcURL =
         String.format(
-            "r2dbc:gcp:mssql://%s:%s@%s/%s?cloudSqlIpType=%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME, IP_TYPE);
+            "r2dbc:gcp:mssql://%s:%s@%s/%s", DB_USER, DB_PASSWORD, CONNECTION_NAME, DB_NAME);
 
     // Initialize connection pool
     ConnectionFactory connectionFactory = ConnectionFactories.get(r2dbcURL);