Skip to content
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

Remove devconsole-spi from core #35426

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions extensions/datasource/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions extensions/grpc/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 1 addition & 6 deletions extensions/liquibase/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions extensions/vertx-http/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}

}
2 changes: 1 addition & 1 deletion extensions/vertx-http/dev-console-spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions extensions/vertx-http/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
}
}
};
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading