Skip to content

Commit f675b60

Browse files
committed
chore: run formatter
1 parent 33e53a8 commit f675b60

File tree

143 files changed

+3216
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+3216
-78
lines changed

datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ public synchronized File getProjectDirectory() {
262262
static class StartupMonitor extends Thread {
263263
private final InputStream inputStream;
264264
private volatile boolean success = false;
265+
265266
/** This latch will reach 0 once server startup has completed. */
266267
private final CountDownLatch startupCompleteLatch = new CountDownLatch(1);
267268

datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreException.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@ public DatastoreException(String methodName, Code code, String message, Throwabl
2828
this.code = code;
2929
}
3030

31-
/** @return the canonical error code */
31+
/**
32+
* @return the canonical error code
33+
*/
3234
public Code getCode() {
3335
return code;
3436
}
3537

36-
/** @return the datastore method name */
38+
/**
39+
* @return the datastore method name
40+
*/
3741
public String getMethodName() {
3842
return methodName;
3943
}

datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,9 @@ private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options)
336336
return;
337337
}
338338

339-
/** @see #getOptionsFromEnv() */
339+
/**
340+
* @see #getOptionsFromEnv()
341+
*/
340342
public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException {
341343
return DatastoreFactory.get().create(getOptionsFromEnv().build());
342344
}

datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/EndToEndChecksumHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
class EndToEndChecksumHandler {
2525
/** The checksum http header on http requests */
2626
static final String HTTP_REQUEST_CHECKSUM_HEADER = "x-request-checksum-348659783";
27+
2728
/** The checksum http header on http responses */
2829
static final String HTTP_RESPONSE_CHECKSUM_HEADER = "x-response-checksum-348659783";
2930

datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/QuerySplitterTest.java

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ public void disallowsSortOrder() {
101101
public void disallowsMultipleKinds() {
102102
Datastore datastore = factory.create(options.build());
103103
Query queryWithMultipleKinds =
104-
query
105-
.toBuilder()
104+
query.toBuilder()
106105
.addKind(KindExpression.newBuilder().setName("another-kind").build())
107106
.build();
108107
IllegalArgumentException exception =
@@ -129,8 +128,7 @@ public void disallowsKindlessQuery() {
129128
public void disallowsInequalityFilter() {
130129
Datastore datastore = factory.create(options.build());
131130
Query queryWithInequality =
132-
query
133-
.toBuilder()
131+
query.toBuilder()
134132
.setFilter(makeFilter("foo", Operator.GREATER_THAN, makeValue("value")))
135133
.build();
136134
IllegalArgumentException exception =
@@ -177,16 +175,13 @@ public void getSplits() throws Exception {
177175

178176
assertThat(splittedQueries)
179177
.containsExactly(
180-
query
181-
.toBuilder()
178+
query.toBuilder()
182179
.setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
183180
.build(),
184-
query
185-
.toBuilder()
181+
query.toBuilder()
186182
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
187183
.build(),
188-
query
189-
.toBuilder()
184+
query.toBuilder()
190185
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
191186
.build());
192187

@@ -229,16 +224,13 @@ public void getSplitsWithDatabaseId() throws Exception {
229224

230225
assertThat(splitQueries)
231226
.containsExactly(
232-
query
233-
.toBuilder()
227+
query.toBuilder()
234228
.setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
235229
.build(),
236-
query
237-
.toBuilder()
230+
query.toBuilder()
238231
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
239232
.build(),
240-
query
241-
.toBuilder()
233+
query.toBuilder()
242234
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
243235
.build());
244236

@@ -277,12 +269,10 @@ public void notEnoughSplits() throws Exception {
277269

278270
assertThat(splittedQueries)
279271
.containsExactly(
280-
query
281-
.toBuilder()
272+
query.toBuilder()
282273
.setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey0))
283274
.build(),
284-
query
285-
.toBuilder()
275+
query.toBuilder()
286276
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey0, null))
287277
.build());
288278

@@ -325,16 +315,13 @@ public void getSplits_withReadTime() throws Exception {
325315

326316
assertThat(splittedQueries)
327317
.containsExactly(
328-
query
329-
.toBuilder()
318+
query.toBuilder()
330319
.setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
331320
.build(),
332-
query
333-
.toBuilder()
321+
query.toBuilder()
334322
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
335323
.build(),
336-
query
337-
.toBuilder()
324+
query.toBuilder()
338325
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
339326
.build());
340327

google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreException.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@ public DatastoreException(String methodName, Code code, String message, Throwabl
2828
this.code = code;
2929
}
3030

31-
/** @return the canonical error code */
31+
/**
32+
* @return the canonical error code
33+
*/
3234
public Code getCode() {
3335
return code;
3436
}
3537

36-
/** @return the datastore method name */
38+
/**
39+
* @return the datastore method name
40+
*/
3741
public String getMethodName() {
3842
return methodName;
3943
}

google-cloud-datastore-utils/src/main/java/com/google/datastore/utils/DatastoreHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,9 @@ private static void setProjectEndpointFromEnv(DatastoreOptions.Builder options)
338338
return;
339339
}
340340

341-
/** @see #getOptionsFromEnv() */
341+
/**
342+
* @see #getOptionsFromEnv()
343+
*/
342344
public static Datastore getDatastoreFromEnv() throws GeneralSecurityException, IOException {
343345
return DatastoreFactory.get().create(getOptionsFromEnv().build());
344346
}

google-cloud-datastore-utils/src/test/java/com/google/datastore/utils/QuerySplitterTest.java

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ public void disallowsSortOrder() {
8787
public void disallowsMultipleKinds() {
8888
com.google.datastore.utils.Datastore datastore = factory.create(options.build());
8989
Query queryWithMultipleKinds =
90-
query
91-
.toBuilder()
90+
query.toBuilder()
9291
.addKind(KindExpression.newBuilder().setName("another-kind").build())
9392
.build();
9493
IllegalArgumentException exception =
@@ -117,8 +116,7 @@ public void disallowsKindlessQuery() {
117116
public void disallowsInequalityFilter() {
118117
com.google.datastore.utils.Datastore datastore = factory.create(options.build());
119118
Query queryWithInequality =
120-
query
121-
.toBuilder()
119+
query.toBuilder()
122120
.setFilter(makeFilter("foo", Operator.GREATER_THAN, makeValue("value")))
123121
.build();
124122
IllegalArgumentException exception =
@@ -169,16 +167,13 @@ public void getSplits() throws Exception {
169167

170168
assertThat(splittedQueries)
171169
.containsExactly(
172-
query
173-
.toBuilder()
170+
query.toBuilder()
174171
.setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
175172
.build(),
176-
query
177-
.toBuilder()
173+
query.toBuilder()
178174
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
179175
.build(),
180-
query
181-
.toBuilder()
176+
query.toBuilder()
182177
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
183178
.build());
184179

@@ -223,16 +218,13 @@ public void getSplitsWithDatabaseId() throws Exception {
223218

224219
assertThat(splitQueries)
225220
.containsExactly(
226-
query
227-
.toBuilder()
221+
query.toBuilder()
228222
.setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
229223
.build(),
230-
query
231-
.toBuilder()
224+
query.toBuilder()
232225
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
233226
.build(),
234-
query
235-
.toBuilder()
227+
query.toBuilder()
236228
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
237229
.build());
238230

@@ -272,12 +264,10 @@ public void notEnoughSplits() throws Exception {
272264

273265
assertThat(splittedQueries)
274266
.containsExactly(
275-
query
276-
.toBuilder()
267+
query.toBuilder()
277268
.setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey0))
278269
.build(),
279-
query
280-
.toBuilder()
270+
query.toBuilder()
281271
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey0, null))
282272
.build());
283273

@@ -321,16 +311,13 @@ public void getSplits_withReadTime() throws Exception {
321311

322312
assertThat(splittedQueries)
323313
.containsExactly(
324-
query
325-
.toBuilder()
314+
query.toBuilder()
326315
.setFilter(makeFilterWithKeyRange(propertyFilter, null, splitKey1))
327316
.build(),
328-
query
329-
.toBuilder()
317+
query.toBuilder()
330318
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey1, splitKey3))
331319
.build(),
332-
query
333-
.toBuilder()
320+
query.toBuilder()
334321
.setFilter(makeFilterWithKeyRange(propertyFilter, splitKey3, null))
335322
.build());
336323

google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ public <T> T runInTransaction(final TransactionCallable<T> callable) {
257257
Callable<T> transactionCallable =
258258
(getOptions().getOpenTelemetryOptions().isEnabled()
259259
? new TracedReadWriteTransactionCallable<T>(
260-
this, callable, /*transactionOptions=*/ null, span)
261-
: new ReadWriteTransactionCallable<T>(this, callable, /*transactionOptions=*/ null));
260+
this, callable, /* transactionOptions= */ null, span)
261+
: new ReadWriteTransactionCallable<T>(this, callable, /* transactionOptions= */ null));
262262
try (Scope ignored = span.makeCurrent()) {
263263
return RetryHelper.runWithRetries(
264264
transactionCallable,

google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
/** Represents an {@link Aggregation} which returns count. */
2424
public class CountAggregation extends Aggregation {
2525

26-
/** @param alias Alias to used when running this aggregation. */
26+
/**
27+
* @param alias Alias to used when running this aggregation.
28+
*/
2729
public CountAggregation(String alias) {
2830
super(alias);
2931
}

0 commit comments

Comments
 (0)