This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 1a98616ce9f Add component model and option lookup helpers to
BuildTimeCamelCatalog
1a98616ce9f is described below
commit 1a98616ce9f8a389dbea1265a8fc4dd8b2a0a123
Author: James Netherton <[email protected]>
AuthorDate: Thu Nov 19 07:27:54 2026 +0000
Add component model and option lookup helpers to BuildTimeCamelCatalog
Components serving several comma separated schemes now get one catalog
schema resource per scheme. Previously their models did not resolve, so
their options were missing from getAllOptions() and the option types of
the http, mail, smpp, coap and cometd components were not registered as
unremovable beans.
BuildTimeCamelCatalog gains getComponentModels(), getDataFormatModels(),
getLanguageModels(), getComponentOptionNames(Class) and
getEndpointOptionNames(Class).
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
.../core/deployment/CamelBeansProcessor.java | 13 ++-
.../deployment/catalog/BuildTimeCamelCatalog.java | 112 +++++++++++++++------
2 files changed, 87 insertions(+), 38 deletions(-)
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeansProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeansProcessor.java
index 2874c9118fb..85ff7e04552 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeansProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeansProcessor.java
@@ -127,11 +127,14 @@ class CamelBeansProcessor {
.collect(Collectors.toList());
for (AnnotationInstance instance : annotations) {
- SchemaResource resource = new SchemaResource();
- resource.setName(instance.value().asString());
-
resource.setType(instance.name().withoutPackagePrefix().toLowerCase());
- resource.setClassName(instance.target().asClass().name());
- resources.add(resource);
+ // A class can serve several comma separated names, each with its
own JSON schema
+ for (String name : instance.value().asString().split(",")) {
+ SchemaResource resource = new SchemaResource();
+ resource.setName(name.trim());
+
resource.setType(instance.name().withoutPackagePrefix().toLowerCase());
+ resource.setClassName(instance.target().asClass().name());
+ resources.add(resource);
+ }
}
BuildTimeJsonSchemaResolver resolver = new
BuildTimeJsonSchemaResolver(resources);
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeCamelCatalog.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeCamelCatalog.java
index 2c4e21fe54b..f618d497e8e 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeCamelCatalog.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeCamelCatalog.java
@@ -18,13 +18,17 @@ package org.apache.camel.quarkus.core.deployment.catalog;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
-import java.util.Set;
+import java.util.TreeMap;
+import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.camel.catalog.impl.AbstractCamelCatalog;
import org.apache.camel.tooling.model.BaseOptionModel;
import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.DataFormatModel;
+import org.apache.camel.tooling.model.LanguageModel;
public class BuildTimeCamelCatalog extends AbstractCamelCatalog {
@@ -36,6 +40,33 @@ public class BuildTimeCamelCatalog extends
AbstractCamelCatalog {
return (BuildTimeJsonSchemaResolver) super.getJSonSchemaResolver();
}
+ /**
+ * Gets the models of the components that are on the classpath, one per
component scheme
+ *
+ * @return List of {@link ComponentModel} instances
+ */
+ public List<ComponentModel> getComponentModels() {
+ return getModels("component", this::componentModel);
+ }
+
+ /**
+ * Gets the models of the data formats that are on the classpath
+ *
+ * @return List of {@link DataFormatModel} instances
+ */
+ public List<DataFormatModel> getDataFormatModels() {
+ return getModels("dataformat", this::dataFormatModel);
+ }
+
+ /**
+ * Gets the models of the languages that are on the classpath
+ *
+ * @return List of {@link LanguageModel} instances
+ */
+ public List<LanguageModel> getLanguageModels() {
+ return getModels("language", this::languageModel);
+ }
+
/**
* Gets a list of all component, endpoint, dataformat & language options
for the components that are on the classpath
*
@@ -43,44 +74,59 @@ public class BuildTimeCamelCatalog extends
AbstractCamelCatalog {
*/
public List<BaseOptionModel> getAllOptions() {
List<BaseOptionModel> options = new ArrayList<>();
- BuildTimeJsonSchemaResolver resolver = getJSonSchemaResolver();
- Set<SchemaResource> schemaResources = resolver.getSchemaResources();
-
- // Component options
- List<ComponentModel> componentModels = schemaResources
- .stream()
- .map(SchemaResource::getName)
- .map(this::componentModel)
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
+ List<ComponentModel> componentModels = getComponentModels();
+ componentModels.forEach(model ->
options.addAll(model.getComponentOptions()));
+ componentModels.forEach(model ->
options.addAll(model.getEndpointOptions()));
+ getDataFormatModels().forEach(model ->
options.addAll(model.getOptions()));
+ getLanguageModels().forEach(model ->
options.addAll(model.getOptions()));
+ return options;
+ }
- // For components we need to combine the component options with the
endpoint options
- componentModels.stream()
- .flatMap(componentModel ->
componentModel.getComponentOptions().stream())
- .forEach(options::add);
+ /**
+ * Gets the names of the component options of the given Java type, keyed
by component scheme. Schemes without such
+ * an option are omitted.
+ *
+ * @param javaType the Java type of the options to find
+ * @return Map of component scheme to option names
+ */
+ public Map<String, List<String>> getComponentOptionNames(Class<?>
javaType) {
+ return getOptionNames(javaType, ComponentModel::getComponentOptions);
+ }
- componentModels.stream()
- .flatMap(componentModel ->
componentModel.getEndpointOptions().stream())
- .forEach(options::add);
+ /**
+ * Gets the names of the endpoint options of the given Java type, keyed by
component scheme. Schemes without such
+ * an option are omitted.
+ *
+ * @param javaType the Java type of the options to find
+ * @return Map of component scheme to option names
+ */
+ public Map<String, List<String>> getEndpointOptionNames(Class<?> javaType)
{
+ return getOptionNames(javaType, ComponentModel::getEndpointOptions);
+ }
- // DataFormat options
- schemaResources
- .stream()
- .map(SchemaResource::getName)
- .map(this::dataFormatModel)
- .filter(Objects::nonNull)
- .flatMap(dataFormatModel ->
dataFormatModel.getOptions().stream())
- .forEach(options::add);
+ private Map<String, List<String>> getOptionNames(Class<?> javaType,
+ Function<ComponentModel, List<? extends BaseOptionModel>>
optionsResolver) {
+ Map<String, List<String>> optionNames = new TreeMap<>();
+ for (ComponentModel model : getComponentModels()) {
+ List<String> names = optionsResolver.apply(model)
+ .stream()
+ .filter(option ->
javaType.getName().equals(option.getJavaType()))
+ .map(BaseOptionModel::getName)
+ .collect(Collectors.toCollection(ArrayList::new));
+ if (!names.isEmpty()) {
+ optionNames.put(model.getScheme(), names);
+ }
+ }
+ return optionNames;
+ }
- // Language options
- schemaResources
+ private <T> List<T> getModels(String type, Function<String, T>
modelResolver) {
+ return getJSonSchemaResolver().getSchemaResources()
.stream()
+ .filter(resource -> type.equals(resource.getType()))
.map(SchemaResource::getName)
- .map(this::languageModel)
+ .map(modelResolver)
.filter(Objects::nonNull)
- .flatMap(languageModel -> languageModel.getOptions().stream())
- .forEach(options::add);
-
- return options;
+ .toList();
}
}