Merge branch 'main' into main

quarkusio · Jul 26, 2023 · 2039e0a · 2039e0a
2 parents aba60a7 + 8f0e94e
commit 2039e0a
Show file tree

Hide file tree

Showing 25 changed files with 51 additions and 307 deletions.
diff --git a/...ava/io/quarkus/infinispan/client/deployment/devconsole/InfinispanDevConsoleProcessor.java b/...ava/io/quarkus/infinispan/client/deployment/devconsole/InfinispanDevConsoleProcessor.java
diff --git a/.../devconsole/InfinispanDevUiProcessor.java → ...yment/devui/InfinispanDevUIProcessor.java b/.../devconsole/InfinispanDevUiProcessor.java → ...yment/devui/InfinispanDevUIProcessor.java
@@ -1,17 +1,19 @@
-package io.quarkus.infinispan.client.deployment.devconsole;
+package io.quarkus.infinispan.client.deployment.devui;
 
 import org.infinispan.commons.util.Version;
 
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.processor.BuiltinScope;
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
 import io.quarkus.devui.spi.page.CardPageBuildItem;
 import io.quarkus.devui.spi.page.Page;
 import io.quarkus.devui.spi.page.PageBuilder;
-import io.quarkus.infinispan.client.runtime.devconsole.InfinispanJsonRPCService;
+import io.quarkus.infinispan.client.runtime.devui.InfinispanClientsContainer;
+import io.quarkus.infinispan.client.runtime.devui.InfinispanJsonRPCService;
 
-public class InfinispanDevUiProcessor {
+public class InfinispanDevUIProcessor {
 
     @BuildStep(onlyIf = IsDevelopment.class)
     public CardPageBuildItem infinispanServer() {
@@ -45,4 +47,9 @@ public CardPageBuildItem infinispanServer() {
     public JsonRPCProvidersBuildItem createJsonRPCService() {
         return new JsonRPCProvidersBuildItem(InfinispanJsonRPCService.class, BuiltinScope.SINGLETON.getName());
     }
+
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public AdditionalBeanBuildItem beans() {
+        return AdditionalBeanBuildItem.unremovableOf(InfinispanClientsContainer.class);
+    }
 }
diff --git a/extensions/infinispan-client/deployment/src/main/resources/dev-templates/embedded.html b/extensions/infinispan-client/deployment/src/main/resources/dev-templates/embedded.html
diff --git a/...evconsole/InfinispanClientsContainer.java → ...ime/devui/InfinispanClientsContainer.java b/...evconsole/InfinispanClientsContainer.java → ...ime/devui/InfinispanClientsContainer.java
@@ -1,4 +1,4 @@
-package io.quarkus.infinispan.client.runtime.devconsole;
+package io.quarkus.infinispan.client.runtime.devui;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;

diff --git a/.../devconsole/InfinispanJsonRPCService.java → ...ntime/devui/InfinispanJsonRPCService.java b/.../devconsole/InfinispanJsonRPCService.java → ...ntime/devui/InfinispanJsonRPCService.java
@@ -1,4 +1,4 @@
-package io.quarkus.infinispan.client.runtime.devconsole;
+package io.quarkus.infinispan.client.runtime.devui;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.logging.Log;

diff --git a/...devconsole/RabbitDevConsoleProcessor.java → ...eployment/devui/RabbitDevUIProcessor.java b/...devconsole/RabbitDevConsoleProcessor.java → ...eployment/devui/RabbitDevUIProcessor.java
@@ -1,24 +1,15 @@
-package io.quarkus.smallrye.reactivemessaging.rabbitmq.deployment.devconsole;
+package io.quarkus.smallrye.reactivemessaging.rabbitmq.deployment.devui;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
-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.smallrye.reactivemessaging.rabbitmq.runtime.devconsole.DevRabbitMqHttpPortSupplier;
-import io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devconsole.RabbitHttpPortFinder;
-import io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devconsole.RabbitMqJsonRpcService;
+import io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui.RabbitHttpPortFinder;
+import io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui.RabbitMqJsonRpcService;
 
-public class RabbitDevConsoleProcessor {
-
-    @BuildStep(onlyIf = IsDevelopment.class)
-    public DevConsoleRuntimeTemplateInfoBuildItem collectInfos(CurateOutcomeBuildItem curateOutcomeBuildItem) {
-        return new DevConsoleRuntimeTemplateInfoBuildItem("rabbitHttpPort",
-                new DevRabbitMqHttpPortSupplier(), this.getClass(), curateOutcomeBuildItem);
-    }
+public class RabbitDevUIProcessor {
 
     @BuildStep(onlyIf = IsDevelopment.class)
     AdditionalBeanBuildItem beans() {

diff --git a/...rye-reactive-messaging-rabbitmq/deployment/src/main/resources/dev-templates/embedded.html b/...rye-reactive-messaging-rabbitmq/deployment/src/main/resources/dev-templates/embedded.html
diff --git a/...ntime/devconsole/DevRabbitMqHttpPort.java → ...mq/runtime/devui/DevRabbitMqHttpPort.java b/...ntime/devconsole/DevRabbitMqHttpPort.java → ...mq/runtime/devui/DevRabbitMqHttpPort.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devconsole;
+package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui;
 
 import java.util.function.Supplier;
 

diff --git a/...vconsole/DevRabbitMqHttpPortSupplier.java → ...me/devui/DevRabbitMqHttpPortSupplier.java b/...vconsole/DevRabbitMqHttpPortSupplier.java → ...me/devui/DevRabbitMqHttpPortSupplier.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devconsole;
+package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui;
 
 import java.util.function.Supplier;
 

diff --git a/...time/devconsole/RabbitHttpPortFinder.java → ...q/runtime/devui/RabbitHttpPortFinder.java b/...time/devconsole/RabbitHttpPortFinder.java → ...q/runtime/devui/RabbitHttpPortFinder.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devconsole;
+package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui;
 
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Singleton;

diff --git a/...me/devconsole/RabbitMqJsonRpcService.java → ...runtime/devui/RabbitMqJsonRpcService.java b/...me/devconsole/RabbitMqJsonRpcService.java → ...runtime/devui/RabbitMqJsonRpcService.java
@@ -1,4 +1,4 @@
-package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devconsole;
+package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;

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();