Skip to content

Commit

Permalink
fix(#1716): Remove obsolete data type transformer implementations (#1732
Browse files Browse the repository at this point in the history
)

- Data type transformer implementations have been moved to the Camel core project
- Using those transformers in Camel works with version 4.2.0 onwards
  • Loading branch information
christophd committed Nov 15, 2023
1 parent 5bea94c commit 17e53a0
Show file tree
Hide file tree
Showing 59 changed files with 36 additions and 3,193 deletions.
3 changes: 1 addition & 2 deletions kamelets/avro-deserialize-action.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,13 @@ spec:
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:checkbox'
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.2.0-SNAPSHOT"
- "camel:kamelet"
- "camel:core"
- "camel:jackson-avro"
template:
beans:
- name: schemaResolver
type: "#class:org.apache.camel.kamelets.utils.format.converter.avro.AvroSchemaResolver"
type: "#class:org.apache.camel.component.jackson.avro.transform.AvroSchemaResolver"
property:
- key: validate
value: '{{validate}}'
Expand Down
3 changes: 1 addition & 2 deletions kamelets/avro-serialize-action.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,13 @@ spec:
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:checkbox'
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.2.0-SNAPSHOT"
- "camel:kamelet"
- "camel:core"
- "camel:jackson-avro"
template:
beans:
- name: schemaResolver
type: "#class:org.apache.camel.kamelets.utils.format.converter.avro.AvroSchemaResolver"
type: "#class:org.apache.camel.component.jackson.avro.transform.AvroSchemaResolver"
property:
- key: validate
value: '{{validate}}'
Expand Down
1 change: 0 additions & 1 deletion kamelets/data-type-action.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ spec:
description: Defines the data type that will be applied by this action. Apache Camel and the Kamelet catalog support different data types and performs automatic message conversion according to the given type.
type: string
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.2.0-SNAPSHOT"
- "camel:kamelet"
- "camel:core"
template:
Expand Down
2 changes: 1 addition & 1 deletion kamelets/protobuf-deserialize-action.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
template:
beans:
- name: schemaResolver
type: "#class:org.apache.camel.kamelets.utils.format.converter.protobuf.ProtobufSchemaResolver"
type: "#class:org.apache.camel.kamelets.utils.format.schema.protobuf.ProtobufSchemaResolver"
property:
- key: schema
value: '{{schema:}}'
Expand Down
2 changes: 1 addition & 1 deletion kamelets/protobuf-serialize-action.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
template:
beans:
- name: schemaResolver
type: "#class:org.apache.camel.kamelets.utils.format.converter.protobuf.ProtobufSchemaResolver"
type: "#class:org.apache.camel.kamelets.utils.format.schema.protobuf.ProtobufSchemaResolver"
property:
- key: schema
value: '{{schema:}}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ void testSupportedHeaders() throws Exception {
verifyHeaders("azure-storage-blob-source", 34);
verifyHeaders("azure-storage-blob-sink", 33);
verifyHeaders("azure-storage-blob-changefeed-source", 34);
verifyHeaders("azure-storage-datalake-source", 0);
verifyHeaders("azure-storage-datalake-sink", 0);
verifyHeaders("azure-storage-datalake-source", 25);
verifyHeaders("azure-storage-datalake-sink", 37);
verifyHeaders("azure-storage-queue-source", 6);
verifyHeaders("azure-storage-queue-sink", 16);
verifyHeaders("cassandra-sink", 1);
Expand Down
27 changes: 1 addition & 26 deletions library/camel-kamelets-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,37 +71,12 @@
<artifactId>camel-kafka</artifactId>
</dependency>

<!-- Optional dependencies for data type conversion -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-ddb</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-s3</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws2-sqs</artifactId>
<scope>provided</scope>
</dependency>
<!-- Dependencies for azure credential configuration -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-blob</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-storage</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-google-sheets</artifactId>
<scope>provided</scope>
</dependency>

<!-- Dependencies for mongodb connection configuration -->
<dependency>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 17e53a0

Please sign in to comment.