diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 81a3746511ff1..08d831bfd1e5b 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -587,6 +587,11 @@ quarkus-arc ${project.version} + + io.quarkus + quarkus-arc-dev + ${project.version} + io.quarkus quarkus-arc-deployment @@ -789,6 +794,11 @@ quarkus-datasource ${project.version} + + io.quarkus + quarkus-datasource-dev + ${project.version} + io.quarkus quarkus-datasource-deployment @@ -944,6 +954,11 @@ quarkus-oidc ${project.version} + + io.quarkus + quarkus-oidc-dev + ${project.version} + io.quarkus quarkus-test-oidc-server @@ -1129,6 +1144,11 @@ quarkus-flyway ${project.version} + + io.quarkus + quarkus-flyway-dev + ${project.version} + io.quarkus quarkus-flyway-deployment @@ -1204,6 +1224,11 @@ quarkus-liquibase ${project.version} + + io.quarkus + quarkus-liquibase-dev + ${project.version} + io.quarkus quarkus-liquibase-deployment @@ -1474,6 +1499,11 @@ quarkus-infinispan-client ${project.version} + + io.quarkus + quarkus-infinispan-client-dev + ${project.version} + io.quarkus quarkus-infinispan-client-deployment @@ -1579,6 +1609,11 @@ quarkus-kafka-client ${project.version} + + io.quarkus + quarkus-kafka-client-dev + ${project.version} + io.quarkus quarkus-kafka-client-deployment @@ -1589,6 +1624,11 @@ quarkus-kafka-streams ${project.version} + + io.quarkus + quarkus-kafka-streams-dev + ${project.version} + io.quarkus quarkus-kafka-streams-deployment @@ -1759,6 +1799,11 @@ quarkus-messaging ${project.version} + + io.quarkus + quarkus-messaging-dev + ${project.version} + io.quarkus quarkus-messaging-kotlin @@ -1814,6 +1859,11 @@ quarkus-messaging-rabbitmq ${project.version} + + io.quarkus + quarkus-messaging-rabbitmq-dev + ${project.version} + io.quarkus quarkus-messaging-rabbitmq-deployment @@ -2066,6 +2116,11 @@ quarkus-smallrye-fault-tolerance ${project.version} + + io.quarkus + quarkus-smallrye-fault-tolerance-dev + ${project.version} + io.quarkus quarkus-smallrye-fault-tolerance-deployment @@ -2121,6 +2176,11 @@ quarkus-vertx-http ${project.version} + + io.quarkus + quarkus-vertx-http-dev + ${project.version} + io.quarkus quarkus-vertx-http-dev-console-spi @@ -2268,6 +2328,11 @@ + + io.quarkus + quarkus-grpc-dev + ${project.version} + io.quarkus quarkus-grpc-xds @@ -2349,6 +2414,11 @@ quarkus-websockets-next ${project.version} + + io.quarkus + quarkus-websockets-next-dev + ${project.version} + io.quarkus quarkus-websockets-next-deployment @@ -2394,6 +2464,11 @@ quarkus-scheduler ${project.version} + + io.quarkus + quarkus-scheduler-dev + ${project.version} + io.quarkus quarkus-scheduler-deployment @@ -2674,6 +2749,11 @@ quarkus-rest ${project.version} + + io.quarkus + quarkus-rest-dev + ${project.version} + io.quarkus quarkus-rest-kotlin @@ -2949,6 +3029,11 @@ quarkus-container-image ${project.version} + + io.quarkus + quarkus-container-image-dev + ${project.version} + io.quarkus quarkus-container-image-spi @@ -3179,6 +3264,11 @@ quarkus-cache ${project.version} + + io.quarkus + quarkus-cache-dev + ${project.version} + io.quarkus quarkus-cache-deployment diff --git a/extensions/arc/deployment/pom.xml b/extensions/arc/deployment/pom.xml index eb95259c8e0c0..0a3f039b12414 100644 --- a/extensions/arc/deployment/pom.xml +++ b/extensions/arc/deployment/pom.xml @@ -29,6 +29,10 @@ io.quarkus quarkus-arc + + io.quarkus + quarkus-arc-dev + io.quarkus.arc arc-processor diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevModeApiProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevModeApiProcessor.java index 4114294e92453..6447bd9415368 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevModeApiProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevModeApiProcessor.java @@ -24,7 +24,7 @@ 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; @@ -44,7 +44,7 @@ public class ArcDevModeApiProcessor { */ private static final int DEPENCENY_GRAPH_NODES_LIMIT = 30; - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public void collectBeanInfo(ArcConfig config, ValidationPhaseBuildItem validationPhaseBuildItem, CompletedApplicationClassPredicateBuildItem predicate, BuildProducer arcBeanInfoProducer) { diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevUIProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevUIProcessor.java index 93b9ce67bc85f..496bb09048d31 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/ArcDevUIProcessor.java +++ b/extensions/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 + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCService() { return new JsonRPCProvidersBuildItem(ArcJsonRPCService.class); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void registerMonitoringComponents(ArcConfig config, BuildProducer beans, BuildProducer annotationTransformers, CustomScopeAnnotationsBuildItem customScopes, List beanDefiningAnnotations) { diff --git a/extensions/arc/pom.xml b/extensions/arc/pom.xml index b5493d31a39b1..bc7791e4327a3 100644 --- a/extensions/arc/pom.xml +++ b/extensions/arc/pom.xml @@ -18,6 +18,7 @@ runtime test-supplement test-supplement-decorator + runtime-dev diff --git a/extensions/arc/runtime-dev/pom.xml b/extensions/arc/runtime-dev/pom.xml new file mode 100644 index 0000000000000..e9e76520402bb --- /dev/null +++ b/extensions/arc/runtime-dev/pom.xml @@ -0,0 +1,23 @@ + + + + quarkus-arc-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-arc-dev + Quarkus - ArC - Runtime Dev mode + Build time CDI dependency injection - Dev mode only + + + + ${project.groupId} + quarkus-arc + + + + \ No newline at end of file diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/EventInfo.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/EventInfo.java similarity index 96% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/EventInfo.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/EventInfo.java index 9ce8f7a265fc4..061ce394617b3 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/EventInfo.java +++ b/extensions/arc/runtime-dev/src/main/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/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/EventsMonitor.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/EventsMonitor.java similarity index 99% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/EventsMonitor.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/EventsMonitor.java index 94a6ebb2d7819..25a5a9adfdf05 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/EventsMonitor.java +++ b/extensions/arc/runtime-dev/src/main/java/io/quarkus/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/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/InvocationInfo.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/InvocationInfo.java similarity index 96% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/InvocationInfo.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/InvocationInfo.java index acc98f37e7207..e918789d6c0dd 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devmode/InvocationInfo.java +++ b/extensions/arc/runtime-dev/src/main/java/io/quarkus/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/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Invocation.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/Invocation.java similarity index 99% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Invocation.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/Invocation.java index cd301510a341d..99a1bc71dcddc 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Invocation.java +++ b/extensions/arc/runtime-dev/src/main/java/io/quarkus/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/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/InvocationInterceptor.java similarity index 95% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/InvocationInterceptor.java index 611e46898dc5b..3976e7d257afa 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationInterceptor.java +++ b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/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/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/InvocationTree.java similarity index 96% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/InvocationTree.java index 5f43e0d396743..ac3d01ddf633d 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationTree.java +++ b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/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/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/InvocationsMonitor.java similarity index 97% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/InvocationsMonitor.java index 0f25f90f722f6..e459fbe8fab4d 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/InvocationsMonitor.java +++ b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/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/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/Monitored.java similarity index 90% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/console/Monitored.java index 6c3c7c2601940..8cf6716b3ab53 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devconsole/Monitored.java +++ b/extensions/arc/runtime-dev/src/main/java/io/quarkus/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/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devui/ArcJsonRPCService.java b/extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/ui/ArcJsonRPCService.java similarity index 92% rename from extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devui/ArcJsonRPCService.java rename to extensions/arc/runtime-dev/src/main/java/io/quarkus/arc/runtime/dev/ui/ArcJsonRPCService.java index c2de24e73fd49..b4c727af16ea4 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/devui/ArcJsonRPCService.java +++ b/extensions/arc/runtime-dev/src/main/java/io/quarkus/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 index 2eb5f59d7e9f9..1c618b1b97645 100644 --- a/extensions/arc/runtime/pom.xml +++ b/extensions/arc/runtime/pom.xml @@ -33,11 +33,14 @@ io.quarkus quarkus-extension-maven-plugin - - - io.quarkus.cdi - - + + + io.quarkus.cdi + + + ${project.groupId}:${project.artifactId}-dev:${project.version} + + maven-compiler-plugin diff --git a/extensions/cache/deployment/pom.xml b/extensions/cache/deployment/pom.xml index 9f349acab98f8..30cfb9151c5b4 100644 --- a/extensions/cache/deployment/pom.xml +++ b/extensions/cache/deployment/pom.xml @@ -17,6 +17,10 @@ io.quarkus quarkus-cache + + + io.quarkus + quarkus-cache-dev io.quarkus @@ -30,6 +34,11 @@ io.quarkus quarkus-arc-deployment + + io.quarkus + quarkus-arc-dev + true + io.quarkus quarkus-caffeine-deployment diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/devui/CacheDevUiProcessor.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/devui/CacheDevUiProcessor.java index 765c3e6330826..d52faa96b7acc 100644 --- a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/devui/CacheDevUiProcessor.java +++ b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/devui/CacheDevUiProcessor.java @@ -1,7 +1,7 @@ package io.quarkus.cache.deployment.devui; -import io.quarkus.cache.runtime.devui.CacheJsonRPCService; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.cache.runtime.dev.ui.CacheJsonRPCService; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; import io.quarkus.devui.spi.JsonRPCProvidersBuildItem; @@ -10,7 +10,7 @@ public class CacheDevUiProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) CardPageBuildItem create(CurateOutcomeBuildItem bi) { CardPageBuildItem pageBuildItem = new CardPageBuildItem(); pageBuildItem.addPage(Page.webComponentPageBuilder() @@ -21,7 +21,7 @@ CardPageBuildItem create(CurateOutcomeBuildItem bi) { return pageBuildItem; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCServiceForCache() { return new JsonRPCProvidersBuildItem(CacheJsonRPCService.class); } diff --git a/extensions/cache/pom.xml b/extensions/cache/pom.xml index a7f580a571601..5ee2e67c6d4ba 100644 --- a/extensions/cache/pom.xml +++ b/extensions/cache/pom.xml @@ -20,5 +20,6 @@ deployment-spi runtime runtime-spi + runtime-dev diff --git a/extensions/cache/runtime-dev/pom.xml b/extensions/cache/runtime-dev/pom.xml new file mode 100644 index 0000000000000..84bb2496889c0 --- /dev/null +++ b/extensions/cache/runtime-dev/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + quarkus-cache-parent + io.quarkus + 999-SNAPSHOT + + + quarkus-cache-dev + Quarkus - Cache - Runtime Dev mode + Enable application data caching in CDI beans - Dev mode only + + + + ${project.groupId} + quarkus-cache + + + \ No newline at end of file diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/devui/CacheJsonRPCService.java b/extensions/cache/runtime-dev/src/main/java/io/quarkus/cache/runtime/dev/ui/CacheJsonRPCService.java similarity index 96% rename from extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/devui/CacheJsonRPCService.java rename to extensions/cache/runtime-dev/src/main/java/io/quarkus/cache/runtime/dev/ui/CacheJsonRPCService.java index d4962c5ec1496..33b3ac6387056 100644 --- a/extensions/cache/runtime/src/main/java/io/quarkus/cache/runtime/devui/CacheJsonRPCService.java +++ b/extensions/cache/runtime-dev/src/main/java/io/quarkus/cache/runtime/dev/ui/CacheJsonRPCService.java @@ -1,4 +1,4 @@ -package io.quarkus.cache.runtime.devui; +package io.quarkus.cache.runtime.dev.ui; import java.util.ArrayList; import java.util.Collection; @@ -9,8 +9,6 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.jboss.logging.Logger; - import io.quarkus.cache.Cache; import io.quarkus.cache.CacheManager; import io.quarkus.cache.CaffeineCache; @@ -26,9 +24,6 @@ public class CacheJsonRPCService { @Inject CacheManager manager; - @Inject - Logger logger; - @NonBlocking public JsonArray getAll() { Collection names = manager.getCacheNames(); diff --git a/extensions/cache/runtime/pom.xml b/extensions/cache/runtime/pom.xml index 6181d84973c02..a8fcafb1e5798 100644 --- a/extensions/cache/runtime/pom.xml +++ b/extensions/cache/runtime/pom.xml @@ -59,9 +59,12 @@ quarkus-extension-maven-plugin - io.quarkus.cache - - + io.quarkus.cache + + + ${project.groupId}:${project.artifactId}-dev:${project.version} + + maven-compiler-plugin diff --git a/extensions/container-image/deployment/pom.xml b/extensions/container-image/deployment/pom.xml index a0713daf60f17..7139f4a78bcda 100644 --- a/extensions/container-image/deployment/pom.xml +++ b/extensions/container-image/deployment/pom.xml @@ -33,6 +33,10 @@ io.quarkus quarkus-container-image + + io.quarkus + quarkus-container-image-dev + io.quarkus quarkus-junit5-internal diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devui/ContainerImageDevUiProcessor.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devui/ContainerImageDevUiProcessor.java index 4b9323eca00f2..400c0058e15f8 100644 --- a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devui/ContainerImageDevUiProcessor.java +++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/devui/ContainerImageDevUiProcessor.java @@ -10,9 +10,9 @@ import io.quarkus.bootstrap.app.AugmentResult; import io.quarkus.bootstrap.app.CuratedApplication; import io.quarkus.bootstrap.app.QuarkusBootstrap; -import io.quarkus.container.image.runtime.devui.ContainerBuilderJsonRpcService; +import io.quarkus.container.image.runtime.dev.ui.ContainerBuilderJsonRpcService; import io.quarkus.container.spi.AvailableContainerImageExtensionBuildItem; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.dev.console.DevConsoleManager; import io.quarkus.dev.console.TempSystemProperties; @@ -22,7 +22,7 @@ public class ContainerImageDevUiProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) CardPageBuildItem create(List extensions) { // Get the list of builders List array = extensions.stream().map(AvailableContainerImageExtensionBuildItem::getName).sorted() @@ -37,7 +37,7 @@ CardPageBuildItem create(List extensi return card; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCServiceForContainerBuild() { DevConsoleManager.register("container-image-build-action", build()); return new JsonRPCProvidersBuildItem(ContainerBuilderJsonRpcService.class); diff --git a/extensions/container-image/pom.xml b/extensions/container-image/pom.xml index bb2474fd039f7..9c4406abdfd61 100644 --- a/extensions/container-image/pom.xml +++ b/extensions/container-image/pom.xml @@ -25,5 +25,6 @@ container-image-podman container-image-jib container-image-openshift + runtime-dev diff --git a/extensions/container-image/runtime-dev/pom.xml b/extensions/container-image/runtime-dev/pom.xml new file mode 100644 index 0000000000000..b2096daf39847 --- /dev/null +++ b/extensions/container-image/runtime-dev/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + quarkus-container-image-parent + io.quarkus + 999-SNAPSHOT + + + quarkus-container-image-dev + Quarkus - Container Image - Runtime Dev mode + Build container images of your application - Dev mode only + + + + ${project.groupId} + quarkus-container-image + + + \ No newline at end of file diff --git a/extensions/container-image/runtime/src/main/java/io/quarkus/container/image/runtime/devui/ContainerBuilderJsonRpcService.java b/extensions/container-image/runtime-dev/src/main/java/io/quarkus/container/image/runtime/dev/ui/ContainerBuilderJsonRpcService.java similarity index 89% rename from extensions/container-image/runtime/src/main/java/io/quarkus/container/image/runtime/devui/ContainerBuilderJsonRpcService.java rename to extensions/container-image/runtime-dev/src/main/java/io/quarkus/container/image/runtime/dev/ui/ContainerBuilderJsonRpcService.java index 026e86c280ac3..96f97f1874286 100644 --- a/extensions/container-image/runtime/src/main/java/io/quarkus/container/image/runtime/devui/ContainerBuilderJsonRpcService.java +++ b/extensions/container-image/runtime-dev/src/main/java/io/quarkus/container/image/runtime/dev/ui/ContainerBuilderJsonRpcService.java @@ -1,4 +1,4 @@ -package io.quarkus.container.image.runtime.devui; +package io.quarkus.container.image.runtime.dev.ui; import java.util.Map; diff --git a/extensions/container-image/runtime/pom.xml b/extensions/container-image/runtime/pom.xml index 5126d4db980b2..c5523e6eb2935 100644 --- a/extensions/container-image/runtime/pom.xml +++ b/extensions/container-image/runtime/pom.xml @@ -31,6 +31,19 @@ io.quarkus quarkus-extension-maven-plugin + + + process-resources + + extension-descriptor + + + + ${project.groupId}:${project.artifactId}-dev:${project.version} + + + + maven-compiler-plugin diff --git a/extensions/datasource/deployment-spi/pom.xml b/extensions/datasource/deployment-spi/pom.xml index c5fe1bd7c7c4d..970162d4dd1f6 100644 --- a/extensions/datasource/deployment-spi/pom.xml +++ b/extensions/datasource/deployment-spi/pom.xml @@ -10,7 +10,7 @@ 4.0.0 quarkus-datasource-deployment-spi - Quarkus - Datasource - Deployment + Quarkus - Datasource - Deployment SPI diff --git a/extensions/datasource/deployment/pom.xml b/extensions/datasource/deployment/pom.xml index d258163def6e7..a8c8776644928 100644 --- a/extensions/datasource/deployment/pom.xml +++ b/extensions/datasource/deployment/pom.xml @@ -29,6 +29,10 @@ io.quarkus quarkus-datasource + + io.quarkus + quarkus-datasource-dev + io.quarkus quarkus-datasource-deployment-spi diff --git a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devui/DevUIDatasourceProcessor.java b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devui/DevUIDatasourceProcessor.java index 39e0bbf395041..54b69d0b18dc9 100644 --- a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devui/DevUIDatasourceProcessor.java +++ b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devui/DevUIDatasourceProcessor.java @@ -5,8 +5,8 @@ import java.util.List; import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; -import io.quarkus.datasource.runtime.devui.DatasourceJsonRpcService; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.datasource.runtime.dev.ui.DatasourceJsonRpcService; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.devui.spi.JsonRPCProvidersBuildItem; import io.quarkus.devui.spi.page.CardPageBuildItem; @@ -14,7 +14,7 @@ public class DevUIDatasourceProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) CardPageBuildItem create(DataSourcesBuildTimeConfig dataSourceBuildTimeConfig) { CardPageBuildItem card = new CardPageBuildItem(); @@ -30,7 +30,7 @@ CardPageBuildItem create(DataSourcesBuildTimeConfig dataSourceBuildTimeConfig) { return card; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem registerJsonRpcBackend() { return new JsonRPCProvidersBuildItem(DatasourceJsonRpcService.class); } diff --git a/extensions/datasource/pom.xml b/extensions/datasource/pom.xml index 3831e40d41a48..90c31cbc5a9bd 100644 --- a/extensions/datasource/pom.xml +++ b/extensions/datasource/pom.xml @@ -18,5 +18,6 @@ deployment runtime deployment-spi + runtime-dev diff --git a/extensions/datasource/runtime-dev/pom.xml b/extensions/datasource/runtime-dev/pom.xml new file mode 100644 index 0000000000000..4fea4e45a1572 --- /dev/null +++ b/extensions/datasource/runtime-dev/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-datasource-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-datasource-dev + Quarkus - Datasource - Runtime Dev mode + Configure your datasources - Dev mode only + + + + ${project.groupId} + quarkus-datasource + + + \ No newline at end of file diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/devui/DatasourceJsonRpcService.java b/extensions/datasource/runtime-dev/src/main/java/io/quarkus/datasource/runtime/dev/ui/DatasourceJsonRpcService.java similarity index 92% rename from extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/devui/DatasourceJsonRpcService.java rename to extensions/datasource/runtime-dev/src/main/java/io/quarkus/datasource/runtime/dev/ui/DatasourceJsonRpcService.java index 934b5c82087aa..87150402927ab 100644 --- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/devui/DatasourceJsonRpcService.java +++ b/extensions/datasource/runtime-dev/src/main/java/io/quarkus/datasource/runtime/dev/ui/DatasourceJsonRpcService.java @@ -1,4 +1,4 @@ -package io.quarkus.datasource.runtime.devui; +package io.quarkus.datasource.runtime.dev.ui; import java.util.ServiceLoader; diff --git a/extensions/datasource/runtime/pom.xml b/extensions/datasource/runtime/pom.xml index 7e9260ed089e2..00593d62523e3 100644 --- a/extensions/datasource/runtime/pom.xml +++ b/extensions/datasource/runtime/pom.xml @@ -41,6 +41,19 @@ io.quarkus quarkus-extension-maven-plugin + + + process-resources + + extension-descriptor + + + + ${project.groupId}:${project.artifactId}-dev:${project.version} + + + + maven-compiler-plugin diff --git a/extensions/flyway/deployment/pom.xml b/extensions/flyway/deployment/pom.xml index dda6855c95541..951c22943d12f 100644 --- a/extensions/flyway/deployment/pom.xml +++ b/extensions/flyway/deployment/pom.xml @@ -29,6 +29,10 @@ io.quarkus quarkus-flyway + + io.quarkus + quarkus-flyway-dev + io.quarkus quarkus-vertx-http-dev-ui-tests diff --git a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/devui/FlywayDevUIProcessor.java b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/devui/FlywayDevUIProcessor.java index a5a2acbe71d34..8faa38a2bb1be 100644 --- a/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/devui/FlywayDevUIProcessor.java +++ b/extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/devui/FlywayDevUIProcessor.java @@ -8,7 +8,7 @@ import java.util.function.Supplier; import io.quarkus.agroal.spi.JdbcInitialSQLGeneratorBuildItem; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; @@ -16,12 +16,12 @@ import io.quarkus.devui.spi.page.CardPageBuildItem; import io.quarkus.devui.spi.page.Page; import io.quarkus.flyway.runtime.FlywayBuildTimeConfig; -import io.quarkus.flyway.runtime.devui.FlywayDevUIRecorder; -import io.quarkus.flyway.runtime.devui.FlywayJsonRpcService; +import io.quarkus.flyway.runtime.dev.ui.FlywayDevUIRecorder; +import io.quarkus.flyway.runtime.dev.ui.FlywayJsonRpcService; public class FlywayDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Record(value = RUNTIME_INIT, optional = true) CardPageBuildItem create(FlywayDevUIRecorder recorder, FlywayBuildTimeConfig buildTimeConfig, List generatorBuildItem, @@ -45,7 +45,7 @@ CardPageBuildItem create(FlywayDevUIRecorder recorder, FlywayBuildTimeConfig bui return card; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem registerJsonRpcBackend() { return new JsonRPCProvidersBuildItem(FlywayJsonRpcService.class); } diff --git a/extensions/flyway/pom.xml b/extensions/flyway/pom.xml index 78fe0ed722454..98763556e61d4 100644 --- a/extensions/flyway/pom.xml +++ b/extensions/flyway/pom.xml @@ -17,5 +17,6 @@ runtime deployment + runtime-dev diff --git a/extensions/flyway/runtime-dev/pom.xml b/extensions/flyway/runtime-dev/pom.xml new file mode 100644 index 0000000000000..5634ded8663b0 --- /dev/null +++ b/extensions/flyway/runtime-dev/pom.xml @@ -0,0 +1,21 @@ + + + + quarkus-flyway-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-flyway-dev + Quarkus - Flyway - Runtime - Dev mode + Handle your database schema migrations - Dev mode only + + + io.quarkus + quarkus-flyway + + + \ No newline at end of file diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devui/FlywayDevUIRecorder.java b/extensions/flyway/runtime-dev/src/main/java/io/quarkus/flyway/runtime/dev/ui/FlywayDevUIRecorder.java similarity index 93% rename from extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devui/FlywayDevUIRecorder.java rename to extensions/flyway/runtime-dev/src/main/java/io/quarkus/flyway/runtime/dev/ui/FlywayDevUIRecorder.java index eab797073aa3d..b02e542af1ffd 100644 --- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devui/FlywayDevUIRecorder.java +++ b/extensions/flyway/runtime-dev/src/main/java/io/quarkus/flyway/runtime/dev/ui/FlywayDevUIRecorder.java @@ -1,4 +1,4 @@ -package io.quarkus.flyway.runtime.devui; +package io.quarkus.flyway.runtime.dev.ui; import java.util.Map; import java.util.function.Supplier; diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devui/FlywayJsonRpcService.java b/extensions/flyway/runtime-dev/src/main/java/io/quarkus/flyway/runtime/dev/ui/FlywayJsonRpcService.java similarity index 99% rename from extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devui/FlywayJsonRpcService.java rename to extensions/flyway/runtime-dev/src/main/java/io/quarkus/flyway/runtime/dev/ui/FlywayJsonRpcService.java index 11ca2f9d8e090..acadf80623c7e 100644 --- a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/devui/FlywayJsonRpcService.java +++ b/extensions/flyway/runtime-dev/src/main/java/io/quarkus/flyway/runtime/dev/ui/FlywayJsonRpcService.java @@ -1,4 +1,4 @@ -package io.quarkus.flyway.runtime.devui; +package io.quarkus.flyway.runtime.dev.ui; import static java.util.List.of; diff --git a/extensions/flyway/runtime/pom.xml b/extensions/flyway/runtime/pom.xml index 47a34db56c9a7..8d4fcb05bd482 100644 --- a/extensions/flyway/runtime/pom.xml +++ b/extensions/flyway/runtime/pom.xml @@ -66,6 +66,9 @@ io.quarkus.flyway + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml index 21951ca19dff4..ac11f207752b3 100644 --- a/extensions/grpc/deployment/pom.xml +++ b/extensions/grpc/deployment/pom.xml @@ -29,6 +29,10 @@ io.quarkus quarkus-grpc + + io.quarkus + quarkus-grpc-dev + io.quarkus quarkus-grpc-common-deployment diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/devui/GrpcDevUIProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/devui/GrpcDevUIProcessor.java index 2e013ba090673..1a7e07cca6d06 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/devui/GrpcDevUIProcessor.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/devui/GrpcDevUIProcessor.java @@ -34,7 +34,7 @@ import io.quarkus.arc.deployment.UnremovableBeanBuildItem; import io.quarkus.arc.processor.AnnotationsTransformer; import io.quarkus.arc.processor.DotNames; -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.deployment.builditem.CombinedIndexBuildItem; @@ -48,15 +48,15 @@ import io.quarkus.grpc.deployment.DelegatingGrpcBeanBuildItem; import io.quarkus.grpc.deployment.GrpcDotNames; import io.quarkus.grpc.protoc.plugin.MutinyGrpcGenerator; +import io.quarkus.grpc.runtime.dev.ui.GrpcJsonRPCService; import io.quarkus.grpc.runtime.devmode.CollectStreams; import io.quarkus.grpc.runtime.devmode.DelegatingGrpcBeansStorage; import io.quarkus.grpc.runtime.devmode.GrpcServices; import io.quarkus.grpc.runtime.devmode.StreamCollectorInterceptor; -import io.quarkus.grpc.runtime.devui.GrpcJsonRPCService; public class GrpcDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public AdditionalBeanBuildItem beans() { return AdditionalBeanBuildItem.builder() .addBeanClass(GrpcServices.class) @@ -64,7 +64,7 @@ public AdditionalBeanBuildItem beans() { .build(); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void prepareDelegatingBeanStorage( List delegatingBeans, BuildProducer unremovableBeans, @@ -96,7 +96,7 @@ void prepareDelegatingBeanStorage( unremovableBeans.produce(UnremovableBeanBuildItem.beanClassNames(className)); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public void collectMessagePrototypes(CombinedIndexBuildItem index, // Dummy producer to ensure the build step is executed BuildProducer service) @@ -123,7 +123,7 @@ public void collectMessagePrototypes(CombinedIndexBuildItem index, DevConsoleManager.setGlobal("io.quarkus.grpc.messagePrototypes", messagePrototypes); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) AnnotationsTransformerBuildItem transformUserDefinedServices(CombinedIndexBuildItem combinedIndexBuildItem) { Set servicesToTransform = new HashSet<>(); IndexView index = combinedIndexBuildItem.getIndex(); @@ -171,7 +171,7 @@ public void transform(AnnotationsTransformer.TransformationContext context) { }); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public CardPageBuildItem pages(CombinedIndexBuildItem index) throws ClassNotFoundException, NoSuchMethodException, SecurityException, @@ -226,7 +226,7 @@ private ClassInfo findAbstractBindableService(ClassInfo clazz, IndexView index) return null; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCServiceForCache() { return new JsonRPCProvidersBuildItem(GrpcJsonRPCService.class); } diff --git a/extensions/grpc/pom.xml b/extensions/grpc/pom.xml index 32c150f5b3c14..1ceaa37a8d1c9 100644 --- a/extensions/grpc/pom.xml +++ b/extensions/grpc/pom.xml @@ -24,5 +24,6 @@ xds inprocess cli + runtime-dev \ No newline at end of file diff --git a/extensions/grpc/runtime-dev/pom.xml b/extensions/grpc/runtime-dev/pom.xml new file mode 100644 index 0000000000000..78798d6203fb9 --- /dev/null +++ b/extensions/grpc/runtime-dev/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + quarkus-grpc-parent + io.quarkus + 999-SNAPSHOT + + + quarkus-grpc-dev + Quarkus - gRPC - Runtime - Dev mode + Serve and consume gRPC services - Dev mode only + + + io.quarkus + quarkus-grpc + + + \ No newline at end of file diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devui/GrpcJsonRPCService.java b/extensions/grpc/runtime-dev/src/main/java/io/quarkus/grpc/runtime/dev/ui/GrpcJsonRPCService.java similarity index 99% rename from extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devui/GrpcJsonRPCService.java rename to extensions/grpc/runtime-dev/src/main/java/io/quarkus/grpc/runtime/dev/ui/GrpcJsonRPCService.java index f55adb7b9159b..2b2778900af70 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/devui/GrpcJsonRPCService.java +++ b/extensions/grpc/runtime-dev/src/main/java/io/quarkus/grpc/runtime/dev/ui/GrpcJsonRPCService.java @@ -1,4 +1,4 @@ -package io.quarkus.grpc.runtime.devui; +package io.quarkus.grpc.runtime.dev.ui; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml index 927401b02b8f4..656f2ed29a2e1 100644 --- a/extensions/grpc/runtime/pom.xml +++ b/extensions/grpc/runtime/pom.xml @@ -152,7 +152,9 @@ process-resources - ${project.groupId}:${project.artifactId}-deployment:${project.version} + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/hibernate-orm/runtime/pom.xml b/extensions/hibernate-orm/runtime/pom.xml index 205773ecdff7a..f3eba2f7633d0 100644 --- a/extensions/hibernate-orm/runtime/pom.xml +++ b/extensions/hibernate-orm/runtime/pom.xml @@ -46,6 +46,11 @@ quarkus-vertx-http true + + io.quarkus + quarkus-vertx-http-dev + true + io.quarkus quarkus-junit5-internal diff --git a/extensions/infinispan-client/deployment/pom.xml b/extensions/infinispan-client/deployment/pom.xml index 31d373777421c..0d08cd498b792 100644 --- a/extensions/infinispan-client/deployment/pom.xml +++ b/extensions/infinispan-client/deployment/pom.xml @@ -29,6 +29,10 @@ io.quarkus quarkus-infinispan-client + + io.quarkus + quarkus-infinispan-client-dev + io.quarkus quarkus-caffeine-deployment diff --git a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/devui/InfinispanDevUIProcessor.java b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/devui/InfinispanDevUIProcessor.java index 5f596f3c3b9f6..d46099539f395 100644 --- a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/devui/InfinispanDevUIProcessor.java +++ b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/devui/InfinispanDevUIProcessor.java @@ -4,18 +4,18 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.processor.BuiltinScope; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; 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.devui.InfinispanClientsContainer; -import io.quarkus.infinispan.client.runtime.devui.InfinispanJsonRPCService; +import io.quarkus.infinispan.client.runtime.dev.ui.InfinispanClientsContainer; +import io.quarkus.infinispan.client.runtime.dev.ui.InfinispanJsonRPCService; public class InfinispanDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public CardPageBuildItem infinispanServer() { CardPageBuildItem cardPageBuildItem = new CardPageBuildItem(); @@ -43,12 +43,12 @@ public CardPageBuildItem infinispanServer() { return cardPageBuildItem; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) public JsonRPCProvidersBuildItem createJsonRPCService() { return new JsonRPCProvidersBuildItem(InfinispanJsonRPCService.class, BuiltinScope.SINGLETON.getName()); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public AdditionalBeanBuildItem beans() { return AdditionalBeanBuildItem.unremovableOf(InfinispanClientsContainer.class); } diff --git a/extensions/infinispan-client/pom.xml b/extensions/infinispan-client/pom.xml index 098c9701f3126..fe9ffa8bcc2c9 100644 --- a/extensions/infinispan-client/pom.xml +++ b/extensions/infinispan-client/pom.xml @@ -16,5 +16,6 @@ deployment runtime + runtime-dev diff --git a/extensions/infinispan-client/runtime-dev/pom.xml b/extensions/infinispan-client/runtime-dev/pom.xml new file mode 100644 index 0000000000000..1bc6f45cc9a9f --- /dev/null +++ b/extensions/infinispan-client/runtime-dev/pom.xml @@ -0,0 +1,21 @@ + + + + quarkus-infinispan-client-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-infinispan-client-dev + Quarkus - Infinispan - Client - Runtime Dev mode + Connect to the Infinispan data grid for distributed caching - Dev mode only + + + io.quarkus + quarkus-infinispan-client + + + \ No newline at end of file diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/devui/InfinispanClientsContainer.java b/extensions/infinispan-client/runtime-dev/src/main/java/io/quarkus/infinispan/client/runtime/dev/ui/InfinispanClientsContainer.java similarity index 97% rename from extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/devui/InfinispanClientsContainer.java rename to extensions/infinispan-client/runtime-dev/src/main/java/io/quarkus/infinispan/client/runtime/dev/ui/InfinispanClientsContainer.java index cc5529fe27d0c..ba4e51f595410 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/devui/InfinispanClientsContainer.java +++ b/extensions/infinispan-client/runtime-dev/src/main/java/io/quarkus/infinispan/client/runtime/dev/ui/InfinispanClientsContainer.java @@ -1,4 +1,4 @@ -package io.quarkus.infinispan.client.runtime.devui; +package io.quarkus.infinispan.client.runtime.dev.ui; import java.lang.annotation.Annotation; import java.util.ArrayList; diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/devui/InfinispanJsonRPCService.java b/extensions/infinispan-client/runtime-dev/src/main/java/io/quarkus/infinispan/client/runtime/dev/ui/InfinispanJsonRPCService.java similarity index 91% rename from extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/devui/InfinispanJsonRPCService.java rename to extensions/infinispan-client/runtime-dev/src/main/java/io/quarkus/infinispan/client/runtime/dev/ui/InfinispanJsonRPCService.java index a1ec5641cc894..0cb7bc7097c32 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/devui/InfinispanJsonRPCService.java +++ b/extensions/infinispan-client/runtime-dev/src/main/java/io/quarkus/infinispan/client/runtime/dev/ui/InfinispanJsonRPCService.java @@ -1,4 +1,4 @@ -package io.quarkus.infinispan.client.runtime.devui; +package io.quarkus.infinispan.client.runtime.dev.ui; import io.quarkus.arc.Arc; import io.quarkus.logging.Log; diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml index 9a0b808987f3f..7f0e3206f1369 100644 --- a/extensions/infinispan-client/runtime/pom.xml +++ b/extensions/infinispan-client/runtime/pom.xml @@ -162,6 +162,19 @@ io.quarkus quarkus-extension-maven-plugin + + + process-resources + + extension-descriptor + + + + ${project.groupId}:${project.artifactId}-dev:${project.version} + + + + maven-compiler-plugin diff --git a/extensions/kafka-client/deployment/pom.xml b/extensions/kafka-client/deployment/pom.xml index 1f153248d8ad3..3831140ac9fcd 100644 --- a/extensions/kafka-client/deployment/pom.xml +++ b/extensions/kafka-client/deployment/pom.xml @@ -18,6 +18,10 @@ io.quarkus quarkus-kafka-client + + io.quarkus + quarkus-kafka-client-dev + org.xerial.snappy snappy-java diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java index 466db943c2d6a..8f5719ed50a33 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java @@ -93,8 +93,8 @@ import io.quarkus.kafka.client.runtime.KafkaRecorder; import io.quarkus.kafka.client.runtime.KafkaRuntimeConfigProducer; import io.quarkus.kafka.client.runtime.SnappyRecorder; -import io.quarkus.kafka.client.runtime.devui.KafkaTopicClient; -import io.quarkus.kafka.client.runtime.devui.KafkaUiUtils; +import io.quarkus.kafka.client.runtime.dev.ui.KafkaTopicClient; +import io.quarkus.kafka.client.runtime.dev.ui.KafkaUiUtils; import io.quarkus.kafka.client.runtime.graal.SnappyFeature; import io.quarkus.kafka.client.serialization.BufferDeserializer; import io.quarkus.kafka.client.serialization.BufferSerializer; diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/devui/KafkaDevUIProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/devui/KafkaDevUIProcessor.java index 8e3546c6217e9..426252be67057 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/devui/KafkaDevUIProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/devui/KafkaDevUIProcessor.java @@ -2,12 +2,12 @@ import org.jboss.logging.Logger; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; 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.kafka.client.runtime.devui.KafkaJsonRPCService; +import io.quarkus.kafka.client.runtime.dev.ui.KafkaJsonRPCService; /** * Kafka Dev UI (v2) @@ -16,7 +16,7 @@ public class KafkaDevUIProcessor { private static final Logger log = Logger.getLogger(KafkaDevUIProcessor.class); - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public CardPageBuildItem pages() { CardPageBuildItem cardPageBuildItem = new CardPageBuildItem(); @@ -48,7 +48,7 @@ public CardPageBuildItem pages() { return cardPageBuildItem; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCService() { return new JsonRPCProvidersBuildItem(KafkaJsonRPCService.class); } diff --git a/extensions/kafka-client/pom.xml b/extensions/kafka-client/pom.xml index a0e0885d2b170..9eb72255edc53 100644 --- a/extensions/kafka-client/pom.xml +++ b/extensions/kafka-client/pom.xml @@ -17,5 +17,6 @@ deployment runtime + runtime-dev diff --git a/extensions/kafka-client/runtime-dev/pom.xml b/extensions/kafka-client/runtime-dev/pom.xml new file mode 100644 index 0000000000000..e9c810056f571 --- /dev/null +++ b/extensions/kafka-client/runtime-dev/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + + io.quarkus + quarkus-kafka-client-parent + 999-SNAPSHOT + + + quarkus-kafka-client-dev + Quarkus - Kafka - Client - Runtime Dev mode + Connect to Apache Kafka with its native API - Dev mode only + + + io.quarkus + quarkus-kafka-client + + + \ No newline at end of file diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaJsonRPCService.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaJsonRPCService.java similarity index 79% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaJsonRPCService.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaJsonRPCService.java index b5fe4ebdd3fcf..8d1677fb6eeb9 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaJsonRPCService.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaJsonRPCService.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui; +package io.quarkus.kafka.client.runtime.dev.ui; import java.util.ArrayList; import java.util.List; @@ -8,15 +8,15 @@ import jakarta.inject.Inject; import io.quarkus.kafka.client.runtime.KafkaAdminClient; -import io.quarkus.kafka.client.runtime.devui.model.Order; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaCreateTopicRequest; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaMessageCreateRequest; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaMessagesRequest; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaOffsetRequest; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaAclInfo; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaInfo; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaMessagePage; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaTopic; +import io.quarkus.kafka.client.runtime.KafkaCreateTopicRequest; +import io.quarkus.kafka.client.runtime.dev.ui.model.Order; +import io.quarkus.kafka.client.runtime.dev.ui.model.request.KafkaMessageCreateRequest; +import io.quarkus.kafka.client.runtime.dev.ui.model.request.KafkaMessagesRequest; +import io.quarkus.kafka.client.runtime.dev.ui.model.request.KafkaOffsetRequest; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaAclInfo; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaInfo; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaMessagePage; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaTopic; public class KafkaJsonRPCService { diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaTopicClient.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaTopicClient.java similarity index 96% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaTopicClient.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaTopicClient.java index 2cfd5b990dd7f..a86df4a9d2896 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaTopicClient.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaTopicClient.java @@ -1,6 +1,6 @@ -package io.quarkus.kafka.client.runtime.devui; +package io.quarkus.kafka.client.runtime.dev.ui; -import static io.quarkus.kafka.client.runtime.devui.util.ConsumerFactory.createConsumer; +import static io.quarkus.kafka.client.runtime.dev.ui.util.ConsumerFactory.createConsumer; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -35,10 +35,10 @@ import org.apache.kafka.common.utils.Bytes; import io.quarkus.kafka.client.runtime.KafkaAdminClient; -import io.quarkus.kafka.client.runtime.devui.model.Order; -import io.quarkus.kafka.client.runtime.devui.model.converter.KafkaModelConverter; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaMessageCreateRequest; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaMessagePage; +import io.quarkus.kafka.client.runtime.dev.ui.model.Order; +import io.quarkus.kafka.client.runtime.dev.ui.model.converter.KafkaModelConverter; +import io.quarkus.kafka.client.runtime.dev.ui.model.request.KafkaMessageCreateRequest; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaMessagePage; import io.smallrye.common.annotation.Identifier; @ApplicationScoped diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaUiUtils.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaUiUtils.java similarity index 88% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaUiUtils.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaUiUtils.java index f08702bc906a9..a1f1fc0572aca 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/KafkaUiUtils.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/KafkaUiUtils.java @@ -1,6 +1,6 @@ -package io.quarkus.kafka.client.runtime.devui; +package io.quarkus.kafka.client.runtime.dev.ui; -import static io.quarkus.kafka.client.runtime.devui.util.ConsumerFactory.createConsumer; +import static io.quarkus.kafka.client.runtime.dev.ui.util.ConsumerFactory.createConsumer; import java.io.IOException; import java.io.InputStream; @@ -32,20 +32,20 @@ import io.netty.buffer.ByteBufInputStream; import io.quarkus.kafka.client.runtime.KafkaAdminClient; -import io.quarkus.kafka.client.runtime.devui.model.Order; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaMessageCreateRequest; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaMessagesRequest; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaOffsetRequest; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaAclEntry; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaAclInfo; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaClusterInfo; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaConsumerGroup; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaConsumerGroupMember; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaConsumerGroupMemberPartitionAssignment; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaInfo; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaMessagePage; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaNode; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaTopic; +import io.quarkus.kafka.client.runtime.dev.ui.model.Order; +import io.quarkus.kafka.client.runtime.dev.ui.model.request.KafkaMessageCreateRequest; +import io.quarkus.kafka.client.runtime.dev.ui.model.request.KafkaMessagesRequest; +import io.quarkus.kafka.client.runtime.dev.ui.model.request.KafkaOffsetRequest; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaAclEntry; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaAclInfo; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaClusterInfo; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaConsumerGroup; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaConsumerGroupMember; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaConsumerGroupMemberPartitionAssignment; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaInfo; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaMessagePage; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaNode; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaTopic; import io.smallrye.common.annotation.Identifier; import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonObject; diff --git a/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/Order.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/Order.java new file mode 100644 index 0000000000000..55a16d087dff5 --- /dev/null +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/Order.java @@ -0,0 +1,6 @@ +package io.quarkus.kafka.client.runtime.dev.ui.model; + +public enum Order { + OLD_FIRST, + NEW_FIRST +} diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/converter/KafkaModelConverter.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/converter/KafkaModelConverter.java similarity index 90% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/converter/KafkaModelConverter.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/converter/KafkaModelConverter.java index 2b14ee5c8483a..5c30934d9289f 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/converter/KafkaModelConverter.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/converter/KafkaModelConverter.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.converter; +package io.quarkus.kafka.client.runtime.dev.ui.model.converter; import java.nio.charset.StandardCharsets; import java.util.Map; @@ -10,7 +10,7 @@ import org.apache.kafka.common.header.Header; import org.apache.kafka.common.utils.Bytes; -import io.quarkus.kafka.client.runtime.devui.model.response.KafkaMessage; +import io.quarkus.kafka.client.runtime.dev.ui.model.response.KafkaMessage; public class KafkaModelConverter { public KafkaMessage convert(ConsumerRecord message) { diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaMessageCreateRequest.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaMessageCreateRequest.java similarity index 93% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaMessageCreateRequest.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaMessageCreateRequest.java index 2ac7d67bd81c3..6242172814c10 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaMessageCreateRequest.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaMessageCreateRequest.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.request; +package io.quarkus.kafka.client.runtime.dev.ui.model.request; import java.util.Map; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaMessagesRequest.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaMessagesRequest.java similarity index 90% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaMessagesRequest.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaMessagesRequest.java index a171310df7046..0f7e757222826 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaMessagesRequest.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaMessagesRequest.java @@ -1,8 +1,8 @@ -package io.quarkus.kafka.client.runtime.devui.model.request; +package io.quarkus.kafka.client.runtime.dev.ui.model.request; import java.util.Map; -import io.quarkus.kafka.client.runtime.devui.model.Order; +import io.quarkus.kafka.client.runtime.dev.ui.model.Order; public class KafkaMessagesRequest { private String topicName; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaOffsetRequest.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaOffsetRequest.java similarity index 84% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaOffsetRequest.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaOffsetRequest.java index c7d988ce42da7..eff9b03964f03 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaOffsetRequest.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/request/KafkaOffsetRequest.java @@ -1,8 +1,8 @@ -package io.quarkus.kafka.client.runtime.devui.model.request; +package io.quarkus.kafka.client.runtime.dev.ui.model.request; import java.util.List; -import io.quarkus.kafka.client.runtime.devui.model.Order; +import io.quarkus.kafka.client.runtime.dev.ui.model.Order; public class KafkaOffsetRequest { private String topicName; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaAclEntry.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaAclEntry.java similarity index 91% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaAclEntry.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaAclEntry.java index 30fc05b5766c8..223e1bc635931 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaAclEntry.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaAclEntry.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; public class KafkaAclEntry { private String operation; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaAclInfo.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaAclInfo.java similarity index 92% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaAclInfo.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaAclInfo.java index baf26053f43fb..252003e23719b 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaAclInfo.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaAclInfo.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; import java.util.ArrayList; import java.util.List; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaClusterInfo.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaClusterInfo.java similarity index 92% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaClusterInfo.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaClusterInfo.java index f3d4265907ced..34cef5f26bb6e 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaClusterInfo.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaClusterInfo.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; import java.util.ArrayList; import java.util.List; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroup.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroup.java similarity index 95% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroup.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroup.java index 662129c167a57..eb30a917c3851 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroup.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroup.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; import java.util.Collection; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroupMember.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroupMember.java similarity index 93% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroupMember.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroupMember.java index 75b06c1488cee..4b59dd0f692a6 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroupMember.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroupMember.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; import java.util.Collection; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroupMemberPartitionAssignment.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroupMemberPartitionAssignment.java similarity index 90% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroupMemberPartitionAssignment.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroupMemberPartitionAssignment.java index adbbe43a28782..90c80d3dd5437 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaConsumerGroupMemberPartitionAssignment.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaConsumerGroupMemberPartitionAssignment.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; public class KafkaConsumerGroupMemberPartitionAssignment { diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaInfo.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaInfo.java similarity index 93% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaInfo.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaInfo.java index b3c6f760a8009..40fe53118bf08 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaInfo.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaInfo.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; import java.util.List; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaMessage.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaMessage.java similarity index 94% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaMessage.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaMessage.java index 4c6db12d37378..0fdf03d9ec427 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaMessage.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaMessage.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; import java.util.Map; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaMessagePage.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaMessagePage.java similarity index 89% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaMessagePage.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaMessagePage.java index 5af77fa521f3c..38b759f9bc5ea 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaMessagePage.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaMessagePage.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; import java.util.Collection; import java.util.Map; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaNode.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaNode.java similarity index 89% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaNode.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaNode.java index b69461f187a25..4df6984d9c6e3 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaNode.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaNode.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; public class KafkaNode { private String host; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaTopic.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaTopic.java similarity index 93% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaTopic.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaTopic.java index a5ab3025ac7b3..1cf79dcd72a1a 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/response/KafkaTopic.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/model/response/KafkaTopic.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.response; +package io.quarkus.kafka.client.runtime.dev.ui.model.response; public class KafkaTopic { private String name; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/util/ConsumerFactory.java b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/util/ConsumerFactory.java similarity index 96% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/util/ConsumerFactory.java rename to extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/util/ConsumerFactory.java index 34a577ead19a9..166f9d51bd39d 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/util/ConsumerFactory.java +++ b/extensions/kafka-client/runtime-dev/src/main/java/io/quarkus/kafka/client/runtime/dev/ui/util/ConsumerFactory.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.util; +package io.quarkus.kafka.client.runtime.dev.ui.util; import java.util.*; diff --git a/extensions/kafka-client/runtime/pom.xml b/extensions/kafka-client/runtime/pom.xml index de94c0e1ac346..59e2aaea75313 100644 --- a/extensions/kafka-client/runtime/pom.xml +++ b/extensions/kafka-client/runtime/pom.xml @@ -86,6 +86,9 @@ io.quarkus.kafka + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java index 8f8486630e18c..152f43a4b4d8c 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaAdminClient.java @@ -22,7 +22,6 @@ import org.apache.kafka.common.acl.AclBindingFilter; import org.apache.kafka.common.resource.ResourcePatternFilter; -import io.quarkus.kafka.client.runtime.devui.model.request.KafkaCreateTopicRequest; import io.smallrye.common.annotation.Identifier; @ApplicationScoped diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaCreateTopicRequest.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaCreateTopicRequest.java similarity index 93% rename from extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaCreateTopicRequest.java rename to extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaCreateTopicRequest.java index 883a6ba1ecaa4..aedb4a88a5242 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/request/KafkaCreateTopicRequest.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/KafkaCreateTopicRequest.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.client.runtime.devui.model.request; +package io.quarkus.kafka.client.runtime; import java.util.Map; diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/Order.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/Order.java deleted file mode 100644 index d3735ac00bcd8..0000000000000 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/devui/model/Order.java +++ /dev/null @@ -1,6 +0,0 @@ -package io.quarkus.kafka.client.runtime.devui.model; - -public enum Order { - OLD_FIRST, - NEW_FIRST -} diff --git a/extensions/kafka-streams/deployment/pom.xml b/extensions/kafka-streams/deployment/pom.xml index d391443cf2f51..98166b82deeb6 100644 --- a/extensions/kafka-streams/deployment/pom.xml +++ b/extensions/kafka-streams/deployment/pom.xml @@ -29,6 +29,10 @@ io.quarkus quarkus-kafka-streams + + io.quarkus + quarkus-kafka-streams-dev + io.quarkus quarkus-smallrye-health-spi diff --git a/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/devui/KafkaStreamsDevUIProcessor.java b/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/devui/KafkaStreamsDevUIProcessor.java index bcd15f3044e15..81b14111d3ca9 100644 --- a/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/devui/KafkaStreamsDevUIProcessor.java +++ b/extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/devui/KafkaStreamsDevUIProcessor.java @@ -1,16 +1,16 @@ package io.quarkus.kafka.streams.deployment.devui; -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.devui.spi.JsonRPCProvidersBuildItem; import io.quarkus.devui.spi.page.CardPageBuildItem; import io.quarkus.devui.spi.page.Page; -import io.quarkus.kafka.streams.runtime.devui.KafkaStreamsJsonRPCService; +import io.quarkus.kafka.streams.runtime.dev.ui.KafkaStreamsJsonRPCService; public class KafkaStreamsDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public void createPages(BuildProducer cardPageProducer) { CardPageBuildItem cardPageBuildItem = new CardPageBuildItem(); @@ -23,8 +23,8 @@ public void createPages(BuildProducer cardPageProducer) { cardPageProducer.produce(cardPageBuildItem); } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) public void createJsonRPCService(BuildProducer jsonRPCServiceProducer) { jsonRPCServiceProducer.produce(new JsonRPCProvidersBuildItem(KafkaStreamsJsonRPCService.class)); } -} \ No newline at end of file +} diff --git a/extensions/kafka-streams/pom.xml b/extensions/kafka-streams/pom.xml index a354d5475a7b8..9161587563e0c 100644 --- a/extensions/kafka-streams/pom.xml +++ b/extensions/kafka-streams/pom.xml @@ -17,5 +17,6 @@ deployment runtime + runtime-dev diff --git a/extensions/kafka-streams/runtime-dev/pom.xml b/extensions/kafka-streams/runtime-dev/pom.xml new file mode 100644 index 0000000000000..68eb4f86da467 --- /dev/null +++ b/extensions/kafka-streams/runtime-dev/pom.xml @@ -0,0 +1,36 @@ + + + + quarkus-kafka-streams-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-kafka-streams-dev + Quarkus - Kafka Streams - Runtime Dev mode + Implement stream processing applications based on Apache Kafka - Dev mode only + + + io.quarkus + quarkus-kafka-streams + + + io.quarkus + quarkus-junit5-internal + test + + + org.assertj + assertj-core + test + + + io.quarkus + quarkus-junit5-mockito + test + + + \ No newline at end of file diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devmode/KafkaStreamsHotReplacementSetup.java b/extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/KafkaStreamsHotReplacementSetup.java similarity index 97% rename from extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devmode/KafkaStreamsHotReplacementSetup.java rename to extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/KafkaStreamsHotReplacementSetup.java index d5bbcac879bd1..cb285ec5aa85f 100644 --- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devmode/KafkaStreamsHotReplacementSetup.java +++ b/extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/KafkaStreamsHotReplacementSetup.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.streams.runtime.devmode; +package io.quarkus.kafka.streams.runtime.dev; import java.util.concurrent.Executor; import java.util.concurrent.Executors; diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devui/KafkaStreamsJsonRPCService.java b/extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/ui/KafkaStreamsJsonRPCService.java similarity index 99% rename from extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devui/KafkaStreamsJsonRPCService.java rename to extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/ui/KafkaStreamsJsonRPCService.java index 3b2c00d9c1a70..1d463d66e9180 100644 --- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devui/KafkaStreamsJsonRPCService.java +++ b/extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/ui/KafkaStreamsJsonRPCService.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.streams.runtime.devui; +package io.quarkus.kafka.streams.runtime.dev.ui; import java.util.Arrays; import java.util.function.Consumer; diff --git a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devui/TopologyParserContext.java b/extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/ui/TopologyParserContext.java similarity index 99% rename from extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devui/TopologyParserContext.java rename to extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/ui/TopologyParserContext.java index cb5eabf58edb3..5530355d02c4d 100644 --- a/extensions/kafka-streams/runtime/src/main/java/io/quarkus/kafka/streams/runtime/devui/TopologyParserContext.java +++ b/extensions/kafka-streams/runtime-dev/src/main/java/io/quarkus/kafka/streams/runtime/dev/ui/TopologyParserContext.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.streams.runtime.devui; +package io.quarkus.kafka.streams.runtime.dev.ui; import java.util.ArrayList; import java.util.Arrays; diff --git a/extensions/kafka-streams/runtime/src/test/java/io/quarkus/kafka/streams/runtime/devui/KafkaStreamsJsonRPCServiceTest.java b/extensions/kafka-streams/runtime-dev/src/test/java/io/quarkus/kafka/streams/runtime/dev/ui/KafkaStreamsJsonRPCServiceTest.java similarity index 99% rename from extensions/kafka-streams/runtime/src/test/java/io/quarkus/kafka/streams/runtime/devui/KafkaStreamsJsonRPCServiceTest.java rename to extensions/kafka-streams/runtime-dev/src/test/java/io/quarkus/kafka/streams/runtime/dev/ui/KafkaStreamsJsonRPCServiceTest.java index e1f83f489792b..20774430fa5a7 100644 --- a/extensions/kafka-streams/runtime/src/test/java/io/quarkus/kafka/streams/runtime/devui/KafkaStreamsJsonRPCServiceTest.java +++ b/extensions/kafka-streams/runtime-dev/src/test/java/io/quarkus/kafka/streams/runtime/dev/ui/KafkaStreamsJsonRPCServiceTest.java @@ -1,4 +1,4 @@ -package io.quarkus.kafka.streams.runtime.devui; +package io.quarkus.kafka.streams.runtime.dev.ui; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/extensions/kafka-streams/runtime/pom.xml b/extensions/kafka-streams/runtime/pom.xml index f3c807cec5ee4..4847546f0d8d7 100644 --- a/extensions/kafka-streams/runtime/pom.xml +++ b/extensions/kafka-streams/runtime/pom.xml @@ -62,6 +62,19 @@ io.quarkus quarkus-extension-maven-plugin + + + process-resources + + extension-descriptor + + + + ${project.groupId}:${project.artifactId}-dev:${project.version} + + + + maven-compiler-plugin diff --git a/extensions/liquibase/liquibase/deployment/pom.xml b/extensions/liquibase/liquibase/deployment/pom.xml index 7d7ea5f1933b2..bb2a63724a10e 100644 --- a/extensions/liquibase/liquibase/deployment/pom.xml +++ b/extensions/liquibase/liquibase/deployment/pom.xml @@ -33,6 +33,10 @@ io.quarkus quarkus-liquibase + + io.quarkus + quarkus-liquibase-dev + io.quarkus quarkus-vertx-http-dev-ui-spi diff --git a/extensions/liquibase/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/devui/LiquibaseDevUIProcessor.java b/extensions/liquibase/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/devui/LiquibaseDevUIProcessor.java index 0ea95e377d8d2..5ee5dec61bf51 100644 --- a/extensions/liquibase/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/devui/LiquibaseDevUIProcessor.java +++ b/extensions/liquibase/liquibase/deployment/src/main/java/io/quarkus/liquibase/deployment/devui/LiquibaseDevUIProcessor.java @@ -4,13 +4,13 @@ import java.net.URL; import java.util.jar.Manifest; -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.devui.spi.JsonRPCProvidersBuildItem; import io.quarkus.devui.spi.page.CardPageBuildItem; import io.quarkus.devui.spi.page.Page; -import io.quarkus.liquibase.runtime.devui.LiquibaseJsonRpcService; +import io.quarkus.liquibase.runtime.dev.ui.LiquibaseJsonRpcService; import liquibase.changelog.DatabaseChangeLog; /** @@ -18,7 +18,7 @@ */ public class LiquibaseDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createCard(BuildProducer cardPageBuildItemBuildProducer) { final CardPageBuildItem card = new CardPageBuildItem(); @@ -40,7 +40,7 @@ void createCard(BuildProducer cardPageBuildItemBuildProducer) cardPageBuildItemBuildProducer.produce(card); } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem registerJsonRpcBackend() { return new JsonRPCProvidersBuildItem(LiquibaseJsonRpcService.class); } diff --git a/extensions/liquibase/liquibase/pom.xml b/extensions/liquibase/liquibase/pom.xml index 0fbecf16ad369..7b35bdeda114b 100644 --- a/extensions/liquibase/liquibase/pom.xml +++ b/extensions/liquibase/liquibase/pom.xml @@ -17,5 +17,6 @@ runtime deployment + runtime-dev diff --git a/extensions/liquibase/liquibase/runtime-dev/pom.xml b/extensions/liquibase/liquibase/runtime-dev/pom.xml new file mode 100644 index 0000000000000..840caff8f9870 --- /dev/null +++ b/extensions/liquibase/liquibase/runtime-dev/pom.xml @@ -0,0 +1,21 @@ + + + + quarkus-liquibase-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-liquibase-dev + Quarkus - Liquibase - Runtime Dev mode + Handle your database schema migrations with Liquibase - Dev mode only + + + io.quarkus + quarkus-liquibase + + + \ No newline at end of file diff --git a/extensions/liquibase/liquibase/runtime-dev/src/main/java/io/quarkus/liquibase/runtime/dev/ui/LiquibaseFactoriesSupplier.java b/extensions/liquibase/liquibase/runtime-dev/src/main/java/io/quarkus/liquibase/runtime/dev/ui/LiquibaseFactoriesSupplier.java new file mode 100644 index 0000000000000..a2f7155edcc10 --- /dev/null +++ b/extensions/liquibase/liquibase/runtime-dev/src/main/java/io/quarkus/liquibase/runtime/dev/ui/LiquibaseFactoriesSupplier.java @@ -0,0 +1,43 @@ +package io.quarkus.liquibase.runtime.dev.ui; + +import java.util.Collection; +import java.util.Comparator; +import java.util.Set; +import java.util.TreeSet; +import java.util.function.Supplier; + +import io.quarkus.arc.InstanceHandle; +import io.quarkus.datasource.common.runtime.DataSourceUtil; +import io.quarkus.liquibase.LiquibaseFactory; +import io.quarkus.liquibase.runtime.LiquibaseFactoryUtil; + +public class LiquibaseFactoriesSupplier implements Supplier> { + + @Override + public Collection get() { + Set containers = new TreeSet<>(LiquibaseFactoryComparator.INSTANCE); + for (InstanceHandle handle : LiquibaseFactoryUtil.getActiveLiquibaseFactories()) { + containers.add(handle.get()); + } + return containers; + } + + private static class LiquibaseFactoryComparator implements Comparator { + + private static final LiquibaseFactoryComparator INSTANCE = new LiquibaseFactoryComparator(); + + @Override + public int compare(LiquibaseFactory o1, LiquibaseFactory o2) { + String dataSourceName1 = o1.getDataSourceName(); + String dataSourceName2 = o2.getDataSourceName(); + if (DataSourceUtil.isDefault(dataSourceName1)) { + return -1; + } + if (DataSourceUtil.isDefault(dataSourceName2)) { + return 1; + } + return dataSourceName1.compareTo(dataSourceName2); + } + + } +} diff --git a/extensions/liquibase/liquibase/runtime-dev/src/main/java/io/quarkus/liquibase/runtime/dev/ui/LiquibaseJsonRpcService.java b/extensions/liquibase/liquibase/runtime-dev/src/main/java/io/quarkus/liquibase/runtime/dev/ui/LiquibaseJsonRpcService.java new file mode 100644 index 0000000000000..49b1e7926f208 --- /dev/null +++ b/extensions/liquibase/liquibase/runtime-dev/src/main/java/io/quarkus/liquibase/runtime/dev/ui/LiquibaseJsonRpcService.java @@ -0,0 +1,52 @@ +package io.quarkus.liquibase.runtime.dev.ui; + +import java.util.Collection; + +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; + +import io.quarkus.liquibase.LiquibaseFactory; +import liquibase.Liquibase; + +@ApplicationScoped +public class LiquibaseJsonRpcService { + + private Collection factories; + + @PostConstruct + void init() { + factories = new LiquibaseFactoriesSupplier().get(); + } + + public boolean clear(String ds) throws Exception { + for (LiquibaseFactory lf : factories) { + if (ds.equalsIgnoreCase(lf.getDataSourceName())) { + try (Liquibase liquibase = lf.createLiquibase()) { + liquibase.dropAll(); + } + return true; + } + } + return false; + } + + public boolean migrate(String ds) throws Exception { + for (LiquibaseFactory lf : factories) { + if (ds.equalsIgnoreCase(lf.getDataSourceName())) { + try (Liquibase liquibase = lf.createLiquibase()) { + liquibase.update(lf.createContexts(), lf.createLabels()); + } + return true; + } + } + return false; + } + + public Integer getDatasourceCount() { + return factories.size(); + } + + public Collection getLiquibaseFactories() { + return factories; + } +} diff --git a/extensions/liquibase/liquibase/runtime/pom.xml b/extensions/liquibase/liquibase/runtime/pom.xml index d36be99afa54c..8ce094b7dae5b 100644 --- a/extensions/liquibase/liquibase/runtime/pom.xml +++ b/extensions/liquibase/liquibase/runtime/pom.xml @@ -64,7 +64,7 @@ quarkus-vertx-http true - + io.quarkus @@ -82,6 +82,9 @@ io.quarkus.liquibase + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/liquibase/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devui/LiquibaseFactoriesSupplier.java b/extensions/liquibase/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devui/LiquibaseFactoriesSupplier.java index 87a10e56483fd..a2f7155edcc10 100644 --- a/extensions/liquibase/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devui/LiquibaseFactoriesSupplier.java +++ b/extensions/liquibase/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devui/LiquibaseFactoriesSupplier.java @@ -1,4 +1,4 @@ -package io.quarkus.liquibase.runtime.devui; +package io.quarkus.liquibase.runtime.dev.ui; import java.util.Collection; import java.util.Comparator; diff --git a/extensions/liquibase/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devui/LiquibaseJsonRpcService.java b/extensions/liquibase/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devui/LiquibaseJsonRpcService.java index 65547a5867888..49b1e7926f208 100644 --- a/extensions/liquibase/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devui/LiquibaseJsonRpcService.java +++ b/extensions/liquibase/liquibase/runtime/src/main/java/io/quarkus/liquibase/runtime/devui/LiquibaseJsonRpcService.java @@ -1,4 +1,4 @@ -package io.quarkus.liquibase.runtime.devui; +package io.quarkus.liquibase.runtime.dev.ui; import java.util.Collection; diff --git a/extensions/oidc/deployment/pom.xml b/extensions/oidc/deployment/pom.xml index 8f61153678894..b6ec2dda434ae 100644 --- a/extensions/oidc/deployment/pom.xml +++ b/extensions/oidc/deployment/pom.xml @@ -29,6 +29,10 @@ io.quarkus quarkus-oidc + + io.quarkus + quarkus-oidc-dev + io.quarkus quarkus-oidc-common-deployment diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/AbstractDevUIProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/AbstractDevUIProcessor.java index 7394d6bf82968..a06cb7e25f866 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/AbstractDevUIProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/AbstractDevUIProcessor.java @@ -14,8 +14,8 @@ import io.quarkus.devui.spi.page.CardPageBuildItem; import io.quarkus.devui.spi.page.Page; import io.quarkus.oidc.runtime.OidcTenantConfig; -import io.quarkus.oidc.runtime.devui.OidcDevUiRecorder; -import io.quarkus.oidc.runtime.devui.OidcDevUiRpcSvcPropertiesBean; +import io.quarkus.oidc.runtime.dev.ui.OidcDevUiRecorder; +import io.quarkus.oidc.runtime.dev.ui.OidcDevUiRpcSvcPropertiesBean; import io.quarkus.runtime.RuntimeValue; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevUIProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevUIProcessor.java index 94dc906183d42..47e1eb1f738fd 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevUIProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevUIProcessor.java @@ -7,7 +7,7 @@ import io.quarkus.arc.deployment.BeanContainerBuildItem; import io.quarkus.deployment.Capabilities; -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.deployment.annotations.Consume; @@ -20,8 +20,8 @@ import io.quarkus.oidc.deployment.OidcBuildTimeConfig; import io.quarkus.oidc.runtime.OidcTenantConfig; import io.quarkus.oidc.runtime.OidcTenantConfig.Provider; -import io.quarkus.oidc.runtime.devui.OidcDevJsonRpcService; -import io.quarkus.oidc.runtime.devui.OidcDevUiRecorder; +import io.quarkus.oidc.runtime.dev.ui.OidcDevJsonRpcService; +import io.quarkus.oidc.runtime.dev.ui.OidcDevUiRecorder; import io.quarkus.oidc.runtime.providers.KnownOidcProviders; import io.quarkus.runtime.configuration.ConfigUtils; import io.quarkus.vertx.core.deployment.CoreVertxBuildItem; @@ -44,7 +44,7 @@ public class OidcDevUIProcessor extends AbstractDevUIProcessor { OidcBuildTimeConfig oidcConfig; @Record(ExecutionTime.RUNTIME_INIT) - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Consume(CoreVertxBuildItem.class) // metadata discovery requires Vertx instance @Consume(RuntimeConfigSetupCompleteBuildItem.class) void prepareOidcDevConsole(Capabilities capabilities, @@ -95,7 +95,7 @@ void prepareOidcDevConsole(Capabilities capabilities, } } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem produceOidcDevJsonRpcService() { return new JsonRPCProvidersBuildItem(OidcDevJsonRpcService.class); } diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevUIProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevUIProcessor.java index fdb70bacb7144..d0ee9587f68d0 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevUIProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevUIProcessor.java @@ -7,7 +7,7 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.BeanContainerBuildItem; import io.quarkus.deployment.Capabilities; -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.deployment.annotations.Consume; @@ -21,9 +21,9 @@ import io.quarkus.oidc.deployment.DevUiConfig; import io.quarkus.oidc.deployment.OidcBuildTimeConfig; import io.quarkus.oidc.deployment.devservices.AbstractDevUIProcessor; -import io.quarkus.oidc.runtime.devui.OidcDevJsonRpcService; -import io.quarkus.oidc.runtime.devui.OidcDevLoginObserver; -import io.quarkus.oidc.runtime.devui.OidcDevUiRecorder; +import io.quarkus.oidc.runtime.dev.ui.OidcDevJsonRpcService; +import io.quarkus.oidc.runtime.dev.ui.OidcDevLoginObserver; +import io.quarkus.oidc.runtime.dev.ui.OidcDevUiRecorder; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; import io.quarkus.vertx.http.runtime.VertxHttpConfig; @@ -33,7 +33,7 @@ public class KeycloakDevUIProcessor extends AbstractDevUIProcessor { OidcBuildTimeConfig oidcConfig; @Record(ExecutionTime.RUNTIME_INIT) - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Consume(RuntimeConfigSetupCompleteBuildItem.class) void produceProviderComponent(Optional configProps, BuildProducer keycloakAdminPageProducer, @@ -76,12 +76,12 @@ void produceProviderComponent(Optional confi } } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem produceOidcDevJsonRpcService() { return new JsonRPCProvidersBuildItem(OidcDevJsonRpcService.class); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) AdditionalBeanBuildItem registerOidcDevLoginObserver() { // TODO: this is called even when Keycloak DEV UI is disabled and OIDC DEV UI is enabled // we should fine a mechanism to switch where the endpoints are registered or have shared build steps @@ -89,7 +89,7 @@ AdditionalBeanBuildItem registerOidcDevLoginObserver() { } @Record(ExecutionTime.RUNTIME_INIT) - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void invokeEndpoint(BuildProducer routeProducer, OidcDevUiRecorder recorder, NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) { // TODO: this is called even when Keycloak DEV UI is disabled and OIDC DEV UI is enabled diff --git a/extensions/oidc/pom.xml b/extensions/oidc/pom.xml index 97b57b5ad32d7..e7c108e0cdae6 100644 --- a/extensions/oidc/pom.xml +++ b/extensions/oidc/pom.xml @@ -16,5 +16,6 @@ deployment runtime + runtime-dev diff --git a/extensions/oidc/runtime-dev/pom.xml b/extensions/oidc/runtime-dev/pom.xml new file mode 100644 index 0000000000000..d1f9ca7aa4b52 --- /dev/null +++ b/extensions/oidc/runtime-dev/pom.xml @@ -0,0 +1,21 @@ + + + + quarkus-oidc-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-oidc-dev + Quarkus - OpenID Connect Adapter - Runtime Dev mode + Verify Bearer access tokens and authenticate users with Authorization Code Flow - Dev mode only + + + io.quarkus + quarkus-oidc + + + \ No newline at end of file diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevJsonRpcService.java b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevJsonRpcService.java similarity index 96% rename from extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevJsonRpcService.java rename to extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevJsonRpcService.java index 41ec4d28187d3..ad63504a5660c 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevJsonRpcService.java +++ b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevJsonRpcService.java @@ -1,6 +1,6 @@ -package io.quarkus.oidc.runtime.devui; +package io.quarkus.oidc.runtime.dev.ui; -import static io.quarkus.oidc.runtime.devui.OidcDevServicesUtils.getTokens; +import static io.quarkus.oidc.runtime.dev.ui.OidcDevServicesUtils.getTokens; import jakarta.inject.Inject; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevLoginObserver.java b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevLoginObserver.java similarity index 98% rename from extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevLoginObserver.java rename to extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevLoginObserver.java index cc5ab5b683d6b..e4a63ffb49b67 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevLoginObserver.java +++ b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevLoginObserver.java @@ -1,4 +1,4 @@ -package io.quarkus.oidc.runtime.devui; +package io.quarkus.oidc.runtime.dev.ui; import java.time.Duration; import java.util.function.Function; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevServicesUtils.java b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevServicesUtils.java similarity index 99% rename from extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevServicesUtils.java rename to extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevServicesUtils.java index 5d9fc9335c0a8..67d27520952b3 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevServicesUtils.java +++ b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevServicesUtils.java @@ -1,4 +1,4 @@ -package io.quarkus.oidc.runtime.devui; +package io.quarkus.oidc.runtime.dev.ui; import java.time.Duration; import java.util.Map; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevSessionCookieReaderHandler.java b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevSessionCookieReaderHandler.java similarity index 98% rename from extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevSessionCookieReaderHandler.java rename to extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevSessionCookieReaderHandler.java index 80e0c4da15166..0f8fb6039d603 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevSessionCookieReaderHandler.java +++ b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevSessionCookieReaderHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.oidc.runtime.devui; +package io.quarkus.oidc.runtime.dev.ui; import io.quarkus.arc.Arc; import io.quarkus.oidc.AuthorizationCodeTokens; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevSessionLogoutHandler.java b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevSessionLogoutHandler.java similarity index 94% rename from extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevSessionLogoutHandler.java rename to extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevSessionLogoutHandler.java index 49d924add3836..ff2f8a592712e 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevSessionLogoutHandler.java +++ b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevSessionLogoutHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.oidc.runtime.devui; +package io.quarkus.oidc.runtime.dev.ui; import io.quarkus.oidc.runtime.OidcUtils; import io.vertx.core.Handler; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRecorder.java b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRecorder.java similarity index 99% rename from extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRecorder.java rename to extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRecorder.java index ed3a40fb0dec9..669c7e9dcb255 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRecorder.java +++ b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRecorder.java @@ -1,4 +1,4 @@ -package io.quarkus.oidc.runtime.devui; +package io.quarkus.oidc.runtime.dev.ui; import java.time.Duration; import java.util.List; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRpcSvcPropertiesBean.java b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRpcSvcPropertiesBean.java similarity index 99% rename from extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRpcSvcPropertiesBean.java rename to extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRpcSvcPropertiesBean.java index 4349166bd9e43..4bdc8628b05f4 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRpcSvcPropertiesBean.java +++ b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRpcSvcPropertiesBean.java @@ -1,4 +1,4 @@ -package io.quarkus.oidc.runtime.devui; +package io.quarkus.oidc.runtime.dev.ui; import java.time.Duration; import java.util.List; diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRuntimePropertiesDTO.java b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRuntimePropertiesDTO.java similarity index 99% rename from extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRuntimePropertiesDTO.java rename to extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRuntimePropertiesDTO.java index 5695a5bd53b15..7b6f185d503cc 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRuntimePropertiesDTO.java +++ b/extensions/oidc/runtime-dev/src/main/java/io/quarkus/oidc/runtime/dev/ui/OidcDevUiRuntimePropertiesDTO.java @@ -1,4 +1,4 @@ -package io.quarkus.oidc.runtime.devui; +package io.quarkus.oidc.runtime.dev.ui; import java.util.List; diff --git a/extensions/oidc/runtime/pom.xml b/extensions/oidc/runtime/pom.xml index 550415017b15d..e79a4486906e2 100644 --- a/extensions/oidc/runtime/pom.xml +++ b/extensions/oidc/runtime/pom.xml @@ -66,6 +66,9 @@ io.quarkus.oidc + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/resteasy-reactive/rest/deployment/pom.xml b/extensions/resteasy-reactive/rest/deployment/pom.xml index a506c92c91c7a..75b8c0a36155d 100644 --- a/extensions/resteasy-reactive/rest/deployment/pom.xml +++ b/extensions/resteasy-reactive/rest/deployment/pom.xml @@ -34,6 +34,10 @@ io.quarkus quarkus-rest + + io.quarkus + quarkus-rest-dev + io.quarkus quarkus-rest-server-spi-deployment diff --git a/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devui/ResteasyReactiveDevUIProcessor.java b/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devui/ResteasyReactiveDevUIProcessor.java index 62eed430fe18b..cb454c3bfe976 100644 --- a/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devui/ResteasyReactiveDevUIProcessor.java +++ b/extensions/resteasy-reactive/rest/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/devui/ResteasyReactiveDevUIProcessor.java @@ -1,16 +1,16 @@ package io.quarkus.resteasy.reactive.server.deployment.devui; -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.devui.spi.JsonRPCProvidersBuildItem; import io.quarkus.devui.spi.page.CardPageBuildItem; import io.quarkus.devui.spi.page.Page; -import io.quarkus.resteasy.reactive.server.runtime.devui.ResteasyReactiveJsonRPCService; +import io.quarkus.resteasy.reactive.server.runtime.dev.ui.ResteasyReactiveJsonRPCService; public class ResteasyReactiveDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public void createPages(BuildProducer cardPageProducer) { CardPageBuildItem cardPageBuildItem = new CardPageBuildItem(); @@ -46,7 +46,7 @@ public void createPages(BuildProducer cardPageProducer) { cardPageProducer.produce(cardPageBuildItem); } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) public void createJsonRPCService(BuildProducer jsonRPCServiceProducer) { jsonRPCServiceProducer.produce(new JsonRPCProvidersBuildItem(ResteasyReactiveJsonRPCService.class)); } diff --git a/extensions/resteasy-reactive/rest/pom.xml b/extensions/resteasy-reactive/rest/pom.xml index 07fedd6edd26c..45136eae9b439 100644 --- a/extensions/resteasy-reactive/rest/pom.xml +++ b/extensions/resteasy-reactive/rest/pom.xml @@ -17,6 +17,7 @@ deployment spi-deployment runtime + runtime-dev diff --git a/extensions/resteasy-reactive/rest/runtime-dev/pom.xml b/extensions/resteasy-reactive/rest/runtime-dev/pom.xml new file mode 100644 index 0000000000000..b1e31a1e3bb6e --- /dev/null +++ b/extensions/resteasy-reactive/rest/runtime-dev/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-rest-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-rest-dev + Quarkus - REST - Runtime Dev mode + A Jakarta REST implementation utilizing build time processing and Vert.x. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it. - Dev Mode only + + + + io.quarkus + quarkus-rest + + + \ No newline at end of file diff --git a/extensions/resteasy-reactive/rest/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/devui/ResteasyReactiveJsonRPCService.java b/extensions/resteasy-reactive/rest/runtime-dev/src/main/java/io/quarkus/resteasy/reactive/server/runtime/dev/ui/ResteasyReactiveJsonRPCService.java similarity index 98% rename from extensions/resteasy-reactive/rest/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/devui/ResteasyReactiveJsonRPCService.java rename to extensions/resteasy-reactive/rest/runtime-dev/src/main/java/io/quarkus/resteasy/reactive/server/runtime/dev/ui/ResteasyReactiveJsonRPCService.java index b04e555d7eafa..38b4f5e20cce0 100644 --- a/extensions/resteasy-reactive/rest/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/devui/ResteasyReactiveJsonRPCService.java +++ b/extensions/resteasy-reactive/rest/runtime-dev/src/main/java/io/quarkus/resteasy/reactive/server/runtime/dev/ui/ResteasyReactiveJsonRPCService.java @@ -1,4 +1,4 @@ -package io.quarkus.resteasy.reactive.server.runtime.devui; +package io.quarkus.resteasy.reactive.server.runtime.dev.ui; import java.util.List; import java.util.Map; diff --git a/extensions/resteasy-reactive/rest/runtime/pom.xml b/extensions/resteasy-reactive/rest/runtime/pom.xml index f83251ff30709..6233332fa9715 100644 --- a/extensions/resteasy-reactive/rest/runtime/pom.xml +++ b/extensions/resteasy-reactive/rest/runtime/pom.xml @@ -61,6 +61,9 @@ io.quarkus.rest io.quarkus.resteasy.reactive + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/scheduler/deployment/pom.xml b/extensions/scheduler/deployment/pom.xml index e761b53bbcc3e..c1f218946aa89 100644 --- a/extensions/scheduler/deployment/pom.xml +++ b/extensions/scheduler/deployment/pom.xml @@ -30,6 +30,10 @@ io.quarkus quarkus-scheduler + + io.quarkus + quarkus-scheduler-dev + io.quarkus quarkus-vertx-http-deployment diff --git a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/devui/SchedulerDevUIProcessor.java b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/devui/SchedulerDevUIProcessor.java index c0902c75587bf..461d31f9fbd57 100644 --- a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/devui/SchedulerDevUIProcessor.java +++ b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/devui/SchedulerDevUIProcessor.java @@ -2,7 +2,7 @@ import java.util.List; -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.devui.spi.JsonRPCProvidersBuildItem; @@ -11,11 +11,11 @@ import io.quarkus.devui.spi.page.Page; import io.quarkus.devui.spi.page.WebComponentPageBuilder; import io.quarkus.scheduler.deployment.ScheduledBusinessMethodItem; -import io.quarkus.scheduler.runtime.devui.SchedulerJsonRPCService; +import io.quarkus.scheduler.runtime.dev.ui.SchedulerJsonRPCService; public class SchedulerDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void page(List scheduledMethods, BuildProducer cardPages, BuildProducer footerPages) { @@ -35,7 +35,7 @@ void page(List scheduledMethods, footerPages.produce(new FooterPageBuildItem(logPageBuilder)); } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem rpcProvider() { return new JsonRPCProvidersBuildItem(SchedulerJsonRPCService.class); } diff --git a/extensions/scheduler/pom.xml b/extensions/scheduler/pom.xml index babdb6acf34c2..c763ada6acc27 100644 --- a/extensions/scheduler/pom.xml +++ b/extensions/scheduler/pom.xml @@ -21,5 +21,6 @@ common kotlin runtime + runtime-dev diff --git a/extensions/scheduler/runtime-dev/pom.xml b/extensions/scheduler/runtime-dev/pom.xml new file mode 100644 index 0000000000000..659aa0899064d --- /dev/null +++ b/extensions/scheduler/runtime-dev/pom.xml @@ -0,0 +1,21 @@ + + + + quarkus-scheduler-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-scheduler-dev + Quarkus - Scheduler - Runtime Dev mode + Schedule jobs and tasks - Dev mode only + + + io.quarkus + quarkus-scheduler + + + \ No newline at end of file diff --git a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/devui/SchedulerJsonRPCService.java b/extensions/scheduler/runtime-dev/src/main/java/io/quarkus/scheduler/runtime/dev/ui/SchedulerJsonRPCService.java similarity index 99% rename from extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/devui/SchedulerJsonRPCService.java rename to extensions/scheduler/runtime-dev/src/main/java/io/quarkus/scheduler/runtime/dev/ui/SchedulerJsonRPCService.java index 9d01ffd3b6f5a..59dc0eff0b3b1 100644 --- a/extensions/scheduler/runtime/src/main/java/io/quarkus/scheduler/runtime/devui/SchedulerJsonRPCService.java +++ b/extensions/scheduler/runtime-dev/src/main/java/io/quarkus/scheduler/runtime/dev/ui/SchedulerJsonRPCService.java @@ -1,4 +1,4 @@ -package io.quarkus.scheduler.runtime.devui; +package io.quarkus.scheduler.runtime.dev.ui; import java.time.Instant; import java.time.LocalDateTime; diff --git a/extensions/scheduler/runtime/pom.xml b/extensions/scheduler/runtime/pom.xml index 25d1caa53dc48..dbb54ffa4e497 100644 --- a/extensions/scheduler/runtime/pom.xml +++ b/extensions/scheduler/runtime/pom.xml @@ -54,6 +54,9 @@ io.quarkus.scheduler + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/smallrye-fault-tolerance/deployment/pom.xml b/extensions/smallrye-fault-tolerance/deployment/pom.xml index 50c3ad7d8e587..f4ba52163f477 100644 --- a/extensions/smallrye-fault-tolerance/deployment/pom.xml +++ b/extensions/smallrye-fault-tolerance/deployment/pom.xml @@ -33,6 +33,10 @@ io.quarkus quarkus-smallrye-fault-tolerance + + io.quarkus + quarkus-smallrye-fault-tolerance-dev + io.quarkus quarkus-junit5-internal diff --git a/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/devui/FaultToleranceDevUIProcessor.java b/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/devui/FaultToleranceDevUIProcessor.java index 257435f569446..1cf32cfece977 100644 --- a/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/devui/FaultToleranceDevUIProcessor.java +++ b/extensions/smallrye-fault-tolerance/deployment/src/main/java/io/quarkus/smallrye/faulttolerance/deployment/devui/FaultToleranceDevUIProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.smallrye.faulttolerance.deployment.devui; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.devui.spi.JsonRPCProvidersBuildItem; import io.quarkus.devui.spi.page.CardPageBuildItem; @@ -9,7 +9,7 @@ public class FaultToleranceDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) CardPageBuildItem cardPage(FaultToleranceInfoBuildItem faultToleranceInfo) { CardPageBuildItem pageBuildItem = new CardPageBuildItem(); @@ -22,7 +22,7 @@ CardPageBuildItem cardPage(FaultToleranceInfoBuildItem faultToleranceInfo) { return pageBuildItem; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem jsonRPCService() { return new JsonRPCProvidersBuildItem(FaultToleranceJsonRpcService.class); } diff --git a/extensions/smallrye-fault-tolerance/pom.xml b/extensions/smallrye-fault-tolerance/pom.xml index eb9091a4f1c98..f148bd73273fc 100644 --- a/extensions/smallrye-fault-tolerance/pom.xml +++ b/extensions/smallrye-fault-tolerance/pom.xml @@ -17,6 +17,7 @@ deployment runtime + runtime-dev diff --git a/extensions/smallrye-fault-tolerance/runtime-dev/pom.xml b/extensions/smallrye-fault-tolerance/runtime-dev/pom.xml new file mode 100644 index 0000000000000..66107177dff2d --- /dev/null +++ b/extensions/smallrye-fault-tolerance/runtime-dev/pom.xml @@ -0,0 +1,26 @@ + + + + quarkus-smallrye-fault-tolerance-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-smallrye-fault-tolerance-dev + Quarkus - SmallRye Fault Tolerance - Runtime Dev mode + Build fault-tolerant network services - Dev mode only + + + io.quarkus + quarkus-smallrye-fault-tolerance + + + io.vertx + vertx-core + true + + + \ No newline at end of file diff --git a/extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/devui/FaultToleranceJsonRpcService.java b/extensions/smallrye-fault-tolerance/runtime-dev/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/devui/FaultToleranceJsonRpcService.java similarity index 100% rename from extensions/smallrye-fault-tolerance/runtime/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/devui/FaultToleranceJsonRpcService.java rename to extensions/smallrye-fault-tolerance/runtime-dev/src/main/java/io/quarkus/smallrye/faulttolerance/runtime/devui/FaultToleranceJsonRpcService.java diff --git a/extensions/smallrye-fault-tolerance/runtime/pom.xml b/extensions/smallrye-fault-tolerance/runtime/pom.xml index 3e6dfa2b3d699..9f54e14d04364 100644 --- a/extensions/smallrye-fault-tolerance/runtime/pom.xml +++ b/extensions/smallrye-fault-tolerance/runtime/pom.xml @@ -69,12 +69,6 @@ smallrye-fault-tolerance-mutiny - - - io.vertx - vertx-core - true - @@ -86,6 +80,9 @@ io.quarkus.smallrye.faulttolerance + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/pom.xml b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/pom.xml index a28fc62c8e931..5da7722dca857 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/pom.xml @@ -26,6 +26,10 @@ io.quarkus quarkus-messaging-rabbitmq + + io.quarkus + quarkus-messaging-rabbitmq-dev + io.quarkus quarkus-mutiny-reactive-streams-operators-deployment diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/devui/RabbitDevUIProcessor.java b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/devui/RabbitDevUIProcessor.java index 8f882ffe437b9..d2b298489a6b4 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/devui/RabbitDevUIProcessor.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/devui/RabbitDevUIProcessor.java @@ -1,29 +1,29 @@ package io.quarkus.smallrye.reactivemessaging.rabbitmq.deployment.devui; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; -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.devui.spi.JsonRPCProvidersBuildItem; import io.quarkus.devui.spi.page.CardPageBuildItem; -import io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui.RabbitHttpPortFinder; -import io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui.RabbitMqJsonRpcService; +import io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.dev.ui.RabbitHttpPortFinder; +import io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.dev.ui.RabbitMqJsonRpcService; public class RabbitDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) AdditionalBeanBuildItem beans() { return AdditionalBeanBuildItem.unremovableOf(RabbitHttpPortFinder.class); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createCard(BuildProducer cardPageBuildItemBuildProducer) { final CardPageBuildItem card = new CardPageBuildItem(); card.setCustomCard("qwc-rabbitmq-card.js"); cardPageBuildItemBuildProducer.produce(card); } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem registerJsonRpcBackend() { return new JsonRPCProvidersBuildItem(RabbitMqJsonRpcService.class); } diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/pom.xml b/extensions/smallrye-reactive-messaging-rabbitmq/pom.xml index deaab0b51968c..9ddbcf01d2ed2 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/pom.xml +++ b/extensions/smallrye-reactive-messaging-rabbitmq/pom.xml @@ -17,5 +17,6 @@ deployment runtime + runtime-dev diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/pom.xml b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/pom.xml new file mode 100644 index 0000000000000..c61ef67e87577 --- /dev/null +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + + io.quarkus + quarkus-messaging-rabbitmq-parent + 999-SNAPSHOT + + + quarkus-messaging-rabbitmq-dev + Quarkus - Messaging - RabbitMQ 1.0 - Runtime Dev mode + Connect to RabbitMQ with Reactive Messaging - Dev mode only + + + io.quarkus + quarkus-messaging-rabbitmq + + + \ No newline at end of file diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/DevRabbitMqHttpPort.java b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/DevRabbitMqHttpPort.java similarity index 99% rename from extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/DevRabbitMqHttpPort.java rename to extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/DevRabbitMqHttpPort.java index 8ae2668c0a3f9..932171c115130 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/DevRabbitMqHttpPort.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/DevRabbitMqHttpPort.java @@ -1,4 +1,4 @@ -package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui; +package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.dev.ui; import java.util.function.Supplier; diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/DevRabbitMqHttpPortSupplier.java b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/DevRabbitMqHttpPortSupplier.java similarity index 97% rename from extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/DevRabbitMqHttpPortSupplier.java rename to extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/DevRabbitMqHttpPortSupplier.java index 00a829786bdcf..f4021aff7ecdb 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/DevRabbitMqHttpPortSupplier.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/DevRabbitMqHttpPortSupplier.java @@ -1,4 +1,4 @@ -package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui; +package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.dev.ui; import java.util.function.Supplier; diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/RabbitHttpPortFinder.java b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/RabbitHttpPortFinder.java similarity index 98% rename from extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/RabbitHttpPortFinder.java rename to extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/RabbitHttpPortFinder.java index 7ac3570bd2279..10393e9b047f7 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/RabbitHttpPortFinder.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/RabbitHttpPortFinder.java @@ -1,4 +1,4 @@ -package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui; +package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.dev.ui; import jakarta.enterprise.event.Observes; import jakarta.inject.Singleton; diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/RabbitMqJsonRpcService.java b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/RabbitMqJsonRpcService.java similarity index 98% rename from extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/RabbitMqJsonRpcService.java rename to extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/RabbitMqJsonRpcService.java index 4e1eeb6cc34c3..dd4f2db05e9ba 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/devui/RabbitMqJsonRpcService.java +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/runtime/dev/ui/RabbitMqJsonRpcService.java @@ -1,4 +1,4 @@ -package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.devui; +package io.quarkus.smallrye.reactivemessaging.rabbitmq.runtime.dev.ui; import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.ApplicationScoped; diff --git a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/pom.xml b/extensions/smallrye-reactive-messaging-rabbitmq/runtime/pom.xml index 54b256b2703ee..bc963725f4da7 100644 --- a/extensions/smallrye-reactive-messaging-rabbitmq/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging-rabbitmq/runtime/pom.xml @@ -67,6 +67,19 @@ io.quarkus quarkus-extension-maven-plugin + + + process-resources + + extension-descriptor + + + + ${project.groupId}:${project.artifactId}-dev:${project.version} + + + + maven-compiler-plugin diff --git a/extensions/smallrye-reactive-messaging/deployment/pom.xml b/extensions/smallrye-reactive-messaging/deployment/pom.xml index 48bb697915491..fdff18287a32e 100644 --- a/extensions/smallrye-reactive-messaging/deployment/pom.xml +++ b/extensions/smallrye-reactive-messaging/deployment/pom.xml @@ -26,6 +26,10 @@ io.quarkus quarkus-messaging + + io.quarkus + quarkus-messaging-dev + io.quarkus quarkus-smallrye-health-spi diff --git a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/devui/ReactiveMessagingDevUIProcessor.java b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/devui/ReactiveMessagingDevUIProcessor.java index aeb25e82c4982..1566f32df9dfb 100644 --- a/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/devui/ReactiveMessagingDevUIProcessor.java +++ b/extensions/smallrye-reactive-messaging/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/deployment/devui/ReactiveMessagingDevUIProcessor.java @@ -10,20 +10,20 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.BeanDiscoveryFinishedBuildItem; import io.quarkus.arc.processor.InjectionPointInfo; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; 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.smallrye.reactivemessaging.deployment.ReactiveMessagingDotNames; -import io.quarkus.smallrye.reactivemessaging.runtime.devui.Connectors; -import io.quarkus.smallrye.reactivemessaging.runtime.devui.DevConsoleRecorder; -import io.quarkus.smallrye.reactivemessaging.runtime.devui.ReactiveMessagingJsonRpcService; +import io.quarkus.smallrye.reactivemessaging.runtime.dev.ui.Connectors; +import io.quarkus.smallrye.reactivemessaging.runtime.dev.ui.DevConsoleRecorder; +import io.quarkus.smallrye.reactivemessaging.runtime.dev.ui.ReactiveMessagingJsonRpcService; public class ReactiveMessagingDevUIProcessor { @io.quarkus.deployment.annotations.Record(STATIC_INIT) - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public void collectInjectionInfo(DevConsoleRecorder recorder, BeanDiscoveryFinishedBuildItem beanDiscoveryFinished) { Map emitters = new HashMap<>(); Map channels = new HashMap<>(); @@ -48,12 +48,12 @@ public void collectInjectionInfo(DevConsoleRecorder recorder, BeanDiscoveryFinis recorder.setInjectionInfo(emitters, channels); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) AdditionalBeanBuildItem beans() { return AdditionalBeanBuildItem.unremovableOf(Connectors.class); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) CardPageBuildItem create() { CardPageBuildItem card = new CardPageBuildItem(); card.addPage(Page.webComponentPageBuilder() @@ -64,7 +64,7 @@ CardPageBuildItem create() { return card; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCServiceForCache() { return new JsonRPCProvidersBuildItem(ReactiveMessagingJsonRpcService.class); } diff --git a/extensions/smallrye-reactive-messaging/pom.xml b/extensions/smallrye-reactive-messaging/pom.xml index d1ddd056a965b..ac32d989ea56a 100644 --- a/extensions/smallrye-reactive-messaging/pom.xml +++ b/extensions/smallrye-reactive-messaging/pom.xml @@ -18,5 +18,6 @@ deployment kotlin runtime + runtime-dev diff --git a/extensions/smallrye-reactive-messaging/runtime-dev/pom.xml b/extensions/smallrye-reactive-messaging/runtime-dev/pom.xml new file mode 100644 index 0000000000000..f2543c261eb6a --- /dev/null +++ b/extensions/smallrye-reactive-messaging/runtime-dev/pom.xml @@ -0,0 +1,20 @@ + + + + quarkus-messaging-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + quarkus-messaging-dev + Quarkus - Messaging - Runtime Dev mode + Produce and consume messages and implement event driven and data streaming applications - Dev mode only + + + io.quarkus + quarkus-messaging + + + \ No newline at end of file diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/Connectors.java b/extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/Connectors.java similarity index 94% rename from extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/Connectors.java rename to extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/Connectors.java index 54e7f6c1a1004..9d189ba70ab81 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/Connectors.java +++ b/extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/Connectors.java @@ -1,4 +1,4 @@ -package io.quarkus.smallrye.reactivemessaging.runtime.devui; +package io.quarkus.smallrye.reactivemessaging.runtime.dev.ui; 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.devui.DevReactiveMessagingInfos.Component; -import io.quarkus.smallrye.reactivemessaging.runtime.devui.DevReactiveMessagingInfos.ComponentType; +import io.quarkus.smallrye.reactivemessaging.runtime.dev.ui.DevReactiveMessagingInfos.Component; +import io.quarkus.smallrye.reactivemessaging.runtime.dev.ui.DevReactiveMessagingInfos.ComponentType; // we use a separate component due to weird class loading issues that occur when accessing config properties @Singleton diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/DevConsoleRecorder.java b/extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/DevConsoleRecorder.java similarity index 87% rename from extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/DevConsoleRecorder.java rename to extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/DevConsoleRecorder.java index 60dcf5ed50b60..6aaebc7cf6b28 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/DevConsoleRecorder.java +++ b/extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/DevConsoleRecorder.java @@ -1,4 +1,4 @@ -package io.quarkus.smallrye.reactivemessaging.runtime.devui; +package io.quarkus.smallrye.reactivemessaging.runtime.dev.ui; import java.util.HashMap; import java.util.Map; diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/DevReactiveMessagingInfos.java b/extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/DevReactiveMessagingInfos.java similarity index 99% rename from extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/DevReactiveMessagingInfos.java rename to extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/DevReactiveMessagingInfos.java index 3fc7884e69be0..0816db4773084 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/DevReactiveMessagingInfos.java +++ b/extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/DevReactiveMessagingInfos.java @@ -1,4 +1,4 @@ -package io.quarkus.smallrye.reactivemessaging.runtime.devui; +package io.quarkus.smallrye.reactivemessaging.runtime.dev.ui; import java.util.ArrayList; import java.util.Collections; diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/ReactiveMessagingJsonRpcService.java b/extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/ReactiveMessagingJsonRpcService.java similarity index 96% rename from extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/ReactiveMessagingJsonRpcService.java rename to extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/ReactiveMessagingJsonRpcService.java index 57554fb7e1785..3c7da9769cd25 100644 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/devui/ReactiveMessagingJsonRpcService.java +++ b/extensions/smallrye-reactive-messaging/runtime-dev/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/dev/ui/ReactiveMessagingJsonRpcService.java @@ -1,4 +1,4 @@ -package io.quarkus.smallrye.reactivemessaging.runtime.devui; +package io.quarkus.smallrye.reactivemessaging.runtime.dev.ui; import java.util.List; diff --git a/extensions/smallrye-reactive-messaging/runtime/pom.xml b/extensions/smallrye-reactive-messaging/runtime/pom.xml index d905539602a6a..e7216cbc061b4 100644 --- a/extensions/smallrye-reactive-messaging/runtime/pom.xml +++ b/extensions/smallrye-reactive-messaging/runtime/pom.xml @@ -92,6 +92,9 @@ io.quarkus.smallrye.reactive.messaging io.quarkus.messaging + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml index 8da2520f5adb5..17385afb27c6f 100644 --- a/extensions/vertx-http/deployment/pom.xml +++ b/extensions/vertx-http/deployment/pom.xml @@ -25,6 +25,10 @@ io.quarkus quarkus-vertx-http + + io.quarkus + quarkus-vertx-http-dev + io.quarkus quarkus-vertx-http-deployment-spi diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java index 1497f93ee263b..887bb27b6352a 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java @@ -49,7 +49,7 @@ import io.mvnpm.importmap.model.Imports; import io.quarkus.bootstrap.model.ApplicationModel; import io.quarkus.builder.Version; -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.deployment.builditem.LaunchModeBuildItem; @@ -95,7 +95,7 @@ public class BuildTimeContentProcessor { * Here we create references to internal dev ui files so that they can be imported by ref. * This will be merged into the final importmap */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) InternalImportMapBuildItem createKnownInternalImportMap(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) { String contextRoot = nonApplicationRootPathBuildItem.getNonApplicationRootPath() + EndpointsProcessor.DEV_UI + SLASH; @@ -143,7 +143,7 @@ InternalImportMapBuildItem createKnownInternalImportMap(NonApplicationRootPathBu return internalImportMapBuildItem; } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) RelocationImportMapBuildItem createRelocationMap() { RelocationImportMapBuildItem relocationImportMapBuildItem = new RelocationImportMapBuildItem(); @@ -171,7 +171,7 @@ RelocationImportMapBuildItem createRelocationMap() { * @param pageBuildItems * @param buildTimeConstProducer */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void mapPageBuildTimeData(List cards, List menus, List footers, @@ -204,7 +204,7 @@ void mapPageBuildTimeData(List cards, } } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) DeploymentMethodBuildItem mapDeploymentMethods( List buildTimeActions, CurateOutcomeBuildItem curateOutcomeBuildItem) { @@ -274,7 +274,7 @@ private Map getBuildTimeDataForCard(CurateOutcomeBuildItem curat * @param quteTemplateProducer * @param internalImportMapProducer */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createBuildTimeConstJsTemplate(CurateOutcomeBuildItem curateOutcomeBuildItem, NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem, List buildTimeConstBuildItems, @@ -319,7 +319,7 @@ void createBuildTimeConstJsTemplate(CurateOutcomeBuildItem curateOutcomeBuildIte /** * Here we find all the mvnpm jars */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void gatherMvnpmJars(BuildProducer mvnpmProducer, CurateOutcomeBuildItem curateOutcomeBuildItem) { Set mvnpmJars = new HashSet<>(); ClassLoader tccl = Thread.currentThread().getContextClassLoader(); @@ -343,7 +343,7 @@ void gatherMvnpmJars(BuildProducer mvnpmProducer, CurateOutcomeB * * @return The QuteTemplate Build item that will create the end result */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) QuteTemplateBuildItem createIndexHtmlTemplate( MvnpmBuildItem mvnpmBuildItem, ThemeVarsBuildItem themeVarsBuildItem, @@ -395,7 +395,7 @@ QuteTemplateBuildItem createIndexHtmlTemplate( } // Here load all templates - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void loadAllBuildTimeTemplates(BuildProducer buildTimeContentProducer, List templates) { ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -434,7 +434,7 @@ void loadAllBuildTimeTemplates(BuildProducer buildTimeCo /** * Creates json data that is available in Javascript */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createBuildTimeData(BuildProducer buildTimeConstProducer, BuildProducer themeVarsProducer, CurateOutcomeBuildItem curateOutcomeBuildItem, diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java index 50b2406b3ca2e..a6640e61c3ce7 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java @@ -33,7 +33,7 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.BeanContainerBuildItem; import io.quarkus.arc.processor.BuiltinScope; -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.deployment.annotations.ExecutionTime; @@ -126,7 +126,7 @@ public class DevUIProcessor { private static final Logger log = Logger.getLogger(DevUIProcessor.class); - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Record(ExecutionTime.STATIC_INIT) void registerDevUiHandlers( DevUIConfig devUIConfig, @@ -265,7 +265,7 @@ private boolean hasOwnIndexHtml() { /** * This makes sure the JsonRPC Classes for both the internal Dev UI and extensions is available as a bean and on the index. */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void additionalBean(BuildProducer additionalBeanProducer, BuildProducer additionalIndexProducer, List jsonRPCProvidersBuildItems) { @@ -300,7 +300,7 @@ void additionalBean(BuildProducer additionalBeanProduce /** * This goes through all jsonRPC methods and discover the methods using Jandex */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void findAllJsonRPCMethods(BuildProducer jsonRPCMethodsProvider, BuildProducer buildTimeConstProducer, LaunchModeBuildItem launchModeBuildItem, @@ -403,7 +403,7 @@ void findAllJsonRPCMethods(BuildProducer jsonRPC } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Record(ExecutionTime.RUNTIME_INIT) void createJsonRpcRouter(DevUIRecorder recorder, BeanContainerBuildItem beanContainer, @@ -424,7 +424,7 @@ void createJsonRpcRouter(DevUIRecorder recorder, /** * This build all the pages for dev ui, based on the extension included */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void processFooterLogs(BuildProducer buildTimeActionProducer, BuildProducer footerPageProducer, List footerLogBuildItems) { @@ -476,7 +476,7 @@ private String capitalizeFirstLetter(String input) { /** * This build all the pages for dev ui, based on the extension included */ - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @SuppressWarnings("unchecked") void getAllExtensions(List cardPageBuildItems, List menuPageBuildItems, @@ -735,7 +735,7 @@ public WebJarResourcesFilter.FilterResult apply(String fileName, InputStream fil DEVUI)); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createAllRoutes(WebJarResultsBuildItem webJarResultsBuildItem, LaunchModeBuildItem launchModeBuildItem, List devUIWebJarBuiltItems, diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/build/BuildMetricsDevUIProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/build/BuildMetricsDevUIProcessor.java index 606357d79d335..6778a4d25172d 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/build/BuildMetricsDevUIProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/build/BuildMetricsDevUIProcessor.java @@ -4,7 +4,7 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.processor.DotNames; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.BuildSteps; import io.quarkus.deployment.annotations.Record; @@ -13,7 +13,7 @@ import io.quarkus.devui.runtime.build.BuildMetricsJsonRPCService; import io.quarkus.devui.spi.JsonRPCProvidersBuildItem; -@BuildSteps(onlyIf = { IsDevelopment.class }) +@BuildSteps(onlyIf = { IsLocalDevelopment.class }) public class BuildMetricsDevUIProcessor { @BuildStep diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/ide/IdeProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/ide/IdeProcessor.java index b42cde929990e..8591408cf0fda 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/ide/IdeProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/ide/IdeProcessor.java @@ -10,7 +10,7 @@ import org.jboss.logging.Logger; -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.deployment.annotations.ExecutionTime; @@ -31,7 +31,7 @@ public class IdeProcessor { private static final Logger log = Logger.getLogger(IdeProcessor.class); private static final Map LANG_TO_EXT = Map.of("java", "java", "kotlin", "kt"); - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Record(ExecutionTime.RUNTIME_INIT) void createOpenInIDEService(BuildProducer buildTimeActionProducer, BuildProducer routeProducer, diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/logstream/LogStreamProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/logstream/LogStreamProcessor.java index ad0306d8312f5..eb28f4571cc3a 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/logstream/LogStreamProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/logstream/LogStreamProcessor.java @@ -4,7 +4,7 @@ import java.util.Optional; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; -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.deployment.annotations.ExecutionTime; @@ -31,14 +31,14 @@ public class LogStreamProcessor { private final String namespace = "devui-logstream"; - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void additionalBean(BuildProducer additionalBeanProducer) { additionalBeanProducer.produce(AdditionalBeanBuildItem.builder() .addBeanClass(LogStreamBroadcaster.class) .setUnremovable().build()); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Record(ExecutionTime.STATIC_INIT) @SuppressWarnings("unchecked") public void handler(BuildProducer streamingLogHandlerBuildItem, @@ -52,7 +52,7 @@ public void handler(BuildProducer streamingLogHand streamingLogHandlerBuildItem.produce(new StreamingLogHandlerBuildItem((RuntimeValue) mutinyLogHandler)); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void registerBuildTimeActions(BuildProducer buildTimeActionProducer, LaunchModeBuildItem launchModeBuildItem) { @@ -137,7 +137,7 @@ void registerBuildTimeActions(BuildProducer buildTimeA buildTimeActionProducer.produce(keyStrokeActions); } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCService() { return new JsonRPCProvidersBuildItem(namespace, LogStreamJsonRPCService.class); } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/BuildMetricsProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/BuildMetricsProcessor.java index 78aa07a5e5407..b595f89a65d5e 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/BuildMetricsProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/BuildMetricsProcessor.java @@ -1,6 +1,6 @@ package io.quarkus.devui.deployment.menu; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.devui.deployment.InternalPageBuildItem; import io.quarkus.devui.spi.page.Page; @@ -10,7 +10,7 @@ */ public class BuildMetricsProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) InternalPageBuildItem createBuildMetricsPages() { InternalPageBuildItem buildMetricsPages = new InternalPageBuildItem("Build Metrics", 50); @@ -29,4 +29,4 @@ InternalPageBuildItem createBuildMetricsPages() { return buildMetricsPages; } -} \ No newline at end of file +} diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ConfigurationProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ConfigurationProcessor.java index 7174c9abd7d04..d8c31891b2d8c 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ConfigurationProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ConfigurationProcessor.java @@ -20,7 +20,7 @@ import jakarta.inject.Singleton; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; -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.deployment.annotations.ExecutionTime; @@ -31,20 +31,20 @@ import io.quarkus.dev.config.CurrentConfig; import io.quarkus.dev.console.DevConsoleManager; import io.quarkus.devui.deployment.InternalPageBuildItem; -import io.quarkus.devui.runtime.config.ConfigDescription; import io.quarkus.devui.runtime.config.ConfigDescriptionBean; import io.quarkus.devui.runtime.config.ConfigDevUIRecorder; import io.quarkus.devui.runtime.config.ConfigJsonRPCService; import io.quarkus.devui.spi.JsonRPCProvidersBuildItem; import io.quarkus.devui.spi.buildtime.BuildTimeActionBuildItem; import io.quarkus.devui.spi.page.Page; +import io.quarkus.vertx.http.runtime.devmode.ConfigDescription; /** * This creates Extensions Page */ public class ConfigurationProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) InternalPageBuildItem createConfigurationPages( List configDescriptionBuildItems, Optional devServicesLauncherConfig) { @@ -68,7 +68,7 @@ InternalPageBuildItem createConfigurationPages( return configurationPages; } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Record(ExecutionTime.STATIC_INIT) void registerConfigs(List configDescriptionBuildItems, Optional devServicesLauncherConfig, @@ -94,7 +94,7 @@ void registerConfigs(List configDescriptionBuildItem recorder.registerConfigs(configDescriptions, devServicesConfig); } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) @Record(ExecutionTime.RUNTIME_INIT) void registerBuildTimeActions( BuildProducer buildTimeActionProducer, diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ContinuousTestingProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ContinuousTestingProcessor.java index d622d78fac184..697146c0ee9de 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ContinuousTestingProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ContinuousTestingProcessor.java @@ -6,7 +6,7 @@ import java.util.Optional; import io.quarkus.arc.deployment.BeanContainerBuildItem; -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.deployment.annotations.ExecutionTime; @@ -30,7 +30,7 @@ public class ContinuousTestingProcessor { @Record(ExecutionTime.RUNTIME_INIT) - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public void continuousTestingState( ContinuousTestingRecorder recorder, LaunchModeBuildItem launchModeBuildItem, @@ -49,7 +49,7 @@ public void continuousTestingState( } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) InternalPageBuildItem createContinuousTestingPages() { InternalPageBuildItem continuousTestingPages = new InternalPageBuildItem("Continuous Testing", 30); @@ -64,7 +64,7 @@ InternalPageBuildItem createContinuousTestingPages() { } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void registerBuildTimeActions(LaunchModeBuildItem launchModeBuildItem, BuildProducer buildTimeActionProducer) { @@ -81,7 +81,7 @@ void registerBuildTimeActions(LaunchModeBuildItem launchModeBuildItem, buildTimeActionProducer.produce(actions); } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCService() { return new JsonRPCProvidersBuildItem(NAMESPACE, ContinuousTestingJsonRPCService.class); } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/DependenciesProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/DependenciesProcessor.java index eb38bd492003e..4f514674e73e3 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/DependenciesProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/DependenciesProcessor.java @@ -15,7 +15,7 @@ import org.eclipse.microprofile.config.ConfigProvider; import io.quarkus.bootstrap.model.ApplicationModel; -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.deployment.pkg.builditem.CurateOutcomeBuildItem; @@ -31,7 +31,7 @@ public class DependenciesProcessor { private static final String NAMESPACE = "devui-dependencies"; - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createAppDeps(BuildProducer menuProducer, CurateOutcomeBuildItem curateOutcomeBuildItem) { @@ -59,7 +59,7 @@ void createAppDeps(BuildProducer menuProducer, } } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createBuildTimeActions(BuildProducer buildTimeActionProducer, CurateOutcomeBuildItem curateOutcomeBuildItem) { if (isEnabled()) { diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/DevServicesProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/DevServicesProcessor.java index e1a317e322dc0..a8409eacadbe6 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/DevServicesProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/DevServicesProcessor.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.TreeMap; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.DevServicesResultBuildItem; import io.quarkus.deployment.dev.devservices.DevServiceDescriptionBuildItem; @@ -17,7 +17,7 @@ */ public class DevServicesProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) InternalPageBuildItem createDevServicesPages(List devServiceDescriptions, List devServicesResultBuildItems) { diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/EndpointsProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/EndpointsProcessor.java index 79d67d15c95b6..80ccc3ea9d4f3 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/EndpointsProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/EndpointsProcessor.java @@ -4,7 +4,7 @@ import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.Capability; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.devui.deployment.InternalPageBuildItem; import io.quarkus.devui.spi.JsonRPCProvidersBuildItem; @@ -19,7 +19,7 @@ public class EndpointsProcessor { private static final String NAMESPACE = "devui-endpoints"; public static final String DEV_UI = "dev-ui"; - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) InternalPageBuildItem createEndpointsPage(Capabilities capabilities, NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) { @@ -55,7 +55,7 @@ InternalPageBuildItem createEndpointsPage(Capabilities capabilities, return endpointsPage; } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCService() { return new JsonRPCProvidersBuildItem(NAMESPACE, ResourceNotFoundData.class); } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ExtensionsProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ExtensionsProcessor.java index a5b639559d67c..2970b17b643e6 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ExtensionsProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ExtensionsProcessor.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; -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.deployment.builditem.LaunchModeBuildItem; @@ -33,7 +33,7 @@ */ public class ExtensionsProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) InternalPageBuildItem createExtensionsPages(ExtensionsBuildItem extensionsBuildItem) { InternalPageBuildItem extensionsPages = new InternalPageBuildItem("Extensions", 10); @@ -55,7 +55,7 @@ InternalPageBuildItem createExtensionsPages(ExtensionsBuildItem extensionsBuildI return extensionsPages; } - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createBuildTimeActions(BuildProducer buildTimeActionProducer, LaunchModeBuildItem launchModeBuildItem) { diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ReadmeProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ReadmeProcessor.java index 09d9ada23e1bf..93a9483672da7 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ReadmeProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ReadmeProcessor.java @@ -5,7 +5,7 @@ import java.nio.file.Path; import java.util.Optional; -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.devui.deployment.InternalPageBuildItem; @@ -20,7 +20,7 @@ public class ReadmeProcessor { private static final String NS = "devui-readme"; - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) void createReadmePage(BuildProducer internalPageProducer) { String readme = getContents("README.md") @@ -42,7 +42,7 @@ void createReadmePage(BuildProducer internalPageProducer) } } - @BuildStep + @BuildStep(onlyIf = IsLocalDevelopment.class) JsonRPCProvidersBuildItem createJsonRPCServiceForCache() { return new JsonRPCProvidersBuildItem(NS, ReadmeJsonRPCService.class); } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/welcome/WelcomeProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/welcome/WelcomeProcessor.java index 201b09d741133..31c0710cdddf2 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/welcome/WelcomeProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/welcome/WelcomeProcessor.java @@ -11,7 +11,7 @@ import io.quarkus.bootstrap.workspace.SourceDir; import io.quarkus.bootstrap.workspace.WorkspaceModule; -import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.IsLocalDevelopment; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; import io.quarkus.devui.deployment.ExtensionsBuildItem; @@ -24,7 +24,7 @@ */ public class WelcomeProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) InternalPageBuildItem createWelcomePages(CurateOutcomeBuildItem curateOutcomeBuildItem, ExtensionsBuildItem extensionsBuildItem) { diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/console/ConsoleProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/console/ConsoleProcessor.java index 6563507df048a..dfd84813295cc 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/console/ConsoleProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/console/ConsoleProcessor.java @@ -39,9 +39,9 @@ import io.quarkus.deployment.console.ConsoleStateManager; import io.quarkus.dev.config.CurrentConfig; import io.quarkus.dev.spi.DevModeType; -import io.quarkus.devui.runtime.config.ConfigDescription; import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem; import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; +import io.quarkus.vertx.http.runtime.devmode.ConfigDescription; import io.quarkus.vertx.http.runtime.devmode.ConfigDescriptionsManager; public class ConsoleProcessor { diff --git a/extensions/vertx-http/pom.xml b/extensions/vertx-http/pom.xml index f370261e6feee..a76e0a0b730ca 100644 --- a/extensions/vertx-http/pom.xml +++ b/extensions/vertx-http/pom.xml @@ -22,5 +22,6 @@ dev-ui-spi dev-ui-resources dev-ui-tests + runtime-dev diff --git a/extensions/vertx-http/runtime-dev/pom.xml b/extensions/vertx-http/runtime-dev/pom.xml new file mode 100644 index 0000000000000..b7f761c50ee57 --- /dev/null +++ b/extensions/vertx-http/runtime-dev/pom.xml @@ -0,0 +1,21 @@ + + + + quarkus-vertx-http-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-vertx-http-dev + Quarkus - Vert.x - HTTP - Runtime Dev mode + Vert.x HTTP - Dev mode only + + + io.quarkus + quarkus-vertx-http + + + \ No newline at end of file diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/DevUIBuildTimeStaticHandler.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUICORSFilter.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/DevUICORSFilter.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUICORSFilter.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/DevUICORSFilter.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/DevUIRecorder.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIWebSocket.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/DevUIWebSocket.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/DevUIWebSocket.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/DevUIWebSocket.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/EndpointInfoHandler.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/EndpointInfoHandler.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/EndpointInfoHandler.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/EndpointInfoHandler.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/LocalHostOnlyFilter.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/LocalHostOnlyFilter.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/LocalHostOnlyFilter.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/LocalHostOnlyFilter.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/MvnpmHandler.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/MvnpmHandler.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/MvnpmHandler.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/MvnpmHandler.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/VaadinRouterHandler.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/VaadinRouterHandler.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/VaadinRouterHandler.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/VaadinRouterHandler.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/VertxRouteInfoService.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/VertxRouteInfoService.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/VertxRouteInfoService.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/VertxRouteInfoService.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsDevUIController.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsDevUIController.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsDevUIController.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsDevUIController.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsDevUIRecorder.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsDevUIRecorder.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsDevUIRecorder.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsDevUIRecorder.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsJsonRPCService.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsJsonRPCService.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsJsonRPCService.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/build/BuildMetricsJsonRPCService.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcMessage.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcMessage.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcMessage.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcMessage.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcRouter.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcRouter.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcRouter.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcRouter.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/MessageType.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/comms/MessageType.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/MessageType.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/comms/MessageType.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/ReflectionInfo.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/comms/ReflectionInfo.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/ReflectionInfo.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/comms/ReflectionInfo.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDescriptionBean.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigDescriptionBean.java similarity index 84% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDescriptionBean.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigDescriptionBean.java index efff206a81a2e..7d687de6770bc 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDescriptionBean.java +++ b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigDescriptionBean.java @@ -2,6 +2,8 @@ import java.util.List; +import io.quarkus.vertx.http.runtime.devmode.ConfigDescription; + public class ConfigDescriptionBean { private List allConfig; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDevUIRecorder.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigDevUIRecorder.java similarity index 99% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDevUIRecorder.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigDevUIRecorder.java index c4ca99a1391e7..e1ce02862a3ed 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDevUIRecorder.java +++ b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigDevUIRecorder.java @@ -14,6 +14,7 @@ import org.eclipse.microprofile.config.spi.ConfigSource; import io.quarkus.runtime.annotations.Recorder; +import io.quarkus.vertx.http.runtime.devmode.ConfigDescription; import io.smallrye.config.ConfigValue; import io.smallrye.config.SmallRyeConfig; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigJsonRPCService.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigJsonRPCService.java similarity index 96% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigJsonRPCService.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigJsonRPCService.java index 1b87e66558b94..d3139bfd9c481 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigJsonRPCService.java +++ b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/config/ConfigJsonRPCService.java @@ -8,6 +8,7 @@ import jakarta.inject.Inject; import io.quarkus.dev.console.DevConsoleManager; +import io.quarkus.vertx.http.runtime.devmode.ConfigDescription; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCService.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCService.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCService.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCService.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCState.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCState.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCState.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingJsonRPCState.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingRecorder.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingRecorder.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingRecorder.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/continuoustesting/ContinuousTestingRecorder.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcCodec.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcCodec.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcCodec.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcCodec.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcKeys.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcKeys.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcKeys.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcKeys.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcMethod.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcMethod.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcMethod.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcMethod.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcMethodName.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcMethodName.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcMethodName.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcMethodName.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcRequest.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcRequest.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcRequest.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcRequest.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcResponse.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcResponse.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcResponse.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/JsonRpcResponse.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/json/JsonMapper.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/json/JsonMapper.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/json/JsonMapper.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/json/JsonMapper.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/json/JsonTypeAdapter.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/json/JsonTypeAdapter.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/jsonrpc/json/JsonTypeAdapter.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/jsonrpc/json/JsonTypeAdapter.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/JsonFormatter.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/JsonFormatter.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/JsonFormatter.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/JsonFormatter.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamBroadcaster.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamBroadcaster.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamBroadcaster.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamBroadcaster.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamJsonRPCService.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamJsonRPCService.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamJsonRPCService.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamJsonRPCService.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamRecorder.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamRecorder.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamRecorder.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/LogStreamRecorder.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/MutinyLogHandler.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/MutinyLogHandler.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/logstream/MutinyLogHandler.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/logstream/MutinyLogHandler.java diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/readme/ReadmeJsonRPCService.java b/extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/readme/ReadmeJsonRPCService.java similarity index 100% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/readme/ReadmeJsonRPCService.java rename to extensions/vertx-http/runtime-dev/src/main/java/io/quarkus/devui/runtime/readme/ReadmeJsonRPCService.java diff --git a/extensions/vertx-http/runtime/pom.xml b/extensions/vertx-http/runtime/pom.xml index 09df41f0d86f7..5287e15fabf25 100644 --- a/extensions/vertx-http/runtime/pom.xml +++ b/extensions/vertx-http/runtime/pom.xml @@ -116,6 +116,9 @@ io.quarkus.vertx.http + + ${project.groupId}:${project.artifactId}-dev:${project.version} + diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDescription.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java similarity index 98% rename from extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDescription.java rename to extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java index 7663dc2838e14..7f772777fd7df 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/config/ConfigDescription.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java @@ -1,4 +1,4 @@ -package io.quarkus.devui.runtime.config; +package io.quarkus.vertx.http.runtime.devmode; import java.util.List; diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java index 090453094ce61..1f44d86b8a93c 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManager.java @@ -15,7 +15,6 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.spi.ConfigSource; -import io.quarkus.devui.runtime.config.ConfigDescription; import io.smallrye.config.ConfigValue; import io.smallrye.config.SmallRyeConfig; import io.vertx.core.impl.ConcurrentHashSet; @@ -71,7 +70,7 @@ public void addNamedConfigGroup(String name) { } public Map> calculate() { - List configDescriptions = new ArrayList<>(this.configDescriptions); + List cd = new ArrayList<>(this.configDescriptions); Map> ordered = new TreeMap<>(); List properties = new ArrayList<>(); @@ -119,7 +118,7 @@ public Map> calculate() { Map foundItems = new HashMap<>(); Set bannedExpansionCombos = new HashSet<>(); //we iterate over every config description - for (ConfigDescription item : configDescriptions) { + for (ConfigDescription item : cd) { //if they are a non-wildcard description we just add them directly if (!item.getName().contains("{*}")) { //we don't want to accidentally use these properties as name expansions @@ -277,7 +276,7 @@ public Map> calculate() { ordered.putIfAbsent(csn, new ArrayList<>()); ordered.get(csn).add(item); - configDescriptions.add(item); + cd.add(item); } }); for (List i : ordered.values()) { diff --git a/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManagerUnitTest.java b/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManagerUnitTest.java index 593be9aead61e..96baeac1b91d7 100644 --- a/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManagerUnitTest.java +++ b/extensions/vertx-http/runtime/src/test/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsManagerUnitTest.java @@ -8,7 +8,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.quarkus.devui.runtime.config.ConfigDescription; import io.smallrye.config.PropertiesConfigSource; public class ConfigDescriptionsManagerUnitTest { diff --git a/extensions/websockets-next/deployment/pom.xml b/extensions/websockets-next/deployment/pom.xml index a1e5ec3f6e8ce..d8e04df3c1ca5 100644 --- a/extensions/websockets-next/deployment/pom.xml +++ b/extensions/websockets-next/deployment/pom.xml @@ -33,7 +33,10 @@ io.quarkus quarkus-websockets-next - + + io.quarkus + quarkus-websockets-next-dev + io.quarkus diff --git a/extensions/websockets-next/deployment/src/main/java/io/quarkus/websockets/next/deployment/devui/WebSocketServerDevUIProcessor.java b/extensions/websockets-next/deployment/src/main/java/io/quarkus/websockets/next/deployment/devui/WebSocketServerDevUIProcessor.java index cf9e788803608..5ec0c0bb1749b 100644 --- a/extensions/websockets-next/deployment/src/main/java/io/quarkus/websockets/next/deployment/devui/WebSocketServerDevUIProcessor.java +++ b/extensions/websockets-next/deployment/src/main/java/io/quarkus/websockets/next/deployment/devui/WebSocketServerDevUIProcessor.java @@ -14,7 +14,7 @@ import org.jboss.jandex.Type; import org.jboss.jandex.Type.Kind; -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.devui.spi.JsonRPCProvidersBuildItem; @@ -24,11 +24,11 @@ import io.quarkus.websockets.next.deployment.GeneratedEndpointBuildItem; import io.quarkus.websockets.next.deployment.WebSocketEndpointBuildItem; import io.quarkus.websockets.next.deployment.WebSocketProcessor; -import io.quarkus.websockets.next.runtime.devui.WebSocketNextJsonRPCService; +import io.quarkus.websockets.next.runtime.dev.ui.WebSocketNextJsonRPCService; public class WebSocketServerDevUIProcessor { - @BuildStep(onlyIf = IsDevelopment.class) + @BuildStep(onlyIf = IsLocalDevelopment.class) public void pages(List endpoints, List generatedEndpoints, BuildProducer cardPages) { @@ -45,7 +45,7 @@ public void pages(List endpoints, Listruntime kotlin spi + runtime-dev diff --git a/extensions/websockets-next/runtime-dev/pom.xml b/extensions/websockets-next/runtime-dev/pom.xml new file mode 100644 index 0000000000000..f43997fb29c88 --- /dev/null +++ b/extensions/websockets-next/runtime-dev/pom.xml @@ -0,0 +1,28 @@ + + + + quarkus-websockets-next-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-websockets-next-dev + Quarkus - WebSockets Next - Runtime Dev mode + Implementation of the WebSocket API with enhanced efficiency and usability - Dev mode only + + + + io.quarkus + quarkus-websockets-next + + + + org.junit.jupiter + junit-jupiter + test + + + \ No newline at end of file diff --git a/extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/devui/WebSocketNextJsonRPCService.java b/extensions/websockets-next/runtime-dev/src/main/java/io/quarkus/websockets/next/runtime/dev/ui/WebSocketNextJsonRPCService.java similarity index 99% rename from extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/devui/WebSocketNextJsonRPCService.java rename to extensions/websockets-next/runtime-dev/src/main/java/io/quarkus/websockets/next/runtime/dev/ui/WebSocketNextJsonRPCService.java index 18ad40fa18cc4..736e3f6c7559f 100644 --- a/extensions/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/runtime/devui/WebSocketNextJsonRPCService.java +++ b/extensions/websockets-next/runtime-dev/src/main/java/io/quarkus/websockets/next/runtime/dev/ui/WebSocketNextJsonRPCService.java @@ -1,4 +1,4 @@ -package io.quarkus.websockets.next.runtime.devui; +package io.quarkus.websockets.next.runtime.dev.ui; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/extensions/websockets-next/runtime/src/test/java/io/quarkus/websockets/next/runtime/devui/WebSocketNextJsonRPCServiceTest.java b/extensions/websockets-next/runtime-dev/src/test/java/io/quarkus/websockets/next/runtime/dev/ui/WebSocketNextJsonRPCServiceTest.java similarity index 95% rename from extensions/websockets-next/runtime/src/test/java/io/quarkus/websockets/next/runtime/devui/WebSocketNextJsonRPCServiceTest.java rename to extensions/websockets-next/runtime-dev/src/test/java/io/quarkus/websockets/next/runtime/dev/ui/WebSocketNextJsonRPCServiceTest.java index b0d75d001ad70..56e9b3656cbeb 100644 --- a/extensions/websockets-next/runtime/src/test/java/io/quarkus/websockets/next/runtime/devui/WebSocketNextJsonRPCServiceTest.java +++ b/extensions/websockets-next/runtime-dev/src/test/java/io/quarkus/websockets/next/runtime/dev/ui/WebSocketNextJsonRPCServiceTest.java @@ -1,4 +1,4 @@ -package io.quarkus.websockets.next.runtime.devui; +package io.quarkus.websockets.next.runtime.dev.ui; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/extensions/websockets-next/runtime/pom.xml b/extensions/websockets-next/runtime/pom.xml index 7c8cd116092df..86e55d63042e9 100644 --- a/extensions/websockets-next/runtime/pom.xml +++ b/extensions/websockets-next/runtime/pom.xml @@ -47,6 +47,23 @@ io.quarkus.security quarkus-security + + + io.opentelemetry + opentelemetry-api + true + + + io.opentelemetry.semconv + opentelemetry-semconv + true + + + + io.micrometer + micrometer-core + true + org.junit.jupiter @@ -64,6 +81,9 @@ io.quarkus.websockets.next + + ${project.groupId}:${project.artifactId}-dev:${project.version} +