Skip to content

Commit baacaf9

Browse files
address feedback: use guava for overflow math & codacy tweaks
1 parent 6f9479e commit baacaf9

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserver.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.api.gax.rpc.StateCheckingResponseObserver;
2121
import com.google.api.gax.rpc.StreamController;
2222
import com.google.common.base.Preconditions;
23+
import com.google.common.math.IntMath;
2324
import java.util.concurrent.CancellationException;
2425
import java.util.concurrent.atomic.AtomicInteger;
2526
import java.util.concurrent.atomic.AtomicReference;
@@ -159,10 +160,8 @@ private void onRequest(int count) {
159160
if (current == Integer.MAX_VALUE) {
160161
return;
161162
}
162-
// Prevent overflow
163-
int maxRequest = Integer.MAX_VALUE - current;
164-
int newValue = maxRequest > count ? current + count : Integer.MAX_VALUE;
165163

164+
int newValue = IntMath.saturatedAdd(current, count);
166165
if (numRequested.compareAndSet(current, newValue)) {
167166
break;
168167
}

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/reframing/ReframingResponseObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public void testReframerPushError() throws Exception {
320320
new DasherizingReframer(1) {
321321
@Override
322322
public void push(String response) {
323-
if (response.equals("boom")) {
323+
if ("boom".equals(response)) {
324324
throw new IllegalStateException("fake error");
325325
}
326326
super.push(response);

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/gaxx/testing/FakeStreamingApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static class ServerStreamingStashCallable<RequestT, ResponseT>
120120
private ResponseObserver<ResponseT> actualObserver;
121121
private RequestT actualRequest;
122122
private List<ResponseT> responseList;
123-
private BlockingQueue<StreamControllerStash<ResponseT>> calls = Queues.newLinkedBlockingQueue();
123+
private final BlockingQueue<StreamControllerStash<ResponseT>> calls = Queues.newLinkedBlockingQueue();
124124

125125
public ServerStreamingStashCallable() {
126126
responseList = new ArrayList<>();

0 commit comments

Comments
 (0)