This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1361e1da9c92ba24316e622c7c051d277e750c4c Author: JiriOndrusek <[email protected]> AuthorDate: Thu Mar 21 09:53:23 2024 +0100 Changes required by new Kind.bean from catalog + generated files --- .../catalog/quarkus/QuarkusRuntimeProvider.java | 21 +++++++++++++++++++++ .../catalog/BuildTimeJsonSchemaResolver.java | 5 +++++ poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- .../src/main/generated/flattened-reduced-pom.xml | 2 +- .../generated/flattened-reduced-verbose-pom.xml | 2 +- .../org/apache/camel/quarkus/maven/CqCatalog.java | 22 +++++++++++++++++++++- 6 files changed, 50 insertions(+), 4 deletions(-) diff --git a/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java b/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java index 617725bce2..8d06a0bb20 100644 --- a/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java +++ b/catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java @@ -41,6 +41,7 @@ public class QuarkusRuntimeProvider implements RuntimeProvider { private static final String LANGUAGE_DIR = "org/apache/camel/catalog/quarkus/languages"; private static final String TRANSFORMER_DIR = "org/apache/camel/catalog/quarkus/transformers"; private static final String OTHER_DIR = "org/apache/camel/catalog/quarkus/others"; + private static final String BEANS_DIR = "org/apache/camel/catalog/beans"; private static final String CAPABILITIES_CATALOG = "org/apache/camel/catalog/quarkus/capabilities.properties"; private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/quarkus/components.properties"; private static final String DEV_CONSOLE_CATALOG = "org/apache/camel/catalog/quarkus/consoles.properties"; @@ -48,6 +49,7 @@ public class QuarkusRuntimeProvider implements RuntimeProvider { private static final String LANGUAGE_CATALOG = "org/apache/camel/catalog/quarkus/languages.properties"; private static final String TRANSFORMER_CATALOG = "org/apache/camel/catalog/quarkus/transformers.properties"; private static final String OTHER_CATALOG = "org/apache/camel/catalog/quarkus/others.properties"; + private static final String BEANS_CATALOG = "org/apache/camel/catalog/quarkus/beans.properties"; private CamelCatalog camelCatalog; @@ -106,6 +108,11 @@ public class QuarkusRuntimeProvider implements RuntimeProvider { return OTHER_DIR; } + @Override + public String getPojoBeanJSonSchemaDirectory() { + return BEANS_DIR; + } + @Override public List<String> findComponentNames() { List<String> names = new ArrayList<>(); @@ -190,6 +197,20 @@ public class QuarkusRuntimeProvider implements RuntimeProvider { return names; } + @Override + public List<String> findBeansNames() { + List<String> names = new ArrayList<>(); + InputStream is = camelCatalog.getVersionManager().getResourceAsStream(BEANS_CATALOG); + if (is != null) { + try { + CatalogHelper.loadLines(is, names); + } catch (IOException e) { + // ignore + } + } + return names; + } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public Map<String, String> findCapabilities() { diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeJsonSchemaResolver.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeJsonSchemaResolver.java index 0da3f16b3a..2aaa7012a4 100644 --- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeJsonSchemaResolver.java +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeJsonSchemaResolver.java @@ -74,6 +74,11 @@ public class BuildTimeJsonSchemaResolver implements JSonSchemaResolver { throw new UnsupportedOperationException("Main JSON schema resolution is not supported"); } + @Override + public String getPojoBeanJSonSchema(String name) { + throw new UnsupportedOperationException("Pojo bean JSON schema resolution is not supported"); + } + public Set<SchemaResource> getSchemaResources() { return schemaResources; } diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4e53074798..5b2efceeee 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6637,7 +6637,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>fontbox</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 44bace1588..96841c28cf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6582,7 +6582,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>fontbox</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d5a2443b3a..0c03d3f43f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6582,7 +6582,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>fontbox</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java index b99edc310d..8a0e548e41 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java @@ -224,7 +224,7 @@ public class CqCatalog { public static Stream<Kind> kinds() { return Stream.of(Kind.values()) - .filter(kind -> (kind != Kind.eip && kind != Kind.model)); + .filter(kind -> (kind != Kind.eip && kind != Kind.model && kind != Kind.bean)); } public static boolean isFirstScheme(ArtifactModel<?> model) { @@ -334,6 +334,7 @@ public class CqCatalog { private static final String LANGUAGE_DIR = CQ_CATALOG_DIR + "/languages"; private static final String TRANSFORMER_DIR = CQ_CATALOG_DIR + "/transformers"; private static final String OTHER_DIR = CQ_CATALOG_DIR + "/others"; + private static final String BEANS_DIR = CQ_CATALOG_DIR + "/beans"; private static final String COMPONENTS_CATALOG = CQ_CATALOG_DIR + "/components.properties"; private static final String DATA_FORMATS_CATALOG = CQ_CATALOG_DIR + "/dataformats.properties"; private static final String DEV_CONSOLE_CATALOG = CQ_CATALOG_DIR + "/consoles.properties"; @@ -403,6 +404,11 @@ public class CqCatalog { return OTHER_DIR; } + @Override + public String getPojoBeanJSonSchemaDirectory() { + return BEANS_DIR; + } + protected String getComponentsCatalog() { return COMPONENTS_CATALOG; } @@ -515,6 +521,20 @@ public class CqCatalog { return names; } + @Override + public List<String> findBeansNames() { + List<String> names = new ArrayList<>(); + InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getPojoBeanJSonSchemaDirectory()); + if (is != null) { + try { + CatalogHelper.loadLines(is, names); + } catch (IOException e) { + // ignore + } + } + return names; + } + @Override public Map<String, String> findCapabilities() { final Properties properties = new Properties();
