chore: format code

googleapis · Sep 14, 2023 · 5e35926 · 5e35926
1 parent e135a92
commit 5e35926
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/src/main/java/com/google/cloud/spanner/jdbc/JdbcPreparedStatement.java b/src/main/java/com/google/cloud/spanner/jdbc/JdbcPreparedStatement.java
@@ -46,10 +46,15 @@ class JdbcPreparedStatement extends AbstractJdbcPreparedStatement {
     super(connection);
     this.sql = sql;
     try {
-      // The PostgreSQL parser allows comments to be present in the SQL string that is used to parse the
-      String sqlForParameterExtraction = getConnection().getDialect() == Dialect.POSTGRESQL ? this.sql : parser.removeCommentsAndTrim(this.sql);
+      // The PostgreSQL parser allows comments to be present in the SQL string that is used to parse
+      // the
+      String sqlForParameterExtraction =
+          getConnection().getDialect() == Dialect.POSTGRESQL
+              ? this.sql
+              : parser.removeCommentsAndTrim(this.sql);
       this.parameters =
-          parser.convertPositionalParametersToNamedParameters(POS_PARAM_CHAR, sqlForParameterExtraction);
+          parser.convertPositionalParametersToNamedParameters(
+              POS_PARAM_CHAR, sqlForParameterExtraction);
     } catch (SpannerException e) {
       throw JdbcSqlExceptionFactory.of(e);
     }

diff --git a/src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java b/src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java
@@ -52,7 +52,6 @@
 import org.junit.Test;
 import org.junit.function.ThrowingRunnable;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
@@ -70,9 +69,8 @@ public static Object[] parameters() {
     return Dialect.values();
   }
 
-  @Parameter
-  public Dialect dialect;
-
+  @Parameter public Dialect dialect;
+
   private static final String DDL = "create table my_table";
   private static final long LARGE_UPDATE_COUNT = 2L * Integer.MAX_VALUE;
 
@@ -85,31 +83,33 @@ public static Object[] parameters() {
 
   @Before
   public void setupResults() {
-    QUERY = dialect == Dialect.POSTGRESQL
-        ? "/*@ lock_scanned_ranges = exclusive */ select * from my_table"
-        : "select * from my_table";
-    DML = dialect == Dialect.POSTGRESQL
-        ? "/*@ lock_scanned_ranges = exclusive */ insert into my_table (id, value) values (1, 'One')"
-        : "insert into my_table (id, value) values (1, 'One')";
-    DML_THEN_RETURN_ID = DML + (dialect == Dialect.POSTGRESQL
-        ? "\nRETURNING \"id\""
-        : "\nTHEN RETURN `id`");
-    LARGE_DML = dialect == Dialect.POSTGRESQL
-        ? "/*@ lock_scanned_ranges = exclusive */ update my_table set value='new value' where true"
-        : "update my_table set value='new value' where true";
-    LARGE_DML_THEN_RETURN_ID = LARGE_DML + (dialect == Dialect.POSTGRESQL
-        ? "\nRETURNING \"id\""
-        : "\nTHEN RETURN `id`");
+    QUERY =
+        dialect == Dialect.POSTGRESQL
+            ? "/*@ lock_scanned_ranges = exclusive */ select * from my_table"
+            : "select * from my_table";
+    DML =
+        dialect == Dialect.POSTGRESQL
+            ? "/*@ lock_scanned_ranges = exclusive */ insert into my_table (id, value) values (1, 'One')"
+            : "insert into my_table (id, value) values (1, 'One')";
+    DML_THEN_RETURN_ID =
+        DML + (dialect == Dialect.POSTGRESQL ? "\nRETURNING \"id\"" : "\nTHEN RETURN `id`");
+    LARGE_DML =
+        dialect == Dialect.POSTGRESQL
+            ? "/*@ lock_scanned_ranges = exclusive */ update my_table set value='new value' where true"
+            : "update my_table set value='new value' where true";
+    LARGE_DML_THEN_RETURN_ID =
+        LARGE_DML + (dialect == Dialect.POSTGRESQL ? "\nRETURNING \"id\"" : "\nTHEN RETURN `id`");
     DML_RETURNING =
         dialect == Dialect.POSTGRESQL
             ? "/*@ lock_scanned_ranges = exclusive */ insert into my_table (id, value) values (1, 'One') RETURNING *"
             : "insert into my_table (id, value) values (1, 'One') THEN RETURN *";
 
-    // This forces a refresh of the Spanner instance that is used for a connection, which again is needed in order to refresh the dialect of the database.
+    // This forces a refresh of the Spanner instance that is used for a connection, which again is
+    // needed in order to refresh the dialect of the database.
     SpannerPool.closeSpannerPool();
     mockSpanner.putStatementResult(StatementResult.detectDialectResult(dialect));
     super.setupResults();
-    
+
     com.google.spanner.v1.ResultSet resultSet =
         com.google.spanner.v1.ResultSet.newBuilder()
             .setMetadata(