(camel) branch regen_bot updated (bb5e1d188dc -> 495deb08129)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from bb5e1d188dc CAMEL-20488: Drop support for old swagger v2 spec (openapi v2) add bf3b7698a06 camel-cloudevents - Fix name with plus sign is a valid name. Fix metadata generator to allow that. add 23021c2ec18 camel-cloudevents - Fix name with plus sign is a valid name. Fix metadata generator to allow that. add 495deb08129 routes-loader should use marker file name as-is without the dot to dash hack No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/transformers.properties | 2 +- ...json.json => application-cloudevents+json.json} | 0 ...json.json => application-cloudevents+json.json} | 0 .../CloudEventJsonDataTypeTransformerTest.java | 2 +- .../org/apache/camel/spi/TransformerResolver.java | 1 - .../camel/impl/engine/DefaultRoutesLoader.java | 4 +--- .../camel/routes-loader/{camel-xml => camel.xml} | 0 .../apache/camel/dsl/xml/io/XmlLoadAppTest.java| 25 ++ .../io/{camel-app2.xml => camel-app11.camel.xml} | 7 +++--- .../camel/routes-loader/{camel-xml => camel.xml} | 0 .../routes-loader/{kamelet-yaml => kamelet.yaml} | 0 .../packaging/GenerateDataTypeTransformerMojo.java | 2 +- .../camel/maven/packaging/SpiGeneratorMojo.java| 2 +- 13 files changed, 33 insertions(+), 12 deletions(-) rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/{application-cloudevents-json.json => application-cloudevents+json.json} (100%) rename components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/{application-cloudevents-json.json => application-cloudevents+json.json} (100%) rename dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/{camel-xml => camel.xml} (100%) copy dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/{camel-app2.xml => camel-app11.camel.xml} (88%) rename dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/{camel-xml => camel.xml} (100%) rename dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/{kamelet-yaml => kamelet.yaml} (100%)
(camel) branch main updated: Upgrade groovy 4.0.19
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 dad765d1096 Upgrade groovy 4.0.19 dad765d1096 is described below commit dad765d1096f2dfda58e174af7ab108c0160d3cd Author: Claus Ibsen AuthorDate: Sat Mar 2 08:38:10 2024 +0100 Upgrade groovy 4.0.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 933ba47df27..a9195755da9 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ 4.0.4 4.0.4 4.0.4 -4.0.18 +4.0.19 false
(camel) 02/03: camel-cloudevents - Fix name with plus sign is a valid name. Fix metadata generator to allow that.
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 commit 23021c2ec1855475ca9e870c11ef7f086ebb9d17 Author: Claus Ibsen AuthorDate: Sat Mar 2 08:15:08 2024 +0100 camel-cloudevents - Fix name with plus sign is a valid name. Fix metadata generator to allow that. --- .../resources/org/apache/camel/catalog/transformers.properties | 2 +- ...lication-cloudevents-json.json => application-cloudevents+json.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties index dc80293a5b4..16afe3fe2c9 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties @@ -1,4 +1,4 @@ -application-cloudevents-json +application-cloudevents+json application-json application-octet-stream application-x-java-object diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/application-cloudevents-json.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/application-cloudevents+json.json similarity index 100% rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/application-cloudevents-json.json rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/application-cloudevents+json.json
(camel) branch main updated (bb5e1d188dc -> 495deb08129)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from bb5e1d188dc CAMEL-20488: Drop support for old swagger v2 spec (openapi v2) new bf3b7698a06 camel-cloudevents - Fix name with plus sign is a valid name. Fix metadata generator to allow that. new 23021c2ec18 camel-cloudevents - Fix name with plus sign is a valid name. Fix metadata generator to allow that. new 495deb08129 routes-loader should use marker file name as-is without the dot to dash hack The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/camel/catalog/transformers.properties | 2 +- ...json.json => application-cloudevents+json.json} | 0 ...json.json => application-cloudevents+json.json} | 0 .../CloudEventJsonDataTypeTransformerTest.java | 2 +- .../org/apache/camel/spi/TransformerResolver.java | 1 - .../camel/impl/engine/DefaultRoutesLoader.java | 4 +--- .../camel/routes-loader/{camel-xml => camel.xml} | 0 .../apache/camel/dsl/xml/io/XmlLoadAppTest.java| 25 ++ .../io/{camel-app2.xml => camel-app11.camel.xml} | 7 +++--- .../camel/routes-loader/{camel-xml => camel.xml} | 0 .../routes-loader/{kamelet-yaml => kamelet.yaml} | 0 .../packaging/GenerateDataTypeTransformerMojo.java | 2 +- .../camel/maven/packaging/SpiGeneratorMojo.java| 2 +- 13 files changed, 33 insertions(+), 12 deletions(-) rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/{application-cloudevents-json.json => application-cloudevents+json.json} (100%) rename components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/{application-cloudevents-json.json => application-cloudevents+json.json} (100%) rename dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/{camel-xml => camel.xml} (100%) copy dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/{camel-app2.xml => camel-app11.camel.xml} (88%) rename dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/{camel-xml => camel.xml} (100%) rename dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/{kamelet-yaml => kamelet.yaml} (100%)
(camel) 03/03: routes-loader should use marker file name as-is without the dot to dash hack
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 commit 495deb08129d1268fd5e115c20e13c3347fabebb Author: Claus Ibsen AuthorDate: Sat Mar 2 08:28:04 2024 +0100 routes-loader should use marker file name as-is without the dot to dash hack --- .../camel/impl/engine/DefaultRoutesLoader.java | 4 +--- .../camel/routes-loader/{camel-xml => camel.xml} | 0 .../apache/camel/dsl/xml/io/XmlLoadAppTest.java| 25 .../apache/camel/dsl/xml/io/camel-app11.camel.xml | 27 ++ .../camel/routes-loader/{camel-xml => camel.xml} | 0 .../routes-loader/{kamelet-yaml => kamelet.yaml} | 0 6 files changed, 53 insertions(+), 3 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java index 3270da91b8d..edff15a1626 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java @@ -251,10 +251,8 @@ public class DefaultRoutesLoader extends ServiceSupport implements RoutesLoader, final CamelContext ecc = getCamelContext(); final FactoryFinder finder = ecc.getCamelContextExtension().getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH); -// the marker files are generated with dot as dash -String sanitized = extension.replace(".", "-"); RoutesBuilderLoader answer -= ResolverHelper.resolveService(getCamelContext(), finder, sanitized, RoutesBuilderLoader.class).orElse(null); += ResolverHelper.resolveService(getCamelContext(), finder, extension, RoutesBuilderLoader.class).orElse(null); // if it's a multi-extension then fallback to parent if (answer == null && extension.contains(".")) { diff --git a/dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel-xml b/dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml similarity index 100% rename from dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel-xml rename to dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml diff --git a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java index 83700f09df1..fa87d1dbfe0 100644 --- a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java +++ b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java @@ -277,4 +277,29 @@ public class XmlLoadAppTest { } } +@Test +public void testLoadCamelAppCamelXmlExt() throws Exception { +try (DefaultCamelContext context = new DefaultCamelContext()) { +context.start(); + +Resource resource = PluginHelper.getResourceLoader(context).resolveResource( +"/org/apache/camel/dsl/xml/io/camel-app11.camel.xml"); + +RoutesLoader routesLoader = PluginHelper.getRoutesLoader(context); +routesLoader.preParseRoute(resource, false); +routesLoader.loadRoutes(resource); + +assertNotNull(context.getRoute("r11"), "Loaded r9 route should be there"); +assertEquals(1, context.getRoutes().size()); + +// test that loaded route works +MockEndpoint y11 = context.getEndpoint("mock:y11", MockEndpoint.class); +y11.expectedBodiesReceived("Hi World"); +context.createProducerTemplate().sendBody("direct:x11", "Hi World"); +y11.assertIsSatisfied(); + +context.stop(); +} +} + } diff --git a/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/camel-app11.camel.xml b/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/camel-app11.camel.xml new file mode 100644 index 000..bfae9cb76b8 --- /dev/null +++ b/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/camel-app11.camel.xml @@ -0,0 +1,27 @@ + + +http://www.springframework.org/schema/beans;> + + + + + + + diff --git a/dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel-xml b/dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel.xml similarity index 100% rename from dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/routes-loader/camel-xml rename to
(camel) 01/03: camel-cloudevents - Fix name with plus sign is a valid name. Fix metadata generator to allow that.
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 commit bf3b7698a06fd4722e95ce282bcbdef02d7a2984 Author: Claus Ibsen AuthorDate: Sat Mar 2 08:08:25 2024 +0100 camel-cloudevents - Fix name with plus sign is a valid name. Fix metadata generator to allow that. --- ...lication-cloudevents-json.json => application-cloudevents+json.json} | 0 .../cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java | 2 +- .../src/main/java/org/apache/camel/spi/TransformerResolver.java | 1 - .../apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java | 2 +- .../main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java| 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-cloudevents-json.json b/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-cloudevents+json.json similarity index 100% rename from components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-cloudevents-json.json rename to components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/application-cloudevents+json.json diff --git a/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java b/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java index 6f3376fe061..02b223e10a1 100644 --- a/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java +++ b/components/camel-cloudevents/src/test/java/org/apache/camel/component/cloudevents/transformer/CloudEventJsonDataTypeTransformerTest.java @@ -96,7 +96,7 @@ class CloudEventJsonDataTypeTransformerTest { @Test public void shouldLookupTransformer() throws Exception { Transformer transformer -= camelContext.getTransformerRegistry().resolveTransformer(new TransformerKey("application-cloudevents/json")); += camelContext.getTransformerRegistry().resolveTransformer(new TransformerKey("application-cloudevents+json")); Assertions.assertNotNull(transformer); Assertions.assertEquals(CloudEventJsonDataTypeTransformer.class, transformer.getClass()); } diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/TransformerResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/TransformerResolver.java index af75c26051b..23817d1affb 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/TransformerResolver.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/TransformerResolver.java @@ -52,7 +52,6 @@ public interface TransformerResolver { default String normalize(K key) { String keyString = key.toString(); keyString = StringHelper.after(keyString, DataType.DEFAULT_SCHEME + ":", keyString); - return StringHelper.sanitize(keyString).toLowerCase(Locale.US); } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java index c395fd581ba..bf93e9984c2 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java @@ -220,7 +220,7 @@ public class GenerateDataTypeTransformerMojo extends AbstractGeneratorMojo { } private String sanitizeFileName(String fileName) { -return fileName.replaceAll("[^A-Za-z0-9-/]", "-"); +return fileName.replaceAll("[^A-Za-z0-9+-/]", "-"); } private String asTitle(String name) { diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java index 841d2217a84..c33a083c880 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java @@ -163,7 +163,7 @@ public class SpiGeneratorMojo extends AbstractGeneratorMojo { } private String sanitizeFileName(String fileName) { -return fileName.replaceAll("[^A-Za-z0-9-/+]", "-"); +return
(camel) branch regen_bot updated (2d90abc64fb -> bb5e1d188dc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 2d90abc64fb CAMEL-20482: use min/max depth during markerfile cleanup (#13366) add bb5e1d188dc CAMEL-20488: Drop support for old swagger v2 spec (openapi v2) No new revisions were added by this update. Summary of changes: .../rest/producer/JettyRestProducerInvalidApiDocTest.java | 2 +- components/camel-jetty/src/test/resources/hello-api.json | 10 +++--- 2 files changed, 8 insertions(+), 4 deletions(-)
(camel) branch main updated: CAMEL-20488: Drop support for old swagger v2 spec (openapi v2)
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 bb5e1d188dc CAMEL-20488: Drop support for old swagger v2 spec (openapi v2) bb5e1d188dc is described below commit bb5e1d188dc67e5e072226e87a2a35726eb30cfd Author: Claus Ibsen AuthorDate: Sat Mar 2 07:51:06 2024 +0100 CAMEL-20488: Drop support for old swagger v2 spec (openapi v2) --- .../rest/producer/JettyRestProducerInvalidApiDocTest.java | 2 +- components/camel-jetty/src/test/resources/hello-api.json | 10 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerInvalidApiDocTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerInvalidApiDocTest.java index c59efee7d85..edf2dd716b8 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerInvalidApiDocTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerInvalidApiDocTest.java @@ -69,7 +69,7 @@ public class JettyRestProducerInvalidApiDocTest extends CamelTestSupport { fail("Should fail"); } catch (Exception e) { IllegalArgumentException iae = assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause()); -assertEquals("OpenApi api-doc does not contain query parameter name for get:/api/bye", iae.getMessage()); +assertEquals("OpenApi api-doc does not contain operation for get:/api/bye", iae.getMessage()); } } } diff --git a/components/camel-jetty/src/test/resources/hello-api.json b/components/camel-jetty/src/test/resources/hello-api.json index 6cc6a72f48f..a0bda54cd59 100644 --- a/components/camel-jetty/src/test/resources/hello-api.json +++ b/components/camel-jetty/src/test/resources/hello-api.json @@ -1,7 +1,11 @@ + { - "swagger" : "2.0", - "host" : "localhost:8080", - "basePath" : "/api", + "openapi": "3.0.2", + "servers": [ +{ + "url": "localhost:8080/api" +} + ], "tags" : [ { "name" : "hello" } ],
(camel) branch regen_bot updated (0e7b252ad41 -> 2d90abc64fb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 0e7b252ad41 CAMEL-20464 - Slack CloudEvent transformer (#13365) add 2d90abc64fb CAMEL-20482: use min/max depth during markerfile cleanup (#13366) No new revisions were added by this update. Summary of changes: .../MarkerFileExclusiveReadLockStrategy.java | 19 +- ...lusiveReadLockStrategyRecursiveCleanupTest.java | 199 + 2 files changed, 213 insertions(+), 5 deletions(-) create mode 100644 core/camel-core/src/test/java/org/apache/camel/component/file/MarkerFileExclusiveReadLockStrategyRecursiveCleanupTest.java
(camel) branch camel-4.4.x updated: CAMEL-20482: use min/max depth during markerfile cleanup (#13366)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.4.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-4.4.x by this push: new a3a3501b9ee CAMEL-20482: use min/max depth during markerfile cleanup (#13366) a3a3501b9ee is described below commit a3a3501b9ee9a2351ada9fdd0cd7e4a675cfe710 Author: Stephen Higgs AuthorDate: Sat Mar 2 01:37:15 2024 -0500 CAMEL-20482: use min/max depth during markerfile cleanup (#13366) * CAMEL-20482: use min/max depth during markerfile cleanup * CAMEL-20482: modify cleanup logging to trace --- .../MarkerFileExclusiveReadLockStrategy.java | 19 +- ...lusiveReadLockStrategyRecursiveCleanupTest.java | 199 + 2 files changed, 213 insertions(+), 5 deletions(-) diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java index 06cb6c47d49..82650398f48 100644 --- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java +++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java @@ -57,7 +57,8 @@ public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusive String endpointPath = endpoint.getConfiguration().getDirectory(); StopWatch watch = new StopWatch(); -deleteLockFiles(file, endpoint.isRecursive(), endpoint.isHiddenFilesEnabled(), endpointPath, endpoint.getFilter(), +deleteLockFiles(file, endpoint.isRecursive(), endpoint.getMinDepth(), endpoint.getMaxDepth(), 1, +endpoint.isHiddenFilesEnabled(), endpointPath, endpoint.getFilter(), endpoint.getAntFilter(), excludePattern, includePattern); @@ -170,10 +171,16 @@ public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusive } private static void deleteLockFiles( -File dir, boolean recursive, boolean hiddenFilesEnabled, String endpointPath, GenericFileFilter filter, +File dir, boolean recursive, int minDepth, int maxDepth, int depth, boolean hiddenFilesEnabled, String endpointPath, +GenericFileFilter filter, GenericFileFilter antFilter, Pattern excludePattern, Pattern includePattern) { + +if (recursive) { +LOG.trace("checking: depth {}, minDepth {}, maxDepth {}, directory: {}", depth, minDepth, maxDepth, dir); +} + File[] files = dir.listFiles(); if (files == null || files.length == 0) { return; @@ -210,11 +217,13 @@ public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusive } } -if (file.getName().endsWith(FileComponent.DEFAULT_LOCK_FILE_POSTFIX)) { +if (file.getName().endsWith(FileComponent.DEFAULT_LOCK_FILE_POSTFIX) && (depth >= minDepth)) { LOG.warn("Deleting orphaned lock file: {}", file); FileUtil.deleteFile(file); -} else if (recursive && file.isDirectory()) { -deleteLockFiles(file, true, hiddenFilesEnabled, endpointPath, filter, antFilter, excludePattern, +} else if (recursive && file.isDirectory() && (depth < maxDepth)) { +deleteLockFiles(file, true, minDepth, maxDepth, depth + 1, hiddenFilesEnabled, endpointPath, filter, +antFilter, +excludePattern, includePattern); } } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/MarkerFileExclusiveReadLockStrategyRecursiveCleanupTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/MarkerFileExclusiveReadLockStrategyRecursiveCleanupTest.java new file mode 100644 index 000..9be63945b0d --- /dev/null +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/MarkerFileExclusiveReadLockStrategyRecursiveCleanupTest.java @@ -0,0 +1,199 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + *
(camel) branch main updated: CAMEL-20482: use min/max depth during markerfile cleanup (#13366)
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 2d90abc64fb CAMEL-20482: use min/max depth during markerfile cleanup (#13366) 2d90abc64fb is described below commit 2d90abc64fbb645abf3a176f4b5e52b8901ba03b Author: Stephen Higgs AuthorDate: Sat Mar 2 01:37:15 2024 -0500 CAMEL-20482: use min/max depth during markerfile cleanup (#13366) * CAMEL-20482: use min/max depth during markerfile cleanup * CAMEL-20482: modify cleanup logging to trace --- .../MarkerFileExclusiveReadLockStrategy.java | 19 +- ...lusiveReadLockStrategyRecursiveCleanupTest.java | 199 + 2 files changed, 213 insertions(+), 5 deletions(-) diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java index 06cb6c47d49..82650398f48 100644 --- a/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java +++ b/components/camel-file/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java @@ -57,7 +57,8 @@ public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusive String endpointPath = endpoint.getConfiguration().getDirectory(); StopWatch watch = new StopWatch(); -deleteLockFiles(file, endpoint.isRecursive(), endpoint.isHiddenFilesEnabled(), endpointPath, endpoint.getFilter(), +deleteLockFiles(file, endpoint.isRecursive(), endpoint.getMinDepth(), endpoint.getMaxDepth(), 1, +endpoint.isHiddenFilesEnabled(), endpointPath, endpoint.getFilter(), endpoint.getAntFilter(), excludePattern, includePattern); @@ -170,10 +171,16 @@ public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusive } private static void deleteLockFiles( -File dir, boolean recursive, boolean hiddenFilesEnabled, String endpointPath, GenericFileFilter filter, +File dir, boolean recursive, int minDepth, int maxDepth, int depth, boolean hiddenFilesEnabled, String endpointPath, +GenericFileFilter filter, GenericFileFilter antFilter, Pattern excludePattern, Pattern includePattern) { + +if (recursive) { +LOG.trace("checking: depth {}, minDepth {}, maxDepth {}, directory: {}", depth, minDepth, maxDepth, dir); +} + File[] files = dir.listFiles(); if (files == null || files.length == 0) { return; @@ -210,11 +217,13 @@ public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusive } } -if (file.getName().endsWith(FileComponent.DEFAULT_LOCK_FILE_POSTFIX)) { +if (file.getName().endsWith(FileComponent.DEFAULT_LOCK_FILE_POSTFIX) && (depth >= minDepth)) { LOG.warn("Deleting orphaned lock file: {}", file); FileUtil.deleteFile(file); -} else if (recursive && file.isDirectory()) { -deleteLockFiles(file, true, hiddenFilesEnabled, endpointPath, filter, antFilter, excludePattern, +} else if (recursive && file.isDirectory() && (depth < maxDepth)) { +deleteLockFiles(file, true, minDepth, maxDepth, depth + 1, hiddenFilesEnabled, endpointPath, filter, +antFilter, +excludePattern, includePattern); } } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/MarkerFileExclusiveReadLockStrategyRecursiveCleanupTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/MarkerFileExclusiveReadLockStrategyRecursiveCleanupTest.java new file mode 100644 index 000..9be63945b0d --- /dev/null +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/MarkerFileExclusiveReadLockStrategyRecursiveCleanupTest.java @@ -0,0 +1,199 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT
Re: [PR] CAMEL-20482: use min/max depth during markerfile cleanup [camel]
davsclaus merged PR #13366: URL: https://github.com/apache/camel/pull/13366 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1974236565 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8119630058-1409-39da1173-ec91-41aa-b796-722a24b4bba2 * Camel Quarkus Commit: 2d13bc15d6151cbec9521d7cef4a7b003712e856 * Quarkus Main Commit: b1c787bc6f8b936e25304272bbf47b51335171c6 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8119630058 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 901af6146 chore: changelog automatic update 901af6146 is described below commit 901af6146fb0ce6fb497436034eaa7d0e3e8a769 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 2 01:07:28 2024 + chore: changelog automatic update --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c68d1d5f..73a7d4e0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ **Closed issues:** +- Route parameters are ignored for `path` parameters [\#5203](https://github.com/apache/camel-k/issues/5203) +- Builder property failure when using non xml tag characters [\#5195](https://github.com/apache/camel-k/issues/5195) +- Error configuring property: camel.component.test\[1\]port\[80\]tcp.addr because cannot find component with name test\[1\]port\[80\]tcp. [\#5179](https://github.com/apache/camel-k/issues/5179) - Get environment variable value is empty in properties file [\#5178](https://github.com/apache/camel-k/issues/5178) - Debug Integrations failing [\#5161](https://github.com/apache/camel-k/issues/5161) - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143)
(camel-k) branch release-2.1.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.1.x by this push: new 1d1003159 chore: changelog automatic update 1d1003159 is described below commit 1d1003159ff035dd4668b70e9138c25914b2a762 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 2 00:26:08 2024 + chore: changelog automatic update --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c68d1d5f..73a7d4e0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ **Closed issues:** +- Route parameters are ignored for `path` parameters [\#5203](https://github.com/apache/camel-k/issues/5203) +- Builder property failure when using non xml tag characters [\#5195](https://github.com/apache/camel-k/issues/5195) +- Error configuring property: camel.component.test\[1\]port\[80\]tcp.addr because cannot find component with name test\[1\]port\[80\]tcp. [\#5179](https://github.com/apache/camel-k/issues/5179) - Get environment variable value is empty in properties file [\#5178](https://github.com/apache/camel-k/issues/5178) - Debug Integrations failing [\#5161](https://github.com/apache/camel-k/issues/5161) - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143)
(camel-karavan) branch main updated: Navigation improvements
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new ad3a375e Navigation improvements ad3a375e is described below commit ad3a375e4109969eef864845beb612330ae8b340 Author: Marat Gubaidullin AuthorDate: Fri Mar 1 19:07:00 2024 -0500 Navigation improvements --- karavan-app/src/main/webui/src/api/ProjectStore.ts | 8 +- .../src/main/webui/src/editor/CodeEditor.tsx | 68 .../FileEditor.tsx => editor/DesignerEditor.tsx} | 52 ++--- .../EditorToolbar.tsx} | 56 +++--- .../src/main/webui/src/editor/FileEditor.tsx | 50 + .../src/main/webui/src/project/ProjectPage.tsx | 24 +++-- .../src/main/webui/src/project/ProjectPanel.tsx| 2 +- .../src/main/webui/src/project/ProjectTitle.tsx| 117 + .../src/main/webui/src/project/ProjectToolbar.tsx | 20 +--- 9 files changed, 237 insertions(+), 160 deletions(-) diff --git a/karavan-app/src/main/webui/src/api/ProjectStore.ts b/karavan-app/src/main/webui/src/api/ProjectStore.ts index ccbb0399..861a0c06 100644 --- a/karavan-app/src/main/webui/src/api/ProjectStore.ts +++ b/karavan-app/src/main/webui/src/api/ProjectStore.ts @@ -130,7 +130,7 @@ export const useProjectStore = createWithEqualityFn((set) => ({ project: new Project(), images: [], operation: 'none', -tabIndex: 'files', +tabIndex: 'topology', isPushing: false, isPulling: false, isRunning: false, @@ -152,9 +152,9 @@ export const useProjectStore = createWithEqualityFn((set) => ({ })); }, setTabIndex: (tabIndex: string | number) => { -set((state: ProjectState) => ({ -tabIndex: tabIndex -})); +set((state: ProjectState) => { +return {tabIndex: tabIndex}; +}); }, setImages: (images: string[]) => { set((state: ProjectState) => { diff --git a/karavan-app/src/main/webui/src/editor/CodeEditor.tsx b/karavan-app/src/main/webui/src/editor/CodeEditor.tsx new file mode 100644 index ..3658889b --- /dev/null +++ b/karavan-app/src/main/webui/src/editor/CodeEditor.tsx @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import React, {useEffect, useState} from 'react'; +import '../designer/karavan.css'; +import Editor from "@monaco-editor/react"; +import {useFileStore} from "../api/ProjectStore"; +import {ProjectService} from "../api/ProjectService"; +import {shallow} from "zustand/shallow"; + +interface Props { +projectId: string +} + +const languages = new Map([ +['sh', 'shell'], +['md', 'markdown'], +['properties', 'ini'] +]) + +export function CodeEditor(props: Props) { + +const [file, designerTab, setFile] = useFileStore((s) => [s.file, s.designerTab, s.setFile], shallow) +const [code, setCode] = useState(); + +useEffect(() => { +setCode(file?.code); +}, []); + +function save(name: string, code: string) { +if (file) { +file.code = code; +ProjectService.updateFile(file, true); +} +} + +const extension = file?.name.split('.').pop(); +const language = extension && languages.has(extension) ? languages.get(extension) : extension; +return ( +file !== undefined ? + { +if (value) { +save(file?.name, value) +} +}} +/> +: <> +) +} diff --git a/karavan-app/src/main/webui/src/project/FileEditor.tsx b/karavan-app/src/main/webui/src/editor/DesignerEditor.tsx similarity index 79% rename from karavan-app/src/main/webui/src/project/FileEditor.tsx rename to karavan-app/src/main/webui/src/editor/DesignerEditor.tsx index 95a1a195..a4391f72 100644 --- a/karavan-app/src/main/webui/src/project/FileEditor.tsx +++ b/karavan-app/src/main/webui/src/editor/DesignerEditor.tsx @@ -17,7 +17,6 @@ import React, {useEffect, useState} from 'react'; import '../designer/karavan.css'; import Editor from
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 09d22082c chore: nightly automatic updates 09d22082c is described below commit 09d22082c6d1f98d4e663acfd95888976e8297f2 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Mar 1 23:45:55 2024 + chore: nightly automatic updates --- CHANGELOG.md | 6 +++ README.adoc | 2 +- badge.out| 2 +- coverage | 2 +- coverage.out | 157 ++- 5 files changed, 88 insertions(+), 81 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a0df8b93..fa55a29e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ **Closed issues:** +- Route parameters are ignored for `path` parameters [\#5203](https://github.com/apache/camel-k/issues/5203) +- Builder property failure when using non xml tag characters [\#5195](https://github.com/apache/camel-k/issues/5195) +- Error configuring property: camel.component.test\[1\]port\[80\]tcp.addr because cannot find component with name test\[1\]port\[80\]tcp. [\#5179](https://github.com/apache/camel-k/issues/5179) - Get environment variable value is empty in properties file [\#5178](https://github.com/apache/camel-k/issues/5178) - Debug Integrations failing [\#5161](https://github.com/apache/camel-k/issues/5161) - Performance regression due to configmap/secrets whole cluster watch [\#5143](https://github.com/apache/camel-k/issues/5143) @@ -46,7 +49,10 @@ **Merged pull requests:** +- fix\(e2e\): stricter pipe test check [\#5202](https://github.com/apache/camel-k/pull/5202) ([squakez](https://github.com/squakez)) +- fix\(trait\): deprecate operator inspecting secrets [\#5201](https://github.com/apache/camel-k/pull/5201) ([squakez](https://github.com/squakez)) - fix\(trait\): catalog to drive dependencies [\#5199](https://github.com/apache/camel-k/pull/5199) ([squakez](https://github.com/squakez)) +- fix\(quarkus\): build time properties into file [\#5198](https://github.com/apache/camel-k/pull/5198) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/prometheus/client\_golang from 1.18.0 to 1.19.0 [\#5193](https://github.com/apache/camel-k/pull/5193) ([dependabot[bot]](https://github.com/apps/dependabot)) - update quarkus-native.adoc [\#5190](https://github.com/apache/camel-k/pull/5190) ([bvahdat](https://github.com/bvahdat)) - chore: use constants for config types [\#5189](https://github.com/apache/camel-k/pull/5189) ([squakez](https://github.com/squakez)) diff --git a/README.adoc b/README.adoc index 4246309d8..141a5a589 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernet image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative;, link="https://github.com/apache/camel-k/actions/workflows/knative.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml;] -image:https://img.shields.io/badge/Coverage-36.4%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] +image:https://img.shields.io/badge/Coverage-36.8%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com;] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider. diff --git a/badge.out b/badge.out index ccdca3231..19a266d74 100644 --- a/badge.out +++ b/badge.out @@ -1,2 +1,2 @@ -![Coverage](https://img.shields.io/badge/Coverage-36.4%25-yellow) \ No newline at end of file +![Coverage](https://img.shields.io/badge/Coverage-36.8%25-yellow) \ No newline at end of file diff --git a/coverage b/coverage index 305c06b2b..4202a199f 100644 --- a/coverage +++ b/coverage @@ -1 +1 @@ -36.4 +36.8 diff --git a/coverage.out b/coverage.out index 9bd6f1fa6..98130b17d 100644 --- a/coverage.out +++ b/coverage.out @@ -158,31 +158,30 @@ github.com/apache/camel-k/v2/pkg/apis/camel/v1/integration_types_support.go:107:
(camel-k-runtime) 01/02: chore: update changelog
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit 232c1ce3c7656a673332e210b34e06f72bb6d4d7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Mar 1 23:34:11 2024 + chore: update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2086f57a..5e6ee7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Merged pull requests:** +- feat: Bump to CQ 3.8.0 [\#1178](https://github.com/apache/camel-k-runtime/pull/1178) ([squakez](https://github.com/squakez)) +- build\(deps\): bump com.google.cloud.tools:jib-maven-plugin from 3.4.0 to 3.4.1 [\#1177](https://github.com/apache/camel-k-runtime/pull/1177) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump org.codehaus.mojo:exec-maven-plugin from 3.1.1 to 3.2.0 [\#1175](https://github.com/apache/camel-k-runtime/pull/1175) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump org.immutables:value from 2.10.0 to 2.10.1 [\#1173](https://github.com/apache/camel-k-runtime/pull/1173) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump org.assertj:assertj-core from 3.25.2 to 3.25.3 [\#1167](https://github.com/apache/camel-k-runtime/pull/1167) ([dependabot[bot]](https://github.com/apps/dependabot))
(camel-k-runtime) branch main updated (89e52cd1 -> 2004f41a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git from 89e52cd1 feat: Bump to CQ 3.8.0 new 232c1ce3 chore: update changelog new 2004f41a chore: update SBOM The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 2 + camel-k-runtime-sbom/camel-k-runtime-sbom.json | 11999 --- camel-k-runtime-sbom/camel-k-runtime-sbom.xml | 11251 ++--- 3 files changed, 11827 insertions(+), 11425 deletions(-)
[I] Pod failure when using fixed native image [camel-k]
hernanDatgDev opened a new issue, #5207: URL: https://github.com/apache/camel-k/issues/5207 ### What happened? Link to Zulip chat: https://camel.zulipchat.com/#narrow/stream/257299-camel-k/topic/Run.20integration.20w.20existing.20native.20image.20.2F.20image.20trait When running an integration with a native image defined explicitly the pod is using the wrong command to start the container and as a result the pod fails to start. Under normal native integration execution (without defining the container image) the pod is started with a command that calls the native executable. For example: ``` - command: - ./camel-k-integration-2.3.0-runner ``` When running an integration in the default jvm mode, the pod command is different. For example ``` - args: ... io.quarkus.bootstrap.runner.QuarkusEntryPoint command: - /bin/sh - -c ``` When running an integration with a native image defined explicitly, the pod tries to start the native app with the default jvm command which does not work. With guidance from the community I tried running the same integration with the native image, also with the JVM trait disabled. This resulted in the pod having no command defined at all, which of course did still not work. There was a brief mention in Zulip for including the starting command to the kit image itself. I personally favor this suggestion however looking for further guidance on the best way to move forward with this issue. ### Steps to reproduce 1. Run any integration in native mode. Save the image generated. 2. Run any other integration (can be the same), and configure the `container.image` trait with the image saved from step 1. ### Relevant log output _No response_ ### Camel K version 2.3.0-SNAPSHOT, 2.1.0 (personal patched version) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Trace tab default container
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 77cae5db Trace tab default container 77cae5db is described below commit 77cae5db82875c95d742bdb2dfe64990f0b44aaf Author: Marat Gubaidullin AuthorDate: Fri Mar 1 15:29:07 2024 -0500 Trace tab default container --- karavan-app/src/main/webui/src/project/trace/TraceTab.tsx | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/karavan-app/src/main/webui/src/project/trace/TraceTab.tsx b/karavan-app/src/main/webui/src/project/trace/TraceTab.tsx index b34a5361..a21fc0f4 100644 --- a/karavan-app/src/main/webui/src/project/trace/TraceTab.tsx +++ b/karavan-app/src/main/webui/src/project/trace/TraceTab.tsx @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import React, {useState} from 'react'; +import React, {useEffect, useState} from 'react'; import { Bullseye, Button, @@ -68,6 +68,11 @@ export function TraceTab() { const camelContainers = containers .filter(c => c.projectId === project.projectId && ['devmode', 'project'].includes(c.type)); + +function getContainer() { +return containerName ? containerName : camelContainers.at(0)?.containerName; +} + return ( @@ -85,7 +90,7 @@ export function TraceTab() { {camelContainers.map((containerStatus, index) => { if (selected) { setContainerName(containerStatus.containerName); @@ -116,7 +121,7 @@ export function TraceTab() { - + ) }
(camel-karavan) branch main updated: Better logging for camelservice
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 29fb845a Better logging for camelservice 29fb845a is described below commit 29fb845a63812c487a3e5196e134e46e3a4d92e7 Author: Marat Gubaidullin AuthorDate: Fri Mar 1 15:18:02 2024 -0500 Better logging for camelservice --- .../apache/camel/karavan/service/CamelService.java | 26 +++--- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java index af2f6e34..2668b76c 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java @@ -106,7 +106,7 @@ public class CamelService { containerStatus.setCodeLoaded(true); eventBus.publish(ContainerStatusService.CONTAINER_STATUS, JsonObject.mapFrom(containerStatus)); } catch (Exception ex) { -LOGGER.error(ex.getMessage()); +LOGGER.error("ReloadProjectCode " + (ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage())); } } @@ -117,8 +117,8 @@ public class CamelService { HttpResponse result = getWebClient().putAbs(url) .timeout(timeout).sendBuffer(Buffer.buffer(body)).subscribeAsCompletionStage().toCompletableFuture().get(); return result.statusCode() == 200; -} catch (Exception e) { -LOGGER.error(e.getMessage()); +} catch (Exception ex) { +LOGGER.error("putRequest " + (ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage())); } return false; } @@ -127,8 +127,8 @@ public class CamelService { String url = getContainerAddressForReload(containerName) + "/q/upload/*"; try { return deleteResult(url, 1000); -} catch (InterruptedException | ExecutionException e) { -LOGGER.error(e.getMessage()); +} catch (InterruptedException | ExecutionException ex) { +LOGGER.error("deleteRequest " + (ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage())); } return null; } @@ -137,8 +137,8 @@ public class CamelService { String url = getContainerAddressForReload(containerName) + "/q/dev/reload?reload=true"; try { return getResult(url, 1000); -} catch (InterruptedException | ExecutionException e) { -LOGGER.error(e.getMessage()); +} catch (InterruptedException | ExecutionException ex) { +LOGGER.error("reloadRequest " + (ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage())); } return null; } @@ -169,8 +169,8 @@ public class CamelService { String url = getContainerAddressForStatus(containerStatus) + "/q/dev/" + statusName.name(); try { return getResult(url, 500); -} catch (InterruptedException | ExecutionException e) { -LOGGER.error(e.getMessage()); +} catch (InterruptedException | ExecutionException ex) { +LOGGER.error("getCamelStatus " + (ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage())); } return null; } @@ -202,8 +202,8 @@ public class CamelService { JsonObject res = result.bodyAsJsonObject(); return res.encodePrettily(); } -} catch (Exception e) { -LOGGER.error(e.getMessage()); +} catch (Exception ex) { +LOGGER.error("getResult " + (ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage())); } return null; } @@ -214,8 +214,8 @@ public class CamelService { .timeout(timeout).send().subscribeAsCompletionStage().toCompletableFuture().get(); JsonObject res = result.bodyAsJsonObject(); return res.encodePrettily(); -} catch (Exception e) { -LOGGER.error(e.getMessage()); +} catch (Exception ex) { +LOGGER.error("deleteResult " + (ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage())); } return null; }
(camel-k-runtime) branch dependabot/maven/groovy-version-4.0.19 created (now f23998e6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/groovy-version-4.0.19 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at f23998e6 build(deps): bump groovy-version from 4.0.18 to 4.0.19 No new revisions were added by this update.
[PR] build(deps): bump groovy-version from 4.0.18 to 4.0.19 [camel-k-runtime]
dependabot[bot] opened a new pull request, #1179: URL: https://github.com/apache/camel-k-runtime/pull/1179 Bumps `groovy-version` from 4.0.18 to 4.0.19. Updates `org.apache.groovy:groovy` from 4.0.18 to 4.0.19 Commits See full diff in https://github.com/apache/groovy/commits;>compare view Updates `org.apache.groovy:groovy-xml` from 4.0.18 to 4.0.19 Commits See full diff in https://github.com/apache/groovy/commits;>compare view Updates `org.apache.groovy:groovy-json` from 4.0.18 to 4.0.19 Commits See full diff in https://github.com/apache/groovy/commits;>compare view Updates `org.apache.groovy:groovy-yaml` from 4.0.18 to 4.0.19 Commits See full diff in https://github.com/apache/groovy/commits;>compare view Updates `org.apache.groovy:groovy-test` from 4.0.18 to 4.0.19 Commits See full diff in https://github.com/apache/groovy/commits;>compare view Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Fix #1156
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 9aff5cbf Fix #1156 9aff5cbf is described below commit 9aff5cbf5245ec303250b7b6f04476417f2d3fce Author: Marat Gubaidullin AuthorDate: Fri Mar 1 14:20:33 2024 -0500 Fix #1156 --- .../property/property/ComponentPropertyField.tsx| 14 -- .../src/designer/property/property/DslPropertyField.tsx | 16 +--- .../src/main/webui/src/designer/utils/CamelUi.tsx | 17 - .../webui/src/project/trace/RunnerInfoTraceMessage.tsx | 6 +- .../property/property/ComponentPropertyField.tsx| 14 -- .../src/designer/property/property/DslPropertyField.tsx | 16 +--- karavan-designer/src/designer/utils/CamelUi.tsx | 17 - .../property/property/ComponentPropertyField.tsx| 14 -- .../src/designer/property/property/DslPropertyField.tsx | 16 +--- karavan-space/src/designer/utils/CamelUi.tsx| 17 - 10 files changed, 112 insertions(+), 35 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyField.tsx b/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyField.tsx index 3f13cb1e..925ab18b 100644 --- a/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyField.tsx +++ b/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyField.tsx @@ -70,7 +70,7 @@ export function ComponentPropertyField(props: Props) { const {onParametersChange, getInternalComponentName} = usePropertiesHook(); -const [integration] = useIntegrationStore((state) => [state.integration], shallow) +const [integration, files] = useIntegrationStore((state) => [state.integration, state.files], shallow) const [dark, setSelectedStep, beans] = useDesignerStore((s) => [s.dark, s.setSelectedStep, s.beans], shallow) @@ -150,12 +150,22 @@ export function ComponentPropertyField(props: Props) { } } +function checkUri(startsWith: string): boolean { +if (props.element && props.element.dslName === 'ToDefinition' && property.name === 'name') { +const uri: string = (props.element as ToDefinition).uri || ''; +return uri.startsWith(startsWith); +} else { +return false; +} +} + function getInternalUriSelect(property: ComponentProperty, value: any) { const selectOptions: JSX.Element[] = []; const componentName = getInternalComponentName(property.name, props.element); const internalUris = CamelUi.getInternalRouteUris(integration, componentName, false); -const uris: string [] = []; +let uris: string[] = CamelUi.getInternalUris(files, checkUri('direct'), checkUri('seda')); uris.push(...internalUris); +uris = [...new Set(uris.map(e => e.includes(":") ? e.split(":")?.at(1) || "" : e))] if (value && value.length > 0 && !uris.includes(value)) { uris.unshift(value); } diff --git a/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.tsx b/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.tsx index 43986796..a17dc88d 100644 --- a/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.tsx +++ b/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.tsx @@ -51,7 +51,7 @@ import {CamelDefinitionApiExt} from "karavan-core/lib/api/CamelDefinitionApiExt" import {ExpressionField} from "./ExpressionField"; import {CamelUi, RouteToCreate} from "../../utils/CamelUi"; import {ComponentPropertyField} from "./ComponentPropertyField"; -import {CamelElement} from "karavan-core/lib/model/IntegrationDefinition"; +import {CamelElement, IntegrationFile} from "karavan-core/lib/model/IntegrationDefinition"; import {KameletPropertyField} from "./KameletPropertyField"; import PlusIcon from "@patternfly/react-icons/dist/esm/icons/plus-icon"; import {ObjectField} from "./ObjectField"; @@ -77,6 +77,7 @@ import {BeanProperties} from "./BeanProperties"; import {PropertyPlaceholderDropdown} from "./PropertyPlaceholderDropdown"; import {VariablesDropdown} from "./VariablesDropdown"; import {ROUTE, GLOBAL} from "karavan-core/lib/api/VariableUtil"; +import {getIntegrations} from "../../../topology/TopologyApi"; interface Props { property: PropertyMeta, @@ -92,7 +93,7 @@ interface Props { export function DslPropertyField(props: Props) { -const [integration, setIntegration, addVariable] = useIntegrationStore((s) => [s.integration, s.setIntegration, s.addVariable], shallow) +const [integration, setIntegration, addVariable, files] =
Re: [I] Direct consumer list if REST Method Properties [camel-karavan]
mgubaidullin closed issue #1156: Direct consumer list if REST Method Properties URL: https://github.com/apache/camel-karavan/issues/1156 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Remove registration of Servlet classes with AdditionalBeanBuildItem
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 b1c787bc6f Remove registration of Servlet classes with AdditionalBeanBuildItem b1c787bc6f is described below commit b1c787bc6f8b936e25304272bbf47b51335171c6 Author: James Netherton AuthorDate: Fri Mar 1 13:48:20 2024 + Remove registration of Servlet classes with AdditionalBeanBuildItem Fixes #3204 --- .../component/servlet/deployment/ServletProcessor.java| 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java b/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java index 308f5489db..7e21a43adb 100644 --- a/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java +++ b/extensions/servlet/deployment/src/main/java/org/apache/camel/quarkus/component/servlet/deployment/ServletProcessor.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map.Entry; import java.util.Optional; -import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; @@ -42,11 +41,11 @@ class ServletProcessor { } @BuildStep -void build(BuildProducer servlet, BuildProducer additionalBean) { +void build(BuildProducer servlet) { boolean servletCreated = false; if (camelServletConfig.defaultServlet.isValid()) { servlet.produce( -newServlet(ServletConfig.DEFAULT_SERVLET_NAME, camelServletConfig.defaultServlet, additionalBean)); +newServlet(ServletConfig.DEFAULT_SERVLET_NAME, camelServletConfig.defaultServlet)); servletCreated = true; } @@ -56,7 +55,7 @@ class ServletProcessor { String.format("Use quarkus.camel.servlet.url-patterns instead of quarkus.camel.servlet.%s.url-patterns", ServletConfig.DEFAULT_SERVLET_NAME)); } -servlet.produce(newServlet(e.getKey(), e.getValue(), additionalBean)); +servlet.produce(newServlet(e.getKey(), e.getValue())); servletCreated = true; } @@ -67,8 +66,7 @@ class ServletProcessor { } -static ServletBuildItem newServlet(String key, ServletConfig servletConfig, -BuildProducer additionalBean) { +static ServletBuildItem newServlet(String key, ServletConfig servletConfig) { final String servletName = servletConfig.getEffectiveServletName(key); final Optional> urlPatterns = servletConfig.urlPatterns; if (!urlPatterns.isPresent() || urlPatterns.get().isEmpty()) { @@ -78,7 +76,6 @@ class ServletProcessor { } final Builder builder = ServletBuildItem.builder(servletName, servletConfig.servletClass); -additionalBean.produce(new AdditionalBeanBuildItem(servletConfig.servletClass)); for (String pattern : urlPatterns.get()) { builder.addMapping(pattern); }
Re: [PR] Remove registration of Servlet classes with AdditionalBeanBuildItem [camel-quarkus]
jamesnetherton merged PR #5831: URL: https://github.com/apache/camel-quarkus/pull/5831 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Usage of `CamelHttpTransportServlet` results in CDI bean removal [camel-quarkus]
jamesnetherton closed issue #3204: Usage of `CamelHttpTransportServlet` results in CDI bean removal URL: https://github.com/apache/camel-quarkus/issues/3204 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Add multipart configuration options to servlet extension
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 7fc2932adb Add multipart configuration options to servlet extension 7fc2932adb is described below commit 7fc2932adbe3ad55ee99703ef94b5ef6cdd5fe92 Author: James Netherton AuthorDate: Fri Mar 1 13:30:51 2024 + Add multipart configuration options to servlet extension Fixes #5326 --- .../ROOT/pages/reference/extensions/servlet.adoc | 48 ++ .../servlet/deployment/ServletProcessor.java | 11 + .../servlet/runtime/CamelServletConfig.java| 36 integration-tests/servlet/pom.xml | 17 .../quarkus/component/servlet/CamelRoute.java | 17 .../component/servlet/MultiPartProcessor.java | 37 + .../src/main/resources/application.properties | 6 +++ .../component/servlet/CamelServletTest.java| 41 -- 8 files changed, 202 insertions(+), 11 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc index 39c76cf246..fd56d2364a 100644 --- a/docs/modules/ROOT/pages/reference/extensions/servlet.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/servlet.adoc @@ -83,6 +83,30 @@ A servletName as it would be defined in a `web.xml` file or in the `jakarta.serv | `string` | `CamelServlet` +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.multipart.location]]`link:#quarkus.camel.servlet.multipart.location[quarkus.camel.servlet.multipart.location]` + +An absolute path to a directory on the file system to store files temporarily while the parts are processed or when the size of the file exceeds the specified file-size-threshold configuration value. +| `string` +| `${java.io.tmpdir}` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.multipart.max-file-size]]`link:#quarkus.camel.servlet.multipart.max-file-size[quarkus.camel.servlet.multipart.max-file-size]` + +The maximum size allowed in bytes for uploaded files. The default size (-1) allows an unlimited size. +| `long` +| `-1` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.multipart.max-request-size]]`link:#quarkus.camel.servlet.multipart.max-request-size[quarkus.camel.servlet.multipart.max-request-size]` + +The maximum size allowed in bytes for a multipart/form-data request. The default size (-1) allows an unlimited size. +| `long` +| `-1` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.multipart.file-size-threshold]]`link:#quarkus.camel.servlet.multipart.file-size-threshold[quarkus.camel.servlet.multipart.file-size-threshold]` + +The file size in bytes after which the file will be temporarily stored on disk. +| `int` +| `0` + |icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.url-patterns]]`link:#quarkus.camel.servlet.-named-servlets-.url-patterns[quarkus.camel.servlet."named-servlets".url-patterns]` A comma separated list of path patterns under which the CamelServlet should be accessible. Example path patterns: `/++*++`, `/services/++*++` @@ -100,6 +124,30 @@ A fully qualified name of a servlet class to serve paths that match `url-pattern A servletName as it would be defined in a `web.xml` file or in the `jakarta.servlet.annotation.WebServlet++#++name()` annotation. | `string` | `CamelServlet` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.multipart.location]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.location[quarkus.camel.servlet."named-servlets".multipart.location]` + +An absolute path to a directory on the file system to store files temporarily while the parts are processed or when the size of the file exceeds the specified file-size-threshold configuration value. +| `string` +| `${java.io.tmpdir}` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.multipart.max-file-size]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.max-file-size[quarkus.camel.servlet."named-servlets".multipart.max-file-size]` + +The maximum size allowed in bytes for uploaded files. The default size (-1) allows an unlimited size. +| `long` +| `-1` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.servlet.-named-servlets-.multipart.max-request-size]]`link:#quarkus.camel.servlet.-named-servlets-.multipart.max-request-size[quarkus.camel.servlet."named-servlets".multipart.max-request-size]` + +The maximum size allowed in bytes for a multipart/form-data request. The default size (-1) allows an unlimited size. +| `long` +| `-1` + +|icon:lock[title=Fixed at build time]
Re: [I] Add capability to configure `MultiPartConfig` for `CamelServlet` [camel-quarkus]
jamesnetherton closed issue #5326: Add capability to configure `MultiPartConfig` for `CamelServlet` URL: https://github.com/apache/camel-quarkus/issues/5326 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add multipart configuration options to servlet extension [camel-quarkus]
jamesnetherton merged PR #5328: URL: https://github.com/apache/camel-quarkus/pull/5328 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20495: camel-jsonpath - If resultType is List then automatic wr… [camel]
rhuan080 commented on code in PR #13364: URL: https://github.com/apache/camel/pull/13364#discussion_r1509426445 ## components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java: ## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.jsonpath; + +import java.io.File; +import java.util.List; +import java.util.Map; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class JsonPathSplitSingleListTest extends CamelTestSupport { + +@Override +protected RouteBuilder createRouteBuilder() { +return new RouteBuilder() { +@Override +public void configure() { +from("direct:start") +// we select first book, but since we split after wards then ensure +// it will be wrapped inside a List object. +.split().jsonpath("$.store.book[0]", List.class) +.to("mock:authors") +.convertBodyTo(String.class); +} +}; +} + +@Test +public void testSplit() throws Exception { Review Comment: Yes, I'm suggesting it because in my tests with the 3.18.x base I use the `expr.setOptions(new Option[]{Option.ALWAYS_RETURN_LIST});` it resolve the `$.store.book[0]`, but is breaking the `$.store.book`. Thus, I would like to make sure it will solve one scenario without changing the behavior of the other. Make sense? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20495: camel-jsonpath - If resultType is List then automatic wr… [camel]
rhuan080 commented on code in PR #13364: URL: https://github.com/apache/camel/pull/13364#discussion_r1509426445 ## components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java: ## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.jsonpath; + +import java.io.File; +import java.util.List; +import java.util.Map; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class JsonPathSplitSingleListTest extends CamelTestSupport { + +@Override +protected RouteBuilder createRouteBuilder() { +return new RouteBuilder() { +@Override +public void configure() { +from("direct:start") +// we select first book, but since we split after wards then ensure +// it will be wrapped inside a List object. +.split().jsonpath("$.store.book[0]", List.class) +.to("mock:authors") +.convertBodyTo(String.class); +} +}; +} + +@Test +public void testSplit() throws Exception { Review Comment: Yes, I'm suggesting it because in my tests with the 3.18.x base I use the `expr.setOptions(new Option[]{Option.ALWAYS_RETURN_LIST});` it resolve the $.store.book[0], but is breaking the $.store.book. Thus, I would like to make sure it will solve one scenario without changing the behavior of the other. Make sense? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20482: use min/max depth during markerfile cleanup [camel]
davsclaus commented on PR #13366: URL: https://github.com/apache/camel/pull/13366#issuecomment-1973743573 Yes the GH tests can sometimes bit a little bit flaky on those file tests in camel-core -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Variable in Traces [camel-karavan]
mgubaidullin commented on issue #1155: URL: https://github.com/apache/camel-karavan/issues/1155#issuecomment-1973737848 ![variables-traces](https://github.com/apache/camel-karavan/assets/1379213/a72f41d4-7c92-49c1-89b7-e233d9f750fa) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20495: camel-jsonpath - If resultType is List then automatic wr… [camel]
davsclaus commented on code in PR #13364: URL: https://github.com/apache/camel/pull/13364#discussion_r1509389810 ## components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java: ## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.jsonpath; + +import java.io.File; +import java.util.List; +import java.util.Map; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class JsonPathSplitSingleListTest extends CamelTestSupport { + +@Override +protected RouteBuilder createRouteBuilder() { +return new RouteBuilder() { +@Override +public void configure() { +from("direct:start") +// we select first book, but since we split after wards then ensure +// it will be wrapped inside a List object. +.split().jsonpath("$.store.book[0]", List.class) +.to("mock:authors") +.convertBodyTo(String.class); +} +}; +} + +@Test +public void testSplit() throws Exception { Review Comment: Those 2 examples above will select all books and be a List already. There is an online evaluator here: https://jsonpath.com/ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Kamelet properties for #731
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 37f78be0 Kamelet properties for #731 37f78be0 is described below commit 37f78be03def403e99dc2f54aac37b85418b160a Author: Marat Gubaidullin AuthorDate: Fri Mar 1 13:26:17 2024 -0500 Kamelet properties for #731 --- .../webui/src/designer/kamelet/KameletInput.tsx| 2 +- karavan-designer/public/example/demo.camel.yaml| 135 + .../src/designer/kamelet/KameletInput.tsx | 2 +- .../src/designer/kamelet/KameletInput.tsx | 2 +- 4 files changed, 9 insertions(+), 132 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/kamelet/KameletInput.tsx b/karavan-app/src/main/webui/src/designer/kamelet/KameletInput.tsx index f1ee50f3..ebab83d7 100644 --- a/karavan-app/src/main/webui/src/designer/kamelet/KameletInput.tsx +++ b/karavan-app/src/main/webui/src/designer/kamelet/KameletInput.tsx @@ -15,6 +15,7 @@ * limitations under the License. */ +import React, {useEffect, useState} from "react"; import { GridItem, FormGroup, @@ -27,7 +28,6 @@ import { capitalize, TextArea } from "@patternfly/react-core"; -import {useEffect, useState} from "react"; import '../karavan.css'; import './kamelet.css'; diff --git a/karavan-designer/public/example/demo.camel.yaml b/karavan-designer/public/example/demo.camel.yaml index 458ab33c..b4e1dec5 100644 --- a/karavan-designer/public/example/demo.camel.yaml +++ b/karavan-designer/public/example/demo.camel.yaml @@ -1,132 +1,9 @@ -#- route: -#id: route-a947 -#nodePrefixId: route-a32 -#from: -# id: from-c489 -# description: Receive Data -# uri: kamelet:aws-ddb-streams-source -# steps: -#- setHeader: -#id: setBody-4434 -#expression: -# simple: -#id: simple-abd8 -#expression: dd -#- filter: -#id: filter-929b -#expression: -# simple: -#id: simple-d932 -#expression: Hello -#steps: -# - bean: -# id: bean-120b -# ref: xxx -# - log: -# id: log-d86e -# message: ${body}!!! -# - to: -# id: to-9f7d -# description: Send notification -# uri: kafka -#- to: -#id: to-53a3 -#description: Send payments -#uri: amqp -#- route: -#id: route-8609 -#nodePrefixId: route-ae2 -#from: -# id: from-6aee -# uri: timer -# steps: -#- to: -#id: to-2df4 -#uri: direct -#parameters: -# name: second_direct -#- to: -#id: to-e017 -#uri: direct -#parameters: -# name: second_direct -#- route: -#id: first-firect -#from: -# id: from-f155 -# uri: direct -# parameters: -#name: first-firect -# steps: -#- to: -#id: to-5c86 -#uri: direct -#parameters: -# name: second_direct -- route: -id: second_direct -from: - id: from-7ce0 - uri: direct - parameters: -name: second_direct - steps: -- setVariable: -id: setVariable-75ca -name: global:data1 -expression: - simple: -id: simple-009e -- convertVariableTo: -id: convertVariableTo-c0b8 -- removeVariable: -id: removeVariable-2cae -- to: -id: to-4711 -uri: metrics -- route: -id: route-18e5 -nodePrefixId: route-656 -from: - id: from-9468 - uri: amqp - variableReceive: global:variable1 - steps: -- doTry: -id: doTry-8bb0 -doCatch: - - id: doCatch-19a9 -steps: - - convertVariableTo: - id: convertVariableTo-b0e5 - name: xxx - toName: yyy -steps: - - multicast: - id: multicast-ad44 - steps: -- to: -id: to-0c20 -variableSend: send1 -variableReceive: receive1 -uri: activemq -- to: -id: to-e79a -variableSend: route:aran1 -variableReceive: route:aran1 -uri: arangodb - - setVariable: - id: setVariable-957d - name: varrr - expression: -
(camel-karavan) branch main updated: Kamelet properties for #731
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 2d2b393e Kamelet properties for #731 2d2b393e is described below commit 2d2b393e7b99b491d4aa18bcfe7998ab60e8e3bd Author: Marat Gubaidullin AuthorDate: Fri Mar 1 13:17:56 2024 -0500 Kamelet properties for #731 --- .../designer/kamelet/KameletAnnotationsPanel.tsx | 8 +- .../kamelet/KameletDefinitionPropertyCard.tsx | 1 - .../designer/kamelet/KameletDefinitionsPanel.tsx | 3 - .../webui/src/designer/kamelet/KameletInput.tsx| 85 +++--- .../webui/src/designer/selector/DslSelector.tsx| 2 - .../designer/kamelet/KameletAnnotationsPanel.tsx | 62 ++ .../kamelet/KameletDefinitionPropertyCard.tsx | 12 +- .../designer/kamelet/KameletDefinitionsPanel.tsx | 28 + .../src/designer/kamelet/KameletInput.tsx | 128 + .../src/designer/selector/DslSelector.tsx | 2 - .../designer/kamelet/KameletAnnotationsPanel.tsx | 62 ++ .../kamelet/KameletDefinitionPropertyCard.tsx | 12 +- .../designer/kamelet/KameletDefinitionsPanel.tsx | 28 + .../src/designer/kamelet/KameletInput.tsx | 128 + .../src/designer/selector/DslSelector.tsx | 2 - 15 files changed, 357 insertions(+), 206 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/kamelet/KameletAnnotationsPanel.tsx b/karavan-app/src/main/webui/src/designer/kamelet/KameletAnnotationsPanel.tsx index 47f08a29..c7fb2374 100644 --- a/karavan-app/src/main/webui/src/designer/kamelet/KameletAnnotationsPanel.tsx +++ b/karavan-app/src/main/webui/src/designer/kamelet/KameletAnnotationsPanel.tsx @@ -17,16 +17,10 @@ import React from 'react'; import { -capitalize, Card, CardBody, CardTitle, -Form, -FormGroup, Grid, GridItem, -InputGroup, -InputGroupItem, -InputGroupText, -TextInput, ToggleGroup, ToggleGroupItem, +Form, Grid, } from '@patternfly/react-core'; import '../karavan.css'; import './kamelet.css'; diff --git a/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionPropertyCard.tsx b/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionPropertyCard.tsx index 0c0115e4..95369040 100644 --- a/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionPropertyCard.tsx +++ b/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionPropertyCard.tsx @@ -31,7 +31,6 @@ import { LabelGroup, Modal, Switch, -TextInput, } from '@patternfly/react-core'; import '../karavan.css'; import './kamelet.css'; diff --git a/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionsPanel.tsx b/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionsPanel.tsx index 4dd057bb..3ce24da5 100644 --- a/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionsPanel.tsx +++ b/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionsPanel.tsx @@ -23,10 +23,7 @@ import { Flex, FlexItem, Form, -FormGroup, Grid, -GridItem, TextArea, -TextInput, } from '@patternfly/react-core'; import '../karavan.css'; import './kamelet.css'; diff --git a/karavan-app/src/main/webui/src/designer/kamelet/KameletInput.tsx b/karavan-app/src/main/webui/src/designer/kamelet/KameletInput.tsx index a9dc794f..f1ee50f3 100644 --- a/karavan-app/src/main/webui/src/designer/kamelet/KameletInput.tsx +++ b/karavan-app/src/main/webui/src/designer/kamelet/KameletInput.tsx @@ -1,10 +1,62 @@ -import { GridItem, FormGroup, InputGroup, InputGroupItem, TextInput, InputGroupText, ToggleGroup, ToggleGroupItem, capitalize, TextArea } from "@patternfly/react-core"; -import { useState } from "react"; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { +GridItem, +FormGroup, +InputGroup, +InputGroupItem, +TextInput, +InputGroupText, +ToggleGroup, +ToggleGroupItem, +capitalize, +TextArea +} from "@patternfly/react-core"; +import
Re: [PR] CAMEL-20482: use min/max depth during markerfile cleanup [camel]
sjhiggs commented on PR #13366: URL: https://github.com/apache/camel/pull/13366#issuecomment-1973643243 The build log shows a failure in `FileConsumerFailureHandledTest`, which does not fail in my local environment. Is there anything more for me to check on my end? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Custom Kamelet Performance Issue Fix #731 (#1153)
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 52d9872e Custom Kamelet Performance Issue Fix #731 (#1153) 52d9872e is described below commit 52d9872e91180920d26ef6f05769379e0a9bb68d Author: Vidhya Sagar <36588343+vidhyasag...@users.noreply.github.com> AuthorDate: Sat Mar 2 01:56:13 2024 +0800 Custom Kamelet Performance Issue Fix #731 (#1153) * reload kamelets on file editor route * reload kamelets in file editor * Saving custom kamelet in KameletApi.ts file * merge issue fix * change to limit container resoures for docker * custom kamelet save on blur implemented - Co-authored-by: induja Co-authored-by: Vidhya Sagar --- .../designer/kamelet/KameletAnnotationsPanel.tsx | 54 ++-- .../kamelet/KameletDefinitionPropertyCard.tsx | 11 +--- .../designer/kamelet/KameletDefinitionsPanel.tsx | 25 ++-- .../webui/src/designer/kamelet/KameletInput.tsx| 73 ++ 4 files changed, 87 insertions(+), 76 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/kamelet/KameletAnnotationsPanel.tsx b/karavan-app/src/main/webui/src/designer/kamelet/KameletAnnotationsPanel.tsx index b1a6b324..47f08a29 100644 --- a/karavan-app/src/main/webui/src/designer/kamelet/KameletAnnotationsPanel.tsx +++ b/karavan-app/src/main/webui/src/designer/kamelet/KameletAnnotationsPanel.tsx @@ -32,6 +32,7 @@ import '../karavan.css'; import './kamelet.css'; import {useIntegrationStore} from "../DesignerStore"; import {shallow} from "zustand/shallow"; +import { KameletInput } from './KameletInput'; const PREFIX = 'camel.apache.org/'; @@ -56,60 +57,17 @@ export function KameletAnnotationsPanel() { } function getElement(key: string, label: string, span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { -return ( - - - - - setValue(key, value)} - value={getValue(key)}/> - - - - -) +return ( setValue(key, value)} type='text' isRequired={true}/>); } function getElementToggleGroup(key: string, label: string, values: string[], span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { -return ( - - - -{values.map(value => - setValue(key, value) } -/> -)} - - - -) +return ( setValue(key, value)} type='toggle' options={values} isRequired={true}/>); + } function getElementIcon(key: string, label: string, span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { -return ( - - - - - - - - - - setValue(key, value)} - value={getValue(key)}/> - - - - -) + +return ( setValue(key, value)} type='icon' isRequired={true}/>); } return ( diff --git a/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionPropertyCard.tsx b/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionPropertyCard.tsx index cf42ef6c..0c0115e4 100644 --- a/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionPropertyCard.tsx +++ b/karavan-app/src/main/webui/src/designer/kamelet/KameletDefinitionPropertyCard.tsx @@ -40,6 +40,7 @@ import {shallow} from "zustand/shallow"; import {DefinitionProperty} from "karavan-core/lib/model/IntegrationDefinition"; import {CamelUtil} from "karavan-core/lib/api/CamelUtil"; import AddIcon from "@patternfly/react-icons/dist/js/icons/plus-circle-icon"; +import { KameletInput } from './KameletInput'; interface Props { index: number @@ -72,15 +73,7 @@ export function KameletDefinitionPropertyCard(props: Props) { function getPropertyField(field: string, label: string, isRequired: boolean, span: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12) { -return ( - - - setPropertyValue(field, value)} - value={getPropertyValue(field)}/> - - -) + return ( setPropertyValue(field, value)} type='text' isRequired={isRequired}/>); } function
Re: [PR] Custom Kamelet Performance Issue Fix #731 [camel-karavan]
mgubaidullin merged PR #1153: URL: https://github.com/apache/camel-karavan/pull/1153 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] UI performance degradation on large YAML [camel-karavan]
mgubaidullin closed issue #731: UI performance degradation on large YAML URL: https://github.com/apache/camel-karavan/issues/731 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20495: camel-jsonpath - If resultType is List then automatic wr… [camel]
rhuan080 commented on code in PR #13364: URL: https://github.com/apache/camel/pull/13364#discussion_r1509320297 ## components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java: ## @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.jsonpath; + +import java.io.File; +import java.util.List; +import java.util.Map; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class JsonPathSplitSingleListTest extends CamelTestSupport { + +@Override +protected RouteBuilder createRouteBuilder() { +return new RouteBuilder() { +@Override +public void configure() { +from("direct:start") +// we select first book, but since we split after wards then ensure +// it will be wrapped inside a List object. +.split().jsonpath("$.store.book[0]", List.class) +.to("mock:authors") +.convertBodyTo(String.class); +} +}; +} + +@Test +public void testSplit() throws Exception { Review Comment: Can we add more tests to make sure the others patterns will work as expected? ``` from("direct:start2") // we select first book, but since we split after wards then ensure // it will be wrapped inside a List object. .split().jsonpath("$.store.book", List.class) .to("mock:authors2") .convertBodyTo(String.class); from("direct:start3") // we select first book, but since we split after wards then ensure // it will be wrapped inside a List object. .split().jsonpath("$.store.book[*]", List.class) .to("mock:authors3") .convertBodyTo(String.class); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Error configuring property: camel.component.test[00001]port[80]tcp.addr because cannot find component with name test[00001]port[80]tcp. [camel-k]
lsergio closed issue #5179: Error configuring property: camel.component.test[1]port[80]tcp.addr because cannot find component with name test[1]port[80]tcp. URL: https://github.com/apache/camel-k/issues/5179 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Fix #1159
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new d0a18eaa Fix #1159 d0a18eaa is described below commit d0a18eaa73553f412cbc0c1c6860b4b9f96c4929 Author: Marat Gubaidullin AuthorDate: Fri Mar 1 11:36:33 2024 -0500 Fix #1159 --- .../src/main/webui/src/designer/DesignerStore.ts | 2 +- .../webui/src/designer/route/RouteDesigner.tsx | 2 +- .../src/designer/route/useRouteDesignerHook.tsx| 2 +- .../webui/src/designer/selector/DslPreferences.tsx | 76 + .../webui/src/designer/selector}/DslSelector.css | 20 + .../webui/src/designer/selector}/DslSelector.tsx | 97 +++--- karavan-designer/src/designer/DesignerStore.ts | 2 +- .../src/designer/route/RouteDesigner.tsx | 2 +- .../src/designer/route/useRouteDesignerHook.tsx| 2 +- .../src/designer/selector/DslPreferences.tsx | 76 + .../src/designer/selector}/DslSelector.css | 20 + .../src/designer/selector}/DslSelector.tsx | 97 +++--- karavan-space/src/designer/DesignerStore.ts| 2 +- karavan-space/src/designer/route/RouteDesigner.tsx | 2 +- .../src/designer/route/useRouteDesignerHook.tsx| 2 +- .../src/designer/selector/DslPreferences.tsx | 76 + .../src/designer/selector}/DslSelector.css | 20 + .../src/designer/selector}/DslSelector.tsx | 97 +++--- 18 files changed, 504 insertions(+), 93 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/DesignerStore.ts b/karavan-app/src/main/webui/src/designer/DesignerStore.ts index e08d9a19..c19038ad 100644 --- a/karavan-app/src/main/webui/src/designer/DesignerStore.ts +++ b/karavan-app/src/main/webui/src/designer/DesignerStore.ts @@ -130,7 +130,7 @@ export const useSelectorStore = createWithEqualityFn((set) = clearSelectedLabels: () => { set((state: SelectorStateState) => { state.selectedLabels.length = 0; -return state; +return {selectedLabels : [... state.selectedLabels]}; }) }, setSelectedLabels: (selectedLabels: string []) => { diff --git a/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx b/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx index 77678b3a..9ef5e827 100644 --- a/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx +++ b/karavan-app/src/main/webui/src/designer/route/RouteDesigner.tsx @@ -23,7 +23,7 @@ import { Button } from '@patternfly/react-core'; import '../karavan.css'; -import {DslSelector} from "./DslSelector"; +import {DslSelector} from "../selector/DslSelector"; import {DslProperties} from "../property/DslProperties"; import {DslConnections} from "./DslConnections"; import PlusIcon from "@patternfly/react-icons/dist/esm/icons/plus-icon"; diff --git a/karavan-app/src/main/webui/src/designer/route/useRouteDesignerHook.tsx b/karavan-app/src/main/webui/src/designer/route/useRouteDesignerHook.tsx index 543f2a00..0f9b7236 100644 --- a/karavan-app/src/main/webui/src/designer/route/useRouteDesignerHook.tsx +++ b/karavan-app/src/main/webui/src/designer/route/useRouteDesignerHook.tsx @@ -226,7 +226,7 @@ export function useRouteDesignerHook () { setParentDsl(parentDsl); setShowSteps(showSteps); setSelectedPosition(position); -setSelectorTabIndex((parentId === undefined && parentDsl === undefined) ? 'kamelet' : 'eip'); +setSelectorTabIndex((parentId === undefined && parentDsl === undefined) ? 'components' : 'eip'); } function onDslSelect (dsl: DslMetaModel, parentId: string, position?: number | undefined) { diff --git a/karavan-app/src/main/webui/src/designer/selector/DslPreferences.tsx b/karavan-app/src/main/webui/src/designer/selector/DslPreferences.tsx new file mode 100644 index ..87844b5a --- /dev/null +++ b/karavan-app/src/main/webui/src/designer/selector/DslPreferences.tsx @@ -0,0 +1,76 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License.
Re: [I] Show mostly used EIP, Components and Kamelets in selector [camel-karavan]
mgubaidullin closed issue #1159: Show mostly used EIP, Components and Kamelets in selector URL: https://github.com/apache/camel-karavan/issues/1159 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (9dc039f4429 -> 0e7b252ad41)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 9dc039f4429 CAMEL-20477: split flaky transacted test add 0e7b252ad41 CAMEL-20464 - Slack CloudEvent transformer (#13365) No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/transformers.properties | 1 + .../slack-application-cloudevents.json | 14 + components/camel-slack/pom.xml | 8 +++ .../org/apache/camel/transformer.properties| 7 +++ .../transformer/slack-application-cloudevents | 2 + .../transformer/slack-application-cloudevents.json | 14 + .../SlackCloudEventDataTypeTransformer.java| 60 ++ 7 files changed, 106 insertions(+) create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/slack-application-cloudevents.json create mode 100644 components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties create mode 100644 components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer/slack-application-cloudevents create mode 100644 components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer/slack-application-cloudevents.json create mode 100644 components/camel-slack/src/main/java/org/apache/camel/component/slack/transform/SlackCloudEventDataTypeTransformer.java
(camel-k-runtime) branch main updated: feat: Bump to CQ 3.8.0
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new 89e52cd1 feat: Bump to CQ 3.8.0 89e52cd1 is described below commit 89e52cd166029c8f3ed41af8a28694d0ded10ee0 Author: Pasquale Congiusti AuthorDate: Fri Mar 1 11:40:33 2024 +0100 feat: Bump to CQ 3.8.0 --- camel-k-core/api/pom.xml | 2 +- camel-k-core/deployment/pom.xml | 2 +- camel-k-core/pom.xml | 2 +- camel-k-core/runtime/pom.xml | 2 +- camel-k-core/support/pom.xml | 2 +- camel-k-cron/deployment/pom.xml | 2 +- camel-k-cron/impl/pom.xml| 2 +- camel-k-cron/pom.xml | 2 +- camel-k-cron/runtime/pom.xml | 2 +- camel-k-knative/impl/pom.xml | 2 +- camel-k-knative/pom.xml | 2 +- camel-k-master/deployment/pom.xml| 2 +- camel-k-master/impl/pom.xml | 2 +- camel-k-master/pom.xml | 2 +- camel-k-master/runtime/pom.xml | 2 +- camel-k-resume-kafka/deployment/pom.xml | 2 +- camel-k-resume-kafka/impl/pom.xml| 2 +- camel-k-resume-kafka/pom.xml | 2 +- camel-k-resume-kafka/runtime/pom.xml | 2 +- camel-k-runtime/deployment/pom.xml | 2 +- camel-k-runtime/pom.xml | 2 +- camel-k-runtime/runtime/pom.xml | 2 +- distribution/pom.xml | 2 +- examples/cron/pom.xml| 2 +- examples/groovy/pom.xml | 2 +- examples/java/pom.xml| 2 +- examples/js/pom.xml | 2 +- examples/kafka-source-s3/pom.xml | 2 +- examples/kamelets-discovery/pom.xml | 2 +- examples/kamelets/pom.xml| 2 +- examples/knative/pom.xml | 2 +- examples/kotlin/pom.xml | 2 +- examples/pom.xml | 2 +- examples/xml/pom.xml | 2 +- examples/yaml/pom.xml| 2 +- itests/camel-k-itests-core/pom.xml | 2 +- itests/camel-k-itests-cron/pom.xml | 2 +- itests/camel-k-itests-kamelet/pom.xml| 2 +- itests/camel-k-itests-knative-consumer/pom.xml | 2 +- itests/camel-k-itests-knative-env-from-properties/pom.xml| 2 +- itests/camel-k-itests-knative-env-from-registry/pom.xml | 2 +- itests/camel-k-itests-knative-producer/pom.xml | 2 +- itests/camel-k-itests-knative-sinkbinding/pom.xml| 2 +- itests/camel-k-itests-knative/pom.xml| 2 +- itests/camel-k-itests-loader-groovy/pom.xml | 2 +- itests/camel-k-itests-loader-java/pom.xml| 2 +- itests/camel-k-itests-loader-js/pom.xml | 2 +- itests/camel-k-itests-loader-jsh/pom.xml | 2 +- itests/camel-k-itests-loader-kotlin/pom.xml | 2 +- itests/camel-k-itests-loader-polyglot/pom.xml| 2 +- itests/camel-k-itests-loader-xml/pom.xml | 2 +- itests/camel-k-itests-loader-yaml/pom.xml| 2 +- itests/camel-k-itests-master/pom.xml | 2 +- itests/camel-k-itests-runtime-xml/pom.xml| 2 +- itests/camel-k-itests-runtime-yaml/pom.xml | 2 +- itests/camel-k-itests-runtime/pom.xml| 2 +- itests/pom.xml | 2 +- pom.xml | 12 ++-- support/camel-k-annotations/pom.xml | 2 +- support/camel-k-apt/pom.xml | 2 +- support/camel-k-catalog-model/pom.xml| 2 +- support/camel-k-catalog/pom.xml | 2 +- .../camel-k-itests-loader-inspector/pom.xml | 2 +- .../camel-k-itests-runtime-inspector/pom.xml | 2 +-
Re: [PR] feat: Bump to CQ 3.8.0 [camel-k-runtime]
squakez merged PR #1178: URL: https://github.com/apache/camel-k-runtime/pull/1178 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20464 - Slack CloudEvent transformer (#13365)
This is an automated email from the ASF dual-hosted git repository. acosentino 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 0e7b252ad41 CAMEL-20464 - Slack CloudEvent transformer (#13365) 0e7b252ad41 is described below commit 0e7b252ad41783675943545f08f6f69d967a8363 Author: Andrea Cosentino AuthorDate: Fri Mar 1 16:52:57 2024 +0100 CAMEL-20464 - Slack CloudEvent transformer (#13365) Signed-off-by: Andrea Cosentino --- .../apache/camel/catalog/transformers.properties | 1 + .../slack-application-cloudevents.json | 14 + components/camel-slack/pom.xml | 8 +++ .../org/apache/camel/transformer.properties| 7 +++ .../transformer/slack-application-cloudevents | 2 + .../transformer/slack-application-cloudevents.json | 14 + .../SlackCloudEventDataTypeTransformer.java| 60 ++ 7 files changed, 106 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties index 9e506ef6293..dc80293a5b4 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties @@ -25,4 +25,5 @@ http-application-cloudevents protobuf-binary protobuf-x-java-object protobuf-x-struct +slack-application-cloudevents text-plain diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/slack-application-cloudevents.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/slack-application-cloudevents.json new file mode 100644 index 000..851fffb7589 --- /dev/null +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/slack-application-cloudevents.json @@ -0,0 +1,14 @@ +{ + "transformer": { +"kind": "transformer", +"name": "slack:application-cloudevents", +"title": "Slack (Application Cloudevents)", +"description": "Adds CloudEvent headers to the Camel message with Slack consumer response details", +"deprecated": false, +"javaType": "org.apache.camel.component.slack.transform.SlackCloudEventDataTypeTransformer", +"groupId": "org.apache.camel", +"artifactId": "camel-slack", +"version": "4.5.0-SNAPSHOT" + } +} + diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml index a6aad8d6a3e..3db3c03781c 100644 --- a/components/camel-slack/pom.xml +++ b/components/camel-slack/pom.xml @@ -60,6 +60,14 @@ ${squareup-okhttp-version} + + +org.apache.camel +camel-cloudevents +provided +true + + org.apache.camel diff --git a/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties b/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties new file mode 100644 index 000..a163703379d --- /dev/null +++ b/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties @@ -0,0 +1,7 @@ +# Generated by camel build tools - do NOT edit this file! +transformers=slack:application-cloudevents +groupId=org.apache.camel +artifactId=camel-slack +version=4.5.0-SNAPSHOT +projectName=Camel :: Slack +projectDescription=Camel Slack Support diff --git a/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer/slack-application-cloudevents b/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer/slack-application-cloudevents new file mode 100644 index 000..16a90312e2e --- /dev/null +++ b/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer/slack-application-cloudevents @@ -0,0 +1,2 @@ +# Generated by camel build tools - do NOT edit this file! +class=org.apache.camel.component.slack.transform.SlackCloudEventDataTypeTransformer diff --git a/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer/slack-application-cloudevents.json b/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer/slack-application-cloudevents.json new file mode 100644 index 000..851fffb7589 --- /dev/null +++ b/components/camel-slack/src/generated/resources/META-INF/services/org/apache/camel/transformer/slack-application-cloudevents.json @@ -0,0 +1,14 @@ +{ + "transformer": { +"kind": "transformer", +"name": "slack:application-cloudevents", +"title": "Slack (Application Cloudevents)", +"description":
(camel) branch CAMEL-20464 deleted (was 6ebea8dc9d9)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20464 in repository https://gitbox.apache.org/repos/asf/camel.git was 6ebea8dc9d9 CAMEL-20464 - Slack CloudEvent transformer The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] CAMEL-20464 - Slack CloudEvent transformer [camel]
oscerd merged PR #13365: URL: https://github.com/apache/camel/pull/13365 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) 01/01: Upgrade Quarkus to 3.9.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit d8a74de83af5288132b19bd0887af2fa7787e5e7 Author: James Netherton AuthorDate: Wed Feb 28 08:13:46 2024 + Upgrade Quarkus to 3.9.0.CR1 --- extensions/google-bigquery/deployment/pom.xml | 4 extensions/google-bigquery/runtime/pom.xml| 4 extensions/google-pubsub/deployment/pom.xml | 4 extensions/google-pubsub/runtime/pom.xml | 4 extensions/grpc/deployment/pom.xml| 4 extensions/grpc/runtime/pom.xml | 8 extensions/salesforce/deployment/pom.xml | 4 extensions/salesforce/runtime/pom.xml | 4 pom.xml | 8 poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 12 files changed, 43 insertions(+), 7 deletions(-) diff --git a/extensions/google-bigquery/deployment/pom.xml b/extensions/google-bigquery/deployment/pom.xml index e4cb3b702f..193d2935dc 100644 --- a/extensions/google-bigquery/deployment/pom.xml +++ b/extensions/google-bigquery/deployment/pom.xml @@ -54,6 +54,10 @@ io.vertx vertx-grpc-server + +org.checkerframework +checker-qual + diff --git a/extensions/google-bigquery/runtime/pom.xml b/extensions/google-bigquery/runtime/pom.xml index 15a4b77477..9dfe0da15d 100644 --- a/extensions/google-bigquery/runtime/pom.xml +++ b/extensions/google-bigquery/runtime/pom.xml @@ -90,6 +90,10 @@ io.grpc grpc-netty + +com.google.code.findbugs +jsr305 + com.google.android annotations diff --git a/extensions/google-pubsub/deployment/pom.xml b/extensions/google-pubsub/deployment/pom.xml index 31b8b31739..3820cbf30b 100644 --- a/extensions/google-pubsub/deployment/pom.xml +++ b/extensions/google-pubsub/deployment/pom.xml @@ -58,6 +58,10 @@ io.vertx vertx-grpc-server + +org.checkerframework +checker-qual + diff --git a/extensions/google-pubsub/runtime/pom.xml b/extensions/google-pubsub/runtime/pom.xml index 9161883ace..437a7ebb91 100644 --- a/extensions/google-pubsub/runtime/pom.xml +++ b/extensions/google-pubsub/runtime/pom.xml @@ -113,6 +113,10 @@ com.google.android annotations + +com.google.code.findbugs +jsr305 + commons-logging commons-logging diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml index db1b712e67..e606eeb03e 100644 --- a/extensions/grpc/deployment/pom.xml +++ b/extensions/grpc/deployment/pom.xml @@ -50,6 +50,10 @@ io.vertx vertx-grpc-server + +org.checkerframework +checker-qual + diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml index bc4e5e3974..b58d4f005d 100644 --- a/extensions/grpc/runtime/pom.xml +++ b/extensions/grpc/runtime/pom.xml @@ -39,6 +39,10 @@ io.quarkus quarkus-grpc-common + +com.google.code.findbugs +jsr305 + io.quarkus quarkus-vertx @@ -55,6 +59,10 @@ io.vertx vertx-grpc-server + +org.checkerframework +checker-qual + diff --git a/extensions/salesforce/deployment/pom.xml b/extensions/salesforce/deployment/pom.xml index 2b2e620592..cd5e5989c7 100644 --- a/extensions/salesforce/deployment/pom.xml +++ b/extensions/salesforce/deployment/pom.xml @@ -57,6 +57,10 @@ io.vertx vertx-grpc-server + +org.checkerframework +checker-qual + diff --git
(camel-quarkus) branch quarkus-main updated (8d1488a3d2 -> d8a74de83a)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 8d1488a3d2 Upgrade Quarkus to 3.9.0.CR1 add d31f480280 Add changelog for 3.8.0 add 0cf7f9b5cd Explicit even more the CHANGELOG.md step add 1df3539a22 Upgrade Quarkus to 3.8.1 add b44944782e jt400 mock coverage + native fixes add e0f131bbc6 Add jolokia and okhttp to dependabot config add 4c4f79b52d Manage software.amazon.awssdk:endpoints-spi add 8555b89d1d Clean up camel-k extension leftovers and add option to shutdown the context on exchange completion add 95ce2eb7ee Remove xerces:xercesImpl from the BOM add 7ca5d9018c Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.1.4 to 3.2.0 (#5826) add 52e9257409 Bump quarkiverse-groovy.version from 3.7.1 to 3.8.0 (#5825) add aa97228ec0 Upgrade cq-maven-plugin to 4.5.0 add 0b0b946c89 Rebalance native test category group-13 new d8a74de83a Upgrade Quarkus to 3.9.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8d1488a3d2) \ N -- N -- N refs/heads/quarkus-main (d8a74de83a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/dependabot.yml | 2 + CHANGELOG.md | 65 docs/antora.yml| 2 +- .../pages/contributor-guide/release-guide.adoc | 8 +- .../org/apache/camel/quarkus/main/CamelMain.java | 5 +- extensions/camel-k/deployment/pom.xml | 81 - .../quarkus/k/deployment/RuntimeProcessor.java | 114 ++- .../deployment/devmode/HotDeploymentProcessor.java | 32 +- .../camel/quarkus/k/deployment/LoaderTest.java | 335 .../deployment/src/test/resources/routes.groovy| 20 -- .../deployment/src/test/resources/routes.js| 19 -- .../deployment/src/test/resources/routes.jsh | 21 -- .../deployment/src/test/resources/routes.xml | 34 -- extensions/camel-k/runtime/pom.xml | 10 +- .../quarkus/k/core/SourceDefinitionConfigurer.java | 114 --- .../k/listener/SourcesConfigurerConfigurer.java| 49 --- ...rg.apache.camel.quarkus.k.core.SourceDefinition | 2 - ...ache.camel.quarkus.k.listener.SourcesConfigurer | 2 - .../org/apache/camel/quarkus/k/core/Runtime.java | 156 -- .../camel/quarkus/k/core/SourceDefinition.java | 184 --- .../apache/camel/quarkus/k/core/SourceType.java| 24 -- .../quarkus/k/listener/AbstractPhaseListener.java | 39 --- .../quarkus/k/listener/ContextConfigurer.java | 38 --- .../quarkus/k/listener/SourcesConfigurer.java | 109 --- .../camel/quarkus/k/runtime/Application.java | 185 --- .../k/runtime/ApplicationConfigSourceProvider.java | 167 +- .../quarkus/k/runtime/ApplicationConstants.java| 40 +++ .../quarkus/k/runtime/ApplicationRecorder.java | 30 +- .../camel/quarkus/k/runtime/ApplicationRoutes.java | 10 +- .../quarkus/k/runtime/ApplicationRoutesConfig.java | 6 +- ...oducers.java => ApplicationShutdownConfig.java} | 32 +- .../k/runtime/ApplicationShutdownCustomizer.java | 91 ++ .../apache/camel/quarkus/k/support/Constants.java | 63 .../camel/quarkus/k/support/DelegatingRuntime.java | 80 - .../camel/quarkus/k/support/PropertiesSupport.java | 93 -- .../camel/quarkus/k/support/RouteBuilders.java | 73 - .../camel/quarkus/k/support/RuntimeSupport.java| 341 - .../apache/camel/quarkus/k/support/Sources.java| 243 --- .../camel/quarkus/k/support/SourcesSupport.java| 187 --- .../camel/quarkus/k/support/StringSupport.java | 75 - ...rg.apache.camel.quarkus.k.core.Runtime$Listener | 19 -- .../org/apache/camel/quarkus/k/SourceTest.java | 54 .../PropertiesFunctionsConfigurerTest.java | 55 .../quarkus/k/listener/SourceConfigurerTest.java | 143 - .../runtime/PropertiesFunctionsConfigurerTest.java | 55 .../quarkus/k/support/PropertiesSupportTest.java | 94
(camel-k) branch main updated (c4db7ac51 -> dce71836b)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from c4db7ac51 fix(quarkus): build time properties into file add dce71836b fix(e2e): stricter pipe test check No new revisions were added by this update. Summary of changes: e2e/common/misc/pipe_test.go | 12 pkg/trait/error_handler.go | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-)
Re: [PR] fix(e2e): stricter pipe test check [camel-k]
squakez merged PR #5202: URL: https://github.com/apache/camel-k/pull/5202 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Error binding property (camel.main.routeControllerBackOffMaxAttempts=true [camel-quarkus]
hakuseki commented on issue #5832: URL: https://github.com/apache/camel-quarkus/issues/5832#issuecomment-1973330947 Ahh, missed that part. Thx -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Error binding property (camel.main.routeControllerBackOffMaxAttempts=true [camel-quarkus]
hakuseki closed issue #5832: Error binding property (camel.main.routeControllerBackOffMaxAttempts=true URL: https://github.com/apache/camel-quarkus/issues/5832 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Error binding property (camel.main.routeControllerBackOffMaxAttempts=true [camel-quarkus]
jamesnetherton commented on issue #5832: URL: https://github.com/apache/camel-quarkus/issues/5832#issuecomment-1973324290 See this section of the Camel 4.4.0 upgrade guide: https://camel.apache.org/manual/camel-4x-upgrade-guide-4_4.html#_camel_main `camel.main.routesController` is now `camel.routecontroller`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20482: use min/max depth during markerfile cleanup [camel]
github-actions[bot] commented on PR #13366: URL: https://github.com/apache/camel/pull/13366#issuecomment-1973322750 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20482: use min/max depth during markerfile cleanup [camel]
sjhiggs opened a new pull request, #13366: URL: https://github.com/apache/camel/pull/13366 # Description Honors min/max depth when cleaning up camel lock files. This resolves an issue where users have a large number of directories and files in subdirectories that do not need to be scanned when cleaning up marker files. # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: #1152
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 266bd141 #1152 266bd141 is described below commit 266bd141e0b5468295b5fb52ee4ebfcb2c207f47 Author: Marat Gubaidullin AuthorDate: Fri Mar 1 09:28:46 2024 -0500 #1152 --- .../main/webui/src/designer/route/DslSelector.tsx | 45 ++ .../src/designer/route/DslSelector.tsx | 45 ++ karavan-space/src/designer/route/DslSelector.tsx | 45 ++ 3 files changed, 111 insertions(+), 24 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx b/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx index 68e62e22..c7dde3e7 100644 --- a/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx +++ b/karavan-app/src/main/webui/src/designer/route/DslSelector.tsx @@ -17,9 +17,28 @@ import React, {useEffect, useState} from 'react'; import { Badge, -Card, CardBody, CardFooter, CardHeader, Flex, FlexItem, Form, FormGroup, Gallery, Modal, PageSection, -Tab, Tabs, TabTitleText, -Text, TextInput, ToggleGroup, ToggleGroupItem,Switch +Card, +CardBody, +CardFooter, +CardHeader, +Flex, +FlexItem, +Form, +FormGroup, +Gallery, +Modal, +PageSection, +Tab, +Tabs, +TabTitleText, +Text, +ToggleGroup, +ToggleGroupItem, +Switch, +TextInputGroup, +TextInputGroupMain, +TextInputGroupUtilities, +Button } from '@patternfly/react-core'; import './DslSelector.css'; import {CamelUi} from "../utils/CamelUi"; @@ -29,6 +48,7 @@ import {shallow} from "zustand/shallow"; import {useRouteDesignerHook} from "./useRouteDesignerHook"; import { ComponentApi } from 'karavan-core/lib/api/ComponentApi'; import { KameletApi } from 'karavan-core/lib/api/KameletApi'; +import TimesIcon from "@patternfly/react-icons/dist/esm/icons/times-icon"; interface Props { tabIndex?: string | number @@ -77,9 +97,16 @@ export function DslSelector (props: Props) { /> } - + setFilter(value)}/> + + setFilter('')}> + + + + ) @@ -141,11 +168,11 @@ export function DslSelector (props: Props) { } const isEip = selectorTabIndex === 'eip'; +const isRouteConfig = parentDsl === 'RouteConfigurationDefinition'; const title = parentDsl === undefined ? "Select source" : "Select step"; const navigation: string = selectorTabIndex ? selectorTabIndex.toString() : ''; const blockedComponents = ComponentApi.getBlockedComponentNames(); const blockedKamelets = KameletApi.getBlockedKameletNames(); -const elements = CamelUi.getSelectorModelsForParentFiltered(parentDsl, navigation, showSteps); const eipElements = CamelUi.getSelectorModelsForParentFiltered(parentDsl, 'eip', showSteps); const componentElements = CamelUi.getSelectorModelsForParentFiltered(parentDsl, 'component', showSteps) @@ -165,6 +192,8 @@ export function DslSelector (props: Props) { ? filteredComponentElements : (navigation === 'kamelet' ? filteredKameletElements : filteredEipElements); +console.log(parentDsl) + return ( -{parentDsl !== undefined && filteredEipElements?.length > 0 && +{parentDsl !== undefined && {`Integration Patterns (${filteredEipElements?.length})`}}> } -{filteredKameletElements?.length > 0 && +{!isRouteConfig && {`Kamelets (${filteredKameletElements?.length})`}}> } -{filteredComponentElements?.length > 0 && +{!isRouteConfig && {`Components (${filteredComponentElements?.length})`}}> diff --git a/karavan-designer/src/designer/route/DslSelector.tsx b/karavan-designer/src/designer/route/DslSelector.tsx index 68e62e22..c7dde3e7 100644 --- a/karavan-designer/src/designer/route/DslSelector.tsx +++ b/karavan-designer/src/designer/route/DslSelector.tsx @@ -17,9 +17,28 @@ import React, {useEffect, useState} from 'react'; import { Badge, -Card, CardBody, CardFooter, CardHeader, Flex, FlexItem, Form, FormGroup, Gallery, Modal, PageSection, -Tab, Tabs, TabTitleText, -Text, TextInput, ToggleGroup, ToggleGroupItem,Switch
[I] Error binding property (camel.main.routeControllerBackOffMaxAttempts=true [camel-quarkus]
hakuseki opened a new issue, #5832: URL: https://github.com/apache/camel-quarkus/issues/5832 ### Bug description When using Camel in Quarkus 3.8.1 there's an error generated, failing the application to start: ``` 2024-03-01 15:23:06,205 ERROR [io.qua.run.Application] (Quarkus Main Thread) - Failed to start application (with profile [dev]): java.lang.RuntimeException: Failed to start quarkus at io.quarkus.runner.ApplicationImpl.doStart(Unknown Source) at io.quarkus.runtime.Application.start(Application.java:101) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:111) at io.quarkus.runtime.Quarkus.run(Quarkus.java:71) at io.quarkus.runtime.Quarkus.run(Quarkus.java:44) at io.quarkus.runtime.Quarkus.run(Quarkus.java:124) at io.quarkus.runner.GeneratedMain.main(Unknown Source) at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) at java.base/java.lang.reflect.Method.invoke(Method.java:580) at io.quarkus.runner.bootstrap.StartupActionImpl$1.run(StartupActionImpl.java:113) at java.base/java.lang.Thread.run(Thread.java:1583) Caused by: java.lang.RuntimeException: java.lang.RuntimeException: org.apache.camel.PropertyBindingException: Error binding property (camel.main.routeControllerBackOffMaxAttempts=true) with name: routeControllerBackOffMaxAttempts on bean: org.apache.camel.main.MainConfigurationProperties@5c8196f with value: true at org.apache.camel.quarkus.core.CamelBootstrapRecorder.start(CamelBootstrapRecorder.java:47) at io.quarkus.deployment.steps.CamelBootstrapProcessor$boot173480958.deploy_0(Unknown Source) at io.quarkus.deployment.steps.CamelBootstrapProcessor$boot173480958.deploy(Unknown Source) ... 11 more Caused by: java.lang.RuntimeException: org.apache.camel.PropertyBindingException: Error binding property (camel.main.routeControllerBackOffMaxAttempts=true) with name: routeControllerBackOffMaxAttempts on bean: org.apache.camel.main.MainConfigurationProperties@5c8196f with value: true at org.apache.camel.quarkus.main.CamelMainRuntime.start(CamelMainRuntime.java:65) at org.apache.camel.quarkus.core.CamelBootstrapRecorder.start(CamelBootstrapRecorder.java:45) ... 13 more Caused by: org.apache.camel.PropertyBindingException: Error binding property (camel.main.routeControllerBackOffMaxAttempts=true) with name: routeControllerBackOffMaxAttempts on bean: org.apache.camel.main.MainConfigurationProperties@5c8196f with value: true at org.apache.camel.main.MainHelper.setPropertiesOnTarget(MainHelper.java:354) at org.apache.camel.main.BaseMainSupport.autoConfigurationMainConfiguration(BaseMainSupport.java:1915) at org.apache.camel.main.BaseMainSupport.autoconfigure(BaseMainSupport.java:451) at org.apache.camel.main.MainSupport.autoconfigure(MainSupport.java:73) at org.apache.camel.main.BaseMainSupport.postProcessCamelContext(BaseMainSupport.java:687) at org.apache.camel.quarkus.main.CamelMain.initCamelContext(CamelMain.java:116) at org.apache.camel.quarkus.main.CamelMain.doInit(CamelMain.java:86) at org.apache.camel.support.service.BaseService.init(BaseService.java:78) at org.apache.camel.quarkus.main.CamelMain.startEngine(CamelMain.java:137) at org.apache.camel.quarkus.main.CamelMainRuntime.start(CamelMainRuntime.java:49) ... 14 more ``` Running Quarkus 3.7.4 works fine Running on MacOS Java(TM) SE Runtime Environment Oracle GraalVM 21+35.1 (build 21+35-jvmci-23.1-b15) Java HotSpot(TM) 64-Bit Server VM Oracle GraalVM 21+35.1 (build 21+35-jvmci-23.1-b15, mixed mode, sharing) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch CAMEL-20464 created (now 6ebea8dc9d9)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20464 in repository https://gitbox.apache.org/repos/asf/camel.git at 6ebea8dc9d9 CAMEL-20464 - Slack CloudEvent transformer No new revisions were added by this update.
Re: [PR] CAMEL-20464 - Slack CloudEvent transformer [camel]
github-actions[bot] commented on PR #13365: URL: https://github.com/apache/camel/pull/13365#issuecomment-1973298150 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20464 - Slack CloudEvent transformer [camel]
oscerd commented on PR #13365: URL: https://github.com/apache/camel/pull/13365#issuecomment-1973297509 /component-test slack -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20464 - Slack CloudEvent transformer [camel]
github-actions[bot] commented on PR #13365: URL: https://github.com/apache/camel/pull/13365#issuecomment-1973297515 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20464 - Slack CloudEvent transformer [camel]
oscerd opened a new pull request, #13365: URL: https://github.com/apache/camel/pull/13365 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Remove registration of Servlet classes with AdditionalBeanBuildItem [camel-quarkus]
jamesnetherton opened a new pull request, #5831: URL: https://github.com/apache/camel-quarkus/pull/5831 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add multipart configuration options to servlet extension [camel-quarkus]
jamesnetherton commented on PR #5328: URL: https://github.com/apache/camel-quarkus/pull/5328#issuecomment-1973212311 To move this along I opened https://github.com/apache/camel-quarkus/issues/5830 to follow up on later. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch main updated: Rebalance native test category group-13
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 0b0b946c89 Rebalance native test category group-13 0b0b946c89 is described below commit 0b0b946c8931031cdb1ddd5038c349a5c696ea6f Author: James Netherton AuthorDate: Fri Mar 1 09:40:10 2024 + Rebalance native test category group-13 --- tooling/scripts/test-categories.yaml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index c9e97cce1c..797ff70c64 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -48,9 +48,13 @@ group-02: - sql group-03: - bean-validator + - box - foundation-grouped - core-discovery-disabled - freemarker + - github + - google + - jsh-dsl - json-validator - main - main-collector @@ -207,19 +211,15 @@ group-12: - rest-openapi - vertx-websocket group-13: - - box - camel-k-runtime - camel-k-runtime-model-reifier - camel-k-runtime-shutdown - fhir - - github - - google - groovy-dsl - jasypt - jira - java-joor-dsl - js-dsl - - jsh-dsl - kotlin-dsl - kubernetes - salesforce
Re: [PR] Rebalance native test category group-13 [camel-quarkus]
jamesnetherton merged PR #5829: URL: https://github.com/apache/camel-quarkus/pull/5829 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (bf71dc3611a -> 9dc039f4429)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from bf71dc3611a Regen add 46c7ae5d42e Update camel-4x-upgrade-guide-4_4.adoc add d09751438e9 CAMEL-20477: TwoConsumerOnSameQueueTest needs an exclusive broker and context add df36d1609da CAMEL-20477: avoid sharing reply queues add 9dc039f4429 CAMEL-20477: split flaky transacted test No new revisions were added by this update. Summary of changes: .../component/jms/TwoConsumerOnSameQueueTest.java | 28 +++- .../spring/tx/JMSTXInOutPersistentQueueIT.java | 3 +- .../spring/tx/JmsToJmsTransactedIT.java| 43 +++- .../tx/JmsToJmsTransactedMarkRollbackIT.java | 79 ++ .../issues/JmsInOutPersistentReplyQueueTest.java | 3 +- ...IT.xml => JmsToJmsTransactedMarkRollbackIT.xml} | 2 +- .../ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 2 +- 7 files changed, 120 insertions(+), 40 deletions(-) create mode 100644 components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedMarkRollbackIT.java copy components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/tx/{JmsToJmsTransactedIT.xml => JmsToJmsTransactedMarkRollbackIT.xml} (96%)
(camel) 02/03: CAMEL-20477: avoid sharing reply queues
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit df36d1609dafb461abb6dd5fadc6929ad9870b9c Author: Otavio Rodolfo Piske AuthorDate: Fri Mar 1 11:23:55 2024 +0100 CAMEL-20477: avoid sharing reply queues --- .../jms/integration/spring/tx/JMSTXInOutPersistentQueueIT.java | 3 ++- .../camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSTXInOutPersistentQueueIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSTXInOutPersistentQueueIT.java index 7e45e6f375e..b631e1a76fd 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSTXInOutPersistentQueueIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSTXInOutPersistentQueueIT.java @@ -70,7 +70,8 @@ public class JMSTXInOutPersistentQueueIT extends AbstractSpringJMSITSupport { return new RouteBuilder() { @Override public void configure() { -from("direct:start").to(ExchangePattern.InOut, "activemq:queue:JMSTXInOutPersistentQueueTest?replyTo=myReplies") +from("direct:start").to(ExchangePattern.InOut, + "activemq:queue:JMSTXInOutPersistentQueueTest?replyTo=JmsInOutPersistentReplyQueueTest.myReplies") .to("mock:reply") .process(exchange -> { if (counter++ < 2) { diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java index 1c137405697..a93141b7132 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java @@ -66,7 +66,8 @@ public class JmsInOutPersistentReplyQueueTest extends AbstractJMSTest { public void configure() { from("seda:start") .log("Sending ${body}") -.to(ExchangePattern.InOut, "activemq:queue:JmsInOutPersistentReplyQueueTest?replyTo=myReplies") +.to(ExchangePattern.InOut, + "activemq:queue:JmsInOutPersistentReplyQueueTest?replyTo=JmsInOutPersistentReplyQueueTest.myReplies") // process the remainder of the route concurrently .threads(5) .log("Reply ${body}")
(camel) 01/03: CAMEL-20477: TwoConsumerOnSameQueueTest needs an exclusive broker and context
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit d09751438e9889207b3111a3879e3d4290bc610b Author: Otavio Rodolfo Piske AuthorDate: Fri Mar 1 11:21:35 2024 +0100 CAMEL-20477: TwoConsumerOnSameQueueTest needs an exclusive broker and context --- .../component/jms/TwoConsumerOnSameQueueTest.java | 28 +- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java index a142011ae43..2fa7d237ca4 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java @@ -18,9 +18,16 @@ package org.apache.camel.component.jms; import java.util.concurrent.TimeUnit; +import jakarta.jms.ConnectionFactory; + +import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; +import org.apache.camel.test.infra.artemis.services.ArtemisService; +import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; +import org.apache.camel.test.junit5.CamelTestSupport; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Tag; @@ -28,14 +35,33 @@ import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; +import org.junit.jupiter.api.extension.RegisterExtension; +import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @Tags({ @Tag("not-parallel") }) @TestInstance(TestInstance.Lifecycle.PER_METHOD) -public class TwoConsumerOnSameQueueTest extends AbstractPersistentJMSTest { +public class TwoConsumerOnSameQueueTest extends CamelTestSupport { + +@RegisterExtension +public static ArtemisService service = ArtemisServiceFactory.createPersistentVMService(); + +@Override +protected CamelContext createCamelContext() throws Exception { +CamelContext camelContext = super.createCamelContext(); + +createConnectionFactory(camelContext); + +return camelContext; +} + +protected void createConnectionFactory(CamelContext camelContext) { +ConnectionFactory connectionFactory = ConnectionFactoryHelper.createConnectionFactory(service); +camelContext.addComponent("activemq", jmsComponentAutoAcknowledge(connectionFactory)); +} @Test public void testTwoConsumerOnSameQueue() throws Exception {
(camel) 03/03: CAMEL-20477: split flaky transacted test
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 9dc039f4429a25e1d469955de9c60f414e7d0a62 Author: Otavio Rodolfo Piske AuthorDate: Fri Mar 1 12:47:27 2024 +0100 CAMEL-20477: split flaky transacted test --- .../spring/tx/JmsToJmsTransactedIT.java| 43 +++- .../tx/JmsToJmsTransactedMarkRollbackIT.java | 79 ++ .../spring/tx/JmsToJmsTransactedMarkRollbackIT.xml | 56 +++ 3 files changed, 143 insertions(+), 35 deletions(-) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java index 348c1cc64cc..10591e5451c 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.java @@ -21,11 +21,13 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -33,8 +35,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @TestInstance(TestInstance.Lifecycle.PER_METHOD) @Tags({ @Tag("not-parallel"), @Tag("spring"), @Tag("tx") }) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public final class JmsToJmsTransactedIT extends CamelSpringTestSupport { +@Order(0) @RegisterExtension public static ArtemisService service = ArtemisServiceFactory.createVMService(); @@ -47,18 +51,13 @@ public final class JmsToJmsTransactedIT extends CamelSpringTestSupport { return service.serviceAddress(); } -@BeforeEach -public void beforeEach() { -service.shutdown(); -service.initialize(); -} - @Override protected ClassPathXmlApplicationContext createApplicationContext() { return new ClassPathXmlApplicationContext( "/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedIT.xml"); } +@Order(1) @Test public void testJmsToJmsTestOK() throws Exception { context.addRoutes(new RouteBuilder() { @@ -77,6 +76,7 @@ public final class JmsToJmsTransactedIT extends CamelSpringTestSupport { assertEquals("Hello World", reply); } +@Order(2) @Test public void testJmsToJmsTestRollbackDueToException() throws Exception { context.addRoutes(new RouteBuilder() { @@ -104,6 +104,7 @@ public final class JmsToJmsTransactedIT extends CamelSpringTestSupport { MockEndpoint.assertIsSatisfied(context); } +@Order(3) @Test public void testJmsToJmsTestRollbackDueToRollback() throws Exception { context.addRoutes(new RouteBuilder() { @@ -134,32 +135,4 @@ public final class JmsToJmsTransactedIT extends CamelSpringTestSupport { Object body = consumer.receiveBody("activemq:queue:DLQ", 2000); assertEquals("Hello World", body); } - -@Test -public void testJmsToJmsTestRollbackDueToMarkRollbackOnly() throws Exception { -context.addRoutes(new RouteBuilder() { -@Override -public void configure() { -from("activemq:queue:JmsToJmsTransactedIT") -.transacted() -.to("mock:start") -.to("activemq:queue:JmsToJmsTransactedIT.reply") -.markRollbackOnly(); - - from("activemq:queue:JmsToJmsTransactedIT.reply").to("log:bar").to("mock:bar"); -} -}); -context.start(); - -MockEndpoint bar = getMockEndpoint("mock:bar"); -bar.expectedMessageCount(0); - -MockEndpoint start = getMockEndpoint("mock:start"); -start.expectedMessageCount(7); // default number of redeliveries by AMQ is 6 so we get 6+1 - -template.sendBody("activemq:queue:JmsToJmsTransactedIT", "Hello World"); - -MockEndpoint.assertIsSatisfied(context); -} - } diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedMarkRollbackIT.java
(camel) branch main updated (46c7ae5d42e -> 9dc039f4429)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 46c7ae5d42e Update camel-4x-upgrade-guide-4_4.adoc new d09751438e9 CAMEL-20477: TwoConsumerOnSameQueueTest needs an exclusive broker and context new df36d1609da CAMEL-20477: avoid sharing reply queues new 9dc039f4429 CAMEL-20477: split flaky transacted test The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../component/jms/TwoConsumerOnSameQueueTest.java | 28 +++- .../spring/tx/JMSTXInOutPersistentQueueIT.java | 3 +- .../spring/tx/JmsToJmsTransactedIT.java| 43 +++- .../tx/JmsToJmsTransactedMarkRollbackIT.java | 79 ++ .../issues/JmsInOutPersistentReplyQueueTest.java | 3 +- ...IT.xml => JmsToJmsTransactedMarkRollbackIT.xml} | 2 +- 6 files changed, 119 insertions(+), 39 deletions(-) create mode 100644 components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JmsToJmsTransactedMarkRollbackIT.java copy components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/tx/{JmsToJmsTransactedIT.xml => JmsToJmsTransactedMarkRollbackIT.xml} (96%)
Re: [PR] CAMEL-20477: a few more fixes (2) [camel]
orpiske merged PR #13363: URL: https://github.com/apache/camel/pull/13363 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20495: camel-jsonpath - If resultType is List then automatic wr… [camel]
github-actions[bot] commented on PR #13364: URL: https://github.com/apache/camel/pull/13364#issuecomment-1973100715 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20495: camel-jsonpath - If resultType is List then automatic wr… [camel]
davsclaus opened a new pull request, #13364: URL: https://github.com/apache/camel/pull/13364 …ap single element into a List. # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch jp-list created (now 014e83d5ada)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jp-list in repository https://gitbox.apache.org/repos/asf/camel.git at 014e83d5ada CAMEL-20495: camel-jsonpath - If resultType is List then automatic wrap single element into a List. This branch includes the following new commits: new 014e83d5ada CAMEL-20495: camel-jsonpath - If resultType is List then automatic wrap single element into a List. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: CAMEL-20495: camel-jsonpath - If resultType is List then automatic wrap single element into a List.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch jp-list in repository https://gitbox.apache.org/repos/asf/camel.git commit 014e83d5adab53a53d5d9f5b6a7ac9ebfdd5763f Author: Claus Ibsen AuthorDate: Fri Mar 1 13:25:27 2024 +0100 CAMEL-20495: camel-jsonpath - If resultType is List then automatic wrap single element into a List. --- .../src/main/docs/jsonpath-language.adoc | 9 ++- .../apache/camel/jsonpath/JsonPathExpression.java | 14 - .../jsonpath/JsonPathSplitSingleListTest.java | 69 ++ 3 files changed, 88 insertions(+), 4 deletions(-) diff --git a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc index d93c48c8603..37e45a1b942 100644 --- a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc +++ b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc @@ -284,10 +284,15 @@ You can use JSONPath to split a JSON document, such as: [source,java] from("direct:start") -.split().jsonpath("$.store.book[*]") +.split().jsonpath("$.store.book[*]", List.class) .to("log:book"); +IMPORTANT: Notice how we specify `List.class` as the result-type. This is because if there is only +a single element (only 1 book), then jsonpath will return the single entity as a `Map` instead of `List`. +Therefore, we tell Camel that the result should always be a `List`, and Camel will then automatic wrap the +single element into a new `List` object. + Then each book is logged, however the message body is a `Map` instance. Sometimes you may want to output this as plain String JSON value instead, which can be done with the `writeAsString` option as shown: @@ -295,7 +300,7 @@ with the `writeAsString` option as shown: [source,java] from("direct:start") -.split().jsonpathWriteAsString("$.store.book[*]") +.split().jsonpathWriteAsString("$.store.book[*]", List.class) .to("log:book"); diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java index e6bbfd0a473..f4ce1e74ea8 100644 --- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java +++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java @@ -17,6 +17,7 @@ package org.apache.camel.jsonpath; import java.util.Collection; +import java.util.LinkedList; import java.util.List; import com.jayway.jsonpath.Option; @@ -156,13 +157,22 @@ public class JsonPathExpression extends ExpressionAdapter { if (unpackArray) { // in some cases we get a single element that is wrapped in a List, so unwrap that // if we for example want to grab the single entity and convert that to a int/boolean/String etc -boolean resultIsCollection = Collection.class.isAssignableFrom(resultType); +boolean resultTypeIsCollection = Collection.class.isAssignableFrom(resultType); boolean singleElement = result instanceof List && ((List) result).size() == 1; -if (singleElement && !resultIsCollection) { +if (singleElement && !resultTypeIsCollection) { result = ((List) result).get(0); LOG.trace("Unwrapping result: {} from single element List before converting to: {}", result, resultType); } +} else { +// special for List +boolean resultTypeIsCollection = Collection.class.isAssignableFrom(resultType); +boolean resultIsCollection = result instanceof List; +if (resultTypeIsCollection && !resultIsCollection) { +var list = new LinkedList<>(); +list.add(result); +return list; +} } return exchange.getContext().getTypeConverter().convertTo(resultType, exchange, result); } else { diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java new file mode 100644 index 000..9325c3a97cb --- /dev/null +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListTest.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License,
Re: [PR] CAMEL-20477: a few more fixes (2) [camel]
github-actions[bot] commented on PR #13363: URL: https://github.com/apache/camel/pull/13363#issuecomment-1973072486 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20477: a few more fixes (2) [camel]
orpiske opened a new pull request, #13363: URL: https://github.com/apache/camel/pull/13363 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: Update camel-4x-upgrade-guide-4_4.adoc
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 46c7ae5d42e Update camel-4x-upgrade-guide-4_4.adoc 46c7ae5d42e is described below commit 46c7ae5d42e79c2ad910042bcbc662a1010f28c2 Author: Claus Ibsen AuthorDate: Fri Mar 1 13:05:54 2024 +0100 Update camel-4x-upgrade-guide-4_4.adoc --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc index 8c2abc95360..43c1ed7587f 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_4.adoc @@ -125,7 +125,7 @@ And the option `camel.main.routeControllerSuperviseEnabled` has been renamed to All kamelets are now turned off error handling in the route templates. This is done to make using kamelets the same as calling a regular Camel component endpoint. Backwards mode can be enabled by setting `noErrorHandler=false` -on the `KameletComponent` or as URI parameter `to("kamelet:http-sink?noErrorHandler=true=x")`. +on the `KameletComponent` or as URI parameter `to("kamelet:http-sink?noErrorHandler=false=x")`. === camel-azure-cosmosdb
(camel) branch regen_bot updated (bf2956bd6a6 -> bf71dc3611a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from bf2956bd6a6 CAMEL-20477: JmsFormatDateHeadersToIso8601Test should recycle the broker for every test add bf71dc3611a Regen No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/spi/RestConfiguration.java | 12 ++-- .../camel/model/rest/RestConfigurationDefinition.java | 18 +- .../apache/camel/main/RestConfigurationProperties.java | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-)
(camel) branch main updated: Regen
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 bf71dc3611a Regen bf71dc3611a is described below commit bf71dc3611ae9bf20caa027a9fc4e26c75ed0b19 Author: Claus Ibsen AuthorDate: Fri Mar 1 12:54:24 2024 +0100 Regen --- .../java/org/apache/camel/spi/RestConfiguration.java | 12 ++-- .../camel/model/rest/RestConfigurationDefinition.java | 18 +- .../apache/camel/main/RestConfigurationProperties.java | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java index 3f6457e8f11..ac2c5fe4950 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java @@ -174,9 +174,9 @@ public class RestConfiguration { /** * Whether to use X-Forward headers to set host etc. for OpenApi. * - * This may be needed in special cases involving reverse-proxy and networking going from HTTP to HTTPS etc. - * Then the proxy can send X-Forward headers (X-Forwarded-Proto) that influences the host names in the OpenAPI schema - * that camel-openapi-java generates from Rest DSL routes. + * This may be needed in special cases involving reverse-proxy and networking going from HTTP to HTTPS etc. Then the + * proxy can send X-Forward headers (X-Forwarded-Proto) that influences the host names in the OpenAPI schema that + * camel-openapi-java generates from Rest DSL routes. */ public boolean isUseXForwardHeaders() { return useXForwardHeaders; @@ -185,9 +185,9 @@ public class RestConfiguration { /** * Whether to use X-Forward headers to set host etc. for OpenApi. * - * This may be needed in special cases involving reverse-proxy and networking going from HTTP to HTTPS etc. - * Then the proxy can send X-Forward headers (X-Forwarded-Proto) that influences the host names in the OpenAPI schema - * that camel-openapi-java generates from Rest DSL routes. + * This may be needed in special cases involving reverse-proxy and networking going from HTTP to HTTPS etc. Then the + * proxy can send X-Forward headers (X-Forwarded-Proto) that influences the host names in the OpenAPI schema that + * camel-openapi-java generates from Rest DSL routes. */ public void setUseXForwardHeaders(boolean useXForwardHeaders) { this.useXForwardHeaders = useXForwardHeaders; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java index ee6cd0feb5d..245b339de23 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java @@ -493,9 +493,9 @@ public class RestConfigurationDefinition { /** * Whether to use X-Forward headers to set host etc. for OpenApi. * - * This may be needed in special cases involving reverse-proxy and networking going from HTTP to HTTPS etc. - * Then the proxy can send X-Forward headers (X-Forwarded-Proto) that influences the host names in the OpenAPI schema - * that camel-openapi-java generates from Rest DSL routes. + * This may be needed in special cases involving reverse-proxy and networking going from HTTP to HTTPS etc. Then the + * proxy can send X-Forward headers (X-Forwarded-Proto) that influences the host names in the OpenAPI schema that + * camel-openapi-java generates from Rest DSL routes. */ public void setUseXForwardHeaders(String useXForwardHeaders) { this.useXForwardHeaders = useXForwardHeaders; @@ -878,9 +878,9 @@ public class RestConfigurationDefinition { /** * Whether to use X-Forward headers to set host etc. for OpenApi. * - * This may be needed in special cases involving reverse-proxy and networking going from HTTP to HTTPS etc. - * Then the proxy can send X-Forward headers (X-Forwarded-Proto) that influences the host names in the OpenAPI schema - * that camel-openapi-java generates from Rest DSL routes. + * This may be needed in special cases involving reverse-proxy and networking going from HTTP to HTTPS etc. Then the + * proxy can send X-Forward headers (X-Forwarded-Proto) that influences the host names in the OpenAPI schema that + * camel-openapi-java generates from Rest DSL routes. */ public RestConfigurationDefinition useXForwardHeaders(boolean useXForwardHeaders) {
(camel) branch regen_bot updated (7ef713c9108 -> bf2956bd6a6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 7ef713c9108 CAMEL-20502: JacksonAvro should be default avro dataformat. Add schemaResolver with classname as option in the model. (#13361) add 94f7ad13b06 CAMEL-20477: JmsEndpointConfigurationTest should not instantiate two brokers add bf2956bd6a6 CAMEL-20477: JmsFormatDateHeadersToIso8601Test should recycle the broker for every test No new revisions were added by this update. Summary of changes: .../jms/JmsEndpointConfigurationTest.java | 28 ++ .../jms/JmsFormatDateHeadersToIso8601Test.java | 7 -- 2 files changed, 17 insertions(+), 18 deletions(-)
(camel-k) branch main updated (9746d6e01 -> c4db7ac51)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 9746d6e01 fix(trait): deprecate operator inspecting secrets add c4db7ac51 fix(quarkus): build time properties into file No new revisions were added by this update. Summary of changes: pkg/builder/quarkus.go | 83 +++-- pkg/builder/quarkus_test.go | 218 2 files changed, 252 insertions(+), 49 deletions(-) create mode 100644 pkg/builder/quarkus_test.go
Re: [I] Builder property failure when using non xml tag characters [camel-k]
squakez closed issue #5195: Builder property failure when using non xml tag characters URL: https://github.com/apache/camel-k/issues/5195 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(quarkus): build time properties into file [camel-k]
squakez merged PR #5198: URL: https://github.com/apache/camel-k/pull/5198 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 02/02: CAMEL-20477: JmsFormatDateHeadersToIso8601Test should recycle the broker for every test
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit bf2956bd6a6e6bb07f13438b445495efbc2d4f1d Author: Otavio Rodolfo Piske AuthorDate: Fri Mar 1 10:57:01 2024 +0100 CAMEL-20477: JmsFormatDateHeadersToIso8601Test should recycle the broker for every test --- .../camel/component/jms/JmsFormatDateHeadersToIso8601Test.java | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java index 9f7637640c0..ac4e9214f62 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java @@ -27,6 +27,8 @@ import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisVMService; import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; @@ -35,13 +37,14 @@ import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -@TestInstance(TestInstance.Lifecycle.PER_CLASS) +@Tags({ @Tag("not-parallel") }) +@TestInstance(TestInstance.Lifecycle.PER_METHOD) public class JmsFormatDateHeadersToIso8601Test extends CamelTestSupport { private static final Date DATE = Date.from(Instant.ofEpochMilli(1519672338000L)); @RegisterExtension -public ArtemisService service = new ArtemisVMService(); +public static ArtemisService service = new ArtemisVMService(); @Test public void testComponentFormatDateHeaderToIso8601() {
(camel) branch main updated (7ef713c9108 -> bf2956bd6a6)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 7ef713c9108 CAMEL-20502: JacksonAvro should be default avro dataformat. Add schemaResolver with classname as option in the model. (#13361) new 94f7ad13b06 CAMEL-20477: JmsEndpointConfigurationTest should not instantiate two brokers new bf2956bd6a6 CAMEL-20477: JmsFormatDateHeadersToIso8601Test should recycle the broker for every test The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../jms/JmsEndpointConfigurationTest.java | 28 ++ .../jms/JmsFormatDateHeadersToIso8601Test.java | 7 -- 2 files changed, 17 insertions(+), 18 deletions(-)
(camel) 01/02: CAMEL-20477: JmsEndpointConfigurationTest should not instantiate two brokers
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 94f7ad13b061610df8f79c61d69565179440ae94 Author: Otavio Rodolfo Piske AuthorDate: Fri Mar 1 10:52:22 2024 +0100 CAMEL-20477: JmsEndpointConfigurationTest should not instantiate two brokers --- .../jms/JmsEndpointConfigurationTest.java | 28 ++ 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java index ae63cbe4072..5efb34fde34 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java @@ -29,12 +29,13 @@ import org.apache.camel.Producer; import org.apache.camel.ProducerTemplate; import org.apache.camel.ResolveEndpointFailedException; import org.apache.camel.ServiceStatus; -import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.infra.artemis.services.ArtemisService; import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory; import org.apache.camel.test.infra.core.CamelContextExtension; import org.apache.camel.test.infra.core.DefaultCamelContextExtension; +import org.apache.camel.test.infra.core.api.CamelTestSupportHelper; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -57,30 +58,28 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -public class JmsEndpointConfigurationTest extends AbstractJMSTest { +public class JmsEndpointConfigurationTest implements CamelTestSupportHelper { + +@Order(1) +@RegisterExtension +public static ArtemisService service = ArtemisServiceFactory.createVMService(); @Order(2) @RegisterExtension public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension(); -private static final Logger LOG = LoggerFactory.getLogger(JmsEndpointConfigurationTest.class); -@RegisterExtension -public ArtemisService service = ArtemisServiceFactory.createVMService(); +private static final Logger LOG = LoggerFactory.getLogger(JmsEndpointConfigurationTest.class); protected CamelContext context; protected ProducerTemplate template; protected ConsumerTemplate consumer; @BindToRegistry("myConnectionFactory") private final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(service.serviceAddress()); + private final Processor failProcessor = exchange -> fail("Should not be reached"); private final Processor dummyProcessor = exchange -> LOG.info("Received: {}", exchange); -@Override -protected String getComponentName() { -return "jms"; -} - @Test public void testDurableSubscriberConfiguredWithDoubleSlash() throws Exception { JmsEndpoint endpoint @@ -143,6 +142,7 @@ public class JmsEndpointConfigurationTest extends AbstractJMSTest { "The connectionFactory should be the instance of UserCredentialsConnectionFactoryAdapter"); } +@Disabled @Test public void testSetConnectionFactoryAndUsernameAndPassword() { JmsEndpoint endpoint = resolveMandatoryEndpoint( @@ -357,7 +357,7 @@ public class JmsEndpointConfigurationTest extends AbstractJMSTest { assertEquals("JmsConsumer[Foo.JmsEndpointConfigurationTest.New]", endpoint.getThreadName()); assertEquals(-1, endpoint.getTimeToLive()); assertEquals(-1, endpoint.getTransactionTimeout()); -assertEquals(1, endpoint.getAcknowledgementMode()); +assertEquals(-1, endpoint.getAcknowledgementMode()); assertNull(endpoint.getAcknowledgementModeName()); assertEquals(-1, endpoint.getCacheLevel()); assertNull(endpoint.getCacheLevelName()); @@ -596,11 +596,6 @@ public class JmsEndpointConfigurationTest extends AbstractJMSTest { assertTrue(listenerContainer.isSubscriptionDurable(), "isSubscriptionDurable()"); } -@Override -protected RouteBuilder createRouteBuilder() { -return null; -} - @Override public CamelContextExtension getCamelContextExtension() { return camelContextExtension; @@ -612,4 +607,5 @@ public class JmsEndpointConfigurationTest extends AbstractJMSTest { template = camelContextExtension.getProducerTemplate(); consumer = camelContextExtension.getConsumerTemplate(); } + }
Re: [PR] CAMEL-20477: a few more fixes [camel]
orpiske merged PR #13362: URL: https://github.com/apache/camel/pull/13362 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] feat: add initial support for camel-k [camel-spring-boot]
lburgazzoli commented on code in PR #1097: URL: https://github.com/apache/camel-spring-boot/pull/1097#discussion_r1508827045 ## core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java: ## @@ -189,6 +197,12 @@ public static CamelContext doConfigureCamelContext(ApplicationContext applicatio // and call after all properties are set DefaultConfigurationConfigurer.afterPropertiesSet(camelContext); +// apply custom configurations if any +// TODO: this must be evaluated as I don't know if it makes sense here. +contextCustomizers.stream() +.sorted(Comparator.comparing(CamelContextCustomizer::getOrder)) +.forEach(c -> c.configure(camelContext)); Review Comment: ok, so I'll try to move to camel-main, the only thing I have to check is on camel-quarkus as it is heavily used -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) branch main updated: Data format converter can be the same as components.
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-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 6f3ce92ccbb Data format converter can be the same as components. 6f3ce92ccbb is described below commit 6f3ce92ccbbb51b435293aac02d66fea63e07fb5 Author: Claus Ibsen AuthorDate: Fri Mar 1 11:54:11 2024 +0100 Data format converter can be the same as components. --- .../jackson/avro/springboot/JacksonAvroDataFormatConverter.java | 6 -- .../component/jackson/springboot/JacksonDataFormatConverter.java| 5 - .../camel/springboot/maven/SpringBootAutoConfigurationMojo.java | 3 --- 3 files changed, 14 deletions(-) diff --git a/components-starter/camel-jackson-avro-starter/src/main/java/org/apache/camel/component/jackson/avro/springboot/JacksonAvroDataFormatConverter.java b/components-starter/camel-jackson-avro-starter/src/main/java/org/apache/camel/component/jackson/avro/springboot/JacksonAvroDataFormatConverter.java index 8c84f6a2682..3ef9d516adc 100644 --- a/components-starter/camel-jackson-avro-starter/src/main/java/org/apache/camel/component/jackson/avro/springboot/JacksonAvroDataFormatConverter.java +++ b/components-starter/camel-jackson-avro-starter/src/main/java/org/apache/camel/component/jackson/avro/springboot/JacksonAvroDataFormatConverter.java @@ -37,12 +37,6 @@ public class JacksonAvroDataFormatConverter implements GenericConverter { @Autowired private ApplicationContext applicationContext; -private final CamelContext camelContext; - -public JacksonAvroDataFormatConverter( -org.apache.camel.CamelContext camelContext) { -this.camelContext = camelContext; -} public Set getConvertibleTypes() { Set answer = new LinkedHashSet<>(); diff --git a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConverter.java b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConverter.java index d915033b881..1fe3878d51b 100644 --- a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConverter.java +++ b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConverter.java @@ -37,11 +37,6 @@ public class JacksonDataFormatConverter implements GenericConverter { @Autowired private ApplicationContext applicationContext; -private final CamelContext camelContext; - -public JacksonDataFormatConverter(org.apache.camel.CamelContext camelContext) { -this.camelContext = camelContext; -} public Set getConvertibleTypes() { Set answer = new LinkedHashSet<>(); diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java index 0fdb94d5516..48334bcc709 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java @@ -1523,9 +1523,6 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator javaClass.implementInterface("GenericConverter"); javaClass.addField().setPrivate().setName("applicationContext").setType(loadClass("org.springframework.context.ApplicationContext")).addAnnotation(Autowired.class); - javaClass.addField().setPrivate().setFinal(true).setName("camelContext").setType(loadClass("org.apache.camel.CamelContext")); - javaClass.addMethod().setConstructor(true).setPublic().setPublic().setName(name).addParameter("org.apache.camel.CamelContext", "camelContext") -.setBody("this.camelContext = camelContext;\n"); String body = createConverterPairBody(model); javaClass.addMethod().setName("getConvertibleTypes").setPublic().setReturnType("Set")
(camel-spring-boot) branch main updated: CAMEL-20502: JacksonAvro should be default avro dataformat. Add schemaResolver with classname as option in the model.
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-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new d22ca0495f9 CAMEL-20502: JacksonAvro should be default avro dataformat. Add schemaResolver with classname as option in the model. d22ca0495f9 is described below commit d22ca0495f92f627a713fbe1022def98c8fdbf69 Author: Claus Ibsen AuthorDate: Fri Mar 1 11:50:16 2024 +0100 CAMEL-20502: JacksonAvro should be default avro dataformat. Add schemaResolver with classname as option in the model. --- .../catalog/dataformats/avroJackson.json | 2 +- .../springboot/catalog/dataformats/jackson.json| 2 +- .../test/AvroMarshalAndUnmarshallTest.java | 9 +-- .../test/AvroMarshalAndUnmarshallXmlTest.java | 3 +- .../src/test/resources/routes/springDataFormat.xml | 4 +- .../camel-core-starter/src/main/docs/core.json | 4 +- .../RestConfigurationDefinitionProperties.java | 9 ++- .../src/main/docs/jackson-avro.json| 2 +- .../JacksonAvroDataFormatConfiguration.java| 1 + .../springboot/JacksonAvroDataFormatConverter.java | 70 ++ .../src/main/docs/jackson.json | 2 +- .../springboot/JacksonDataFormatConfiguration.java | 1 + .../springboot/JacksonDataFormatConverter.java | 69 + .../maven/SpringBootAutoConfigurationMojo.java | 6 +- 14 files changed, 167 insertions(+), 17 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/avroJackson.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/avroJackson.json index 8b13e2ad60f..298ce1be814 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/avroJackson.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/avroJackson.json @@ -33,7 +33,7 @@ "timezone": { "index": 14, "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling." }, "autoDiscoverObjectMapper": { "index": 15, "kind": "attribute", "displayName": "Auto Discover Object Mapper", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If set to true then Jackson will lookup for an objectMapper into the registry" }, "contentTypeHeader": { "index": 16, "kind": "attribute", "displayName": "Content Type Header", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON" }, -"schemaResolver": { "index": 17, "kind": "attribute", "displayName": "Schema Resolver", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Optional schema resolver used to lookup schemas for the data in transit." }, +"schemaResolver": { "index": 17, "kind": "attribute", "displayName": "Schema Resolver", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jackson.SchemaResolver", "deprecated": false, "autowired": false, "secret": false, "description": "Optional schema resolver used to lookup schemas for the data in transit." }, "autoDiscoverSchemaResolver": { "index": 18, "kind": "attribute", "displayName": "Auto Discover Schema Resolver", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When not disabled, the SchemaResolver will be looked up into the registry" } } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json index 28ca4eea608..bb180ec4bab 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json +++
[PR] CAMEL-20477: a few more fixes [camel]
orpiske opened a new pull request, #13362: URL: https://github.com/apache/camel/pull/13362 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org