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 381a78576..047658573 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 @@ void testSupportedHeaders() throws Exception { 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 fe6572bfd..5fc818c4f 100644 --- a/library/camel-kamelets-utils/pom.xml +++ b/library/camel-kamelets-utils/pom.xml @@ -85,6 +85,7 @@ provided + org.junit.jupiter @@ -132,7 +133,6 @@ ${log4j2-version} test - 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 2d7e3bd8b..37d34291d 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 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 @@ void shouldDeserializeHeaders() throws Exception { 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 66b8bc464..01282669c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies - 4.4.1 + 4.5.0-SNAPSHOT org.apache.camel.kamelets @@ -62,7 +62,7 @@ 0.16.1 2.7.11 - 4.4.0 + 4.5.0-SNAPSHOT 2.2.0 4.1.0