grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

binder, xds: address minor linter fixes (#9130)

This commit is contained in:
Sergii Tkachenko 2022-04-29 09:42:15 -07:00 committed by GitHub
parent fdd9ab4f96
commit b3d4607a62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binder/src/main/java/io/grpc/binder/SecurityPolicies.java
View File

@ -28,9 +28,7 @@ import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.CheckReturnValue; import com.google.errorprone.annotations.CheckReturnValue;
import io.grpc.ExperimentalApi; import io.grpc.ExperimentalApi;
import io.grpc.Status; import io.grpc.Status;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List;
/** Static factory methods for creating standard security policies. */ /** Static factory methods for creating standard security policies. */
@CheckReturnValue @CheckReturnValue

9
xds/src/test/java/io/grpc/xds/WrrLocalityLoadBalancerTest.java
View File

@ -43,19 +43,23 @@ import io.grpc.xds.XdsSubchannelPickers.ErrorPicker;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.Map; import java.util.Map;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.Captor; import org.mockito.Captor;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
/** /**
* Tests for {@link WrrLocalityLoadBalancerProvider}. * Tests for {@link WrrLocalityLoadBalancerProvider}.
*/ */
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class WrrLocalityLoadBalancerTest { public class WrrLocalityLoadBalancerTest {
@Rule
public final MockitoRule mockito = MockitoJUnit.rule();
@Mock @Mock
private LoadBalancerProvider mockProvider; private LoadBalancerProvider mockProvider;
@ -73,13 +77,12 @@ public class WrrLocalityLoadBalancerTest {
@Captor @Captor
private ArgumentCaptor<SubchannelPicker> errorPickerCaptor; private ArgumentCaptor<SubchannelPicker> errorPickerCaptor;
private EquivalentAddressGroup eag = new EquivalentAddressGroup(mockSocketAddress); private final EquivalentAddressGroup eag = new EquivalentAddressGroup(mockSocketAddress);
private WrrLocalityLoadBalancer loadBalancer; private WrrLocalityLoadBalancer loadBalancer;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this);
when(mockProvider.newLoadBalancer(isA(Helper.class))).thenReturn(mockChildLb); when(mockProvider.newLoadBalancer(isA(Helper.class))).thenReturn(mockChildLb);
when(mockProvider.getPolicyName()).thenReturn("round_robin"); when(mockProvider.getPolicyName()).thenReturn("round_robin");
loadBalancer = new WrrLocalityLoadBalancer(mockHelper); loadBalancer = new WrrLocalityLoadBalancer(mockHelper);