Release

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.2.1
+* Fixed problems with Brevo API #206 #243
+
 # 1.2.0
 * Updated to Jackson v3
 * Updated dependencies
@@ -7,7 +10,7 @@
 
 # 1.1.0
 * Updated generated code from Brevo's openapi.yml
-* Updated references to "new" official Brevo client #
+* Updated references to "new" official Brevo client
 * Updated dependencies
 
 # 1.0.4

brevo-java-client/src/generated/java/software/xdev/brevo/model/CreateDomainModel.java

@@ -41,7 +41,7 @@
 public class CreateDomainModel {
   public static final String JSON_PROPERTY_ID = "id";
   @jakarta.annotation.Nonnull
-  private Long id;
+  private String id;
 
   public static final String JSON_PROPERTY_DOMAIN_NAME = "domain_name";
   @jakarta.annotation.Nullable
@@ -62,7 +62,7 @@ public class CreateDomainModel {
   public CreateDomainModel() {
   }
 
-  public CreateDomainModel id(@jakarta.annotation.Nonnull Long id) {
+  public CreateDomainModel id(@jakarta.annotation.Nonnull String id) {
 
     this.id = id;
     return this;
@@ -76,14 +76,14 @@ public CreateDomainModel id(@jakarta.annotation.Nonnull Long id) {
   @JsonProperty(value = JSON_PROPERTY_ID, required = true)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
-  public Long getId() {
+  public String getId() {
     return id;
   }
 
 
   @JsonProperty(value = JSON_PROPERTY_ID, required = true)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setId(@jakarta.annotation.Nonnull Long id) {
+  public void setId(@jakarta.annotation.Nonnull String id) {
     this.id = id;
   }
 

brevo-java-client/src/generated/java/software/xdev/brevo/model/Order.java

@@ -28,7 +28,6 @@
 import java.util.Map;
 import software.xdev.brevo.model.OrderBilling;
 import software.xdev.brevo.model.OrderIdentifiers;
-import software.xdev.brevo.model.OrderMetaInfoValue;
 import software.xdev.brevo.model.OrderProductsInner;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -96,7 +95,7 @@ public class Order {
 
   public static final String JSON_PROPERTY_META_INFO = "metaInfo";
   @jakarta.annotation.Nullable
-  private Map<String, OrderMetaInfoValue> metaInfo = new HashMap<>();
+  private Map<String, Object> metaInfo = new HashMap<>();
 
   public Order() {
   }
@@ -367,13 +366,13 @@ public void setCoupons(@jakarta.annotation.Nullable List<String> coupons) {
     this.coupons = coupons;
   }
 
-  public Order metaInfo(@jakarta.annotation.Nullable Map<String, OrderMetaInfoValue> metaInfo) {
+  public Order metaInfo(@jakarta.annotation.Nullable Map<String, Object> metaInfo) {
 
     this.metaInfo = metaInfo;
     return this;
   }
 
-  public Order putMetaInfoItem(String key, OrderMetaInfoValue metaInfoItem) {
+  public Order putMetaInfoItem(String key, Object metaInfoItem) {
     if (this.metaInfo == null) {
       this.metaInfo = new HashMap<>();
     }
@@ -387,16 +386,16 @@ public Order putMetaInfoItem(String key, OrderMetaInfoValue metaInfoItem) {
    */
   @jakarta.annotation.Nullable
   @JsonProperty(value = JSON_PROPERTY_META_INFO, required = false)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
 
-  public Map<String, OrderMetaInfoValue> getMetaInfo() {
+  public Map<String, Object> getMetaInfo() {
     return metaInfo;
   }
 
 
   @JsonProperty(value = JSON_PROPERTY_META_INFO, required = false)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMetaInfo(@jakarta.annotation.Nullable Map<String, OrderMetaInfoValue> metaInfo) {
+  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
+  public void setMetaInfo(@jakarta.annotation.Nullable Map<String, Object> metaInfo) {
     this.metaInfo = metaInfo;
   }
 
@@ -584,9 +583,13 @@ public String toUrlQueryString(String prefix) {
     // add `metaInfo` to the URL query string
     if (getMetaInfo() != null) {
       for (String _key : getMetaInfo().keySet()) {
-        if (getMetaInfo().get(_key) != null) {
-          joiner.add(getMetaInfo().get(_key).toUrlQueryString(String.format(java.util.Locale.ROOT, "%smetaInfo%s%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix))));
+        try {
+          joiner.add(String.format(java.util.Locale.ROOT, "%smetaInfo%s%s=%s", prefix, suffix,
+              "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
+              getMetaInfo().get(_key), URLEncoder.encode(String.valueOf(getMetaInfo().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
+        } catch (UnsupportedEncodingException e) {
+          // Should never happen, UTF-8 is always supported
+          throw new RuntimeException(e);
         }
       }
     }

brevo-java-client/src/generated/java/software/xdev/brevo/model/PostContactInfoContacts.java

@@ -20,8 +20,9 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import software.xdev.brevo.model.PostContactInfoContactsFailure;
-import software.xdev.brevo.model.PostContactInfoContactsSuccess;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.io.UnsupportedEncodingException;
@@ -41,11 +42,11 @@
 public class PostContactInfoContacts {
   public static final String JSON_PROPERTY_SUCCESS = "success";
   @jakarta.annotation.Nullable
-  private PostContactInfoContactsSuccess success;
+  private List<String> success = new ArrayList<>();
 
   public static final String JSON_PROPERTY_FAILURE = "failure";
   @jakarta.annotation.Nullable
-  private PostContactInfoContactsFailure failure;
+  private List<String> failure = new ArrayList<>();
 
   public static final String JSON_PROPERTY_TOTAL = "total";
   @jakarta.annotation.Nullable
@@ -58,12 +59,20 @@ public class PostContactInfoContacts {
   public PostContactInfoContacts() {
   }
 
-  public PostContactInfoContacts success(@jakarta.annotation.Nullable PostContactInfoContactsSuccess success) {
+  public PostContactInfoContacts success(@jakarta.annotation.Nullable List<String> success) {
 
     this.success = success;
     return this;
   }
 
+  public PostContactInfoContacts addSuccessItem(String successItem) {
+    if (this.success == null) {
+      this.success = new ArrayList<>();
+    }
+    this.success.add(successItem);
+    return this;
+  }
+
   /**
    * Get success
    * @return success
@@ -72,23 +81,31 @@ public PostContactInfoContacts success(@jakarta.annotation.Nullable PostContactI
   @JsonProperty(value = JSON_PROPERTY_SUCCESS, required = false)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
-  public PostContactInfoContactsSuccess getSuccess() {
+  public List<String> getSuccess() {
     return success;
   }
 
 
   @JsonProperty(value = JSON_PROPERTY_SUCCESS, required = false)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setSuccess(@jakarta.annotation.Nullable PostContactInfoContactsSuccess success) {
+  public void setSuccess(@jakarta.annotation.Nullable List<String> success) {
     this.success = success;
   }
 
-  public PostContactInfoContacts failure(@jakarta.annotation.Nullable PostContactInfoContactsFailure failure) {
+  public PostContactInfoContacts failure(@jakarta.annotation.Nullable List<String> failure) {
 
     this.failure = failure;
     return this;
   }
 
+  public PostContactInfoContacts addFailureItem(String failureItem) {
+    if (this.failure == null) {
+      this.failure = new ArrayList<>();
+    }
+    this.failure.add(failureItem);
+    return this;
+  }
+
   /**
    * Get failure
    * @return failure
@@ -97,14 +114,14 @@ public PostContactInfoContacts failure(@jakarta.annotation.Nullable PostContactI
   @JsonProperty(value = JSON_PROPERTY_FAILURE, required = false)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
-  public PostContactInfoContactsFailure getFailure() {
+  public List<String> getFailure() {
     return failure;
   }
 
 
   @JsonProperty(value = JSON_PROPERTY_FAILURE, required = false)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setFailure(@jakarta.annotation.Nullable PostContactInfoContactsFailure failure) {
+  public void setFailure(@jakarta.annotation.Nullable List<String> failure) {
     this.failure = failure;
   }
 
@@ -233,12 +250,30 @@ public String toUrlQueryString(String prefix) {
 
     // add `success` to the URL query string
     if (getSuccess() != null) {
-      joiner.add(getSuccess().toUrlQueryString(prefix + "success" + suffix));
+      for (int i = 0; i < getSuccess().size(); i++) {
+        try {
+          joiner.add(String.format(java.util.Locale.ROOT, "%ssuccess%s%s=%s", prefix, suffix,
+              "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
+              URLEncoder.encode(String.valueOf(getSuccess().get(i)), "UTF-8").replaceAll("\\+", "%20")));
+        } catch (UnsupportedEncodingException e) {
+          // Should never happen, UTF-8 is always supported
+          throw new RuntimeException(e);
+        }
+      }
     }
 
     // add `failure` to the URL query string
     if (getFailure() != null) {
-      joiner.add(getFailure().toUrlQueryString(prefix + "failure" + suffix));
+      for (int i = 0; i < getFailure().size(); i++) {
+        try {
+          joiner.add(String.format(java.util.Locale.ROOT, "%sfailure%s%s=%s", prefix, suffix,
+              "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix),
+              URLEncoder.encode(String.valueOf(getFailure().get(i)), "UTF-8").replaceAll("\\+", "%20")));
+        } catch (UnsupportedEncodingException e) {
+          // Should never happen, UTF-8 is always supported
+          throw new RuntimeException(e);
+        }
+      }
     }
 
     // add `total` to the URL query string