Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

api: Target schema should be case insensitive #9899

Merged
merged 1 commit into from
Feb 17, 2023
Merged

api: Target schema should be case insensitive #9899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/main/java/io/grpc/NameResolverProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public abstract class NameResolverProvider extends NameResolver.Factory {
* delegates to {@link Factory#getDefaultScheme()} before {@link NameResolver.Factory} is
* deprecated in https://github.com/grpc/grpc-java/issues/7133.
*
* <p>The scheme should be lower-case.
*
* @since 1.40.0
* */
protected String getScheme() {
Expand Down
7 changes: 6 additions & 1 deletion api/src/main/java/io/grpc/NameResolverRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -162,7 +163,11 @@ private final class NameResolverFactory extends NameResolver.Factory {
@Override
@Nullable
public NameResolver newNameResolver(URI targetUri, NameResolver.Args args) {
NameResolverProvider provider = providers().get(targetUri.getScheme());
String scheme = targetUri.getScheme();
if (scheme == null) {
return null;
}
NameResolverProvider provider = providers().get(scheme.toLowerCase(Locale.US));
return provider == null ? null : provider.newNameResolver(targetUri, args);
}

Expand Down
4 changes: 4 additions & 0 deletions api/src/test/java/io/grpc/NameResolverRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,12 @@ public NameResolver newNameResolver(URI passedUri, NameResolver.Args passedArgs)
});

assertThat(registry.asFactory().newNameResolver(uri, args)).isNull();
assertThat(registry.asFactory().newNameResolver(URI.create("/0.0.0.0:80"), args)).isNull();
assertThat(registry.asFactory().newNameResolver(URI.create("///0.0.0.0:80"), args)).isNull();
assertThat(registry.asFactory().newNameResolver(URI.create("other:///0.0.0.0:80"), args))
.isSameInstanceAs(nr);
assertThat(registry.asFactory().newNameResolver(URI.create("OTHER:///0.0.0.0:80"), args))
.isSameInstanceAs(nr);
assertThat(registry.asFactory().getDefaultScheme()).isEqualTo("dns");
}

Expand Down