api: Javadoc changes for io.grpc.LoadBalancer method signatures#11623
api: Javadoc changes for io.grpc.LoadBalancer method signatures#11623SreeramdasLavanya wants to merge 75 commits intogrpc:masterfrom
Conversation
…h Duration" This reverts commit ab97045.
|
Below points have been addressed: javadoc for public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses)
javadoc for public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses)
|
| * single list if needed. | ||
| * | ||
| * <p>Implementations can choose to reject the given addresses by returning {@code false}. | ||
| * <p>Implementations can choose to reject the given addresses by returning {@code UNAVAILABLE}. |
There was a problem hiding this comment.
Replace with {@code Status.UNAVAILABLE} . Also below.
…d and related changes
| newChildLbStates.add(childLbState); | ||
| if (entry.getValue() != null) { | ||
| //TODO - https://github.com/grpc/grpc-java/issues/11194 | ||
| childLbState.lb.handleResolvedAddresses(entry.getValue()); // update child LB |
There was a problem hiding this comment.
Merged with master branch latest changes
# Conflicts: # util/src/main/java/io/grpc/util/MultiChildLoadBalancer.java
# Conflicts: # services/src/main/java/io/grpc/protobuf/services/HealthCheckingLoadBalancerFactory.java
| assertThat(fakeClock.getPendingTasks()).isEmpty(); | ||
| } | ||
|
|
||
| @Deprecated |
There was a problem hiding this comment.
Revert these changes? The tests were converted to acceptResolvedAddresses.
| loadBalancer = new WrrLocalityLoadBalancer(mockHelper, lbRegistry); | ||
| } | ||
|
|
||
| @Deprecated |
There was a problem hiding this comment.
Revert these changes? The tests were converted to acceptResolvedAddresses.
| * @deprecated As of release 1.69.0, | ||
| * use instead {@link #acceptResolvedAddresses(ResolvedAddresses)} | ||
| */ | ||
| @Deprecated |
There was a problem hiding this comment.
This method is not deprecated, and should not be marked deprecated.
| protected abstract LoadBalancer delegate(); | ||
|
|
||
| @Override | ||
| public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { |
There was a problem hiding this comment.
Revert this method's implementation back to forwarding to handleResolvedAddresses(). Everything (in our code base) extending this class has both methods implemented. You can then remove the SuppressWarnings.
| } | ||
| } | ||
|
|
||
| @Deprecated |
| new TestBalancer(), | ||
| Arrays.asList( | ||
| LoadBalancer.class.getMethod("acceptResolvedAddresses", ResolvedAddresses.class))); | ||
| LoadBalancer.class.getMethod("acceptResolvedAddresses", ResolvedAddresses.class), |
There was a problem hiding this comment.
acceptResolvedAddresses should be removed already with the current code. After you change handleResolverAddresses to forward, it should be removed as well.
|
I worked on all the open comments and added the commit
|
Javadoc changes for io.grpc.LoadBalancer
Fixes #11194