Skip to content

Commit a992bdf

Browse files
committed
fix: minor changes
1 parent c38ce1d commit a992bdf

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

core/src/main/java/io/grpc/internal/DelayedClientTransport.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import java.util.Collection;
3838
import java.util.Collections;
3939
import java.util.LinkedHashSet;
40+
import java.util.Objects;
4041
import java.util.concurrent.Executor;
4142
import javax.annotation.Nonnull;
4243
import javax.annotation.Nullable;
@@ -381,7 +382,7 @@ private PendingStream(PickSubchannelArgs args, ClientStreamTracer[] tracers,
381382
}
382383

383384
void updateDelayReason(String newToken) {
384-
if (!java.util.Objects.equals(delayReasonToken, newToken)) {
385+
if (!Objects.equals(delayReasonToken, newToken)) {
385386
if (delayReasonToken != null) {
386387
for (ClientStreamTracer tracer : tracers) {
387388
tracer.delayEnded();

xds/src/main/java/io/grpc/xds/PriorityLoadBalancer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@ private static final class PriorityPicker extends SubchannelPicker {
367367
private final String priority;
368368

369369
PriorityPicker(SubchannelPicker delegate, String priority) {
370-
this.delegate = com.google.common.base.Preconditions.checkNotNull(delegate, "delegate");
371-
this.priority = com.google.common.base.Preconditions.checkNotNull(priority, "priority");
370+
this.delegate = checkNotNull(delegate, "delegate");
371+
this.priority = checkNotNull(priority, "priority");
372372
}
373373

374374
@Override
@@ -395,7 +395,7 @@ public boolean equals(Object o) {
395395

396396
@Override
397397
public int hashCode() {
398-
return java.util.Objects.hash(delegate, priority);
398+
return Objects.hash(delegate, priority);
399399
}
400400
}
401401
}

xds/src/test/java/io/grpc/xds/RingHashLoadBalancerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,6 @@ public void tfWithReadyChild_doesNotTriggerIdleChildConnection() {
11641164
assertThat(connectionRequestedQueue.poll()).isNull();
11651165
}
11661166

1167-
11681167
private List<Subchannel> initializeLbSubchannels(RingHashConfig config,
11691168
List<EquivalentAddressGroup> servers, InitializationFlags... initFlags) {
11701169

0 commit comments

Comments
 (0)