Skip to content

Commit 7f8b4ed

Browse files
committed
Remove quarkus-mutiny dependency from container-image extensions
1 parent b616f68 commit 7f8b4ed

File tree

4 files changed

+4
-28
lines changed

4 files changed

+4
-28
lines changed

extensions/container-image/deployment/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<groupId>io.quarkus</groupId>
1818
<artifactId>quarkus-core-deployment</artifactId>
1919
</dependency>
20-
<dependency>
21-
<groupId>io.quarkus</groupId>
22-
<artifactId>quarkus-mutiny-deployment</artifactId>
23-
</dependency>
2420
<dependency>
2521
<groupId>io.quarkus</groupId>
2622
<artifactId>quarkus-container-image-spi</artifactId>

extensions/container-image/deployment/src/main/resources/dev-ui/qwc-container-image-build.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,9 @@ export class QwcContainerImageBuild extends LitElement {
121121
this.build_error = false;
122122
this.result = "";
123123
this.jsonRpc.build({'type': this.selected_type, 'builder': this.selected_builder})
124-
.onNext(jsonRpcResponse => {
124+
.then(jsonRpcResponse => {
125125
const msg = jsonRpcResponse.result;
126-
if (msg === "started") {
127-
this.build_complete = false;
128-
this.build_in_progress = true;
129-
this.build_error = false;
130-
} else if (msg.includes("created.")) {
126+
if (msg.includes("created.")) {
131127
this.result = msg;
132128
this.build_complete = true;
133129
this.build_in_progress = false;

extensions/container-image/runtime/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<groupId>io.quarkus</groupId>
2626
<artifactId>quarkus-core</artifactId>
2727
</dependency>
28-
<dependency>
29-
<groupId>io.quarkus</groupId>
30-
<artifactId>quarkus-mutiny</artifactId>
31-
</dependency>
3228
</dependencies>
3329
<build>
3430
<plugins>

extensions/container-image/runtime/src/main/java/io/quarkus/container/image/runtime/devui/ContainerBuilderJsonRpcService.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,15 @@
33
import java.util.Map;
44

55
import io.quarkus.dev.console.DevConsoleManager;
6-
import io.smallrye.mutiny.Multi;
7-
import io.smallrye.mutiny.Uni;
8-
import io.smallrye.mutiny.infrastructure.Infrastructure;
96

107
public class ContainerBuilderJsonRpcService {
118

12-
public Multi<String> build(String type, String builder) {
9+
public String build(String type, String builder) {
1310
Map<String, String> params = Map.of(
1411
"quarkus.container-image.builder", builder,
1512
"quarkus.build.package-type", type);
1613

17-
// For now, the JSON RPC are called on the event loop, but the action is blocking,
18-
// So, work around this by invoking the action on a worker thread.
19-
Multi<String> build = Uni.createFrom().item(() -> DevConsoleManager
20-
.<String> invoke("container-image-build-action", params))
21-
.runSubscriptionOn(Infrastructure.getDefaultExecutor()) // It's a blocking action.
22-
.toMulti();
23-
24-
return Multi.createBy().concatenating()
25-
.streams(Multi.createFrom().item("started"), build);
26-
14+
return DevConsoleManager.invoke("container-image-build-action", params);
2715
}
2816

2917
}

0 commit comments

Comments
 (0)