Skip to content

Commit 4fa612a

Browse files
authored
xds: fix java style
1 parent 40f70ca commit 4fa612a

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@ public void run() {
221221
});
222222
String ldsWatched = xdsClient.ldsResource.get(5, TimeUnit.SECONDS);
223223
assertThat(ldsWatched).isEqualTo("grpc/server?udpa.resource.listening_address=0.0.0.0:1");
224-
HttpConnectionManager hcm_virtual = HttpConnectionManager.forVirtualHosts(
224+
HttpConnectionManager hcmVirtual = HttpConnectionManager.forVirtualHosts(
225225
0L, Collections.singletonList(createVirtualHost("virtual-host-0")),
226226
new ArrayList<NamedFilterConfig>());
227227
FilterChain f0 = createFilterChain("filter-chain-0", createRds("rds"));
228-
FilterChain f1 = createFilterChain("filter-chain-1", hcm_virtual);
228+
FilterChain f1 = createFilterChain("filter-chain-1", hcmVirtual);
229229
xdsClient.deliverLdsUpdate(Collections.singletonList(f0), f1);
230230
xdsServerWrapper.shutdown();
231231
when(mockServer.isTerminated()).thenReturn(true);
@@ -402,9 +402,9 @@ public void run() {
402402
String ldsWatched = xdsClient.ldsResource.get(5, TimeUnit.SECONDS);
403403
assertThat(ldsWatched).isEqualTo("grpc/server?udpa.resource.listening_address=0.0.0.0:1");
404404
VirtualHost virtualHost = createVirtualHost("virtual-host-0");
405-
HttpConnectionManager hcm_virtual = HttpConnectionManager.forVirtualHosts(
405+
HttpConnectionManager hcmVirtual = HttpConnectionManager.forVirtualHosts(
406406
0L, Collections.singletonList(virtualHost), new ArrayList<NamedFilterConfig>());
407-
EnvoyServerProtoData.FilterChain f0 = createFilterChain("filter-chain-0", hcm_virtual);
407+
EnvoyServerProtoData.FilterChain f0 = createFilterChain("filter-chain-0", hcmVirtual);
408408
EnvoyServerProtoData.FilterChain f1 = createFilterChain("filter-chain-1", createRds("r0"));
409409
xdsClient.rdsCount = new CountDownLatch(3);
410410
xdsClient.deliverLdsUpdate(Arrays.asList(f0, f1), null);
@@ -429,7 +429,7 @@ public void run() {
429429
verify(mockServer).start();
430430
assertThat(selectorRef.get().getRoutingConfigs()).isEqualTo(ImmutableMap.of(
431431
f0, ServerRoutingConfig.create(
432-
hcm_virtual.httpFilterConfigs(), hcm_virtual.virtualHosts()),
432+
hcmVirtual.httpFilterConfigs(), hcmVirtual.virtualHosts()),
433433
f2, ServerRoutingConfig.create(f2.getHttpConnectionManager().httpFilterConfigs(),
434434
Collections.singletonList(createVirtualHost("virtual-host-1")))
435435
));
@@ -527,9 +527,9 @@ public void run() {
527527
String ldsWatched = xdsClient.ldsResource.get(5, TimeUnit.SECONDS);
528528
assertThat(ldsWatched).isEqualTo("grpc/server?udpa.resource.listening_address=0.0.0.0:1");
529529
VirtualHost virtualHost = createVirtualHost("virtual-host-0");
530-
HttpConnectionManager hcm_virtual = HttpConnectionManager.forVirtualHosts(
530+
HttpConnectionManager hcmVirtual = HttpConnectionManager.forVirtualHosts(
531531
0L, Collections.singletonList(virtualHost), new ArrayList<NamedFilterConfig>());
532-
EnvoyServerProtoData.FilterChain f0 = createFilterChain("filter-chain-0", hcm_virtual);
532+
EnvoyServerProtoData.FilterChain f0 = createFilterChain("filter-chain-0", hcmVirtual);
533533
EnvoyServerProtoData.FilterChain f1 = createFilterChain("filter-chain-1", createRds("r0"));
534534
xdsClient.deliverLdsUpdate(Arrays.asList(f0, f1), null);
535535
xdsClient.rdsCount.await();

0 commit comments

Comments
 (0)