Skip to content

Commit 7c16de8

Browse files
committed
Revert indendation changes done by IDE in unchanged lines.
1 parent 7abbc4a commit 7c16de8

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -419,47 +419,47 @@ public void discoverAggregateCluster_createsPriorityLbPolicy() {
419419
controlPlaneService.setXdsConfig(ADS_TYPE_URL_CDS, ImmutableMap.of(
420420
// CLUSTER (aggr.) -> [cluster1 (aggr.), cluster2 (logical DNS), cluster3 (EDS)]
421421
CLUSTER, Cluster.newBuilder()
422-
.setName(CLUSTER)
423-
.setClusterType(Cluster.CustomClusterType.newBuilder()
424-
.setName("envoy.clusters.aggregate")
425-
.setTypedConfig(Any.pack(ClusterConfig.newBuilder()
426-
.addClusters(cluster1)
427-
.addClusters(cluster2)
428-
.addClusters(cluster3)
429-
.build())))
430-
.setLbPolicy(Cluster.LbPolicy.RING_HASH)
431-
.build(),
422+
.setName(CLUSTER)
423+
.setClusterType(Cluster.CustomClusterType.newBuilder()
424+
.setName("envoy.clusters.aggregate")
425+
.setTypedConfig(Any.pack(ClusterConfig.newBuilder()
426+
.addClusters(cluster1)
427+
.addClusters(cluster2)
428+
.addClusters(cluster3)
429+
.build())))
430+
.setLbPolicy(Cluster.LbPolicy.RING_HASH)
431+
.build(),
432432
// cluster1 (aggr.) -> [cluster3 (EDS), cluster4 (EDS)]
433433
cluster1, Cluster.newBuilder()
434-
.setName(cluster1)
435-
.setClusterType(Cluster.CustomClusterType.newBuilder()
436-
.setName("envoy.clusters.aggregate")
437-
.setTypedConfig(Any.pack(ClusterConfig.newBuilder()
438-
.addClusters(cluster3)
439-
.addClusters(cluster4)
440-
.build())))
441-
.build(),
434+
.setName(cluster1)
435+
.setClusterType(Cluster.CustomClusterType.newBuilder()
436+
.setName("envoy.clusters.aggregate")
437+
.setTypedConfig(Any.pack(ClusterConfig.newBuilder()
438+
.addClusters(cluster3)
439+
.addClusters(cluster4)
440+
.build())))
441+
.build(),
442442
cluster2, Cluster.newBuilder()
443-
.setName(cluster2)
444-
.setType(Cluster.DiscoveryType.LOGICAL_DNS)
445-
.setLoadAssignment(ClusterLoadAssignment.newBuilder()
446-
.addEndpoints(LocalityLbEndpoints.newBuilder()
447-
.addLbEndpoints(LbEndpoint.newBuilder()
448-
.setEndpoint(Endpoint.newBuilder()
449-
.setAddress(Address.newBuilder()
450-
.setSocketAddress(SocketAddress.newBuilder()
451-
.setAddress("dns.example.com")
452-
.setPortValue(1111)))))))
453-
.build(),
443+
.setName(cluster2)
444+
.setType(Cluster.DiscoveryType.LOGICAL_DNS)
445+
.setLoadAssignment(ClusterLoadAssignment.newBuilder()
446+
.addEndpoints(LocalityLbEndpoints.newBuilder()
447+
.addLbEndpoints(LbEndpoint.newBuilder()
448+
.setEndpoint(Endpoint.newBuilder()
449+
.setAddress(Address.newBuilder()
450+
.setSocketAddress(SocketAddress.newBuilder()
451+
.setAddress("dns.example.com")
452+
.setPortValue(1111)))))))
453+
.build(),
454454
cluster3, EDS_CLUSTER.toBuilder()
455455
.setName(cluster3)
456456
.setCircuitBreakers(CircuitBreakers.newBuilder()
457457
.addThresholds(CircuitBreakers.Thresholds.newBuilder()
458-
.setPriority(RoutingPriority.DEFAULT)
459-
.setMaxRequests(UInt32Value.newBuilder().setValue(100))))
458+
.setPriority(RoutingPriority.DEFAULT)
459+
.setMaxRequests(UInt32Value.newBuilder().setValue(100))))
460460
.build(),
461461
cluster4, EDS_CLUSTER.toBuilder().setName(cluster4).build()));
462-
startXdsDepManager();
462+
startXdsDepManager();
463463

464464
verify(helper, never()).updateBalancingState(eq(ConnectivityState.TRANSIENT_FAILURE), any());
465465
assertThat(childBalancers).hasSize(1);

0 commit comments

Comments
 (0)