chore: fix lint errors

googleapis · Dec 29, 2023 · 929abf4 · 929abf4
1 parent 6b3f572
commit 929abf4
Show file tree

Hide file tree

Showing 9 changed files with 314 additions and 316 deletions.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
@@ -231,7 +231,7 @@ public static Value pgJsonb(@Nullable String v) {
     return new PgJsonbImpl(v == null, v);
   }
 
-    /**
+  /**
    * Returns an {@code PG_OID} value.
    *
    * @param v the value, which may be null
@@ -925,7 +925,7 @@ Value newValue(boolean isNull, BitSet nulls, long[] values) {
           return new PgOidArrayImpl(isNull, nulls, values);
         }
       };
-      
+
   private static final PrimitiveArrayValueFactory<double[], Double> float64ArrayFactory =
       new PrimitiveArrayValueFactory<double[], Double>() {
         @Override
@@ -2087,8 +2087,8 @@ Long getValue(int i) {
     @Override
     com.google.protobuf.Value getValueAsProto(int i) {
       return com.google.protobuf.Value.newBuilder()
-              .setStringValue(Long.toString(values[i]))
-              .build();
+          .setStringValue(Long.toString(values[i]))
+          .build();
     }
 
     @Override
@@ -2335,7 +2335,7 @@ private Value getValue(int fieldIndex) {
                 return Value.jsonArray(value.getJsonList(fieldIndex));
               case PG_JSONB:
                 return Value.pgJsonbArray(value.getPgJsonbList(fieldIndex));
-             case PG_OID:
+              case PG_OID:
                 return Value.pgOidArray(value.getPgOidList(fieldIndex));
               case BYTES:
                 return Value.bytesArray(value.getBytesList(fieldIndex));

diff --git a/...e-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java b/...e-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java
@@ -253,7 +253,13 @@ public static Collection<Object[]> parameters() {
             "getJson",
             Collections.singletonList("getValue")
           },
-          {Type.pgOid(), "getPgOidInternal", 123L, "getPgOid", Collections.singletonList("getValue")},
+          {
+            Type.pgOid(),
+            "getPgOidInternal",
+            123L,
+            "getPgOid",
+            Collections.singletonList("getValue")
+          },
           {
             Type.timestamp(),
             "getTimestampInternal",

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java
@@ -768,11 +768,11 @@ public void getPgJsonb() {
   @Test
   public void getPgOid() {
     consumer.onPartialResultSet(
-            PartialResultSet.newBuilder()
-                    .setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.pgOid()))))
-                    .addValues(Value.pgOid(Long.MIN_VALUE).toProto())
-                    .addValues(Value.pgOid(Long.MAX_VALUE).toProto())
-                    .build());
+        PartialResultSet.newBuilder()
+            .setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.pgOid()))))
+            .addValues(Value.pgOid(Long.MIN_VALUE).toProto())
+            .addValues(Value.pgOid(Long.MAX_VALUE).toProto())
+            .build());
     consumer.onCompleted();
 
     assertThat(resultSet.next()).isTrue();

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java
@@ -618,7 +618,7 @@ private Mutation.WriteBuilder appendAllTypes(Mutation.WriteBuilder builder) {
         .set("pgOidArrNull")
         .toPgOidArray((long[]) null)
         .set("pgOidArrValue")
-        .to(Value.pgOidArray(ImmutableList.of(1L, 2L)))        
+        .to(Value.pgOidArray(ImmutableList.of(1L, 2L)))
         .set("timestampArr")
         .toTimestampArray(ImmutableList.of(Timestamp.MAX_VALUE, Timestamp.MAX_VALUE))
         .set("timestampArrNull")

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java
@@ -18,8 +18,8 @@
 
 import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultBytesBase64;
 import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultJson;
-import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultPgJsonb;
 import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultLongWrapper;
+import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultPgJsonb;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java
@@ -1929,10 +1929,10 @@ public void testEqualsHashCode() {
     tester.addEqualityGroup(Value.pgNumericArray(null), Value.pgNumericArray(null));
 
     tester.addEqualityGroup(
-            Value.pgOidArray(Arrays.asList(1L, 2L)),
-            Value.pgOidArray(new long[] {1L, 2L}),
-            Value.pgOidArray(new long[] {0L, 1L, 2L, 3L}, 1, 2),
-            Value.pgOidArray(plainIterable(1L, 2L)));
+        Value.pgOidArray(Arrays.asList(1L, 2L)),
+        Value.pgOidArray(new long[] {1L, 2L}),
+        Value.pgOidArray(new long[] {0L, 1L, 2L, 3L}, 1, 2),
+        Value.pgOidArray(plainIterable(1L, 2L)));
     tester.addEqualityGroup(Value.pgOidArray(Collections.singletonList(3L)));
     tester.addEqualityGroup(Value.pgOidArray(Collections.singletonList(null)));
     tester.addEqualityGroup(Value.pgOidArray((Iterable<Long>) null));
@@ -2093,8 +2093,10 @@ public void serialization() {
         Value.pgNumericArray(BrokenSerializationList.of("1.23", "1.24", Value.NAN)));
     reserializeAndAssert(Value.pgNumericArray(null));
 
-    reserializeAndAssert(Value.pgOidArray(BrokenSerializationList.of(Long.valueOf(1L), Long.valueOf(2L))));
-    reserializeAndAssert(Value.pgOidArray(BrokenSerializationList.of(Long.valueOf(1L), Long.valueOf(2L), null)));
+    reserializeAndAssert(
+        Value.pgOidArray(BrokenSerializationList.of(Long.valueOf(1L), Long.valueOf(2L))));
+    reserializeAndAssert(
+        Value.pgOidArray(BrokenSerializationList.of(Long.valueOf(1L), Long.valueOf(2L), null)));
     reserializeAndAssert(Value.pgOidArray((Iterable<Long>) null));
 
     reserializeAndAssert(Value.timestamp(null));

diff --git a/...d-spanner/src/test/java/com/google/cloud/spanner/connection/RandomResultSetGenerator.java b/...d-spanner/src/test/java/com/google/cloud/spanner/connection/RandomResultSetGenerator.java
@@ -44,85 +44,87 @@
 public class RandomResultSetGenerator {
   public static Type[] generateAllTypes(Dialect dialect) {
     List<Type> allTypes = new ArrayList<>();
-    allTypes.addAll(Arrays.asList(
-        Type.newBuilder().setCode(TypeCode.BOOL).build(),
-        Type.newBuilder().setCode(TypeCode.INT64).build(),
-        Type.newBuilder().setCode(TypeCode.FLOAT64).build(),
-        dialect == Dialect.POSTGRESQL
-            ? Type.newBuilder()
-                .setCode(TypeCode.NUMERIC)
-                .setTypeAnnotation(TypeAnnotationCode.PG_NUMERIC)
-                .build()
-            : Type.newBuilder().setCode(TypeCode.NUMERIC).build(),
-        Type.newBuilder().setCode(TypeCode.STRING).build(),
-        dialect == Dialect.POSTGRESQL
-            ? Type.newBuilder()
-                .setCode(TypeCode.JSON)
-                .setTypeAnnotation(TypeAnnotationCode.PG_JSONB)
-                .build()
-            : Type.newBuilder().setCode(TypeCode.JSON).build(),
-        Type.newBuilder().setCode(TypeCode.BYTES).build(),
-        Type.newBuilder().setCode(TypeCode.DATE).build(),
-        Type.newBuilder().setCode(TypeCode.TIMESTAMP).build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(Type.newBuilder().setCode(TypeCode.BOOL))
-            .build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(Type.newBuilder().setCode(TypeCode.INT64))
-            .build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(Type.newBuilder().setCode(TypeCode.FLOAT64))
-            .build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(
-                dialect == Dialect.POSTGRESQL
-                    ? Type.newBuilder()
-                        .setCode(TypeCode.NUMERIC)
-                        .setTypeAnnotation(TypeAnnotationCode.PG_NUMERIC)
-                    : Type.newBuilder().setCode(TypeCode.NUMERIC))
-            .build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(Type.newBuilder().setCode(TypeCode.STRING))
-            .build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(
-                dialect == Dialect.POSTGRESQL
-                    ? Type.newBuilder()
-                        .setCode(TypeCode.JSON)
-                        .setTypeAnnotation(TypeAnnotationCode.PG_JSONB)
-                    : Type.newBuilder().setCode(TypeCode.JSON))
-            .build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(Type.newBuilder().setCode(TypeCode.BYTES))
-            .build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(Type.newBuilder().setCode(TypeCode.DATE))
-            .build(),
-        Type.newBuilder()
-            .setCode(TypeCode.ARRAY)
-            .setArrayElementType(Type.newBuilder().setCode(TypeCode.TIMESTAMP))
-            .build()));
+    allTypes.addAll(
+        Arrays.asList(
+            Type.newBuilder().setCode(TypeCode.BOOL).build(),
+            Type.newBuilder().setCode(TypeCode.INT64).build(),
+            Type.newBuilder().setCode(TypeCode.FLOAT64).build(),
+            dialect == Dialect.POSTGRESQL
+                ? Type.newBuilder()
+                    .setCode(TypeCode.NUMERIC)
+                    .setTypeAnnotation(TypeAnnotationCode.PG_NUMERIC)
+                    .build()
+                : Type.newBuilder().setCode(TypeCode.NUMERIC).build(),
+            Type.newBuilder().setCode(TypeCode.STRING).build(),
+            dialect == Dialect.POSTGRESQL
+                ? Type.newBuilder()
+                    .setCode(TypeCode.JSON)
+                    .setTypeAnnotation(TypeAnnotationCode.PG_JSONB)
+                    .build()
+                : Type.newBuilder().setCode(TypeCode.JSON).build(),
+            Type.newBuilder().setCode(TypeCode.BYTES).build(),
+            Type.newBuilder().setCode(TypeCode.DATE).build(),
+            Type.newBuilder().setCode(TypeCode.TIMESTAMP).build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(Type.newBuilder().setCode(TypeCode.BOOL))
+                .build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(Type.newBuilder().setCode(TypeCode.INT64))
+                .build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(Type.newBuilder().setCode(TypeCode.FLOAT64))
+                .build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(
+                    dialect == Dialect.POSTGRESQL
+                        ? Type.newBuilder()
+                            .setCode(TypeCode.NUMERIC)
+                            .setTypeAnnotation(TypeAnnotationCode.PG_NUMERIC)
+                        : Type.newBuilder().setCode(TypeCode.NUMERIC))
+                .build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(Type.newBuilder().setCode(TypeCode.STRING))
+                .build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(
+                    dialect == Dialect.POSTGRESQL
+                        ? Type.newBuilder()
+                            .setCode(TypeCode.JSON)
+                            .setTypeAnnotation(TypeAnnotationCode.PG_JSONB)
+                        : Type.newBuilder().setCode(TypeCode.JSON))
+                .build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(Type.newBuilder().setCode(TypeCode.BYTES))
+                .build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(Type.newBuilder().setCode(TypeCode.DATE))
+                .build(),
+            Type.newBuilder()
+                .setCode(TypeCode.ARRAY)
+                .setArrayElementType(Type.newBuilder().setCode(TypeCode.TIMESTAMP))
+                .build()));
     if (dialect == Dialect.POSTGRESQL) {
-      allTypes.addAll(Arrays.asList(
-          Type.newBuilder()
-              .setCode(TypeCode.INT64)
-              .setTypeAnnotation(TypeAnnotationCode.PG_OID)
-              .build(),
-          Type.newBuilder()
-              .setCode(TypeCode.ARRAY)
-              .setArrayElementType(
-                  Type.newBuilder()
-                      .setCode(TypeCode.INT64)
-                      .setTypeAnnotation(TypeAnnotationCode.PG_OID))
-              .build()));
+      allTypes.addAll(
+          Arrays.asList(
+              Type.newBuilder()
+                  .setCode(TypeCode.INT64)
+                  .setTypeAnnotation(TypeAnnotationCode.PG_OID)
+                  .build(),
+              Type.newBuilder()
+                  .setCode(TypeCode.ARRAY)
+                  .setArrayElementType(
+                      Type.newBuilder()
+                          .setCode(TypeCode.INT64)
+                          .setTypeAnnotation(TypeAnnotationCode.PG_OID))
+                  .build()));
     }
     return allTypes.toArray(new Type[0]);
   }

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
@@ -256,14 +256,18 @@ public void bindInt64Null() {
 
   @Test
   public void bindPgOid() {
-    Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to(Value.pgOid(1234)), Type.pgOid());
+    Struct row =
+        execute(
+            Statement.newBuilder(selectValueQuery).bind("p1").to(Value.pgOid(1234)), Type.pgOid());
     assertThat(row.isNull(0)).isFalse();
     assertThat(row.getPgOid(0)).isEqualTo(1234);
   }
 
   @Test
   public void bindPgOidNull() {
-    Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to(Value.pgOid(null)), Type.pgOid());
+    Struct row =
+        execute(
+            Statement.newBuilder(selectValueQuery).bind("p1").to(Value.pgOid(null)), Type.pgOid());
     assertThat(row.isNull(0)).isTrue();
   }