Skip to content

Commit 85e0a01

Browse files
committed
util: Mark GracefulSwitchLB.switchTo() deprecated
1 parent 9269050 commit 85e0a01

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

util/src/main/java/io/grpc/util/GracefulSwitchLoadBalancer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,11 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
142142
/**
143143
* Gracefully switch to a new policy defined by the given factory, if the given factory isn't
144144
* equal to the current one.
145+
*
146+
* @deprecated Use {@code parseLoadBalancingPolicyConfig()} and pass the configuration to
147+
* {@link io.grpc.LoadBalancer.ResolvedAddresses.Builder#setLoadBalancingPolicyConfig}
145148
*/
149+
@Deprecated
146150
public void switchTo(LoadBalancer.Factory newBalancerFactory) {
147151
switchToCalled = true;
148152
switchToInternal(newBalancerFactory);

util/src/test/java/io/grpc/util/GracefulSwitchLoadBalancerTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public class GracefulSwitchLoadBalancerTest {
8686
// OLD TESTS
8787

8888
@Test
89+
@Deprecated
8990
public void switchTo_canHandleEmptyAddressListFromNameResolutionForwardedToLatestPolicy() {
9091
gracefulSwitchLb.switchTo(lbPolicies[0]);
9192
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -115,6 +116,7 @@ public void switchTo_canHandleEmptyAddressListFromNameResolutionForwardedToLates
115116
}
116117

117118
@Test
119+
@Deprecated
118120
public void switchTo_handleResolvedAddressesAndNameResolutionErrorForwardedToLatestPolicy() {
119121
gracefulSwitchLb.switchTo(lbPolicies[0]);
120122
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -155,6 +157,7 @@ public void switchTo_handleResolvedAddressesAndNameResolutionErrorForwardedToLat
155157
}
156158

157159
@Test
160+
@Deprecated
158161
public void switchTo_acceptResolvedAddressesAndNameResolutionErrorForwardedToLatestPolicy() {
159162
gracefulSwitchLb.switchTo(lbPolicies[0]);
160163
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -195,6 +198,7 @@ public void switchTo_acceptResolvedAddressesAndNameResolutionErrorForwardedToLat
195198
}
196199

197200
@Test
201+
@Deprecated
198202
public void switchTo_shutdownTriggeredWhenSwitchAndForwardedWhenSwitchLbShutdown() {
199203
gracefulSwitchLb.switchTo(lbPolicies[0]);
200204
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -226,6 +230,7 @@ public void switchTo_shutdownTriggeredWhenSwitchAndForwardedWhenSwitchLbShutdown
226230
}
227231

228232
@Test
233+
@Deprecated
229234
public void switchTo_requestConnectionForwardedToLatestPolicies() {
230235
gracefulSwitchLb.switchTo(lbPolicies[0]);
231236
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -263,6 +268,7 @@ public void switchTo_requestConnectionForwardedToLatestPolicies() {
263268
}
264269

265270
@Test
271+
@Deprecated
266272
public void switchTo_createSubchannelForwarded() {
267273
gracefulSwitchLb.switchTo(lbPolicies[0]);
268274
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -289,6 +295,7 @@ public void switchTo_createSubchannelForwarded() {
289295
}
290296

291297
@Test
298+
@Deprecated
292299
public void switchTo_updateBalancingStateIsGraceful() {
293300
gracefulSwitchLb.switchTo(lbPolicies[0]);
294301
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -340,6 +347,7 @@ public void switchTo_updateBalancingStateIsGraceful() {
340347
}
341348

342349
@Test
350+
@Deprecated
343351
public void switchTo_switchWhileOldPolicyIsNotReady() {
344352
gracefulSwitchLb.switchTo(lbPolicies[0]);
345353
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -368,6 +376,7 @@ public void switchTo_switchWhileOldPolicyIsNotReady() {
368376
}
369377

370378
@Test
379+
@Deprecated
371380
public void switchTo_switchWhileOldPolicyGoesFromReadyToNotReady() {
372381
gracefulSwitchLb.switchTo(lbPolicies[0]);
373382
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -398,6 +407,7 @@ public void switchTo_switchWhileOldPolicyGoesFromReadyToNotReady() {
398407
}
399408

400409
@Test
410+
@Deprecated
401411
public void switchTo_switchWhileOldPolicyGoesFromReadyToNotReadyWhileNewPolicyStillIdle() {
402412
gracefulSwitchLb.switchTo(lbPolicies[0]);
403413
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -428,6 +438,7 @@ public void switchTo_switchWhileOldPolicyGoesFromReadyToNotReadyWhileNewPolicySt
428438
}
429439

430440
@Test
441+
@Deprecated
431442
public void switchTo_newPolicyNameTheSameAsPendingPolicy_shouldHaveNoEffect() {
432443
gracefulSwitchLb.switchTo(lbPolicies[0]);
433444
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -445,6 +456,7 @@ public void switchTo_newPolicyNameTheSameAsPendingPolicy_shouldHaveNoEffect() {
445456
}
446457

447458
@Test
459+
@Deprecated
448460
public void switchTo_newPolicyNameTheSameAsCurrentPolicy_shouldShutdownPendingLb() {
449461
gracefulSwitchLb.switchTo(lbPolicies[0]);
450462
LoadBalancer lb0 = balancers.get(lbPolicies[0]);
@@ -468,6 +480,7 @@ public void switchTo_newPolicyNameTheSameAsCurrentPolicy_shouldShutdownPendingLb
468480

469481

470482
@Test
483+
@Deprecated
471484
public void switchTo_newLbFactoryEqualToOldOneShouldHaveNoEffect() {
472485
final List<LoadBalancer> balancers = new ArrayList<>();
473486

0 commit comments

Comments
 (0)