diff --git a/extensions/container-image/container-image-openshift/deployment/pom.xml b/extensions/container-image/container-image-openshift/deployment/pom.xml index 0403d9e816c39..f0c58f60fa958 100644 --- a/extensions/container-image/container-image-openshift/deployment/pom.xml +++ b/extensions/container-image/container-image-openshift/deployment/pom.xml @@ -18,10 +18,6 @@ io.quarkus quarkus-kubernetes-client-internal-deployment - - io.quarkus - quarkus-vertx-http-dev-console-spi - io.quarkus quarkus-kubernetes-client-spi diff --git a/extensions/datasource/runtime/pom.xml b/extensions/datasource/runtime/pom.xml index bbe9cb16b538f..13950aa4a1603 100644 --- a/extensions/datasource/runtime/pom.xml +++ b/extensions/datasource/runtime/pom.xml @@ -22,11 +22,6 @@ vertx-web true - - io.quarkus - quarkus-vertx-http-dev-console-runtime-spi - true - io.quarkus quarkus-arc diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml index a046721e15876..73393d614ff21 100644 --- a/extensions/grpc/runtime/pom.xml +++ b/extensions/grpc/runtime/pom.xml @@ -50,11 +50,6 @@ quarkus-virtual-threads - - io.quarkus - quarkus-vertx-http-dev-console-runtime-spi - true - io.quarkus quarkus-grpc-stubs diff --git a/extensions/liquibase/runtime/pom.xml b/extensions/liquibase/runtime/pom.xml index 6d604c5a17e7f..9bf4693888606 100644 --- a/extensions/liquibase/runtime/pom.xml +++ b/extensions/liquibase/runtime/pom.xml @@ -60,12 +60,7 @@ quarkus-vertx-http true - - io.quarkus - quarkus-vertx-http-dev-console-runtime-spi - true - - + io.quarkus diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml index b9d45fac0cf5c..442b281eecb79 100644 --- a/extensions/vertx-http/deployment/pom.xml +++ b/extensions/vertx-http/deployment/pom.xml @@ -25,10 +25,6 @@ io.quarkus quarkus-vertx-http-deployment-spi - - io.quarkus - quarkus-vertx-http-dev-console-spi - io.quarkus quarkus-mutiny-deployment diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcDevProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcDevProcessor.java index a94209495f368..0c0119d367979 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcDevProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcDevProcessor.java @@ -20,7 +20,6 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; -import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; import io.quarkus.vertx.http.runtime.devmode.ArcDevRecorder; @@ -98,21 +97,4 @@ private Map getConfigProperties(ArcConfig arcConfig) { props.put("quarkus.arc.exclude-types", "" + arcConfig.excludeTypes.map(Object::toString).orElse("")); return props; } - - // NOTE: we can't add this build step to the ArC extension as it would cause a cyclic dependency - @BuildStep - @Record(value = ExecutionTime.STATIC_INIT, optional = true) - DevConsoleRouteBuildItem eventsEndpoint(ArcDevRecorder recorder) { - return DevConsoleRouteBuildItem.builder().ga("io.quarkus", "quarkus-arc").path("events").method("POST") - .handler(recorder.events()).build(); - } - - // NOTE: we can't add this build step to the ArC extension as it would cause a cyclic dependency - @BuildStep - @Record(value = ExecutionTime.STATIC_INIT, optional = true) - DevConsoleRouteBuildItem invocationsEndpoint(ArcDevRecorder recorder) { - return DevConsoleRouteBuildItem.builder().ga("io.quarkus", "quarkus-arc").path("invocations").method("POST") - .handler(recorder.invocations()).build(); - } - } diff --git a/extensions/vertx-http/dev-console-spi/pom.xml b/extensions/vertx-http/dev-console-spi/pom.xml index a2b838691e34b..a59fd49ad23c5 100644 --- a/extensions/vertx-http/dev-console-spi/pom.xml +++ b/extensions/vertx-http/dev-console-spi/pom.xml @@ -12,7 +12,7 @@ quarkus-vertx-http-dev-console-spi Quarkus - Vert.x - HTTP - Dev Console SPI - + io.quarkus diff --git a/extensions/vertx-http/runtime/pom.xml b/extensions/vertx-http/runtime/pom.xml index 32145f659af9f..6f0fd6ea1fdf5 100644 --- a/extensions/vertx-http/runtime/pom.xml +++ b/extensions/vertx-http/runtime/pom.xml @@ -33,10 +33,6 @@ io.smallrye.common smallrye-common-vertx-context - - io.quarkus - quarkus-vertx-http-dev-console-runtime-spi - io.quarkus.security quarkus-security diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java index 2552b9de3885f..019d6ddc52809 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java @@ -12,20 +12,15 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Default; -import io.quarkus.arc.Arc; import io.quarkus.arc.InjectableBean; import io.quarkus.arc.InjectableObserverMethod; import io.quarkus.arc.RemovedBean; import io.quarkus.arc.impl.ArcContainerImpl; -import io.quarkus.arc.runtime.devconsole.InvocationsMonitor; -import io.quarkus.arc.runtime.devmode.EventsMonitor; import io.quarkus.dev.console.DevConsoleManager; -import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; import io.quarkus.runtime.annotations.Recorder; import io.quarkus.vertx.http.runtime.devmode.Json.JsonArrayBuilder; import io.quarkus.vertx.http.runtime.devmode.Json.JsonObjectBuilder; import io.vertx.core.Handler; -import io.vertx.core.MultiMap; import io.vertx.ext.web.RoutingContext; @Recorder @@ -230,37 +225,4 @@ public void handle(RoutingContext ctx) { } }; } - - // NOTE: we can't add this recorder to the ArC extension as it would cause a cyclic dependency - public Handler events() { - return new DevConsolePostHandler() { - @Override - protected void handlePost(RoutingContext event, MultiMap form) - throws Exception { - String action = form.get("action"); - if ("skipContext".equals(action)) { - Arc.container().instance(EventsMonitor.class).get().toggleSkipContextEvents(); - } else { - Arc.container().instance(EventsMonitor.class).get().clear(); - } - } - }; - } - - // NOTE: we can't add this recorder to the ArC extension as it would cause a cyclic dependency - public Handler invocations() { - return new DevConsolePostHandler() { - @Override - protected void handlePost(RoutingContext event, MultiMap form) - throws Exception { - String action = form.get("action"); - if ("filterOutQuarkusBeans".equals(action)) { - Arc.container().instance(InvocationsMonitor.class).get().toggleFilterOutQuarkusBeans(); - } else { - Arc.container().instance(InvocationsMonitor.class).get().clear(); - } - } - }; - } - } diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java index 3572733e61cf0..090453094ce61 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java @@ -15,15 +15,12 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.spi.ConfigSource; -import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; import io.quarkus.devui.runtime.config.ConfigDescription; import io.smallrye.config.ConfigValue; import io.smallrye.config.SmallRyeConfig; -import io.vertx.core.MultiMap; import io.vertx.core.impl.ConcurrentHashSet; -import io.vertx.ext.web.RoutingContext; -public class ConfigDescriptionsManager extends DevConsolePostHandler implements Supplier { +public class ConfigDescriptionsManager implements Supplier { private final List configDescriptions; private final Set devServicesProperties; @@ -307,16 +304,6 @@ public ConfigDescriptionsManager get() { return this; } - @Override - protected void handlePost(RoutingContext event, MultiMap form) throws Exception { - String name = event.request().getFormAttribute("name"); - String value = event.request().getFormAttribute("value"); - addNamedConfigGroup(name + value); - event.redirect(event.request().path().replace("add-named-group", "config") + "?" - + event.request().query()); - - } - static class Holder { final Set expansionKeys; final ConfigDescription configDescription;