@@ -594,18 +594,18 @@ private void verifyEdsPriorityNames(List<String> want,
594594 @ SuppressWarnings ("unchecked" )
595595 public void edsUpdatePriorityName_twoPriorities () {
596596 verifyEdsPriorityNames (Arrays .asList (CLUSTER2 + "[child1]" , CLUSTER2 + "[child2]" ),
597- ImmutableMap .of (locality1 , createEndpoints (1 ),
598- locality2 , createEndpoints (2 )
599- ));
597+ ImmutableMap .of (locality1 , createEndpoints (1 ),
598+ locality2 , createEndpoints (2 )
599+ ));
600600 }
601601
602602 @ Test
603603 @ SuppressWarnings ("unchecked" )
604604 public void edsUpdatePriorityName_addOnePriority () {
605605 verifyEdsPriorityNames (Arrays .asList (CLUSTER2 + "[child2]" ),
606- ImmutableMap .of (locality1 , createEndpoints (1 )),
607- ImmutableMap .of (locality2 , createEndpoints (1 )
608- ));
606+ ImmutableMap .of (locality1 , createEndpoints (1 )),
607+ ImmutableMap .of (locality2 , createEndpoints (1 )
608+ ));
609609 }
610610
611611 @ Test
@@ -628,11 +628,11 @@ locality3, createEndpoints(3))
628628 public void edsUpdatePriorityName_mergeTwoPriorities () {
629629 verifyEdsPriorityNames (Arrays .asList (CLUSTER2 + "[child3]" , CLUSTER2 + "[child1]" ),
630630 ImmutableMap .of (locality1 , createEndpoints (1 ),
631- locality3 , createEndpoints (3 ),
632- locality2 , createEndpoints (2 )),
631+ locality3 , createEndpoints (3 ),
632+ locality2 , createEndpoints (2 )),
633633 ImmutableMap .of (locality1 , createEndpoints (2 ),
634- locality3 , createEndpoints (1 ),
635- locality2 , createEndpoints (1 )
634+ locality3 , createEndpoints (1 ),
635+ locality2 , createEndpoints (1 )
636636 ));
637637 }
638638
@@ -657,30 +657,30 @@ public void onlyEdsClusters_resourceNeverExist_returnErrorPicker() {
657657 xdsClient .deliverResourceNotFound (EDS_SERVICE_NAME1 );
658658
659659 verify (helper ).updateBalancingState (
660- eq (ConnectivityState .TRANSIENT_FAILURE ), pickerCaptor .capture ());
660+ eq (ConnectivityState .TRANSIENT_FAILURE ), pickerCaptor .capture ());
661661 assertPicker (
662- pickerCaptor .getValue (),
663- Status .UNAVAILABLE .withDescription (
664- "No usable endpoint from cluster(s): " + Arrays .asList (CLUSTER1 )),
665- null );
662+ pickerCaptor .getValue (),
663+ Status .UNAVAILABLE .withDescription (
664+ "No usable endpoint from cluster(s): " + Arrays .asList (CLUSTER1 )),
665+ null );
666666 }
667667
668668 @ Test
669669 public void edsCluster_resourcesRevoked_shutDownChildLbPolicy () {
670670 ClusterResolverConfig config = new ClusterResolverConfig (
671- edsDiscoveryMechanism1 , roundRobin , false );
671+ edsDiscoveryMechanism1 , roundRobin , false );
672672 deliverLbConfig (config );
673673 assertThat (xdsClient .watchers .keySet ()).containsExactly (EDS_SERVICE_NAME1 );
674674 assertThat (childBalancers ).isEmpty ();
675675 reset (helper );
676676 EquivalentAddressGroup endpoint1 = makeAddress ("endpoint-addr-1" );
677677 LocalityLbEndpoints localityLbEndpoints1 =
678- LocalityLbEndpoints .create (
679- Collections .singletonList (LbEndpoint .create (endpoint1 , 100 , true ,
680- "hostname1" , ImmutableMap .of ())),
681- 10 /* localityWeight */ , 1 /* priority */ , ImmutableMap .of ());
678+ LocalityLbEndpoints .create (
679+ Collections .singletonList (LbEndpoint .create (endpoint1 , 100 , true ,
680+ "hostname1" , ImmutableMap .of ())),
681+ 10 /* localityWeight */ , 1 /* priority */ , ImmutableMap .of ());
682682 xdsClient .deliverClusterLoadAssignment (
683- EDS_SERVICE_NAME1 , Collections .singletonMap (locality1 , localityLbEndpoints1 ));
683+ EDS_SERVICE_NAME1 , Collections .singletonMap (locality1 , localityLbEndpoints1 ));
684684 assertThat (childBalancers ).hasSize (1 ); // child LB policy created
685685 FakeLoadBalancer childBalancer = Iterables .getOnlyElement (childBalancers );
686686 assertThat (((PriorityLbConfig ) childBalancer .config ).priorities ).hasSize (1 );
@@ -710,7 +710,7 @@ public void handleEdsResource_ignoreUnhealthyEndpoints() {
710710 "hostname2" , ImmutableMap .of ())),
711711 10 /* localityWeight */ , 1 /* priority */ , ImmutableMap .of ());
712712 xdsClient .deliverClusterLoadAssignment (
713- EDS_SERVICE_NAME1 , Collections .singletonMap (locality1 , localityLbEndpoints ));
713+ EDS_SERVICE_NAME1 , Collections .singletonMap (locality1 , localityLbEndpoints ));
714714 FakeLoadBalancer childBalancer = Iterables .getOnlyElement (childBalancers );
715715 assertThat (childBalancer .addresses ).hasSize (1 );
716716 assertAddressesEqual (Collections .singletonList (endpoint2 ), childBalancer .addresses );
@@ -734,8 +734,8 @@ public void handleEdsResource_ignoreLocalitiesWithNoHealthyEndpoints() {
734734 "hostname2" , ImmutableMap .of ())),
735735 10 /* localityWeight */ , 1 /* priority */ , ImmutableMap .of ());
736736 xdsClient .deliverClusterLoadAssignment (
737- EDS_SERVICE_NAME1 ,
738- ImmutableMap .of (locality1 , localityLbEndpoints1 , locality2 , localityLbEndpoints2 ));
737+ EDS_SERVICE_NAME1 ,
738+ ImmutableMap .of (locality1 , localityLbEndpoints1 , locality2 , localityLbEndpoints2 ));
739739
740740 FakeLoadBalancer childBalancer = Iterables .getOnlyElement (childBalancers );
741741 for (EquivalentAddressGroup eag : childBalancer .addresses ) {
@@ -753,13 +753,13 @@ public void handleEdsResource_ignorePrioritiesWithNoHealthyEndpoints() {
753753 LocalityLbEndpoints localityLbEndpoints1 =
754754 LocalityLbEndpoints .create (
755755 Collections .singletonList (LbEndpoint .create (endpoint1 , 100 , false /* isHealthy */ ,
756- "hostname1" , ImmutableMap .of ())),
757- 10 /* localityWeight */ , 1 /* priority */ , ImmutableMap .of ());
756+ "hostname1" , ImmutableMap .of ())),
757+ 10 /* localityWeight */ , 1 /* priority */ , ImmutableMap .of ());
758758 LocalityLbEndpoints localityLbEndpoints2 =
759759 LocalityLbEndpoints .create (
760760 Collections .singletonList (LbEndpoint .create (endpoint2 , 200 , true /* isHealthy */ ,
761- "hostname2" , ImmutableMap .of ())),
762- 10 /* localityWeight */ , 2 /* priority */ , ImmutableMap .of ());
761+ "hostname2" , ImmutableMap .of ())),
762+ 10 /* localityWeight */ , 2 /* priority */ , ImmutableMap .of ());
763763 String priority2 = CLUSTER1 + "[child2]" ;
764764 xdsClient .deliverClusterLoadAssignment (
765765 EDS_SERVICE_NAME1 ,
0 commit comments