Skip to content

Commit 45f4485

Browse files
tlhquynhtlhquynh
committed
chore: fix lint errors
1 parent 0ba885e commit 45f4485

File tree

9 files changed

+314
-316
lines changed

9 files changed

+314
-316
lines changed

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public static Value pgJsonb(@Nullable String v) {
231231
return new PgJsonbImpl(v == null, v);
232232
}
233233

234-
/**
234+
/**
235235
* Returns an {@code PG_OID} value.
236236
*
237237
* @param v the value, which may be null
@@ -925,7 +925,7 @@ Value newValue(boolean isNull, BitSet nulls, long[] values) {
925925
return new PgOidArrayImpl(isNull, nulls, values);
926926
}
927927
};
928-
928+
929929
private static final PrimitiveArrayValueFactory<double[], Double> float64ArrayFactory =
930930
new PrimitiveArrayValueFactory<double[], Double>() {
931931
@Override
@@ -2087,8 +2087,8 @@ Long getValue(int i) {
20872087
@Override
20882088
com.google.protobuf.Value getValueAsProto(int i) {
20892089
return com.google.protobuf.Value.newBuilder()
2090-
.setStringValue(Long.toString(values[i]))
2091-
.build();
2090+
.setStringValue(Long.toString(values[i]))
2091+
.build();
20922092
}
20932093

20942094
@Override
@@ -2335,7 +2335,7 @@ private Value getValue(int fieldIndex) {
23352335
return Value.jsonArray(value.getJsonList(fieldIndex));
23362336
case PG_JSONB:
23372337
return Value.pgJsonbArray(value.getPgJsonbList(fieldIndex));
2338-
case PG_OID:
2338+
case PG_OID:
23392339
return Value.pgOidArray(value.getPgOidList(fieldIndex));
23402340
case BYTES:
23412341
return Value.bytesArray(value.getBytesList(fieldIndex));

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractStructReaderTypesTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,13 @@ public static Collection<Object[]> parameters() {
253253
"getJson",
254254
Collections.singletonList("getValue")
255255
},
256-
{Type.pgOid(), "getPgOidInternal", 123L, "getPgOid", Collections.singletonList("getValue")},
256+
{
257+
Type.pgOid(),
258+
"getPgOidInternal",
259+
123L,
260+
"getPgOid",
261+
Collections.singletonList("getValue")
262+
},
257263
{
258264
Type.timestamp(),
259265
"getTimestampInternal",

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java

Lines changed: 201 additions & 217 deletions
Large diffs are not rendered by default.

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/GrpcResultSetTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -768,11 +768,11 @@ public void getPgJsonb() {
768768
@Test
769769
public void getPgOid() {
770770
consumer.onPartialResultSet(
771-
PartialResultSet.newBuilder()
772-
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.pgOid()))))
773-
.addValues(Value.pgOid(Long.MIN_VALUE).toProto())
774-
.addValues(Value.pgOid(Long.MAX_VALUE).toProto())
775-
.build());
771+
PartialResultSet.newBuilder()
772+
.setMetadata(makeMetadata(Type.struct(Type.StructField.of("f", Type.pgOid()))))
773+
.addValues(Value.pgOid(Long.MIN_VALUE).toProto())
774+
.addValues(Value.pgOid(Long.MAX_VALUE).toProto())
775+
.build());
776776
consumer.onCompleted();
777777

778778
assertThat(resultSet.next()).isTrue();

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/MutationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ private Mutation.WriteBuilder appendAllTypes(Mutation.WriteBuilder builder) {
618618
.set("pgOidArrNull")
619619
.toPgOidArray((long[]) null)
620620
.set("pgOidArrValue")
621-
.to(Value.pgOidArray(ImmutableList.of(1L, 2L)))
621+
.to(Value.pgOidArray(ImmutableList.of(1L, 2L)))
622622
.set("timestampArr")
623623
.toTimestampArray(ImmutableList.of(Timestamp.MAX_VALUE, Timestamp.MAX_VALUE))
624624
.set("timestampArrNull")

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueBinderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultBytesBase64;
2020
import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultJson;
21-
import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultPgJsonb;
2221
import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultLongWrapper;
22+
import static com.google.cloud.spanner.ValueBinderTest.DefaultValues.defaultPgJsonb;
2323
import static com.google.common.truth.Truth.assertThat;
2424
import static com.google.common.truth.Truth.assertWithMessage;
2525

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,10 +1929,10 @@ public void testEqualsHashCode() {
19291929
tester.addEqualityGroup(Value.pgNumericArray(null), Value.pgNumericArray(null));
19301930

19311931
tester.addEqualityGroup(
1932-
Value.pgOidArray(Arrays.asList(1L, 2L)),
1933-
Value.pgOidArray(new long[] {1L, 2L}),
1934-
Value.pgOidArray(new long[] {0L, 1L, 2L, 3L}, 1, 2),
1935-
Value.pgOidArray(plainIterable(1L, 2L)));
1932+
Value.pgOidArray(Arrays.asList(1L, 2L)),
1933+
Value.pgOidArray(new long[] {1L, 2L}),
1934+
Value.pgOidArray(new long[] {0L, 1L, 2L, 3L}, 1, 2),
1935+
Value.pgOidArray(plainIterable(1L, 2L)));
19361936
tester.addEqualityGroup(Value.pgOidArray(Collections.singletonList(3L)));
19371937
tester.addEqualityGroup(Value.pgOidArray(Collections.singletonList(null)));
19381938
tester.addEqualityGroup(Value.pgOidArray((Iterable<Long>) null));
@@ -2093,8 +2093,10 @@ public void serialization() {
20932093
Value.pgNumericArray(BrokenSerializationList.of("1.23", "1.24", Value.NAN)));
20942094
reserializeAndAssert(Value.pgNumericArray(null));
20952095

2096-
reserializeAndAssert(Value.pgOidArray(BrokenSerializationList.of(Long.valueOf(1L), Long.valueOf(2L))));
2097-
reserializeAndAssert(Value.pgOidArray(BrokenSerializationList.of(Long.valueOf(1L), Long.valueOf(2L), null)));
2096+
reserializeAndAssert(
2097+
Value.pgOidArray(BrokenSerializationList.of(Long.valueOf(1L), Long.valueOf(2L))));
2098+
reserializeAndAssert(
2099+
Value.pgOidArray(BrokenSerializationList.of(Long.valueOf(1L), Long.valueOf(2L), null)));
20982100
reserializeAndAssert(Value.pgOidArray((Iterable<Long>) null));
20992101

21002102
reserializeAndAssert(Value.timestamp(null));

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/RandomResultSetGenerator.java

Lines changed: 80 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -44,85 +44,87 @@
4444
public class RandomResultSetGenerator {
4545
public static Type[] generateAllTypes(Dialect dialect) {
4646
List<Type> allTypes = new ArrayList<>();
47-
allTypes.addAll(Arrays.asList(
48-
Type.newBuilder().setCode(TypeCode.BOOL).build(),
49-
Type.newBuilder().setCode(TypeCode.INT64).build(),
50-
Type.newBuilder().setCode(TypeCode.FLOAT64).build(),
51-
dialect == Dialect.POSTGRESQL
52-
? Type.newBuilder()
53-
.setCode(TypeCode.NUMERIC)
54-
.setTypeAnnotation(TypeAnnotationCode.PG_NUMERIC)
55-
.build()
56-
: Type.newBuilder().setCode(TypeCode.NUMERIC).build(),
57-
Type.newBuilder().setCode(TypeCode.STRING).build(),
58-
dialect == Dialect.POSTGRESQL
59-
? Type.newBuilder()
60-
.setCode(TypeCode.JSON)
61-
.setTypeAnnotation(TypeAnnotationCode.PG_JSONB)
62-
.build()
63-
: Type.newBuilder().setCode(TypeCode.JSON).build(),
64-
Type.newBuilder().setCode(TypeCode.BYTES).build(),
65-
Type.newBuilder().setCode(TypeCode.DATE).build(),
66-
Type.newBuilder().setCode(TypeCode.TIMESTAMP).build(),
67-
Type.newBuilder()
68-
.setCode(TypeCode.ARRAY)
69-
.setArrayElementType(Type.newBuilder().setCode(TypeCode.BOOL))
70-
.build(),
71-
Type.newBuilder()
72-
.setCode(TypeCode.ARRAY)
73-
.setArrayElementType(Type.newBuilder().setCode(TypeCode.INT64))
74-
.build(),
75-
Type.newBuilder()
76-
.setCode(TypeCode.ARRAY)
77-
.setArrayElementType(Type.newBuilder().setCode(TypeCode.FLOAT64))
78-
.build(),
79-
Type.newBuilder()
80-
.setCode(TypeCode.ARRAY)
81-
.setArrayElementType(
82-
dialect == Dialect.POSTGRESQL
83-
? Type.newBuilder()
84-
.setCode(TypeCode.NUMERIC)
85-
.setTypeAnnotation(TypeAnnotationCode.PG_NUMERIC)
86-
: Type.newBuilder().setCode(TypeCode.NUMERIC))
87-
.build(),
88-
Type.newBuilder()
89-
.setCode(TypeCode.ARRAY)
90-
.setArrayElementType(Type.newBuilder().setCode(TypeCode.STRING))
91-
.build(),
92-
Type.newBuilder()
93-
.setCode(TypeCode.ARRAY)
94-
.setArrayElementType(
95-
dialect == Dialect.POSTGRESQL
96-
? Type.newBuilder()
97-
.setCode(TypeCode.JSON)
98-
.setTypeAnnotation(TypeAnnotationCode.PG_JSONB)
99-
: Type.newBuilder().setCode(TypeCode.JSON))
100-
.build(),
101-
Type.newBuilder()
102-
.setCode(TypeCode.ARRAY)
103-
.setArrayElementType(Type.newBuilder().setCode(TypeCode.BYTES))
104-
.build(),
105-
Type.newBuilder()
106-
.setCode(TypeCode.ARRAY)
107-
.setArrayElementType(Type.newBuilder().setCode(TypeCode.DATE))
108-
.build(),
109-
Type.newBuilder()
110-
.setCode(TypeCode.ARRAY)
111-
.setArrayElementType(Type.newBuilder().setCode(TypeCode.TIMESTAMP))
112-
.build()));
47+
allTypes.addAll(
48+
Arrays.asList(
49+
Type.newBuilder().setCode(TypeCode.BOOL).build(),
50+
Type.newBuilder().setCode(TypeCode.INT64).build(),
51+
Type.newBuilder().setCode(TypeCode.FLOAT64).build(),
52+
dialect == Dialect.POSTGRESQL
53+
? Type.newBuilder()
54+
.setCode(TypeCode.NUMERIC)
55+
.setTypeAnnotation(TypeAnnotationCode.PG_NUMERIC)
56+
.build()
57+
: Type.newBuilder().setCode(TypeCode.NUMERIC).build(),
58+
Type.newBuilder().setCode(TypeCode.STRING).build(),
59+
dialect == Dialect.POSTGRESQL
60+
? Type.newBuilder()
61+
.setCode(TypeCode.JSON)
62+
.setTypeAnnotation(TypeAnnotationCode.PG_JSONB)
63+
.build()
64+
: Type.newBuilder().setCode(TypeCode.JSON).build(),
65+
Type.newBuilder().setCode(TypeCode.BYTES).build(),
66+
Type.newBuilder().setCode(TypeCode.DATE).build(),
67+
Type.newBuilder().setCode(TypeCode.TIMESTAMP).build(),
68+
Type.newBuilder()
69+
.setCode(TypeCode.ARRAY)
70+
.setArrayElementType(Type.newBuilder().setCode(TypeCode.BOOL))
71+
.build(),
72+
Type.newBuilder()
73+
.setCode(TypeCode.ARRAY)
74+
.setArrayElementType(Type.newBuilder().setCode(TypeCode.INT64))
75+
.build(),
76+
Type.newBuilder()
77+
.setCode(TypeCode.ARRAY)
78+
.setArrayElementType(Type.newBuilder().setCode(TypeCode.FLOAT64))
79+
.build(),
80+
Type.newBuilder()
81+
.setCode(TypeCode.ARRAY)
82+
.setArrayElementType(
83+
dialect == Dialect.POSTGRESQL
84+
? Type.newBuilder()
85+
.setCode(TypeCode.NUMERIC)
86+
.setTypeAnnotation(TypeAnnotationCode.PG_NUMERIC)
87+
: Type.newBuilder().setCode(TypeCode.NUMERIC))
88+
.build(),
89+
Type.newBuilder()
90+
.setCode(TypeCode.ARRAY)
91+
.setArrayElementType(Type.newBuilder().setCode(TypeCode.STRING))
92+
.build(),
93+
Type.newBuilder()
94+
.setCode(TypeCode.ARRAY)
95+
.setArrayElementType(
96+
dialect == Dialect.POSTGRESQL
97+
? Type.newBuilder()
98+
.setCode(TypeCode.JSON)
99+
.setTypeAnnotation(TypeAnnotationCode.PG_JSONB)
100+
: Type.newBuilder().setCode(TypeCode.JSON))
101+
.build(),
102+
Type.newBuilder()
103+
.setCode(TypeCode.ARRAY)
104+
.setArrayElementType(Type.newBuilder().setCode(TypeCode.BYTES))
105+
.build(),
106+
Type.newBuilder()
107+
.setCode(TypeCode.ARRAY)
108+
.setArrayElementType(Type.newBuilder().setCode(TypeCode.DATE))
109+
.build(),
110+
Type.newBuilder()
111+
.setCode(TypeCode.ARRAY)
112+
.setArrayElementType(Type.newBuilder().setCode(TypeCode.TIMESTAMP))
113+
.build()));
113114
if (dialect == Dialect.POSTGRESQL) {
114-
allTypes.addAll(Arrays.asList(
115-
Type.newBuilder()
116-
.setCode(TypeCode.INT64)
117-
.setTypeAnnotation(TypeAnnotationCode.PG_OID)
118-
.build(),
119-
Type.newBuilder()
120-
.setCode(TypeCode.ARRAY)
121-
.setArrayElementType(
122-
Type.newBuilder()
123-
.setCode(TypeCode.INT64)
124-
.setTypeAnnotation(TypeAnnotationCode.PG_OID))
125-
.build()));
115+
allTypes.addAll(
116+
Arrays.asList(
117+
Type.newBuilder()
118+
.setCode(TypeCode.INT64)
119+
.setTypeAnnotation(TypeAnnotationCode.PG_OID)
120+
.build(),
121+
Type.newBuilder()
122+
.setCode(TypeCode.ARRAY)
123+
.setArrayElementType(
124+
Type.newBuilder()
125+
.setCode(TypeCode.INT64)
126+
.setTypeAnnotation(TypeAnnotationCode.PG_OID))
127+
.build()));
126128
}
127129
return allTypes.toArray(new Type[0]);
128130
}

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,18 @@ public void bindInt64Null() {
256256

257257
@Test
258258
public void bindPgOid() {
259-
Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to(Value.pgOid(1234)), Type.pgOid());
259+
Struct row =
260+
execute(
261+
Statement.newBuilder(selectValueQuery).bind("p1").to(Value.pgOid(1234)), Type.pgOid());
260262
assertThat(row.isNull(0)).isFalse();
261263
assertThat(row.getPgOid(0)).isEqualTo(1234);
262264
}
263265

264266
@Test
265267
public void bindPgOidNull() {
266-
Struct row = execute(Statement.newBuilder(selectValueQuery).bind("p1").to(Value.pgOid(null)), Type.pgOid());
268+
Struct row =
269+
execute(
270+
Statement.newBuilder(selectValueQuery).bind("p1").to(Value.pgOid(null)), Type.pgOid());
267271
assertThat(row.isNull(0)).isTrue();
268272
}
269273

0 commit comments

Comments
 (0)