Skip to content

Commit 98212ce

Browse files
committed
deprecate canHandleEmptyAddressListFromNameResolution
1 parent b60e494 commit 98212ce

5 files changed

Lines changed: 18 additions & 0 deletions

File tree

api/src/main/java/io/grpc/LoadBalancer.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,18 @@ public void handleSubchannelState(
423423
*
424424
* <p>This method should always return a constant value. It's not specified when this will be
425425
* called.
426+
*
427+
* <p>
428+
* Note that this method is only called when the deprecated
429+
* {@code handleResolvedAddresses()}
430+
* is overwritten.
431+
*
432+
* @deprecated Instead of overwriting this and {@code handleResolvedAddresses()}, only
433+
* overwrite {@code acceptResolvedAddresses()} which indicates if the addresses provided
434+
* by the name resolver are acceptable with the {@code boolean} return value.
426435
*/
436+
@Deprecated
437+
@SuppressWarnings("InlineMeSuggester")
427438
public boolean canHandleEmptyAddressListFromNameResolution() {
428439
return false;
429440
}

grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ public void handleNameResolutionError(Status error) {
154154
}
155155

156156
@Override
157+
@Deprecated
158+
@SuppressWarnings("InlineMeSuggester")
157159
public boolean canHandleEmptyAddressListFromNameResolution() {
158160
return true;
159161
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public void shutdown() {
6363
}
6464

6565
@Override
66+
@Deprecated
67+
@SuppressWarnings("InlineMeSuggester")
6668
public boolean canHandleEmptyAddressListFromNameResolution() {
6769
return delegate().canHandleEmptyAddressListFromNameResolution();
6870
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public void handleSubchannelState_shouldThrow() {
102102
}
103103

104104
@Test
105+
@Deprecated
105106
public void canHandleEmptyAddressListFromNameResolutionForwardedToLatestPolicy() {
106107
assertIsOk(gracefulSwitchLb.acceptResolvedAddresses(addressesBuilder()
107108
.setLoadBalancingPolicyConfig(createConfig(lbPolicies[0], new Object()))

xds/src/main/java/io/grpc/xds/WeightedTargetLoadBalancer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ public void handleNameResolutionError(Status error) {
128128
}
129129

130130
@Override
131+
@Deprecated
132+
@SuppressWarnings("InlineMeSuggester")
131133
public boolean canHandleEmptyAddressListFromNameResolution() {
132134
return true;
133135
}

0 commit comments

Comments
 (0)