core, grpclb: fix import lints (#5017)

This commit is contained in:
zpencer 2018-10-30 14:24:02 -07:00 committed by GitHub
parent 51ab5b9432
commit f3e371c712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 17 deletions

View File

@ -227,7 +227,7 @@ public final class Status {
}
private static final String TEST_EQUALS_FAILURE_PROPERTY = "io.grpc.Status.failOnEqualsForTest";
private static final boolean failOnEqualsForTest =
private static final boolean FAIL_ON_EQUALS_FOR_TEST =
Boolean.parseBoolean(System.getProperty(TEST_EQUALS_FAILURE_PROPERTY, "false"));
// Create the canonical list of Status instances indexed by their code values.
@ -657,7 +657,7 @@ public final class Status {
*/
@Override
public boolean equals(Object obj) {
assert !failOnEqualsForTest
assert !FAIL_ON_EQUALS_FOR_TEST
: "Status.equals called; disable this by setting " + TEST_EQUALS_FAILURE_PROPERTY;
return super.equals(obj);
}

View File

@ -19,6 +19,7 @@ package io.grpc.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Ascii;
import io.grpc.Attributes;
import io.grpc.ConnectivityState;
import io.grpc.ConnectivityStateInfo;
@ -179,7 +180,6 @@ final class AutoConfiguredLoadBalancerFactory extends LoadBalancer.Factory {
static LoadBalancerProvider decideLoadBalancerProvider(
List<EquivalentAddressGroup> servers, @Nullable Map<String, Object> config)
throws PolicyNotFoundException {
String policy = DEFAULT_POLICY;
// Check for balancer addresses
boolean haveBalancerAddress = false;
for (EquivalentAddressGroup s : servers) {
@ -198,7 +198,9 @@ final class AutoConfiguredLoadBalancerFactory extends LoadBalancer.Factory {
serviceConfigChoiceBalancingPolicy =
ServiceConfigUtil.getLoadBalancingPolicyFromServiceConfig(config);
if (serviceConfigChoiceBalancingPolicy != null) {
return getProviderOrThrow(serviceConfigChoiceBalancingPolicy.toLowerCase(),
// Handle ASCII specifically rather than relying on the implicit default locale of the str
return getProviderOrThrow(
Ascii.toLowerCase(serviceConfigChoiceBalancingPolicy),
"service-config specifies load-balancing policy");
}
}

View File

@ -24,8 +24,11 @@ import io.grpc.internal.RoundRobinLoadBalancerProvider;
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Unit tests for {@link LoadBalancerRegistry}. */
@RunWith(JUnit4.class)
public class LoadBalancerRegistryTest {
@Test
public void getClassesViaHardcoded_classesPresent() throws Exception {

View File

@ -19,10 +19,8 @@ package io.grpc;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import io.grpc.ClientStreamTracer;
import io.grpc.LoadBalancer.PickResult;
import io.grpc.LoadBalancer.Subchannel;
import io.grpc.Status;
import java.net.SocketAddress;
import java.util.Arrays;
import java.util.List;

View File

@ -83,7 +83,6 @@ public class ManagedChannelImplIdlenessTest {
private final FakeClock oobExecutor = new FakeClock();
private static final String AUTHORITY = "fakeauthority";
private static final String USER_AGENT = "fakeagent";
private static final ProxyParameters NO_PROXY = null;
private static final long IDLE_TIMEOUT_SECONDS = 30;
private ManagedChannelImpl channel;

View File

@ -59,7 +59,6 @@ import io.grpc.LoadBalancer.SubchannelPicker;
import io.grpc.Metadata;
import io.grpc.Metadata.Key;
import io.grpc.Status;
import io.grpc.internal.GrpcAttributes;
import io.grpc.internal.RoundRobinLoadBalancer.EmptyPicker;
import io.grpc.internal.RoundRobinLoadBalancer.ReadyPicker;
import io.grpc.internal.RoundRobinLoadBalancer.Ref;
@ -88,11 +87,13 @@ import org.mockito.stubbing.Answer;
/** Unit test for {@link RoundRobinLoadBalancer}. */
@RunWith(JUnit4.class)
public class RoundRobinLoadBalancerTest {
private RoundRobinLoadBalancer loadBalancer;
private List<EquivalentAddressGroup> servers = Lists.newArrayList();
private Map<List<EquivalentAddressGroup>, Subchannel> subchannels = Maps.newLinkedHashMap();
private static final Attributes.Key<String> MAJOR_KEY = Attributes.Key.create("major-key");
private Attributes affinity = Attributes.newBuilder().set(MAJOR_KEY, "I got the keys").build();
private RoundRobinLoadBalancer loadBalancer;
private final List<EquivalentAddressGroup> servers = Lists.newArrayList();
private final Map<List<EquivalentAddressGroup>, Subchannel> subchannels = Maps.newLinkedHashMap();
private final Attributes affinity =
Attributes.newBuilder().set(MAJOR_KEY, "I got the keys").build();
@Captor
private ArgumentCaptor<SubchannelPicker> pickerCaptor;

View File

@ -1167,11 +1167,10 @@ public class GrpclbLoadBalancerTest {
inOrder.verify(helper).createOobChannel(eq(resolutionList.get(1)), eq(lbAuthority(0)));
// Attempted to connect to balancer
assertEquals(1, fakeOobChannels.size());
ManagedChannel oobChannel = fakeOobChannels.poll();
assertThat(fakeOobChannels).hasSize(1);
verify(mockLbService).balanceLoad(lbResponseObserverCaptor.capture());
StreamObserver<LoadBalanceResponse> lbResponseObserver = lbResponseObserverCaptor.getValue();
assertEquals(1, lbRequestObservers.size());
assertThat(lbRequestObservers).hasSize(1);
StreamObserver<LoadBalanceRequest> lbRequestObserver = lbRequestObservers.poll();
verify(lbRequestObserver).onNext(
@ -1199,8 +1198,7 @@ public class GrpclbLoadBalancerTest {
// A new stream is created
verify(mockLbService, times(2)).balanceLoad(lbResponseObserverCaptor.capture());
lbResponseObserver = lbResponseObserverCaptor.getValue();
assertEquals(1, lbRequestObservers.size());
assertThat(lbRequestObservers).hasSize(1);
lbRequestObserver = lbRequestObservers.poll();
verify(lbRequestObserver).onNext(
eq(LoadBalanceRequest.newBuilder().setInitialRequest(