This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-21249-part-2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d059e7581ae7639b6f56f851d64e8ab43c8c363b
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Oct 10 18:44:31 2024 +0200
CAMEL-21249 - Camel-Kamelets: Move Kamelets utils in Camel Kamelets
component - Move DDB2 part to AWS DDB
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
components/camel-aws/camel-aws2-ddb/pom.xml | 6 ++++++
.../META-INF/services/org/apache/camel/transformer.properties | 2 +-
.../org/apache/camel/transformer/aws2-ddb-application-x-struct | 2 ++
.../org/apache/camel/transformer/aws2-ddb-application-x-struct.json | 4 ++--
.../aws2/ddb/transform}/Ddb2JsonStructDataTypeTransformer.java | 4 ++--
.../transform}/serialization/gson/JavaTimeInstantTypeAdapter.java | 2 +-
components/camel-kamelet/pom.xml | 6 ------
.../org/apache/camel/transformer/aws2-ddb-application-x-struct | 2 --
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml
b/components/camel-aws/camel-aws2-ddb/pom.xml
index 0ea87f7df6e..762fab98414 100644
--- a/components/camel-aws/camel-aws2-ddb/pom.xml
+++ b/components/camel-aws/camel-aws2-ddb/pom.xml
@@ -62,6 +62,12 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-gson</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
<!-- for testing -->
<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
