Merge pull request #35426 from phillip-kruger/deprecate-devconsole-spi

Remove devconsole-spi from core
quarkusio · Aug 23, 2023 · 8d51c06 · 8d51c06
2 parents cd46e07 + 1a38195
commit 8d51c06
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 99 deletions.
diff --git a/extensions/container-image/container-image-openshift/deployment/pom.xml b/extensions/container-image/container-image-openshift/deployment/pom.xml
@@ -18,10 +18,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-internal-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-client-spi</artifactId>

diff --git a/extensions/datasource/runtime/pom.xml b/extensions/datasource/runtime/pom.xml
@@ -22,11 +22,6 @@
             <artifactId>vertx-web</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>

diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml
@@ -50,11 +50,6 @@
             <artifactId>quarkus-virtual-threads</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-grpc-stubs</artifactId>

diff --git a/extensions/liquibase/runtime/pom.xml b/extensions/liquibase/runtime/pom.xml
@@ -60,12 +60,7 @@
             <artifactId>quarkus-vertx-http</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
-            <optional>true</optional>
-        </dependency>
-
+
         <!-- test dependencies -->
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml
@@ -25,10 +25,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-http-deployment-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-mutiny-deployment</artifactId>

diff --git a/...tp/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/ArcDevProcessor.java b/...tp/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<String, String> 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
@@ -12,7 +12,7 @@
 
     <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
     <name>Quarkus - Vert.x - HTTP - Dev Console SPI</name>
-
+    
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/extensions/vertx-http/runtime/pom.xml b/extensions/vertx-http/runtime/pom.xml
@@ -33,10 +33,6 @@
             <groupId>io.smallrye.common</groupId>
             <artifactId>smallrye-common-vertx-context</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus.security</groupId>
             <artifactId>quarkus-security</artifactId>

diff --git a/...ertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ArcDevRecorder.java b/...ertx-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<RoutingContext> 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<RoutingContext> 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/...untime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java b/...untime/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<ConfigDescriptionsManager> {
+public class ConfigDescriptionsManager implements Supplier<ConfigDescriptionsManager> {
 
     private final List<ConfigDescription> configDescriptions;
     private final Set<String> 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<String> expansionKeys;
         final ConfigDescription configDescription;