-
Notifications
You must be signed in to change notification settings - Fork 563
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
4.x: Allow Unbuffered OutputStream for Http1ServerResponse (#9276) #9277
Open
VerKWer
wants to merge
1
commit into
helidon-io:main
Choose a base branch
from
VerKWer:9276-no-http1-write-buffer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 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
94 changes: 94 additions & 0 deletions
94
webserver/webserver/src/test/java/io/helidon/webserver/http1/WriteBufferTest.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
/* | ||
* Copyright (c) 2024 Oracle and/or its affiliates. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License 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 io.helidon.webserver.http1; | ||
|
||
import io.helidon.webserver.WebServer; | ||
import io.helidon.webserver.http.Handler; | ||
import io.helidon.webserver.http1.Http1ServerResponse.BlockingOutputStream; | ||
import io.helidon.webserver.http1.Http1ServerResponse.ClosingBufferedOutputStream; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import java.io.OutputStream; | ||
import java.net.HttpURLConnection; | ||
import java.net.URI; | ||
import java.net.URL; | ||
import java.nio.charset.StandardCharsets; | ||
|
||
import io.helidon.webserver.http.ServerResponse; | ||
|
||
import static org.hamcrest.CoreMatchers.instanceOf; | ||
import static org.hamcrest.CoreMatchers.is; | ||
import static org.hamcrest.MatcherAssert.assertThat; | ||
|
||
class WriteBufferTest { | ||
|
||
/** | ||
* Test that a simple response can be sent using the {@link ServerResponse#outputStream()} using the default | ||
* (non-zero) write buffer. | ||
*/ | ||
@Test | ||
void defaultWriteBufferTest() throws Exception { | ||
String path = "/test"; | ||
String response = "Hello World!"; | ||
Handler handler = (req, res) -> { | ||
try(OutputStream out = res.outputStream()) { | ||
assertThat(out, instanceOf(ClosingBufferedOutputStream.class)); | ||
out.write(response.getBytes(StandardCharsets.UTF_8)); | ||
} | ||
}; | ||
WebServer server = WebServer.builder().port(0).routing(it -> it.get(path, handler)).build().start(); | ||
try { | ||
URL url = new URI("http://localhost:" + server.port() + path).toURL(); | ||
HttpURLConnection conn = (HttpURLConnection)url.openConnection(); | ||
conn.setRequestMethod("GET"); | ||
assertThat(conn.getResponseCode(), is(200)); | ||
String received = new String(conn.getInputStream().readAllBytes(), StandardCharsets.UTF_8); | ||
assertThat(received, is(response)); | ||
} finally { | ||
server.stop(); | ||
} | ||
} | ||
|
||
/** | ||
* Test that a simple response can be sent using the {@link ServerResponse#outputStream()} using no write buffer | ||
* (i.e. the write buffer size was set to {@code 0}). | ||
*/ | ||
@Test | ||
void noWriteBufferTest() throws Exception { | ||
String path = "/test"; | ||
String response = "Hello World!"; | ||
Handler handler = (req, res) -> { | ||
try(OutputStream out = res.outputStream()) { | ||
assertThat(out, instanceOf(BlockingOutputStream.class)); | ||
out.write(response.getBytes(StandardCharsets.UTF_8)); | ||
} | ||
}; | ||
WebServer server = WebServer.builder().port(0).writeBufferSize(0) | ||
.routing(it -> it.get(path, handler)).build().start(); | ||
try { | ||
URL url = new URI("http://localhost:" + server.port() + path).toURL(); | ||
HttpURLConnection conn = (HttpURLConnection)url.openConnection(); | ||
conn.setRequestMethod("GET"); | ||
assertThat(conn.getResponseCode(), is(200)); | ||
String received = new String(conn.getInputStream().readAllBytes(), StandardCharsets.UTF_8); | ||
assertThat(received, is(response)); | ||
} finally { | ||
server.stop(); | ||
} | ||
} | ||
|
||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests that require startup of a server should go to:
webserver/tests/webserver
where you can also use the
@ServerTest
annotation. See other tests in the module.If you do not feel like changing the PR, let me know and I will take it over and do the rest.
Thanks for your contribution!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for clarifying this. I'll gladly move the tests. How would I go about actually running the tests there? They don't seem to be part of the
webserver
module, and if I try usingwebserver/tests
as a standalone project, compilation fails due to missing dependencies. I'm sure I'm missing something very obvious here.