-
Notifications
You must be signed in to change notification settings - Fork 566
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Port of static content example to Nima webserver (#6778)
* Port of static content example to Nima webserver. Added new @servertest based test. * Fixed checkstyle. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com> * Replaced StaticContentSupport by StaticContentService. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com> --------- Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
- Loading branch information
Showing
7 changed files
with
165 additions
and
101 deletions.
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
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
76 changes: 0 additions & 76 deletions
76
...atic-content/src/main/java/io/helidon/reactive/webserver/examples/staticcontent/Main.java
This file was deleted.
Oops, something went wrong.
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
69 changes: 69 additions & 0 deletions
69
...server/static-content/src/main/java/io/helidon/webserver/examples/staticcontent/Main.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,69 @@ | ||
| /* | ||
| * Copyright (c) 2017, 2023 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.examples.staticcontent; | ||
|
|
||
| import io.helidon.common.http.Http; | ||
| import io.helidon.logging.common.LogConfig; | ||
| import io.helidon.nima.webserver.WebServer; | ||
| import io.helidon.nima.webserver.http.HttpRouting; | ||
| import io.helidon.nima.webserver.staticcontent.StaticContentService; | ||
|
|
||
| /** | ||
| * The application main class. | ||
| */ | ||
| public final class Main { | ||
| private static final Http.HeaderValue UI_REDIRECT = Http.Header.createCached(Http.Header.LOCATION, "/ui"); | ||
|
|
||
| /** | ||
| * Cannot be instantiated. | ||
| */ | ||
| private Main() { | ||
| } | ||
|
|
||
| /** | ||
| * Application main entry point. | ||
| * | ||
| * @param args command line arguments. | ||
| */ | ||
| public static void main(String[] args) { | ||
| // load logging configuration | ||
| LogConfig.configureRuntime(); | ||
|
|
||
| WebServer server = WebServer.builder() | ||
| .port(8080) | ||
| .routing(Main::routing) | ||
| .start(); | ||
|
|
||
| System.out.println("WEB server is up! http://localhost:" + server.port() + "/greet"); | ||
| } | ||
|
|
||
| /** | ||
| * Updates HTTP Routing. | ||
| */ | ||
| static void routing(HttpRouting.Builder routing) { | ||
| routing.any("/", (req, res) -> { | ||
| // showing the capability to run on any path, and redirecting from root | ||
| res.status(Http.Status.MOVED_PERMANENTLY_301); | ||
| res.headers().set(UI_REDIRECT); | ||
| res.send(); | ||
| }) | ||
| .register("/ui", CounterService::new) | ||
| .register("/ui", StaticContentService.builder("WEB") | ||
| .welcomeFileName("index.html") | ||
| .build()); | ||
| } | ||
| } |
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
71 changes: 71 additions & 0 deletions
71
...er/static-content/src/test/java/io/helidon/webserver/examples/staticcontent/MainTest.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,71 @@ | ||
| /* | ||
| * Copyright (c) 2023 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.examples.staticcontent; | ||
|
|
||
| import io.helidon.common.http.Http; | ||
| import io.helidon.nima.testing.junit5.webserver.ServerTest; | ||
| import io.helidon.nima.testing.junit5.webserver.SetUpRoute; | ||
| import io.helidon.nima.webclient.http1.Http1Client; | ||
| import io.helidon.nima.webclient.http1.Http1ClientResponse; | ||
| import io.helidon.nima.webserver.http.HttpRouting; | ||
| import jakarta.json.JsonNumber; | ||
| import jakarta.json.JsonObject; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.is; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
|
|
||
| @ServerTest | ||
| class MainTest { | ||
|
|
||
| private final Http1Client client; | ||
|
|
||
| protected MainTest(Http1Client client) { | ||
| this.client = client; | ||
| } | ||
|
|
||
| @SetUpRoute | ||
| static void routing(HttpRouting.Builder builder) { | ||
| Main.routing(builder); | ||
| } | ||
|
|
||
| @Test | ||
| void testUi() { | ||
| assertThat(allCounter(), is(1)); | ||
| try (Http1ClientResponse response = client.get("/ui/index.html").request()) { | ||
| assertThat(response.status(), is(Http.Status.OK_200)); | ||
| assertThat(response.headers().contentType().orElseThrow().text(), is("text/html")); | ||
| } | ||
| try (Http1ClientResponse response = client.get("/ui/css/app.css").request()) { | ||
| assertThat(response.status(), is(Http.Status.OK_200)); | ||
| assertThat(response.headers().contentType().orElseThrow().text(), is("text/css")); | ||
| } | ||
| try (Http1ClientResponse response = client.get("/ui/js/app.js").request()) { | ||
| assertThat(response.status(), is(Http.Status.OK_200)); | ||
| assertThat(response.headers().contentType().orElseThrow().text(), is("text/javascript")); | ||
| } | ||
| assertThat(allCounter(), is(5)); // includes /ui/api/counter calls | ||
| } | ||
|
|
||
| private int allCounter() { | ||
| try (Http1ClientResponse response = client.get("/ui/api/counter").request()) { | ||
| assertThat(response.status(), is(Http.Status.OK_200)); | ||
| JsonNumber number = (JsonNumber) response.as(JsonObject.class).get("all"); | ||
| return number.intValue(); | ||
| } | ||
| } | ||
| } |