mirror of https://github.com/grpc/grpc-java.git
Remove unused variables
The removal of the poll()s is a behavior change, but the tests weren't needing to call it.
This commit is contained in:
parent
67eefa69b4
commit
cf0e161bd6
|
|
@ -144,8 +144,6 @@ public class PickFirstLoadBalancerTest {
|
||||||
List<EquivalentAddressGroup> newServers =
|
List<EquivalentAddressGroup> newServers =
|
||||||
Lists.newArrayList(new EquivalentAddressGroup(socketAddr));
|
Lists.newArrayList(new EquivalentAddressGroup(socketAddr));
|
||||||
|
|
||||||
final EquivalentAddressGroup oldEag = new EquivalentAddressGroup(socketAddresses);
|
|
||||||
|
|
||||||
InOrder inOrder = inOrder(mockHelper);
|
InOrder inOrder = inOrder(mockHelper);
|
||||||
|
|
||||||
loadBalancer.handleResolvedAddressGroups(servers, affinity);
|
loadBalancer.handleResolvedAddressGroups(servers, affinity);
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@
|
||||||
|
|
||||||
package io.grpc.grpclb;
|
package io.grpc.grpclb;
|
||||||
|
|
||||||
import static com.google.common.base.Charsets.UTF_8;
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
import static io.grpc.ConnectivityState.CONNECTING;
|
import static io.grpc.ConnectivityState.CONNECTING;
|
||||||
import static io.grpc.ConnectivityState.IDLE;
|
import static io.grpc.ConnectivityState.IDLE;
|
||||||
|
|
@ -57,7 +56,6 @@ import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.verifyNoMoreInteractions;
|
import static org.mockito.Mockito.verifyNoMoreInteractions;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
import com.google.common.io.ByteStreams;
|
|
||||||
import com.google.common.util.concurrent.MoreExecutors;
|
import com.google.common.util.concurrent.MoreExecutors;
|
||||||
import com.google.protobuf.ByteString;
|
import com.google.protobuf.ByteString;
|
||||||
import com.google.protobuf.util.Durations;
|
import com.google.protobuf.util.Durations;
|
||||||
|
|
@ -74,8 +72,6 @@ import io.grpc.LoadBalancer.Subchannel;
|
||||||
import io.grpc.LoadBalancer.SubchannelPicker;
|
import io.grpc.LoadBalancer.SubchannelPicker;
|
||||||
import io.grpc.ManagedChannel;
|
import io.grpc.ManagedChannel;
|
||||||
import io.grpc.Metadata;
|
import io.grpc.Metadata;
|
||||||
import io.grpc.MethodDescriptor;
|
|
||||||
import io.grpc.MethodDescriptor.Marshaller;
|
|
||||||
import io.grpc.Status;
|
import io.grpc.Status;
|
||||||
import io.grpc.grpclb.GrpclbConstants.LbPolicy;
|
import io.grpc.grpclb.GrpclbConstants.LbPolicy;
|
||||||
import io.grpc.grpclb.GrpclbLoadBalancer.ErrorPicker;
|
import io.grpc.grpclb.GrpclbLoadBalancer.ErrorPicker;
|
||||||
|
|
@ -87,9 +83,6 @@ import io.grpc.internal.FakeClock;
|
||||||
import io.grpc.internal.ObjectPool;
|
import io.grpc.internal.ObjectPool;
|
||||||
import io.grpc.internal.SerializingExecutor;
|
import io.grpc.internal.SerializingExecutor;
|
||||||
import io.grpc.stub.StreamObserver;
|
import io.grpc.stub.StreamObserver;
|
||||||
import java.io.ByteArrayInputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.net.SocketAddress;
|
import java.net.SocketAddress;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
@ -119,32 +112,6 @@ public class GrpclbLoadBalancerTest {
|
||||||
Attributes.Key.of("resolution-attr");
|
Attributes.Key.of("resolution-attr");
|
||||||
private static final String SERVICE_AUTHORITY = "api.google.com";
|
private static final String SERVICE_AUTHORITY = "api.google.com";
|
||||||
|
|
||||||
private static final MethodDescriptor<String, String> TRASH_METHOD =
|
|
||||||
MethodDescriptor.<String, String>newBuilder()
|
|
||||||
.setType(MethodDescriptor.MethodType.UNARY)
|
|
||||||
.setFullMethodName("/service/trashmethod")
|
|
||||||
.setRequestMarshaller(StringMarshaller.INSTANCE)
|
|
||||||
.setResponseMarshaller(StringMarshaller.INSTANCE)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
private static class StringMarshaller implements Marshaller<String> {
|
|
||||||
static final StringMarshaller INSTANCE = new StringMarshaller();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InputStream stream(String value) {
|
|
||||||
return new ByteArrayInputStream(value.getBytes(UTF_8));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String parse(InputStream stream) {
|
|
||||||
try {
|
|
||||||
return new String(ByteStreams.toByteArray(stream), UTF_8);
|
|
||||||
} catch (IOException ex) {
|
|
||||||
throw new RuntimeException(ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private Helper helper;
|
private Helper helper;
|
||||||
private LoadBalancerGrpc.LoadBalancerImplBase mockLbService;
|
private LoadBalancerGrpc.LoadBalancerImplBase mockLbService;
|
||||||
|
|
@ -355,7 +322,6 @@ public class GrpclbLoadBalancerTest {
|
||||||
.set(GrpclbConstants.ATTR_LB_POLICY, LbPolicy.GRPCLB).build();
|
.set(GrpclbConstants.ATTR_LB_POLICY, LbPolicy.GRPCLB).build();
|
||||||
deliverResolvedAddresses(grpclbResolutionList, grpclbResolutionAttrs);
|
deliverResolvedAddresses(grpclbResolutionList, grpclbResolutionAttrs);
|
||||||
assertEquals(1, fakeOobChannels.size());
|
assertEquals(1, fakeOobChannels.size());
|
||||||
ManagedChannel oobChannel = fakeOobChannels.poll();
|
|
||||||
verify(mockLbService).balanceLoad(lbResponseObserverCaptor.capture());
|
verify(mockLbService).balanceLoad(lbResponseObserverCaptor.capture());
|
||||||
StreamObserver<LoadBalanceResponse> lbResponseObserver = lbResponseObserverCaptor.getValue();
|
StreamObserver<LoadBalanceResponse> lbResponseObserver = lbResponseObserverCaptor.getValue();
|
||||||
assertEquals(1, lbRequestObservers.size());
|
assertEquals(1, lbRequestObservers.size());
|
||||||
|
|
@ -565,7 +531,6 @@ public class GrpclbLoadBalancerTest {
|
||||||
.set(GrpclbConstants.ATTR_LB_POLICY, LbPolicy.GRPCLB).build();
|
.set(GrpclbConstants.ATTR_LB_POLICY, LbPolicy.GRPCLB).build();
|
||||||
deliverResolvedAddresses(grpclbResolutionList, grpclbResolutionAttrs);
|
deliverResolvedAddresses(grpclbResolutionList, grpclbResolutionAttrs);
|
||||||
assertEquals(1, fakeOobChannels.size());
|
assertEquals(1, fakeOobChannels.size());
|
||||||
ManagedChannel oobChannel = fakeOobChannels.poll();
|
|
||||||
verify(mockLbService).balanceLoad(lbResponseObserverCaptor.capture());
|
verify(mockLbService).balanceLoad(lbResponseObserverCaptor.capture());
|
||||||
StreamObserver<LoadBalanceResponse> lbResponseObserver = lbResponseObserverCaptor.getValue();
|
StreamObserver<LoadBalanceResponse> lbResponseObserver = lbResponseObserverCaptor.getValue();
|
||||||
|
|
||||||
|
|
@ -596,7 +561,6 @@ public class GrpclbLoadBalancerTest {
|
||||||
.set(GrpclbConstants.ATTR_LB_POLICY, LbPolicy.GRPCLB).build();
|
.set(GrpclbConstants.ATTR_LB_POLICY, LbPolicy.GRPCLB).build();
|
||||||
deliverResolvedAddresses(grpclbResolutionList, grpclbResolutionAttrs);
|
deliverResolvedAddresses(grpclbResolutionList, grpclbResolutionAttrs);
|
||||||
assertEquals(1, fakeOobChannels.size());
|
assertEquals(1, fakeOobChannels.size());
|
||||||
ManagedChannel oobChannel = fakeOobChannels.poll();
|
|
||||||
verify(mockLbService).balanceLoad(lbResponseObserverCaptor.capture());
|
verify(mockLbService).balanceLoad(lbResponseObserverCaptor.capture());
|
||||||
StreamObserver<LoadBalanceResponse> lbResponseObserver = lbResponseObserverCaptor.getValue();
|
StreamObserver<LoadBalanceResponse> lbResponseObserver = lbResponseObserverCaptor.getValue();
|
||||||
assertEquals(1, lbRequestObservers.size());
|
assertEquals(1, lbRequestObservers.size());
|
||||||
|
|
@ -1153,7 +1117,7 @@ public class GrpclbLoadBalancerTest {
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String lbAuthority(int i) {
|
private static String lbAuthority(int unused) {
|
||||||
// TODO(ejona): Support varying authorities
|
// TODO(ejona): Support varying authorities
|
||||||
return "lb.google.com";
|
return "lb.google.com";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue