This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ab3f15e3d2e fix compile
ab3f15e3d2e is described below
commit ab3f15e3d2e03a6f9c27a68a7ce7bdf15ca9dbd0
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Jun 16 06:53:47 2025 +0200
fix compile
---
.../dsl/jbang/core/commands/kubernetes/CatalogHelper.java | 12 ++++++------
.../dsl/jbang/core/commands/kubernetes/KubernetesExport.java | 2 +-
.../jbang/core/commands/kubernetes/traits/ServiceTrait.java | 2 +-
.../jbang/core/commands/kubernetes/traits/TraitContext.java | 4 ++--
.../jbang/core/commands/kubernetes/traits/TraitHelper.java | 4 ++--
.../kubernetes/traits/knative/KnativeServiceTrait.java | 2 +-
.../jbang/core/commands/kubernetes/MetadataHelperTest.java | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/CatalogHelper.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/CatalogHelper.java
index e63ecc5772c..f3e692a5137 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/CatalogHelper.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/CatalogHelper.java
@@ -27,19 +27,19 @@ public class CatalogHelper {
// prevent instantiation of utility class
}
- public static CamelCatalog loadCatalog(RuntimeType runtime, String
runtimeVersion) throws Exception {
- return loadCatalog(runtime, runtimeVersion, "", null);
+ public static CamelCatalog loadCatalog(RuntimeType runtime, String
runtimeVersion, boolean download) throws Exception {
+ return loadCatalog(runtime, runtimeVersion, "", null, download);
}
- public static CamelCatalog loadCatalog(RuntimeType runtime, String
runtimeVersion, String repos, String quarkusGroupId)
+ public static CamelCatalog loadCatalog(RuntimeType runtime, String
runtimeVersion, String repos, String quarkusGroupId, boolean download)
throws Exception {
switch (runtime) {
case springBoot:
- return CatalogLoader.loadSpringBootCatalog(repos,
runtimeVersion);
+ return CatalogLoader.loadSpringBootCatalog(repos,
runtimeVersion,download);
case quarkus:
- return CatalogLoader.loadQuarkusCatalog(repos, runtimeVersion,
quarkusGroupId);
+ return CatalogLoader.loadQuarkusCatalog(repos, runtimeVersion,
quarkusGroupId, download);
case main:
- return CatalogLoader.loadCatalog(repos, runtimeVersion);
+ return CatalogLoader.loadCatalog(repos, runtimeVersion,
download);
default:
throw new IllegalArgumentException("Unsupported runtime: " +
runtime);
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
index 83cb4e425b9..a7e7d75f6eb 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
@@ -210,7 +210,7 @@ public class KubernetesExport extends Export {
}
String projectName = getProjectName();
- CamelCatalog catalog = CatalogHelper.loadCatalog(runtime,
runtime.version());
+ CamelCatalog catalog = CatalogHelper.loadCatalog(runtime,
runtime.version(), download);
List<Source> sources;
try {
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/ServiceTrait.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/ServiceTrait.java
index 2feb46c1584..4ed2ee68354 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/ServiceTrait.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/ServiceTrait.java
@@ -51,7 +51,7 @@ public class ServiceTrait extends BaseTrait {
return true;
}
- return TraitHelper.exposesHttpService(context);
+ return TraitHelper.exposesHttpService(context, true);
}
@Override
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitContext.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitContext.java
index 7687e3a6645..866af1b34f5 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitContext.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitContext.java
@@ -206,10 +206,10 @@ public class TraitContext {
return annotations;
}
- public CamelCatalog getCatalog() {
+ public CamelCatalog getCatalog(boolean download) {
if (catalog == null) {
try {
- catalog = CatalogHelper.loadCatalog(RuntimeType.quarkus,
RuntimeType.QUARKUS_VERSION);
+ catalog = CatalogHelper.loadCatalog(RuntimeType.quarkus,
RuntimeType.QUARKUS_VERSION, download);
} catch (Exception e) {
throw new RuntimeCamelException("Failed to create default
Quarkus Camel catalog", e);
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitHelper.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitHelper.java
index 9a326228375..990c6749712 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitHelper.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitHelper.java
@@ -328,10 +328,10 @@ public final class TraitHelper {
* @param context the trait context holding all route sources.
* @return true when routes expose a Http service, false otherwise.
*/
- public static boolean exposesHttpService(TraitContext context) {
+ public static boolean exposesHttpService(TraitContext context, boolean
download) {
try {
boolean exposesHttpServices = false;
- CamelCatalog catalog = context.getCatalog();
+ CamelCatalog catalog = context.getCatalog(download);
if (context.getSources() != null) {
for (Source source : context.getSources()) {
SourceMetadata metadata = context.inspectMetaData(source);
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/knative/KnativeServiceTrait.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/knative/KnativeServiceTrait.java
index d0a2a9c8a6d..09f609878b5 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/knative/KnativeServiceTrait.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/knative/KnativeServiceTrait.java
@@ -59,7 +59,7 @@ public class KnativeServiceTrait extends KnativeBaseTrait {
if (traitConfig.getKnativeService() != null) {
enabled =
Optional.ofNullable(traitConfig.getKnativeService().getEnabled()).orElse(false);
}
- return enabled && TraitHelper.exposesHttpService(context);
+ return enabled && TraitHelper.exposesHttpService(context, true);
}
@Override
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/MetadataHelperTest.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/MetadataHelperTest.java
index 8134ecab251..d2ce2dbf1ad 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/MetadataHelperTest.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/MetadataHelperTest.java
@@ -41,7 +41,7 @@ public class MetadataHelperTest {
@Test
public void testInspectHttpService() throws Exception {
- CamelCatalog catalog = CatalogHelper.loadCatalog(RuntimeType.quarkus,
RuntimeType.quarkus.version());
+ CamelCatalog catalog = CatalogHelper.loadCatalog(RuntimeType.quarkus,
RuntimeType.quarkus.version(), true);
Source source =
SourceHelper.resolveSource("classpath:PlatformHttpServer.java");
SourceMetadata metadata = MetadataHelper.readFromSource(catalog,
source);
