Skip to content

Commit

Permalink
Align to 4.5.0-SNAPSHOT preparing to release (#1954)
Browse files Browse the repository at this point in the history
* Align to 4.5.0-SNAPSHOT preparing to release

Signed-off-by: Andrea Cosentino <ancosen@gmail.com>

* Align to 4.5.0-SNAPSHOT preparing to release

Signed-off-by: Andrea Cosentino <ancosen@gmail.com>

---------

Signed-off-by: Andrea Cosentino <ancosen@gmail.com>
  • Loading branch information
oscerd committed Mar 19, 2024
1 parent bc4d6a9 commit b755193
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion library/camel-kamelets-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<scope>provided</scope>
</dependency>


<!-- Test scoped dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -132,7 +133,6 @@
<version>${log4j2-version}</version>
<scope>test</scope>
</dependency>

</dependencies>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit b755193

Please sign in to comment.