Convert scheme to lower case when parsing URI #2938
Merged
+57
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
0x1306e6d
commented
May 23, 2024
servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/H2SchemeTest.java
Outdated
Show resolved
Hide resolved
...cetalk-http-netty/src/test/java/io/servicetalk/http/netty/MultiAddressUrlHttpClientTest.java
Outdated
Show resolved
Hide resolved
servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpScheme.java
Outdated
Show resolved
Hide resolved
servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpScheme.java
Outdated
Show resolved
Hide resolved
servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpScheme.java
Outdated
Show resolved
Hide resolved
servicetalk-http-api/src/main/java/io/servicetalk/http/api/DefaultHttpRequestMetaData.java
Outdated
Show resolved
Hide resolved
servicetalk-http-api/src/main/java/io/servicetalk/http/api/HttpScheme.java
Outdated
Show resolved
Hide resolved
...tty/src/test/java/io/servicetalk/http/netty/DefaultMultiAddressUrlHttpClientBuilderTest.java
Outdated
Show resolved
Hide resolved
...tty/src/test/java/io/servicetalk/http/netty/DefaultMultiAddressUrlHttpClientBuilderTest.java
Show resolved
Hide resolved
...cetalk-http-netty/src/test/java/io/servicetalk/http/netty/MultiAddressUrlHttpClientTest.java
Outdated
Show resolved
Hide resolved
servicetalk-http-netty/src/main/java/io/servicetalk/http/netty/H2ToStH1ClientDuplexHandler.java
Outdated
Show resolved
Hide resolved
servicetalk-http-netty/src/test/java/io/servicetalk/http/netty/H2SchemeTest.java
Outdated
Show resolved
Hide resolved
0x1306e6d
changed the title
HttpScheme
servicetalk-http-api/src/test/java/io/servicetalk/http/api/Uri3986Test.java
Outdated
Show resolved
Hide resolved
...tty/src/test/java/io/servicetalk/http/netty/DefaultMultiAddressUrlHttpClientBuilderTest.java
Show resolved
Hide resolved
servicetalk-http-api/src/main/java/io/servicetalk/http/api/Uri3986.java
Outdated
Show resolved
Hide resolved
servicetalk-http-api/src/main/java/io/servicetalk/http/api/Uri3986.java
Outdated
Show resolved
Hide resolved
idelpivnitskiy
approved these changes
Jun 2, 2024
idelpivnitskiy
added a commit
to idelpivnitskiy/servicetalk
that referenced
this pull request
Jun 16, 2024
Motivation: In apple#2938 we made it guaranteed that `HttpRequestMetaData#scheme()` result is always in lowercase. We can use that to simplify scheme checks inside `DefaultMultiAddressUrlHttpClientBuilder`. Modifications: - Replace all scheme checks from `equalsIgnoreCase` to `equals`; Result: No need to worry about cases for scheme check.
idelpivnitskiy
added a commit
to idelpivnitskiy/servicetalk
that referenced
this pull request
Jun 17, 2024
Motivation: In apple#2938 we made it guaranteed that `HttpRequestMetaData#scheme()` result is always in lowercase. We can use that to simplify scheme checks inside `DefaultMultiAddressUrlHttpClientBuilder`. Modifications: - Replace all scheme checks from `equalsIgnoreCase` to `equals`; Result: No need to worry about cases for scheme check.
idelpivnitskiy
added a commit
that referenced
this pull request
Jun 17, 2024
Motivation: In #2938 we made it guaranteed that `HttpRequestMetaData#scheme()` result is always in lowercase. We can use that to simplify scheme checks inside `DefaultMultiAddressUrlHttpClientBuilder`. Modifications: - Replace all scheme checks from `equalsIgnoreCase` to `equals`; - Extract exact same instance of `https` string from `Uri3986` to speed up `equals` check; Result: No need to worry about cases for scheme check.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
HttpRequestMetaData#scheme()javadocs state the result will be lowercase, but this is not always the case becauseUri3986parses the scheme as-is. As a result,DefaultMultiAddressUrlHttpClientBuildermay have more than 1 client instance for the same address if users use URI with different scheme letters case.See #1423 for details.
Modifications:
Uri3986reusing well-known schemes ("http" and "https")Result:
Fixes #1423.