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 879d900b82f CAMEL-21249 - Camel-Kamelets: Move Kamelets utils in Camel
Kamelets component - Move DDB2 part to AWS DDB (#15915)
879d900b82f is described below
commit 879d900b82f4e5fcbe0085b506dd8285d534054e
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Oct 10 21:46:12 2024 +0200
CAMEL-21249 - Camel-Kamelets: Move Kamelets utils in Camel Kamelets
component - Move DDB2 part to AWS DDB (#15915)
* CAMEL-21249 - Camel-Kamelets: Move Kamelets utils in Camel Kamelets
component - Move DDB2 part to AWS DDB
Signed-off-by: Andrea Cosentino <[email protected]>
* CAMEL-21249 - Camel-Kamelets: Move Kamelets utils in Camel Kamelets
component - Move DDB2 part to AWS DDB
Signed-off-by: Andrea Cosentino <[email protected]>
* CAMEL-21249 - Camel-Kamelets: Move Kamelets utils in Camel Kamelets
component - Move DDB2 part to AWS DDB
Signed-off-by: Andrea Cosentino <[email protected]>
---------
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../transformers/aws2-ddb-application-x-struct.json | 4 ++--
components/camel-aws/camel-aws2-ddb/pom.xml | 16 ++++++++++++++++
.../services/org/apache/camel/transformer.properties | 2 +-
.../camel/transformer/aws2-ddb-application-x-struct | 2 ++
.../camel/transformer/aws2-ddb-application-x-struct.json | 4 ++--
.../transform}/Ddb2JsonStructDataTypeTransformer.java | 4 ++--
.../serialization/gson/JavaTimeInstantTypeAdapter.java | 2 +-
components/camel-kamelet/pom.xml | 6 ------
.../camel/transformer/aws2-ddb-application-x-struct | 2 --
9 files changed, 26 insertions(+), 16 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/aws2-ddb-application-x-struct.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/aws2-ddb-application-x-struct.json
index d826347d326..c748a96dbff 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/aws2-ddb-application-x-struct.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/aws2-ddb-application-x-struct.json
@@ -5,9 +5,9 @@
"title": "Aws2 Ddb (Application X Struct)",
"description": "Transforms DynamoDB record into a Json node",
"deprecated": false,
- "javaType":
"org.apache.camel.component.kamelet.utils.transform.aws2.ddb.Ddb2JsonStructDataTypeTransformer",
+ "javaType":
"org.apache.camel.component.aws2.ddb.transform.Ddb2JsonStructDataTypeTransformer",
"groupId": "org.apache.camel",
- "artifactId": "camel-kamelet",
+ "artifactId": "camel-aws2-ddb",
"version": "4.9.0-SNAPSHOT"
}
}
diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml
b/components/camel-aws/camel-aws2-ddb/pom.xml
index 0ea87f7df6e..a1c00594ef2 100644
--- a/components/camel-aws/camel-aws2-ddb/pom.xml
+++ b/components/camel-aws/camel-aws2-ddb/pom.xml
@@ -54,6 +54,22 @@
<artifactId>apache-client</artifactId>
<version>${aws-java-sdk2-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- provided -->
<dependency>
diff --git
a/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
index 1d5067488ef..a04f30de5f0 100644
---
a/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
+++
b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
@@ -1,5 +1,5 @@
# Generated by camel build tools - do NOT edit this file!
-transformers=aws2-ddb:application-json aws2-ddbstream:application-cloudevents
+transformers=aws2-ddb:application-json aws2-ddb:application-x-struct
aws2-ddbstream:application-cloudevents
groupId=org.apache.camel
artifactId=camel-aws2-ddb
version=4.9.0-SNAPSHOT
diff --git
a/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct
b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct
new file mode 100644
index 00000000000..c1ace602f4b
--- /dev/null
+++
b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ddb.transform.Ddb2JsonStructDataTypeTransformer
diff --git
a/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct.json
b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct.json
similarity index 67%
rename from
components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct.json
rename to
components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct.json
index d826347d326..c748a96dbff 100644
---
a/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct.json
+++
b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct.json
@@ -5,9 +5,9 @@
"title": "Aws2 Ddb (Application X Struct)",
"description": "Transforms DynamoDB record into a Json node",
"deprecated": false,
- "javaType":
"org.apache.camel.component.kamelet.utils.transform.aws2.ddb.Ddb2JsonStructDataTypeTransformer",
+ "javaType":
"org.apache.camel.component.aws2.ddb.transform.Ddb2JsonStructDataTypeTransformer",
"groupId": "org.apache.camel",
- "artifactId": "camel-kamelet",
+ "artifactId": "camel-aws2-ddb",
"version": "4.9.0-SNAPSHOT"
}
}
diff --git
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/transform/aws2/ddb/Ddb2JsonStructDataTypeTransformer.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/Ddb2JsonStructDataTypeTransformer.java
similarity index 91%
rename from
components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/transform/aws2/ddb/Ddb2JsonStructDataTypeTransformer.java
rename to
components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/Ddb2JsonStructDataTypeTransformer.java
index 629f4ebadb9..920377ff097 100644
---
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/transform/aws2/ddb/Ddb2JsonStructDataTypeTransformer.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/Ddb2JsonStructDataTypeTransformer.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.camel.component.kamelet.utils.transform.aws2.ddb;
+package org.apache.camel.component.aws2.ddb.transform;
import java.time.Instant;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.camel.Message;
-import
org.apache.camel.component.kamelet.utils.serialization.gson.JavaTimeInstantTypeAdapter;
+import
org.apache.camel.component.aws2.ddb.transform.serialization.gson.JavaTimeInstantTypeAdapter;
import org.apache.camel.spi.DataType;
import org.apache.camel.spi.DataTypeTransformer;
import org.apache.camel.spi.Transformer;
diff --git
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/serialization/gson/JavaTimeInstantTypeAdapter.java
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/serialization/gson/JavaTimeInstantTypeAdapter.java
similarity index 95%
rename from
components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/serialization/gson/JavaTimeInstantTypeAdapter.java
rename to
components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/serialization/gson/JavaTimeInstantTypeAdapter.java
index 6e062fc4c27..888761c9396 100644
---
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/serialization/gson/JavaTimeInstantTypeAdapter.java
+++
b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/serialization/gson/JavaTimeInstantTypeAdapter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.component.kamelet.utils.serialization.gson;
+package org.apache.camel.component.aws2.ddb.transform.serialization.gson;
import java.lang.reflect.Type;
import java.time.Instant;
diff --git a/components/camel-kamelet/pom.xml b/components/camel-kamelet/pom.xml
index 7473eabff03..67c8e42f4b5 100644
--- a/components/camel-kamelet/pom.xml
+++ b/components/camel-kamelet/pom.xml
@@ -85,12 +85,6 @@
<artifactId>camel-mongodb</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-gson</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- TESTS -->
<dependency>
diff --git
a/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct
b/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct
deleted file mode 100644
index 4db224fcbbe..00000000000
---
a/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/transformer/aws2-ddb-application-x-struct
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.kamelet.utils.transform.aws2.ddb.Ddb2JsonStructDataTypeTransformer
