Skip to content

Commit 91e8f36

Browse files
author
Dhriti Chopra
committed
fix: fix lint
1 parent 72af919 commit 91e8f36

2 files changed

Lines changed: 72 additions & 77 deletions

File tree

‎java-storage/google-cloud-storage/src/main/java/com/google/cloud/storage/GapicUnbufferedReadableByteChannel.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.google.cloud.storage.Hasher.UncheckedChecksumMismatchException;
3434
import com.google.cloud.storage.ResponseContentLifecycleHandle.ChildRef;
3535
import com.google.cloud.storage.Retrying.Retrier;
36-
import java.util.OptionalLong;
3736
import com.google.cloud.storage.UnbufferedReadableByteChannelSession.UnbufferedReadableByteChannel;
3837
import com.google.common.base.Suppliers;
3938
import com.google.protobuf.ByteString;
@@ -50,6 +49,7 @@
5049
import java.nio.channels.ScatteringByteChannel;
5150
import java.util.List;
5251
import java.util.Locale;
52+
import java.util.OptionalLong;
5353
import java.util.concurrent.ArrayBlockingQueue;
5454
import java.util.concurrent.CancellationException;
5555
import java.util.concurrent.ExecutionException;
@@ -92,9 +92,15 @@ final class GapicUnbufferedReadableByteChannel
9292
this.result = result;
9393
this.read = read;
9494
this.req = req;
95-
this.hasher = (req.getReadOffset() == 0)
96-
? new CumulativeHasher(hasher, 0, req.getReadLimit() <= 0 ? OptionalLong.empty() : OptionalLong.of(req.getReadLimit()))
97-
: hasher;
95+
this.hasher =
96+
(req.getReadOffset() == 0)
97+
? new CumulativeHasher(
98+
hasher,
99+
0,
100+
req.getReadLimit() <= 0
101+
? OptionalLong.empty()
102+
: OptionalLong.of(req.getReadLimit()))
103+
: hasher;
98104
this.fetchOffset = new AtomicLong(req.getReadOffset());
99105
this.blobOffset = req.getReadOffset();
100106
this.retrier = retrier;
@@ -326,7 +332,6 @@ private void validateCumulativeChecksum() throws IOException {
326332
}
327333
}
328334

329-
330335
private final class ReadObjectObserver extends StateCheckingResponseObserver<ReadObjectResponse> {
331336

332337
private final SettableApiFuture<Void> open = SettableApiFuture.create();

‎java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/GapicUnbufferedReadableByteChannelTest.java‎

Lines changed: 62 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ public void validateCumulativeChecksum_success() throws IOException {
8787
Object metadata =
8888
Object.newBuilder()
8989
.setSize(testContent.length())
90-
.setChecksums(
91-
ObjectChecksums.newBuilder()
92-
.setCrc32C(testContent.getCrc32c())
93-
.build())
90+
.setChecksums(ObjectChecksums.newBuilder().setCrc32C(testContent.getCrc32c()).build())
9491
.build();
9592

9693
ResponseContentLifecycleManager<ReadObjectResponse> manager =
@@ -137,9 +134,7 @@ public void validateCumulativeChecksum_failure() throws IOException {
137134
Object.newBuilder()
138135
.setSize(testContent.length())
139136
.setChecksums(
140-
ObjectChecksums.newBuilder()
141-
.setCrc32C(testContent.getCrc32c() + 1)
142-
.build())
137+
ObjectChecksums.newBuilder().setCrc32C(testContent.getCrc32c() + 1).build())
143138
.build();
144139

145140
ResponseContentLifecycleManager<ReadObjectResponse> manager =
@@ -173,7 +168,8 @@ public void call(
173168
ByteBuffer buffer = ByteBuffer.allocate(15);
174169
IOException exception = assertThrows(IOException.class, () -> c.read(buffer));
175170
assertThat(exception.getCause()).isInstanceOf(StorageException.class);
176-
assertThat(exception.getCause().getCause()).isInstanceOf(UncheckedCumulativeChecksumMismatchException.class);
171+
assertThat(exception.getCause().getCause())
172+
.isInstanceOf(UncheckedCumulativeChecksumMismatchException.class);
177173
}
178174
}
179175

@@ -186,9 +182,7 @@ public void validateCumulativeChecksum_skippedForRangedRead() throws IOException
186182
Object.newBuilder()
187183
.setSize(testContent.length())
188184
.setChecksums(
189-
ObjectChecksums.newBuilder()
190-
.setCrc32C(testContent.getCrc32c() + 1)
191-
.build())
185+
ObjectChecksums.newBuilder().setCrc32C(testContent.getCrc32c() + 1).build())
192186
.build();
193187

194188
ResponseContentLifecycleManager<ReadObjectResponse> manager =
@@ -239,10 +233,7 @@ public void validateCumulativeChecksum_multipleChunks_success() throws IOExcepti
239233
Object metadata =
240234
Object.newBuilder()
241235
.setSize(fullContent.length())
242-
.setChecksums(
243-
ObjectChecksums.newBuilder()
244-
.setCrc32C(fullContent.getCrc32c())
245-
.build())
236+
.setChecksums(ObjectChecksums.newBuilder().setCrc32C(fullContent.getCrc32c()).build())
246237
.build();
247238

248239
ResponseContentLifecycleManager<ReadObjectResponse> manager =
@@ -259,26 +250,28 @@ public void call(
259250
ResponseObserver<ReadObjectResponse> respond,
260251
ApiCallContext context) {
261252
respond.onStart(TestUtils.nullStreamController());
262-
new Thread(() -> {
263-
try {
264-
respond.onResponse(
265-
ReadObjectResponse.newBuilder()
266-
.setChecksummedData(chunk1.asChecksummedData())
267-
.build());
268-
respond.onResponse(
269-
ReadObjectResponse.newBuilder()
270-
.setChecksummedData(chunk2.asChecksummedData())
271-
.build());
272-
respond.onResponse(
273-
ReadObjectResponse.newBuilder()
274-
.setChecksummedData(chunk3.asChecksummedData())
275-
.setMetadata(metadata)
276-
.build());
277-
respond.onComplete();
278-
} catch (Throwable t) {
279-
respond.onError(t);
280-
}
281-
}).start();
253+
new Thread(
254+
() -> {
255+
try {
256+
respond.onResponse(
257+
ReadObjectResponse.newBuilder()
258+
.setChecksummedData(chunk1.asChecksummedData())
259+
.build());
260+
respond.onResponse(
261+
ReadObjectResponse.newBuilder()
262+
.setChecksummedData(chunk2.asChecksummedData())
263+
.build());
264+
respond.onResponse(
265+
ReadObjectResponse.newBuilder()
266+
.setChecksummedData(chunk3.asChecksummedData())
267+
.setMetadata(metadata)
268+
.build());
269+
respond.onComplete();
270+
} catch (Throwable t) {
271+
respond.onError(t);
272+
}
273+
})
274+
.start();
282275
}
283276
},
284277
manager),
@@ -306,9 +299,7 @@ public void validateCumulativeChecksum_multipleChunks_failure() throws IOExcepti
306299
Object.newBuilder()
307300
.setSize(fullContent.length())
308301
.setChecksums(
309-
ObjectChecksums.newBuilder()
310-
.setCrc32C(fullContent.getCrc32c() + 1)
311-
.build())
302+
ObjectChecksums.newBuilder().setCrc32C(fullContent.getCrc32c() + 1).build())
312303
.build();
313304

314305
ResponseContentLifecycleManager<ReadObjectResponse> manager =
@@ -325,26 +316,28 @@ public void call(
325316
ResponseObserver<ReadObjectResponse> respond,
326317
ApiCallContext context) {
327318
respond.onStart(TestUtils.nullStreamController());
328-
new Thread(() -> {
329-
try {
330-
respond.onResponse(
331-
ReadObjectResponse.newBuilder()
332-
.setChecksummedData(chunk1.asChecksummedData())
333-
.build());
334-
respond.onResponse(
335-
ReadObjectResponse.newBuilder()
336-
.setChecksummedData(chunk2.asChecksummedData())
337-
.build());
338-
respond.onResponse(
339-
ReadObjectResponse.newBuilder()
340-
.setChecksummedData(chunk3.asChecksummedData())
341-
.setMetadata(metadata)
342-
.build());
343-
respond.onComplete();
344-
} catch (Throwable t) {
345-
respond.onError(t);
346-
}
347-
}).start();
319+
new Thread(
320+
() -> {
321+
try {
322+
respond.onResponse(
323+
ReadObjectResponse.newBuilder()
324+
.setChecksummedData(chunk1.asChecksummedData())
325+
.build());
326+
respond.onResponse(
327+
ReadObjectResponse.newBuilder()
328+
.setChecksummedData(chunk2.asChecksummedData())
329+
.build());
330+
respond.onResponse(
331+
ReadObjectResponse.newBuilder()
332+
.setChecksummedData(chunk3.asChecksummedData())
333+
.setMetadata(metadata)
334+
.build());
335+
respond.onComplete();
336+
} catch (Throwable t) {
337+
respond.onError(t);
338+
}
339+
})
340+
.start();
348341
}
349342
},
350343
manager),
@@ -354,11 +347,15 @@ public void call(
354347
Retrying.neverRetry())) {
355348

356349
ByteBuffer buffer = ByteBuffer.allocate(20);
357-
IOException exception = assertThrows(IOException.class, () -> {
358-
c.read(new ByteBuffer[] {buffer}, 0, 1);
359-
});
350+
IOException exception =
351+
assertThrows(
352+
IOException.class,
353+
() -> {
354+
c.read(new ByteBuffer[] {buffer}, 0, 1);
355+
});
360356
assertThat(exception.getCause()).isInstanceOf(StorageException.class);
361-
assertThat(exception.getCause().getCause()).isInstanceOf(UncheckedCumulativeChecksumMismatchException.class);
357+
assertThat(exception.getCause().getCause())
358+
.isInstanceOf(UncheckedCumulativeChecksumMismatchException.class);
362359
}
363360
}
364361

@@ -416,9 +413,7 @@ public void validateCumulativeChecksum_nonZeroOffset_skipped() throws IOExceptio
416413
Object.newBuilder()
417414
.setSize(testContent.length())
418415
.setChecksums(
419-
ObjectChecksums.newBuilder()
420-
.setCrc32C(testContent.getCrc32c() + 1)
421-
.build())
416+
ObjectChecksums.newBuilder().setCrc32C(testContent.getCrc32c() + 1).build())
422417
.build();
423418

424419
ResponseContentLifecycleManager<ReadObjectResponse> manager =
@@ -462,10 +457,7 @@ public void validateCumulativeChecksum_zeroByteObject_success() throws IOExcepti
462457
Object metadata =
463458
Object.newBuilder()
464459
.setSize(0)
465-
.setChecksums(
466-
ObjectChecksums.newBuilder()
467-
.setCrc32C(0)
468-
.build())
460+
.setChecksums(ObjectChecksums.newBuilder().setCrc32C(0).build())
469461
.build();
470462

471463
ResponseContentLifecycleManager<ReadObjectResponse> manager =
@@ -483,9 +475,7 @@ public void call(
483475
ApiCallContext context) {
484476
respond.onStart(TestUtils.nullStreamController());
485477
respond.onResponse(
486-
ReadObjectResponse.newBuilder()
487-
.setMetadata(metadata)
488-
.build());
478+
ReadObjectResponse.newBuilder().setMetadata(metadata).build());
489479
respond.onComplete();
490480
}
491481
},

0 commit comments

Comments
 (0)