-
Notifications
You must be signed in to change notification settings - Fork 916
Remove eventLoopGroup and hostResolver configs #2017
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
107 changes: 107 additions & 0 deletions
107
...rt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.http.crt; | ||
|
|
||
| import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; | ||
| import static com.github.tomakehurst.wiremock.client.WireMock.any; | ||
| import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; | ||
| import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; | ||
| import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; | ||
| import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
| import static software.amazon.awssdk.http.HttpTestUtils.createProvider; | ||
| import static software.amazon.awssdk.http.crt.CrtHttpClientTestUtils.createRequest; | ||
|
|
||
| import com.github.tomakehurst.wiremock.junit.WireMockRule; | ||
| import java.net.URI; | ||
| import java.util.concurrent.TimeUnit; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import software.amazon.awssdk.crt.CrtResource; | ||
| import software.amazon.awssdk.crt.io.EventLoopGroup; | ||
| import software.amazon.awssdk.crt.io.HostResolver; | ||
| import software.amazon.awssdk.http.RecordingNetworkTrafficListener; | ||
| import software.amazon.awssdk.http.RecordingResponseHandler; | ||
| import software.amazon.awssdk.http.SdkHttpRequest; | ||
| import software.amazon.awssdk.http.async.AsyncExecuteRequest; | ||
| import software.amazon.awssdk.http.async.SdkAsyncHttpClient; | ||
| import software.amazon.awssdk.utils.Logger; | ||
|
|
||
| public class AwsCrtHttpClientWireMockTest { | ||
| private static final Logger log = Logger.loggerFor(AwsCrtHttpClientWireMockTest.class); | ||
| private final RecordingNetworkTrafficListener wiremockTrafficListener = new RecordingNetworkTrafficListener(); | ||
|
|
||
| @Rule | ||
| public WireMockRule mockServer = new WireMockRule(wireMockConfig() | ||
| .dynamicPort() | ||
| .dynamicHttpsPort() | ||
| .networkTrafficListener(wiremockTrafficListener)); | ||
|
|
||
| @BeforeClass | ||
| public static void setup() { | ||
| System.setProperty("aws.crt.debugnative", "true"); | ||
| } | ||
|
|
||
| @Before | ||
| public void methodSetup() { | ||
| wiremockTrafficListener.reset(); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| // Verify there is no resource leak. | ||
| EventLoopGroup.closeStaticDefault(); | ||
| HostResolver.closeStaticDefault(); | ||
| CrtResource.waitForNoResources(); | ||
| } | ||
|
|
||
| @Test | ||
| public void closeClient_reuse_throwException() throws Exception { | ||
| SdkAsyncHttpClient client = AwsCrtAsyncHttpClient.create(); | ||
|
|
||
| client.close(); | ||
| assertThatThrownBy(() -> makeSimpleRequest(client)).hasMessageContaining("is closed"); | ||
| } | ||
|
|
||
| @Test | ||
| public void sharedEventLoopGroup_closeOneClient_shouldNotAffectOtherClients() throws Exception { | ||
| try (SdkAsyncHttpClient client = AwsCrtAsyncHttpClient.create()) { | ||
| makeSimpleRequest(client); | ||
| } | ||
|
|
||
| try (SdkAsyncHttpClient anotherClient = AwsCrtAsyncHttpClient.create()) { | ||
| makeSimpleRequest(anotherClient); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Make a simple async request and wait for it to finish. | ||
| * | ||
| * @param client Client to make request with. | ||
| */ | ||
| private void makeSimpleRequest(SdkAsyncHttpClient client) throws Exception { | ||
| String body = randomAlphabetic(10); | ||
| URI uri = URI.create("http://localhost:" + mockServer.port()); | ||
| stubFor(any(urlPathEqualTo("/")).willReturn(aResponse().withBody(body))); | ||
| SdkHttpRequest request = createRequest(uri); | ||
| RecordingResponseHandler recorder = new RecordingResponseHandler(); | ||
| client.execute(AsyncExecuteRequest.builder().request(request).requestContentPublisher(createProvider("")).responseHandler(recorder).build()); | ||
| recorder.completeFuture().get(5, TimeUnit.SECONDS); | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.