Introduce Dev only module for Arc extension

Signed-off-by: Phillip Kruger <[email protected]>
aloubyansky · Dec 17, 2024 · 583f44d · 583f44d
1 parent 53c4219
commit 583f44d
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 33 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -587,6 +587,11 @@
                 <artifactId>quarkus-arc</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-arc-dev</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-arc-deployment</artifactId>

diff --git a/extensions/arc/deployment/pom.xml b/extensions/arc/deployment/pom.xml
@@ -29,6 +29,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-dev</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus.arc</groupId>
             <artifactId>arc-processor</artifactId>

diff --git a/.../arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevModeApiProcessor.java b/.../arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevModeApiProcessor.java
@@ -22,14 +22,14 @@
 import io.quarkus.arc.processor.InjectionPointInfo;
 import io.quarkus.arc.processor.InterceptorInfo;
 import io.quarkus.arc.processor.ObserverInfo;
-import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.deployment.IsLocalDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.dev.console.DevConsoleManager;
 
 public class ArcDevModeApiProcessor {
 
-    @BuildStep(onlyIf = IsDevelopment.class)
+    @BuildStep(onlyIf = IsLocalDevelopment.class)
     public void collectBeanInfo(ArcConfig config, ValidationPhaseBuildItem validationPhaseBuildItem,
             CompletedApplicationClassPredicateBuildItem predicate,
             BuildProducer<ArcBeanInfoBuildItem> arcBeanInfoProducer) {

diff --git a/...sions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevUIProcessor.java b/...sions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevUIProcessor.java
@@ -13,13 +13,13 @@
 import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
 import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem;
 import io.quarkus.arc.processor.AnnotationsTransformer;
-import io.quarkus.arc.runtime.devconsole.InvocationInterceptor;
-import io.quarkus.arc.runtime.devconsole.InvocationTree;
-import io.quarkus.arc.runtime.devconsole.InvocationsMonitor;
-import io.quarkus.arc.runtime.devconsole.Monitored;
-import io.quarkus.arc.runtime.devmode.EventsMonitor;
-import io.quarkus.arc.runtime.devui.ArcJsonRPCService;
-import io.quarkus.deployment.IsDevelopment;
+import io.quarkus.arc.runtime.dev.EventsMonitor;
+import io.quarkus.arc.runtime.dev.console.InvocationInterceptor;
+import io.quarkus.arc.runtime.dev.console.InvocationTree;
+import io.quarkus.arc.runtime.dev.console.InvocationsMonitor;
+import io.quarkus.arc.runtime.dev.console.Monitored;
+import io.quarkus.arc.runtime.dev.ui.ArcJsonRPCService;
+import io.quarkus.deployment.IsLocalDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
@@ -28,7 +28,7 @@
 
 public class ArcDevUIProcessor {
 
-    @BuildStep(onlyIf = IsDevelopment.class)
+    @BuildStep(onlyIf = IsLocalDevelopment.class)
     public CardPageBuildItem pages(ArcBeanInfoBuildItem arcBeanInfoBuildItem, ArcConfig config) {
         DevBeanInfos beanInfos = arcBeanInfoBuildItem.getBeanInfos();
 
@@ -102,12 +102,12 @@ public CardPageBuildItem pages(ArcBeanInfoBuildItem arcBeanInfoBuildItem, ArcCon
         return pageBuildItem;
     }
 
-    @BuildStep(onlyIf = IsDevelopment.class)
+    @BuildStep(onlyIf = IsLocalDevelopment.class)
     JsonRPCProvidersBuildItem createJsonRPCService() {
         return new JsonRPCProvidersBuildItem(ArcJsonRPCService.class);
     }
 
-    @BuildStep(onlyIf = IsDevelopment.class)
+    @BuildStep(onlyIf = IsLocalDevelopment.class)
     void registerMonitoringComponents(ArcConfig config, BuildProducer<AdditionalBeanBuildItem> beans,
             BuildProducer<AnnotationsTransformerBuildItem> annotationTransformers,
             CustomScopeAnnotationsBuildItem customScopes, List<BeanDefiningAnnotationBuildItem> beanDefiningAnnotations) {

diff --git a/extensions/arc/pom.xml b/extensions/arc/pom.xml
@@ -17,6 +17,7 @@
         <module>deployment</module>
         <module>runtime</module>
         <module>test-supplement</module>
+        <module>runtime-dev</module>
     </modules>
 
 </project>
diff --git a/extensions/arc/runtime-dev/pom.xml b/extensions/arc/runtime-dev/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-arc-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-arc-dev</artifactId>
+    <name>Quarkus - ArC - Runtime Dev mode</name>
+    <description>Build time CDI dependency injection - Dev mode only</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>quarkus-arc</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...uarkus/arc/runtime/devmode/EventInfo.java → ...io/quarkus/arc/runtime/dev/EventInfo.java b/...uarkus/arc/runtime/devmode/EventInfo.java → ...io/quarkus/arc/runtime/dev/EventInfo.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devmode;
+package io.quarkus.arc.runtime.dev;
 
 import java.util.List;
 

diff --git a/...us/arc/runtime/devmode/EventsMonitor.java → ...uarkus/arc/runtime/dev/EventsMonitor.java b/...us/arc/runtime/devmode/EventsMonitor.java → ...uarkus/arc/runtime/dev/EventsMonitor.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devmode;
+package io.quarkus.arc.runtime.dev;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;

diff --git a/...s/arc/runtime/devmode/InvocationInfo.java → ...arkus/arc/runtime/dev/InvocationInfo.java b/...s/arc/runtime/devmode/InvocationInfo.java → ...arkus/arc/runtime/dev/InvocationInfo.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devmode;
+package io.quarkus.arc.runtime.dev;
 
 import java.util.List;
 

diff --git a/...us/arc/runtime/devconsole/Invocation.java → ...s/arc/runtime/dev/console/Invocation.java b/...us/arc/runtime/devconsole/Invocation.java → ...s/arc/runtime/dev/console/Invocation.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devconsole;
+package io.quarkus.arc.runtime.dev.console;
 
 import java.lang.reflect.Method;
 import java.time.Instant;

diff --git a/...ime/devconsole/InvocationInterceptor.java → ...me/dev/console/InvocationInterceptor.java b/...ime/devconsole/InvocationInterceptor.java → ...me/dev/console/InvocationInterceptor.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devconsole;
+package io.quarkus.arc.runtime.dev.console;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -19,8 +19,8 @@
 import io.quarkus.arc.ArcContainer;
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.ManagedContext;
-import io.quarkus.arc.runtime.devconsole.Invocation.Builder;
-import io.quarkus.arc.runtime.devconsole.Invocation.Kind;
+import io.quarkus.arc.runtime.dev.console.Invocation.Builder;
+import io.quarkus.arc.runtime.dev.console.Invocation.Kind;
 
 @Priority(Interceptor.Priority.LIBRARY_BEFORE)
 @Monitored

diff --git a/...rc/runtime/devconsole/InvocationTree.java → ...c/runtime/dev/console/InvocationTree.java b/...rc/runtime/devconsole/InvocationTree.java → ...c/runtime/dev/console/InvocationTree.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devconsole;
+package io.quarkus.arc.runtime.dev.console;
 
 import java.lang.reflect.Method;
 

diff --git a/...untime/devconsole/InvocationsMonitor.java → ...ntime/dev/console/InvocationsMonitor.java b/...untime/devconsole/InvocationsMonitor.java → ...ntime/dev/console/InvocationsMonitor.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devconsole;
+package io.quarkus.arc.runtime.dev.console;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...kus/arc/runtime/devconsole/Monitored.java → ...us/arc/runtime/dev/console/Monitored.java b/...kus/arc/runtime/devconsole/Monitored.java → ...us/arc/runtime/dev/console/Monitored.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devconsole;
+package io.quarkus.arc.runtime.dev.console;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;

diff --git a/.../arc/runtime/devui/ArcJsonRPCService.java → ...arc/runtime/dev/ui/ArcJsonRPCService.java b/.../arc/runtime/devui/ArcJsonRPCService.java → ...arc/runtime/dev/ui/ArcJsonRPCService.java
@@ -1,4 +1,4 @@
-package io.quarkus.arc.runtime.devui;
+package io.quarkus.arc.runtime.dev.ui;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -14,11 +14,11 @@
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InjectableBean;
-import io.quarkus.arc.runtime.devconsole.Invocation;
-import io.quarkus.arc.runtime.devconsole.InvocationsMonitor;
-import io.quarkus.arc.runtime.devmode.EventInfo;
-import io.quarkus.arc.runtime.devmode.EventsMonitor;
-import io.quarkus.arc.runtime.devmode.InvocationInfo;
+import io.quarkus.arc.runtime.dev.EventInfo;
+import io.quarkus.arc.runtime.dev.EventsMonitor;
+import io.quarkus.arc.runtime.dev.InvocationInfo;
+import io.quarkus.arc.runtime.dev.console.Invocation;
+import io.quarkus.arc.runtime.dev.console.InvocationsMonitor;
 import io.smallrye.common.annotation.NonBlocking;
 import io.smallrye.mutiny.Multi;
 

diff --git a/extensions/arc/runtime/pom.xml b/extensions/arc/runtime/pom.xml
@@ -33,11 +33,14 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-extension-maven-plugin</artifactId>
-                    <configuration>
-                        <capabilities>
-                            <provides>io.quarkus.cdi</provides>
-                        </capabilities>
-                    </configuration>
+                <configuration>
+                    <capabilities>
+                        <provides>io.quarkus.cdi</provides>
+                    </capabilities>
+                    <conditionalDevDependencies>
+                        <artifact>${project.groupId}:${project.artifactId}-dev:${project.version}</artifact>
+                    </conditionalDevDependencies>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>