You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2024/03/19 09:36:34 UTC
(camel-kamelets) branch main updated: Align to 4.5.0-SNAPSHOT preparing to release (#1954)
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-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new b7551936 Align to 4.5.0-SNAPSHOT preparing to release (#1954)
b7551936 is described below
commit b75519368cab9869e301c240d256c9e6fa6f5de5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 19 10:36:28 2024 +0100
Align to 4.5.0-SNAPSHOT preparing to release (#1954)
* Align to 4.5.0-SNAPSHOT preparing to release
Signed-off-by: Andrea Cosentino <an...@gmail.com>
* Align to 4.5.0-SNAPSHOT preparing to release
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---------
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../kamelets/catalog/KameletsCatalogTest.java | 2 +-
library/camel-kamelets-utils/pom.xml | 2 +-
.../kafka/KafkaHeaderDeserializerTest.java | 36 +---------------------
pom.xml | 4 +--
4 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 381a7857..04765857 100644
--- a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++ b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -143,7 +143,7 @@ public class KameletsCatalogTest {
verifyHeaders("aws-not-exists", 0);
verifyHeaders("azure-eventhubs-sink", 2);
verifyHeaders("azure-functions-sink", 8);
- verifyHeaders("azure-servicebus-source", 22);
+ verifyHeaders("azure-servicebus-source", 21);
verifyHeaders("azure-storage-blob-source", 34);
verifyHeaders("azure-storage-blob-sink", 33);
verifyHeaders("azure-storage-blob-changefeed-source", 34);
diff --git a/library/camel-kamelets-utils/pom.xml b/library/camel-kamelets-utils/pom.xml
index fe6572bf..5fc818c4 100644
--- a/library/camel-kamelets-utils/pom.xml
+++ b/library/camel-kamelets-utils/pom.xml
@@ -85,6 +85,7 @@
<scope>provided</scope>
</dependency>
+
<!-- Test scoped dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -132,7 +133,6 @@
<version>${log4j2-version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>
diff --git a/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/serialization/kafka/KafkaHeaderDeserializerTest.java b/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/serialization/kafka/KafkaHeaderDeserializerTest.java
index 2d7e3bd8..37d34291 100644
--- a/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/serialization/kafka/KafkaHeaderDeserializerTest.java
+++ b/library/camel-kamelets-utils/src/test/java/org/apache/camel/kamelets/utils/serialization/kafka/KafkaHeaderDeserializerTest.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.support.SimpleTypeConverter;
import org.junit.jupiter.api.Assertions;
@@ -59,41 +60,6 @@ class KafkaHeaderDeserializerTest {
Assertions.assertEquals("1", exchange.getMessage().getHeader("number"));
}
- @Test
- void shouldDeserializeHeadersViaTypeConverter() throws Exception {
- camelContext.setTypeConverter(new SimpleTypeConverter(true, (type, exchange, value) -> "converted"));
-
- Exchange exchange = new DefaultExchange(camelContext);
-
- exchange.getMessage().setHeader("foo", "bar");
- exchange.getMessage().setHeader("fooBytes", "barBytes".getBytes(StandardCharsets.UTF_8));
- exchange.getMessage().setHeader("fooNull", null);
-
- processor.enabled = true;
- processor.process(exchange);
-
- Assertions.assertTrue(exchange.getMessage().hasHeaders());
- Assertions.assertEquals("converted", exchange.getMessage().getHeader("foo"));
- Assertions.assertEquals("converted", exchange.getMessage().getHeader("fooBytes"));
- Assertions.assertEquals("converted", exchange.getMessage().getHeader("fooNull"));
- }
-
- @Test
- void shouldFallbackToDefaultConverter() throws Exception {
- camelContext.setTypeConverter(null);
- Exchange exchange = new DefaultExchange(camelContext);
-
- exchange.getMessage().setHeader("foo", "bar");
- exchange.getMessage().setHeader("fooBytes", "barBytes".getBytes(StandardCharsets.UTF_8));
-
- processor.enabled = true;
- processor.process(exchange);
-
- Assertions.assertTrue(exchange.getMessage().hasHeaders());
- Assertions.assertEquals("bar", exchange.getMessage().getHeader("foo"));
- Assertions.assertEquals("barBytes", exchange.getMessage().getHeader("fooBytes"));
- }
-
@Test
void shouldNotDeserializeHeadersWhenDisabled() throws Exception {
Exchange exchange = new DefaultExchange(camelContext);
diff --git a/pom.xml b/pom.xml
index 66b8bc46..01282669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>camel-dependencies</artifactId>
- <version>4.4.1</version>
+ <version>4.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.kamelets</groupId>
@@ -62,7 +62,7 @@
<apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
<cyclonedx-maven-plugin-version>2.7.11</cyclonedx-maven-plugin-version>
- <camel.version>4.4.0</camel.version>
+ <camel.version>4.5.0-SNAPSHOT</camel.version>
<camel.k.crds.version>2.2.0</camel.k.crds.version>
<citrus.version>4.1.0</citrus.version>