This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch gen-trans in repository https://gitbox.apache.org/repos/asf/camel.git
commit e1a0629ddc572b03003841c086770cd5e0836c5c Author: Claus Ibsen <[email protected]> AuthorDate: Wed Feb 14 18:56:41 2024 +0100 CAMEL-20419: Generate json metadata for @DataTypeTransformer --- .../org/apache/camel/transformer/transformers.json | 12 ++++++++++ .../org/apache/camel/transformer/transformers.json | 12 ++++++++++ .../org/apache/camel/transformer/transformers.json | 12 ++++++++++ .../org/apache/camel/transformer/transformers.json | 12 ++++++++++ .../org/apache/camel/transformer/transformers.json | 9 ++++---- .../org/apache/camel/transformer/transformers.json | 12 ++++++++++ .../org/apache/camel/transformer/transformers.json | 19 ++++++++++++++++ .../org/apache/camel/transformer/transformers.json | 12 ++++++++++ .../org/apache/camel/transformer/transformers.json | 12 ++++++++++ .../org/apache/camel/transformer/transformers.json | 26 ++++++++++++++++++++++ .../org/apache/camel/transformer/transformers.json | 26 ++++++++++++++++++++++ .../org/apache/camel/transformer/transformers.json | 26 ++++++++++++++++++++++ .../org/apache/camel/transformer/transformers.json | 9 +++++--- .../packaging/GenerateDataTypeTransformerMojo.java | 4 +++- 14 files changed, 195 insertions(+), 8 deletions(-) diff --git a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..92149c5f501 --- /dev/null +++ b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,12 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-aws-cloudtrail", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.aws.cloudtrail.transform.CloudtrailCloudEventDataTypeTransformer", + "name": "aws-cloudtrail:application-cloudevents" + } + ] +} + diff --git a/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..05683a173a0 --- /dev/null +++ b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,12 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-aws2-ddb", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.aws2.ddb.transform.Ddb2JsonDataTypeTransformer", + "name": "aws2-ddb:application-json" + } + ] +} + diff --git a/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..05351be4914 --- /dev/null +++ b/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,12 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-aws2-s3", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.aws2.s3.transform.AWS2S3CloudEventDataTypeTransformer", + "name": "aws2-s3:application-cloudevents" + } + ] +} + diff --git a/components/camel-aws/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-aws/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..bf674ef942d --- /dev/null +++ b/components/camel-aws/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,12 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-aws2-sqs", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.aws2.sqs.transform.AWS2SQSCloudEventDataTypeTransformer", + "name": "aws2-sqs:application-cloudevents" + } + ] +} + diff --git a/components/camel-azure/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-azure/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json index effb6a941e7..2657cc484c1 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json +++ b/components/camel-azure/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -1,11 +1,12 @@ { - "groupId": "org.apache.camel", - "artifactId": "camel-azure-storage-blob", - "version": "4.4.0-SNAPSHOT", "transformers": [ { + "groupId": "org.apache.camel", + "artifactId": "camel-azure-storage-blob", + "version": "4.4.0-SNAPSHOT", "className": "org.apache.camel.component.azure.storage.blob.transform.AzureStorageBlobCloudEventDataTypeTransformer", - "name": "azure-storage-blob:application-cloudevents" + "name": "azure-storage-blob:application-cloudevents", + "description": "Adds CloudEvent headers to the Camel message with Azure Store Blob information" } ] } diff --git a/components/camel-azure/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-azure/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..d406bbb7edf --- /dev/null +++ b/components/camel-azure/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,12 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-azure-storage-queue", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.azure.storage.queue.transform.AzureStorageQueueCloudEventDataTypeTransformer", + "name": "azure-storage-queue:application-cloudevents" + } + ] +} + diff --git a/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..a503f812528 --- /dev/null +++ b/components/camel-cloudevents/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,19 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-cloudevents", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.cloudevents.transformer.CloudEventJsonDataTypeTransformer", + "name": "application-cloudevents+json" + }, + { + "groupId": "org.apache.camel", + "artifactId": "camel-cloudevents", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.cloudevents.transformer.CloudEventHttpDataTypeTransformer", + "name": "http:application-cloudevents" + } + ] +} + diff --git a/components/camel-google/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-google/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..8d99875fdee --- /dev/null +++ b/components/camel-google/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,12 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-google-sheets", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.google.sheets.transform.GoogleSheetsJsonStructDataTypeTransformer", + "name": "google-sheets:application-x-struct" + } + ] +} + diff --git a/components/camel-google/camel-google-storage/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-google/camel-google-storage/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..0559fb9bc54 --- /dev/null +++ b/components/camel-google/camel-google-storage/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,12 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-google-storage", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.google.storage.transform.GoogleStorageCloudEventDataTypeTransformer", + "name": "google-storage:application-cloudevents" + } + ] +} + diff --git a/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..cb542f2ba3f --- /dev/null +++ b/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,26 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson-avro", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.avro.transform.AvroBinaryDataTypeTransformer", + "name": "avro-binary" + }, + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson-avro", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.avro.transform.AvroPojoDataTypeTransformer", + "name": "avro-x-java-object" + }, + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson-avro", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.avro.transform.AvroStructDataTypeTransformer", + "name": "avro-x-struct" + } + ] +} + diff --git a/components/camel-jackson-protobuf/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-jackson-protobuf/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..072d546106d --- /dev/null +++ b/components/camel-jackson-protobuf/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,26 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson-protobuf", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.protobuf.transform.ProtobufBinaryDataTypeTransformer", + "name": "protobuf-binary" + }, + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson-protobuf", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.protobuf.transform.ProtobufPojoDataTypeTransformer", + "name": "protobuf-x-java-object" + }, + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson-protobuf", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.protobuf.transform.ProtobufStructDataTypeTransformer", + "name": "protobuf-x-struct" + } + ] +} + diff --git a/components/camel-jackson/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/components/camel-jackson/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json new file mode 100644 index 00000000000..a21a042dafa --- /dev/null +++ b/components/camel-jackson/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -0,0 +1,26 @@ +{ + "transformers": [ + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.transform.JsonDataTypeTransformer", + "name": "application-json" + }, + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.transform.JsonPojoDataTypeTransformer", + "name": "application-x-java-object" + }, + { + "groupId": "org.apache.camel", + "artifactId": "camel-jackson", + "version": "4.4.0-SNAPSHOT", + "className": "org.apache.camel.component.jackson.transform.JsonStructDataTypeTransformer", + "name": "application-x-struct" + } + ] +} + diff --git a/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json index 9fea52e4022..0e33f276033 100644 --- a/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json +++ b/core/camel-core-processor/src/generated/resources/META-INF/services/org/apache/camel/transformer/transformers.json @@ -1,13 +1,16 @@ { - "groupId": "org.apache.camel", - "artifactId": "camel-core-processor", - "version": "4.4.0-SNAPSHOT", "transformers": [ { + "groupId": "org.apache.camel", + "artifactId": "camel-core-processor", + "version": "4.4.0-SNAPSHOT", "className": "org.apache.camel.processor.transformer.ByteArrayDataTypeTransformer", "name": "application-octet-stream" }, { + "groupId": "org.apache.camel", + "artifactId": "camel-core-processor", + "version": "4.4.0-SNAPSHOT", "className": "org.apache.camel.processor.transformer.StringDataTypeTransformer", "name": "text-plain" } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java index 75f047dae3c..480e4faa6c1 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateDataTypeTransformerMojo.java @@ -155,7 +155,9 @@ public class GenerateDataTypeTransformerMojo extends AbstractGeneratorMojo { JsonObject jo = asJsonObject(model); arr.add(jo); } - String json = arr.toJson(); + JsonObject root = new JsonObject(); + root.put("transformers", arr); + String json = root.toJson(); json = Jsoner.prettyPrint(json, 2); // we need to store in META-INF to avoid confusing with component json
