From 5219229529bbff2ff8a2322d78edac7ae639e197 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Tue, 12 Mar 2024 17:06:10 +1100 Subject: [PATCH] index.html (welcome page) now dynamic Signed-off-by: Phillip Kruger --- .../quarkus/runtime/TemplateHtmlBuilder.java | 269 +++++------ .../META-INF/template-html-builder.css | 217 +++++++++ .../deployment/ReactiveRoutesProcessor.java | 25 - .../devmode/ResourceNotFoundHandler.java | 59 --- .../devmode/ResourceNotFoundRecorder.java | 18 - .../deployment/NonJaxRsClassBuildItem.java | 18 + .../deployment/ResteasyBuiltinsProcessor.java | 63 --- .../deployment/ResteasyServletProcessor.java | 13 - .../ResteasyStandaloneBuildStep.java | 10 +- ...tFoundExceptionMapperHttpRootTestCase.java | 4 +- ...onMapperHttpRootTrailingSlashTestCase.java | 4 +- .../test/NotFoundExceptionMapperTestCase.java | 4 +- .../runtime/ExceptionMapperRecorder.java | 44 -- .../runtime/NotFoundExceptionMapper.java | 436 ------------------ .../ResteasyStandaloneRecorder.java | 124 +++++ .../standalone/VertxRequestHandler.java | 10 +- .../ResteasyReactiveDevModeProcessor.java | 63 --- .../deployment/ResteasyReactiveProcessor.java | 4 +- .../FilterWithPathParamsTest.java | 2 +- .../NotFoundExeptionMapper.java | 14 + .../runtime/ExceptionMapperRecorder.java | 33 -- .../runtime/NotFoundExceptionMapper.java | 334 -------------- .../runtime/ResteasyReactiveRecorder.java | 67 ++- .../SpringWebResteasyClassicProcessor.java | 10 +- .../undertow/test/ErrorServletTestCase.java | 3 +- .../runtime/UndertowDeploymentRecorder.java | 4 + extensions/vertx-http/deployment/pom.xml | 4 + .../deployment/BuildTimeContentProcessor.java | 17 +- .../devui/deployment/DevUIProcessor.java | 27 +- .../deployment/menu/EndpointsProcessor.java | 6 + .../deployment/welcome/SelectedExtension.java | 18 + .../devui/deployment/welcome/WelcomeData.java | 18 + .../deployment/welcome/WelcomeProcessor.java | 153 ++++++ .../NonApplicationRootPathBuildItem.java | 12 +- .../deployment/VertxWebRouterBuildItem.java | 4 +- .../deployment/devmode/NotFoundProcessor.java | 88 ++++ .../devmode/RouteDescriptionBuildItem.java | 18 +- .../dev-ui/controller/router-controller.js | 62 +-- .../resources/dev-ui/qwc/qwc-endpoints.js | 2 +- .../resources/dev-ui/qwc/qwc-extensions.js | 2 +- .../main/resources/dev-ui/qwc/qwc-header.js | 59 ++- .../src/main/resources/dev-ui/qwc/qwc-menu.js | 27 +- .../main/resources/dev-ui/qwc/qwc-routes.js | 139 ++++++ .../main/resources/dev-ui/qwc/qwc-welcome.js | 225 +++++++++ .../resources/dev-ui/state/devui-state.js | 7 + .../devui/spi/page/ExternalPageBuilder.java | 4 +- .../java/io/quarkus/devui/spi/page/Page.java | 12 +- .../quarkus/devui/spi/page/PageBuilder.java | 9 +- .../quarkus/devui/runtime/DevUIRecorder.java | 10 +- .../devui/runtime/EndpointInfoHandler.java | 12 +- .../devui/runtime/VertxRouteInfoService.java | 49 ++ .../devmode/ResourceNotFoundHandler.java | 212 +++++++++ .../devmode/ResourceNotFoundRecorder.java | 41 ++ .../runtime/devmode/RouteDescription.java | 50 +- .../devmode/RouteMethodDescription.java | 77 ++++ .../reactive/server/core/Deployment.java | 7 - .../reactive/server/core/DeploymentInfo.java | 10 - .../startup/RuntimeDeploymentManager.java | 5 +- .../server/handlers/ClassRoutingHandler.java | 11 +- .../server/handlers/RestInitialHandler.java | 22 +- .../FilterWithPathParamsTest.java | 2 +- .../NotFoundExeptionMapper.java | 14 + .../META-INF/resources/index.tpl.qute.html | 286 ------------ .../QuarkusCodestartGenerationTest.java | 18 - .../quarkus/maven/it/CreateProjectMojoIT.java | 4 +- .../java/io/quarkus/maven/it/DevMojoIT.java | 2 +- 66 files changed, 1878 insertions(+), 1719 deletions(-) create mode 100644 core/runtime/src/main/resources/META-INF/template-html-builder.css delete mode 100644 extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/devmode/ResourceNotFoundHandler.java delete mode 100644 extensions/reactive-routes/runtime/src/main/java/io/quarkus/vertx/web/runtime/devmode/ResourceNotFoundRecorder.java create mode 100644 extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/NonJaxRsClassBuildItem.java delete mode 100644 extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/ExceptionMapperRecorder.java delete mode 100644 extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/NotFoundExceptionMapper.java create mode 100644 extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NotFoundExeptionMapper.java delete mode 100644 extensions/resteasy-reactive/rest/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ExceptionMapperRecorder.java delete mode 100644 extensions/resteasy-reactive/rest/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/NotFoundExceptionMapper.java create mode 100644 extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/welcome/SelectedExtension.java create mode 100644 extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/welcome/WelcomeData.java create mode 100644 extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/welcome/WelcomeProcessor.java create mode 100644 extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/NotFoundProcessor.java create mode 100644 extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-routes.js create mode 100644 extensions/vertx-http/dev-ui-resources/src/main/resources/dev-ui/qwc/qwc-welcome.js create mode 100644 extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/VertxRouteInfoService.java create mode 100644 extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ResourceNotFoundHandler.java create mode 100644 extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ResourceNotFoundRecorder.java create mode 100644 extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/RouteMethodDescription.java create mode 100644 independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/customproviders/NotFoundExeptionMapper.java delete mode 100644 independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/project/quarkus/base/src/main/resources/META-INF/resources/index.tpl.qute.html diff --git a/core/runtime/src/main/java/io/quarkus/runtime/TemplateHtmlBuilder.java b/core/runtime/src/main/java/io/quarkus/runtime/TemplateHtmlBuilder.java index 225c138383ca6..d5ac0237199fe 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/TemplateHtmlBuilder.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/TemplateHtmlBuilder.java @@ -1,12 +1,17 @@ package io.quarkus.runtime; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; import java.util.Collections; import java.util.List; +import java.util.Scanner; import io.quarkus.dev.config.CurrentConfig; import io.quarkus.runtime.util.ExceptionUtil; public class TemplateHtmlBuilder { + private static String CSS = null; private static final String SCRIPT_STACKTRACE_MANIPULATION = "