feat(element-template-generator): remove the value property and use t…

…his annotation to other connetors
camunda · Feb 14, 2025 · ada930f · ada930f
1 parent c2d9063
commit ada930f
Show file tree

Hide file tree

Showing 28 changed files with 81 additions and 101 deletions.
diff --git a/connectors/aws/aws-textract/element-templates/aws-textract-outbound-connector.json b/connectors/aws/aws-textract/element-templates/aws-textract-outbound-connector.json
@@ -170,11 +170,11 @@
     "tooltip" : "<a href=\"https://docs.camunda.io/docs/next/apis-tools/camunda-api-rest/specifications/create-document-link/\">Camunda Document</a>",
     "type" : "Dropdown",
     "choices" : [ {
-      "name" : "S3",
-      "value" : "S3"
-    }, {
       "name" : "Camunda Document",
       "value" : "UPLOADED"
+    }, {
+      "name" : "S3",
+      "value" : "S3"
     } ]
   }, {
     "id" : "input.documentS3Bucket",

diff --git a/...ors/aws/aws-textract/element-templates/hybrid/aws-textract-outbound-connector-hybrid.json b/...ors/aws/aws-textract/element-templates/hybrid/aws-textract-outbound-connector-hybrid.json
@@ -175,11 +175,11 @@
     "tooltip" : "<a href=\"https://docs.camunda.io/docs/next/apis-tools/camunda-api-rest/specifications/create-document-link/\">Camunda Document</a>",
     "type" : "Dropdown",
     "choices" : [ {
-      "name" : "S3",
-      "value" : "S3"
-    }, {
       "name" : "Camunda Document",
       "value" : "UPLOADED"
+    }, {
+      "name" : "S3",
+      "value" : "S3"
     } ]
   }, {
     "id" : "input.documentS3Bucket",

diff --git a/.../aws-textract/src/main/java/io/camunda/connector/textract/model/DocumentLocationType.java b/.../aws-textract/src/main/java/io/camunda/connector/textract/model/DocumentLocationType.java
@@ -6,7 +6,11 @@
  */
 package io.camunda.connector.textract.model;
 
+import io.camunda.connector.generator.java.annotation.EnumValue;
+
 public enum DocumentLocationType {
+  @EnumValue(label = "S3", order = 1)
   S3,
+  @EnumValue(label = "Camunda Document", order = 0)
   UPLOADED;
 }
diff --git a/...aws-textract/src/main/java/io/camunda/connector/textract/model/TextractExecutionType.java b/...aws-textract/src/main/java/io/camunda/connector/textract/model/TextractExecutionType.java
@@ -6,8 +6,13 @@
  */
 package io.camunda.connector.textract.model;
 
+import io.camunda.connector.generator.java.annotation.EnumValue;
+
 public enum TextractExecutionType {
+  @EnumValue(label = "Real-time", order = 1)
   SYNC,
+  @EnumValue(label = "Polling", order = 2)
   POLLING,
-  ASYNC
+  @EnumValue(label = "Asynchronous", order = 0)
+  ASYNC;
 }
diff --git a/...s/aws-textract/src/main/java/io/camunda/connector/textract/model/TextractRequestData.java b/...s/aws-textract/src/main/java/io/camunda/connector/textract/model/TextractRequestData.java
@@ -21,11 +21,6 @@ public record TextractRequestData(
             type = TemplateProperty.PropertyType.Dropdown,
             defaultValue = "ASYNC",
             feel = FeelMode.disabled,
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(value = "ASYNC", label = "Asynchronous"),
-              @TemplateProperty.DropdownPropertyChoice(value = "SYNC", label = "Real-time"),
-              @TemplateProperty.DropdownPropertyChoice(value = "POLLING", label = "Polling")
-            },
             description = "Endpoint inference type")
         @NotNull
         TextractExecutionType executionType,
@@ -36,12 +31,6 @@ public record TextractRequestData(
             feel = FeelMode.disabled,
             type = TemplateProperty.PropertyType.Dropdown,
             defaultValue = "UPLOADED",
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(value = "S3", label = "S3"),
-              @TemplateProperty.DropdownPropertyChoice(
-                  value = "UPLOADED",
-                  label = "Camunda Document")
-            },
             tooltip =
                 "<a href=\"https://docs.camunda.io/docs/next/apis-tools/camunda-api-rest/specifications/create-document-link/\">Camunda Document</a>",
             condition =

diff --git a/connectors/email/element-templates/email-inbound-connector-boundary.json b/connectors/email/element-templates/email-inbound-connector-boundary.json
@@ -156,12 +156,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.folderToListen",

diff --git a/connectors/email/element-templates/email-inbound-connector-intermediate.json b/connectors/email/element-templates/email-inbound-connector-intermediate.json
@@ -156,12 +156,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.folderToListen",

diff --git a/connectors/email/element-templates/email-message-start-event-connector.json b/connectors/email/element-templates/email-message-start-event-connector.json
@@ -156,12 +156,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.folderToListen",

diff --git a/connectors/email/element-templates/email-outbound-connector.json b/connectors/email/element-templates/email-outbound-connector.json
@@ -216,12 +216,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.pop3Host",
@@ -287,12 +287,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.smtpHost",
@@ -358,12 +358,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.smtpActionDiscriminator",

diff --git a/connectors/email/element-templates/hybrid/email-inbound-connector-boundary-hybrid.json b/connectors/email/element-templates/hybrid/email-inbound-connector-boundary-hybrid.json
@@ -161,12 +161,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.folderToListen",

diff --git a/connectors/email/element-templates/hybrid/email-inbound-connector-intermediate-hybrid.json b/connectors/email/element-templates/hybrid/email-inbound-connector-intermediate-hybrid.json
@@ -161,12 +161,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.folderToListen",

diff --git a/connectors/email/element-templates/hybrid/email-outbound-connector-hybrid.json b/connectors/email/element-templates/hybrid/email-outbound-connector-hybrid.json
@@ -221,12 +221,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.pop3Host",
@@ -292,12 +292,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.smtpHost",
@@ -363,12 +363,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.smtpActionDiscriminator",

diff --git a/...ors/email/element-templates/hybrid/hybrid-email-message-start-event-connector-hybrid.json b/...ors/email/element-templates/hybrid/hybrid-email-message-start-event-connector-hybrid.json
@@ -161,12 +161,12 @@
     "choices" : [ {
       "name" : "TLS",
       "value" : "TLS"
-    }, {
-      "name" : "None",
-      "value" : "NONE"
     }, {
       "name" : "SSL",
       "value" : "SSL"
+    }, {
+      "name" : "None",
+      "value" : "NONE"
     } ]
   }, {
     "id" : "data.folderToListen",

diff --git a/connectors/email/src/main/java/io/camunda/connector/email/config/CryptographicProtocol.java b/connectors/email/src/main/java/io/camunda/connector/email/config/CryptographicProtocol.java
@@ -6,8 +6,13 @@
  */
 package io.camunda.connector.email.config;
 
+import io.camunda.connector.generator.java.annotation.EnumValue;
+
 public enum CryptographicProtocol {
+  @EnumValue(label = "None", order = 2)
   NONE,
+  @EnumValue(label = "TLS", order = 0)
   TLS,
+  @EnumValue(label = "SSL", order = 1)
   SSL;
 }
diff --git a/connectors/email/src/main/java/io/camunda/connector/email/config/ImapConfig.java b/connectors/email/src/main/java/io/camunda/connector/email/config/ImapConfig.java
@@ -43,11 +43,6 @@ public record ImapConfig(
             type = TemplateProperty.PropertyType.Dropdown,
             constraints = @TemplateProperty.PropertyConstraints(notEmpty = true),
             defaultValue = "TLS",
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(label = "TLS", value = "TLS"),
-              @TemplateProperty.DropdownPropertyChoice(label = "None", value = "NONE"),
-              @TemplateProperty.DropdownPropertyChoice(label = "SSL", value = "SSL")
-            },
             binding =
                 @TemplateProperty.PropertyBinding(
                     name = "data.imapConfig.imapCryptographicProtocol"))

diff --git a/connectors/email/src/main/java/io/camunda/connector/email/config/Pop3Config.java b/connectors/email/src/main/java/io/camunda/connector/email/config/Pop3Config.java
@@ -43,11 +43,6 @@ public record Pop3Config(
             type = TemplateProperty.PropertyType.Dropdown,
             constraints = @TemplateProperty.PropertyConstraints(notEmpty = true),
             defaultValue = "TLS",
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(label = "TLS", value = "TLS"),
-              @TemplateProperty.DropdownPropertyChoice(label = "None", value = "NONE"),
-              @TemplateProperty.DropdownPropertyChoice(label = "SSL", value = "SSL")
-            },
             binding =
                 @TemplateProperty.PropertyBinding(
                     name = "data.pop3Config.pop3CryptographicProtocol"))

diff --git a/connectors/email/src/main/java/io/camunda/connector/email/config/SmtpConfig.java b/connectors/email/src/main/java/io/camunda/connector/email/config/SmtpConfig.java
@@ -43,11 +43,6 @@ public record SmtpConfig(
             type = TemplateProperty.PropertyType.Dropdown,
             constraints = @TemplateProperty.PropertyConstraints(notEmpty = true),
             defaultValue = "TLS",
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(label = "TLS", value = "TLS"),
-              @TemplateProperty.DropdownPropertyChoice(label = "None", value = "NONE"),
-              @TemplateProperty.DropdownPropertyChoice(label = "SSL", value = "SSL")
-            },
             binding =
                 @TemplateProperty.PropertyBinding(
                     name = "data.smtpConfig.smtpCryptographicProtocol"))

diff --git a/...mail/src/main/java/io/camunda/connector/email/outbound/protocols/actions/ContentType.java b/...mail/src/main/java/io/camunda/connector/email/outbound/protocols/actions/ContentType.java
@@ -7,11 +7,15 @@
 package io.camunda.connector.email.outbound.protocols.actions;
 
 import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
+import io.camunda.connector.generator.java.annotation.EnumValue;
 
 public enum ContentType {
   @JsonEnumDefaultValue
+  @EnumValue(label = "PLAIN", order = 0)
   PLAIN("text/plain; charset=utf-8"),
+  @EnumValue(label = "HTML", order = 1)
   HTML("text/html; charset=utf-8"),
+  @EnumValue(label = "HTML & Plaintext", order = 2)
   MULTIPART("multipart/mixed; charset=utf-8");
 
   private final String value;

diff --git a/...l/src/main/java/io/camunda/connector/email/outbound/protocols/actions/ImapListEmails.java b/...l/src/main/java/io/camunda/connector/email/outbound/protocols/actions/ImapListEmails.java
@@ -59,10 +59,6 @@ public record ImapListEmails(
             type = TemplateProperty.PropertyType.Dropdown,
             constraints = @TemplateProperty.PropertyConstraints(notEmpty = true),
             defaultValue = "ASC",
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(label = "ASC", value = "ASC"),
-              @TemplateProperty.DropdownPropertyChoice(label = "DESC", value = "DESC")
-            },
             binding = @TemplateProperty.PropertyBinding(name = "data.imapAction.sortOrder"))
         @NotNull
         SortOrder sortOrder)

diff --git a/...l/src/main/java/io/camunda/connector/email/outbound/protocols/actions/Pop3ListEmails.java b/...l/src/main/java/io/camunda/connector/email/outbound/protocols/actions/Pop3ListEmails.java
@@ -36,10 +36,6 @@ public record Pop3ListEmails(
             type = TemplateProperty.PropertyType.Dropdown,
             constraints = @TemplateProperty.PropertyConstraints(notEmpty = true),
             defaultValue = "SENT_DATE",
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(label = "Sent Date", value = "SENT_DATE"),
-              @TemplateProperty.DropdownPropertyChoice(label = "Size", value = "SIZE")
-            },
             binding = @TemplateProperty.PropertyBinding(name = "data.pop3Action.sortField"))
         @NotNull
         SortFieldPop3 sortField,
@@ -53,10 +49,6 @@ public record Pop3ListEmails(
             type = TemplateProperty.PropertyType.Dropdown,
             constraints = @TemplateProperty.PropertyConstraints(notEmpty = true),
             defaultValue = "ASC",
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(label = "ASC", value = "ASC"),
-              @TemplateProperty.DropdownPropertyChoice(label = "DESC", value = "DESC")
-            },
             binding = @TemplateProperty.PropertyBinding(name = "data.pop3Action.sortOrder"))
         @NotNull
         SortOrder sortOrder)

diff --git a/...il/src/main/java/io/camunda/connector/email/outbound/protocols/actions/SmtpSendEmail.java b/...il/src/main/java/io/camunda/connector/email/outbound/protocols/actions/SmtpSendEmail.java
@@ -90,13 +90,6 @@ public record SmtpSendEmail(
             id = "contentType",
             defaultValue = "PLAIN",
             type = TemplateProperty.PropertyType.Dropdown,
-            choices = {
-              @TemplateProperty.DropdownPropertyChoice(label = "PLAIN", value = "PLAIN"),
-              @TemplateProperty.DropdownPropertyChoice(label = "HTML", value = "HTML"),
-              @TemplateProperty.DropdownPropertyChoice(
-                  label = "HTML & Plaintext",
-                  value = "MULTIPART")
-            },
             tooltip = "Email's contentType",
             binding = @TemplateProperty.PropertyBinding(name = "data.smtpAction.contentType"))
         @Valid