Remove Old Dev UI: Reactive messaging

Signed-off-by: Phillip Kruger <phillip.kruger@gmail.com>
phillip-kruger · Jul 26, 2023 · 148db53 · 148db53
1 parent c00bbdb
commit 148db53
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 242 deletions.
diff --git a/...ReactiveMessagingDevConsoleProcessor.java → ...evui/ReactiveMessagingDevUIProcessor.java b/...ReactiveMessagingDevConsoleProcessor.java → ...evui/ReactiveMessagingDevUIProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.deployment.devconsole;
+package io.quarkus.smallrye.reactivemessaging.deployment.devui;
 
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
 
@@ -12,23 +12,17 @@
 import io.quarkus.arc.processor.InjectionPointInfo;
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.Record;
-import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
-import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
+import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
+import io.quarkus.devui.spi.page.CardPageBuildItem;
+import io.quarkus.devui.spi.page.Page;
 import io.quarkus.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames;
-import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.Connectors;
-import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.DevConsoleRecorder;
-import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.DevReactiveMessagingInfosSupplier;
+import io.quarkus.smallrye.reactivemessaging.runtime.devui.Connectors;
+import io.quarkus.smallrye.reactivemessaging.runtime.devui.DevConsoleRecorder;
+import io.quarkus.smallrye.reactivemessaging.runtime.devui.ReactiveMessagingJsonRpcService;
 
-public class ReactiveMessagingDevConsoleProcessor {
+public class ReactiveMessagingDevUIProcessor {
 
-    @BuildStep(onlyIf = IsDevelopment.class)
-    public DevConsoleRuntimeTemplateInfoBuildItem collectInfos(CurateOutcomeBuildItem curateOutcomeBuildItem) {
-        return new DevConsoleRuntimeTemplateInfoBuildItem("reactiveMessagingInfos",
-                new DevReactiveMessagingInfosSupplier(), this.getClass(), curateOutcomeBuildItem);
-    }
-
-    @Record(STATIC_INIT)
+    @io.quarkus.deployment.annotations.Record(STATIC_INIT)
     @BuildStep(onlyIf = IsDevelopment.class)
     public void collectInjectionInfo(DevConsoleRecorder recorder, BeanDiscoveryFinishedBuildItem beanDiscoveryFinished) {
         Map<String, String> emitters = new HashMap<>();
@@ -59,4 +53,19 @@ AdditionalBeanBuildItem beans() {
         return AdditionalBeanBuildItem.unremovableOf(Connectors.class);
     }
 
+    @BuildStep(onlyIf = IsDevelopment.class)
+    CardPageBuildItem create() {
+        CardPageBuildItem card = new CardPageBuildItem();
+        card.addPage(Page.webComponentPageBuilder()
+                .title("Channels")
+                .componentLink("qwc-smallrye-reactive-messaging-channels.js")
+                .icon("font-awesome-solid:diagram-project"));
+
+        return card;
+    }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    JsonRPCProvidersBuildItem createJsonRPCServiceForCache() {
+        return new JsonRPCProvidersBuildItem(ReactiveMessagingJsonRpcService.class);
+    }
 }
diff --git a/.../quarkus/smallrye/reactivemessaging/deployment/devui/ReactiveMessagingDevUiProcessor.java b/.../quarkus/smallrye/reactivemessaging/deployment/devui/ReactiveMessagingDevUiProcessor.java
diff --git a/...ons/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/channels.html b/...ons/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/channels.html
diff --git a/...ons/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/embedded.html b/...ons/smallrye-reactive-messaging/deployment/src/main/resources/dev-templates/embedded.html
diff --git a/...tive-messaging/deployment/src/main/resources/dev-templates/tags/componentDescription.html b/...tive-messaging/deployment/src/main/resources/dev-templates/tags/componentDescription.html
diff --git a/...essaging/deployment/src/main/resources/dev-ui/qwc-smallrye-reactive-messaging-channels.js b/...essaging/deployment/src/main/resources/dev-ui/qwc-smallrye-reactive-messaging-channels.js
@@ -24,7 +24,7 @@ export class QwcSmallryeReactiveMessagingChannels extends LitElement {
     `;
 
     static properties = {
-        "_channels": {state: true, type: Array}
+        _channels: {state: true, type: Array}
     }
 
     /**

diff --git a/...rkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfosSupplier.java b/...rkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfosSupplier.java
diff --git a/...saging/runtime/devconsole/Connectors.java → ...vemessaging/runtime/devui/Connectors.java b/...saging/runtime/devconsole/Connectors.java → ...vemessaging/runtime/devui/Connectors.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.runtime.devconsole;
+package io.quarkus.smallrye.reactivemessaging.runtime.devui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,8 +12,8 @@
 import org.eclipse.microprofile.config.Config;
 
 import io.quarkus.runtime.StartupEvent;
-import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.DevReactiveMessagingInfos.Component;
-import io.quarkus.smallrye.reactivemessaging.runtime.devconsole.DevReactiveMessagingInfos.ComponentType;
+import io.quarkus.smallrye.reactivemessaging.runtime.devui.DevReactiveMessagingInfos.Component;
+import io.quarkus.smallrye.reactivemessaging.runtime.devui.DevReactiveMessagingInfos.ComponentType;
 
 // we use a separate component due to weird class loading issues that occur when accessing config properties
 @Singleton

diff --git a/...untime/devconsole/DevConsoleRecorder.java → ...ing/runtime/devui/DevConsoleRecorder.java b/...untime/devconsole/DevConsoleRecorder.java → ...ing/runtime/devui/DevConsoleRecorder.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.runtime.devconsole;
+package io.quarkus.smallrye.reactivemessaging.runtime.devui;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...devconsole/DevReactiveMessagingInfos.java → ...time/devui/DevReactiveMessagingInfos.java b/...devconsole/DevReactiveMessagingInfos.java → ...time/devui/DevReactiveMessagingInfos.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.runtime.devconsole;
+package io.quarkus.smallrye.reactivemessaging.runtime.devui;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...sole/ReactiveMessagingJsonRpcService.java → ...evui/ReactiveMessagingJsonRpcService.java b/...sole/ReactiveMessagingJsonRpcService.java → ...evui/ReactiveMessagingJsonRpcService.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.runtime.devconsole;
+package io.quarkus.smallrye.reactivemessaging.runtime.devui;
 
 import java.util.List;
 
@@ -10,8 +10,6 @@
 @ApplicationScoped
 public class ReactiveMessagingJsonRpcService {
 
-    // IMPORTANT: To avoid having to depend on jackson, we build a JSON array containing the description of the channels.
-
     public JsonArray getInfo() {
         JsonArray result = new JsonArray();
 

diff --git a/...evmode/src/test/java/io/quarkus/test/devconsole/DevConsoleReactiveMessagingSmokeTest.java b/...evmode/src/test/java/io/quarkus/test/devconsole/DevConsoleReactiveMessagingSmokeTest.java
diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DummyConnector.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DummyConnector.java
diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyProcessor.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/MyProcessor.java