Skip to content

Commit dbf8e8b

Browse files
phillip-krugeraloubyansky
phillip-kruger
authored and
aloubyansky
committed
Introduce Dev only module for Vertx HTTP extension
Signed-off-by: Phillip Kruger <[email protected]>
1 parent 9dd667f commit dbf8e8b

File tree

60 files changed

+104
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+104
-63
lines changed

‎bom/application/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,6 +2176,11 @@
21762176
<artifactId>quarkus-vertx-http</artifactId>
21772177
<version>${project.version}</version>
21782178
</dependency>
2179+
<dependency>
2180+
<groupId>io.quarkus</groupId>
2181+
<artifactId>quarkus-vertx-http-dev</artifactId>
2182+
<version>${project.version}</version>
2183+
</dependency>
21792184
<dependency>
21802185
<groupId>io.quarkus</groupId>
21812186
<artifactId>quarkus-vertx-http-dev-console-spi</artifactId>

‎extensions/hibernate-orm/runtime/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
<artifactId>quarkus-vertx-http</artifactId>
4747
<optional>true</optional>
4848
</dependency>
49+
<dependency>
50+
<groupId>io.quarkus</groupId>
51+
<artifactId>quarkus-vertx-http-dev</artifactId>
52+
<optional>true</optional>
53+
</dependency>
4954
<dependency>
5055
<groupId>io.quarkus</groupId>
5156
<artifactId>quarkus-junit5-internal</artifactId>

‎extensions/vertx-http/deployment/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<groupId>io.quarkus</groupId>
2626
<artifactId>quarkus-vertx-http</artifactId>
2727
</dependency>
28+
<dependency>
29+
<groupId>io.quarkus</groupId>
30+
<artifactId>quarkus-vertx-http-dev</artifactId>
31+
</dependency>
2832
<dependency>
2933
<groupId>io.quarkus</groupId>
3034
<artifactId>quarkus-vertx-http-deployment-spi</artifactId>

‎extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import io.mvnpm.importmap.model.Imports;
5050
import io.quarkus.bootstrap.model.ApplicationModel;
5151
import io.quarkus.builder.Version;
52-
import io.quarkus.deployment.IsDevelopment;
52+
import io.quarkus.deployment.IsLocalDevelopment;
5353
import io.quarkus.deployment.annotations.BuildProducer;
5454
import io.quarkus.deployment.annotations.BuildStep;
5555
import io.quarkus.deployment.builditem.LaunchModeBuildItem;
@@ -95,7 +95,7 @@ public class BuildTimeContentProcessor {
9595
* Here we create references to internal dev ui files so that they can be imported by ref.
9696
* This will be merged into the final importmap
9797
*/
98-
@BuildStep(onlyIf = IsDevelopment.class)
98+
@BuildStep(onlyIf = IsLocalDevelopment.class)
9999
InternalImportMapBuildItem createKnownInternalImportMap(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem) {
100100

101101
String contextRoot = nonApplicationRootPathBuildItem.getNonApplicationRootPath() + EndpointsProcessor.DEV_UI + SLASH;
@@ -143,7 +143,7 @@ InternalImportMapBuildItem createKnownInternalImportMap(NonApplicationRootPathBu
143143
return internalImportMapBuildItem;
144144
}
145145

146-
@BuildStep(onlyIf = IsDevelopment.class)
146+
@BuildStep(onlyIf = IsLocalDevelopment.class)
147147
RelocationImportMapBuildItem createRelocationMap() {
148148

149149
RelocationImportMapBuildItem relocationImportMapBuildItem = new RelocationImportMapBuildItem();
@@ -171,7 +171,7 @@ RelocationImportMapBuildItem createRelocationMap() {
171171
* @param pageBuildItems
172172
* @param buildTimeConstProducer
173173
*/
174-
@BuildStep(onlyIf = IsDevelopment.class)
174+
@BuildStep(onlyIf = IsLocalDevelopment.class)
175175
void mapPageBuildTimeData(List<CardPageBuildItem> cards,
176176
List<MenuPageBuildItem> menus,
177177
List<FooterPageBuildItem> footers,
@@ -204,7 +204,7 @@ void mapPageBuildTimeData(List<CardPageBuildItem> cards,
204204
}
205205
}
206206

207-
@BuildStep(onlyIf = IsDevelopment.class)
207+
@BuildStep(onlyIf = IsLocalDevelopment.class)
208208
DeploymentMethodBuildItem mapDeploymentMethods(
209209
List<BuildTimeActionBuildItem> buildTimeActions,
210210
CurateOutcomeBuildItem curateOutcomeBuildItem) {
@@ -274,7 +274,7 @@ private Map<String, Object> getBuildTimeDataForCard(CurateOutcomeBuildItem curat
274274
* @param quteTemplateProducer
275275
* @param internalImportMapProducer
276276
*/
277-
@BuildStep(onlyIf = IsDevelopment.class)
277+
@BuildStep(onlyIf = IsLocalDevelopment.class)
278278
void createBuildTimeConstJsTemplate(CurateOutcomeBuildItem curateOutcomeBuildItem,
279279
NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
280280
List<BuildTimeConstBuildItem> buildTimeConstBuildItems,
@@ -319,7 +319,7 @@ void createBuildTimeConstJsTemplate(CurateOutcomeBuildItem curateOutcomeBuildIte
319319
/**
320320
* Here we find all the mvnpm jars
321321
*/
322-
@BuildStep(onlyIf = IsDevelopment.class)
322+
@BuildStep(onlyIf = IsLocalDevelopment.class)
323323
void gatherMvnpmJars(BuildProducer<MvnpmBuildItem> mvnpmProducer, CurateOutcomeBuildItem curateOutcomeBuildItem) {
324324
Set<URL> mvnpmJars = new HashSet<>();
325325
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
@@ -343,7 +343,7 @@ void gatherMvnpmJars(BuildProducer<MvnpmBuildItem> mvnpmProducer, CurateOutcomeB
343343
*
344344
* @return The QuteTemplate Build item that will create the end result
345345
*/
346-
@BuildStep(onlyIf = IsDevelopment.class)
346+
@BuildStep(onlyIf = IsLocalDevelopment.class)
347347
QuteTemplateBuildItem createIndexHtmlTemplate(
348348
MvnpmBuildItem mvnpmBuildItem,
349349
ThemeVarsBuildItem themeVarsBuildItem,
@@ -395,7 +395,7 @@ QuteTemplateBuildItem createIndexHtmlTemplate(
395395
}
396396

397397
// Here load all templates
398-
@BuildStep(onlyIf = IsDevelopment.class)
398+
@BuildStep(onlyIf = IsLocalDevelopment.class)
399399
void loadAllBuildTimeTemplates(BuildProducer<StaticContentBuildItem> buildTimeContentProducer,
400400
List<QuteTemplateBuildItem> templates) {
401401
ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -434,7 +434,7 @@ void loadAllBuildTimeTemplates(BuildProducer<StaticContentBuildItem> buildTimeCo
434434
/**
435435
* Creates json data that is available in Javascript
436436
*/
437-
@BuildStep(onlyIf = IsDevelopment.class)
437+
@BuildStep(onlyIf = IsLocalDevelopment.class)
438438
void createBuildTimeData(BuildProducer<BuildTimeConstBuildItem> buildTimeConstProducer,
439439
BuildProducer<ThemeVarsBuildItem> themeVarsProducer,
440440
CurateOutcomeBuildItem curateOutcomeBuildItem,

‎extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
3434
import io.quarkus.arc.deployment.BeanContainerBuildItem;
3535
import io.quarkus.arc.processor.BuiltinScope;
36-
import io.quarkus.deployment.IsDevelopment;
36+
import io.quarkus.deployment.IsLocalDevelopment;
3737
import io.quarkus.deployment.annotations.BuildProducer;
3838
import io.quarkus.deployment.annotations.BuildStep;
3939
import io.quarkus.deployment.annotations.ExecutionTime;
@@ -126,7 +126,7 @@ public class DevUIProcessor {
126126

127127
private static final Logger log = Logger.getLogger(DevUIProcessor.class);
128128

129-
@BuildStep(onlyIf = IsDevelopment.class)
129+
@BuildStep(onlyIf = IsLocalDevelopment.class)
130130
@Record(ExecutionTime.STATIC_INIT)
131131
void registerDevUiHandlers(
132132
DevUIConfig devUIConfig,
@@ -265,7 +265,7 @@ private boolean hasOwnIndexHtml() {
265265
/**
266266
* This makes sure the JsonRPC Classes for both the internal Dev UI and extensions is available as a bean and on the index.
267267
*/
268-
@BuildStep(onlyIf = IsDevelopment.class)
268+
@BuildStep(onlyIf = IsLocalDevelopment.class)
269269
void additionalBean(BuildProducer<AdditionalBeanBuildItem> additionalBeanProducer,
270270
BuildProducer<AdditionalIndexedClassesBuildItem> additionalIndexProducer,
271271
List<JsonRPCProvidersBuildItem> jsonRPCProvidersBuildItems) {
@@ -300,7 +300,7 @@ void additionalBean(BuildProducer<AdditionalBeanBuildItem> additionalBeanProduce
300300
/**
301301
* This goes through all jsonRPC methods and discover the methods using Jandex
302302
*/
303-
@BuildStep(onlyIf = IsDevelopment.class)
303+
@BuildStep(onlyIf = IsLocalDevelopment.class)
304304
void findAllJsonRPCMethods(BuildProducer<JsonRPCRuntimeMethodsBuildItem> jsonRPCMethodsProvider,
305305
BuildProducer<BuildTimeConstBuildItem> buildTimeConstProducer,
306306
LaunchModeBuildItem launchModeBuildItem,
@@ -403,7 +403,7 @@ void findAllJsonRPCMethods(BuildProducer<JsonRPCRuntimeMethodsBuildItem> jsonRPC
403403

404404
}
405405

406-
@BuildStep(onlyIf = IsDevelopment.class)
406+
@BuildStep(onlyIf = IsLocalDevelopment.class)
407407
@Record(ExecutionTime.RUNTIME_INIT)
408408
void createJsonRpcRouter(DevUIRecorder recorder,
409409
BeanContainerBuildItem beanContainer,
@@ -424,7 +424,7 @@ void createJsonRpcRouter(DevUIRecorder recorder,
424424
/**
425425
* This build all the pages for dev ui, based on the extension included
426426
*/
427-
@BuildStep(onlyIf = IsDevelopment.class)
427+
@BuildStep(onlyIf = IsLocalDevelopment.class)
428428
void processFooterLogs(BuildProducer<BuildTimeActionBuildItem> buildTimeActionProducer,
429429
BuildProducer<FooterPageBuildItem> footerPageProducer,
430430
List<FooterLogBuildItem> footerLogBuildItems) {
@@ -476,7 +476,7 @@ private String capitalizeFirstLetter(String input) {
476476
/**
477477
* This build all the pages for dev ui, based on the extension included
478478
*/
479-
@BuildStep(onlyIf = IsDevelopment.class)
479+
@BuildStep(onlyIf = IsLocalDevelopment.class)
480480
@SuppressWarnings("unchecked")
481481
void getAllExtensions(List<CardPageBuildItem> cardPageBuildItems,
482482
List<MenuPageBuildItem> menuPageBuildItems,
@@ -735,7 +735,7 @@ public WebJarResourcesFilter.FilterResult apply(String fileName, InputStream fil
735735
DEVUI));
736736
}
737737

738-
@BuildStep(onlyIf = IsDevelopment.class)
738+
@BuildStep(onlyIf = IsLocalDevelopment.class)
739739
void createAllRoutes(WebJarResultsBuildItem webJarResultsBuildItem,
740740
LaunchModeBuildItem launchModeBuildItem,
741741
List<DevUIWebJarBuildItem> devUIWebJarBuiltItems,

‎extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/build/BuildMetricsDevUIProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
66
import io.quarkus.arc.processor.DotNames;
7-
import io.quarkus.deployment.IsDevelopment;
7+
import io.quarkus.deployment.IsLocalDevelopment;
88
import io.quarkus.deployment.annotations.BuildStep;
99
import io.quarkus.deployment.annotations.BuildSteps;
1010
import io.quarkus.deployment.annotations.Record;
@@ -13,7 +13,7 @@
1313
import io.quarkus.devui.runtime.build.BuildMetricsJsonRPCService;
1414
import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
1515

16-
@BuildSteps(onlyIf = { IsDevelopment.class })
16+
@BuildSteps(onlyIf = { IsLocalDevelopment.class })
1717
public class BuildMetricsDevUIProcessor {
1818

1919
@BuildStep

‎extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/ide/IdeProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import org.jboss.logging.Logger;
1212

13-
import io.quarkus.deployment.IsDevelopment;
13+
import io.quarkus.deployment.IsLocalDevelopment;
1414
import io.quarkus.deployment.annotations.BuildProducer;
1515
import io.quarkus.deployment.annotations.BuildStep;
1616
import io.quarkus.deployment.annotations.ExecutionTime;
@@ -31,7 +31,7 @@ public class IdeProcessor {
3131
private static final Logger log = Logger.getLogger(IdeProcessor.class);
3232
private static final Map<String, String> LANG_TO_EXT = Map.of("java", "java", "kotlin", "kt");
3333

34-
@BuildStep(onlyIf = IsDevelopment.class)
34+
@BuildStep(onlyIf = IsLocalDevelopment.class)
3535
@Record(ExecutionTime.RUNTIME_INIT)
3636
void createOpenInIDEService(BuildProducer<BuildTimeActionBuildItem> buildTimeActionProducer,
3737
BuildProducer<RouteBuildItem> routeProducer,

‎extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/logstream/LogStreamProcessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Optional;
55

66
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
7-
import io.quarkus.deployment.IsDevelopment;
7+
import io.quarkus.deployment.IsLocalDevelopment;
88
import io.quarkus.deployment.annotations.BuildProducer;
99
import io.quarkus.deployment.annotations.BuildStep;
1010
import io.quarkus.deployment.annotations.ExecutionTime;
@@ -31,14 +31,14 @@ public class LogStreamProcessor {
3131

3232
private final String namespace = "devui-logstream";
3333

34-
@BuildStep(onlyIf = IsDevelopment.class)
34+
@BuildStep(onlyIf = IsLocalDevelopment.class)
3535
void additionalBean(BuildProducer<AdditionalBeanBuildItem> additionalBeanProducer) {
3636
additionalBeanProducer.produce(AdditionalBeanBuildItem.builder()
3737
.addBeanClass(LogStreamBroadcaster.class)
3838
.setUnremovable().build());
3939
}
4040

41-
@BuildStep(onlyIf = IsDevelopment.class)
41+
@BuildStep(onlyIf = IsLocalDevelopment.class)
4242
@Record(ExecutionTime.STATIC_INIT)
4343
@SuppressWarnings("unchecked")
4444
public void handler(BuildProducer<StreamingLogHandlerBuildItem> streamingLogHandlerBuildItem,
@@ -52,7 +52,7 @@ public void handler(BuildProducer<StreamingLogHandlerBuildItem> streamingLogHand
5252
streamingLogHandlerBuildItem.produce(new StreamingLogHandlerBuildItem((RuntimeValue) mutinyLogHandler));
5353
}
5454

55-
@BuildStep(onlyIf = IsDevelopment.class)
55+
@BuildStep(onlyIf = IsLocalDevelopment.class)
5656
void registerBuildTimeActions(BuildProducer<BuildTimeActionBuildItem> buildTimeActionProducer,
5757
LaunchModeBuildItem launchModeBuildItem) {
5858

@@ -137,7 +137,7 @@ void registerBuildTimeActions(BuildProducer<BuildTimeActionBuildItem> buildTimeA
137137
buildTimeActionProducer.produce(keyStrokeActions);
138138
}
139139

140-
@BuildStep
140+
@BuildStep(onlyIf = IsLocalDevelopment.class)
141141
JsonRPCProvidersBuildItem createJsonRPCService() {
142142
return new JsonRPCProvidersBuildItem(namespace, LogStreamJsonRPCService.class);
143143
}

‎extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/BuildMetricsProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.quarkus.devui.deployment.menu;
22

3-
import io.quarkus.deployment.IsDevelopment;
3+
import io.quarkus.deployment.IsLocalDevelopment;
44
import io.quarkus.deployment.annotations.BuildStep;
55
import io.quarkus.devui.deployment.InternalPageBuildItem;
66
import io.quarkus.devui.spi.page.Page;
@@ -10,7 +10,7 @@
1010
*/
1111
public class BuildMetricsProcessor {
1212

13-
@BuildStep(onlyIf = IsDevelopment.class)
13+
@BuildStep(onlyIf = IsLocalDevelopment.class)
1414
InternalPageBuildItem createBuildMetricsPages() {
1515

1616
InternalPageBuildItem buildMetricsPages = new InternalPageBuildItem("Build Metrics", 50);
@@ -29,4 +29,4 @@ InternalPageBuildItem createBuildMetricsPages() {
2929

3030
return buildMetricsPages;
3131
}
32-
}
32+
}

‎extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/menu/ConfigurationProcessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import jakarta.inject.Singleton;
2121

2222
import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
23-
import io.quarkus.deployment.IsDevelopment;
23+
import io.quarkus.deployment.IsLocalDevelopment;
2424
import io.quarkus.deployment.annotations.BuildProducer;
2525
import io.quarkus.deployment.annotations.BuildStep;
2626
import io.quarkus.deployment.annotations.ExecutionTime;
@@ -31,20 +31,20 @@
3131
import io.quarkus.dev.config.CurrentConfig;
3232
import io.quarkus.dev.console.DevConsoleManager;
3333
import io.quarkus.devui.deployment.InternalPageBuildItem;
34-
import io.quarkus.devui.runtime.config.ConfigDescription;
3534
import io.quarkus.devui.runtime.config.ConfigDescriptionBean;
3635
import io.quarkus.devui.runtime.config.ConfigDevUIRecorder;
3736
import io.quarkus.devui.runtime.config.ConfigJsonRPCService;
3837
import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
3938
import io.quarkus.devui.spi.buildtime.BuildTimeActionBuildItem;
4039
import io.quarkus.devui.spi.page.Page;
40+
import io.quarkus.vertx.http.runtime.devmode.ConfigDescription;
4141

4242
/**
4343
* This creates Extensions Page
4444
*/
4545
public class ConfigurationProcessor {
4646

47-
@BuildStep(onlyIf = IsDevelopment.class)
47+
@BuildStep(onlyIf = IsLocalDevelopment.class)
4848
InternalPageBuildItem createConfigurationPages(
4949
List<ConfigDescriptionBuildItem> configDescriptionBuildItems,
5050
Optional<DevServicesLauncherConfigResultBuildItem> devServicesLauncherConfig) {
@@ -68,7 +68,7 @@ InternalPageBuildItem createConfigurationPages(
6868
return configurationPages;
6969
}
7070

71-
@BuildStep(onlyIf = IsDevelopment.class)
71+
@BuildStep(onlyIf = IsLocalDevelopment.class)
7272
@Record(ExecutionTime.STATIC_INIT)
7373
void registerConfigs(List<ConfigDescriptionBuildItem> configDescriptionBuildItems,
7474
Optional<DevServicesLauncherConfigResultBuildItem> devServicesLauncherConfig,
@@ -94,7 +94,7 @@ void registerConfigs(List<ConfigDescriptionBuildItem> configDescriptionBuildItem
9494
recorder.registerConfigs(configDescriptions, devServicesConfig);
9595
}
9696

97-
@BuildStep(onlyIf = IsDevelopment.class)
97+
@BuildStep(onlyIf = IsLocalDevelopment.class)
9898
@Record(ExecutionTime.RUNTIME_INIT)
9999
void registerBuildTimeActions(
100100
BuildProducer<BuildTimeActionBuildItem> buildTimeActionProducer,

0 commit comments

Comments
 (0)