Skip Handling of Nullable Properties in Webhooks (#1609)

* Skip handlingNullable code for Webhook models

* Generate Recurring models

* Fix hashCode and equals implementations

* Generate hashCode and equals implementations

Author: gcatanese

src/main/java/com/adyen/model/recurring/Address.java

@@ -11,6 +11,8 @@
 
 package com.adyen.model.recurring;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -30,21 +32,45 @@ public class Address {
   public static final String JSON_PROPERTY_CITY = "city";
   private String city;
 
+  /** Mark when the attribute has been explicitly set. */
+  private boolean isSetCity = false;
+
   public static final String JSON_PROPERTY_COUNTRY = "country";
   private String country;
 
+  /** Mark when the attribute has been explicitly set. */
+  private boolean isSetCountry = false;
+
   public static final String JSON_PROPERTY_HOUSE_NUMBER_OR_NAME = "houseNumberOrName";
   private String houseNumberOrName;
 
+  /** Mark when the attribute has been explicitly set. */
+  private boolean isSetHouseNumberOrName = false;
+
   public static final String JSON_PROPERTY_POSTAL_CODE = "postalCode";
   private String postalCode;
 
+  /** Mark when the attribute has been explicitly set. */
+  private boolean isSetPostalCode = false;
+
   public static final String JSON_PROPERTY_STATE_OR_PROVINCE = "stateOrProvince";
   private String stateOrProvince;
 
+  /** Mark when the attribute has been explicitly set. */
+  private boolean isSetStateOrProvince = false;
+
   public static final String JSON_PROPERTY_STREET = "street";
   private String street;
 
+  /** Mark when the attribute has been explicitly set. */
+  private boolean isSetStreet = false;
+
+  /**
+   * Sets whether attributes with null values should be explicitly included in the JSON payload.
+   * Default is false.
+   */
+  @JsonIgnore private boolean includeNullValues = false;
+
   public Address() {}
 
   /**
@@ -55,6 +81,7 @@ public Address() {}
    */
   public Address city(String city) {
     this.city = city;
+    isSetCity = true; // mark as set
     return this;
   }
 
@@ -78,6 +105,7 @@ public String getCity() {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCity(String city) {
     this.city = city;
+    isSetCity = true; // mark as set
   }
 
   /**
@@ -92,6 +120,7 @@ public void setCity(String city) {
    */
   public Address country(String country) {
     this.country = country;
+    isSetCountry = true; // mark as set
     return this;
   }
 
@@ -123,6 +152,7 @@ public String getCountry() {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCountry(String country) {
     this.country = country;
+    isSetCountry = true; // mark as set
   }
 
   /**
@@ -133,6 +163,7 @@ public void setCountry(String country) {
    */
   public Address houseNumberOrName(String houseNumberOrName) {
     this.houseNumberOrName = houseNumberOrName;
+    isSetHouseNumberOrName = true; // mark as set
     return this;
   }
 
@@ -156,6 +187,7 @@ public String getHouseNumberOrName() {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setHouseNumberOrName(String houseNumberOrName) {
     this.houseNumberOrName = houseNumberOrName;
+    isSetHouseNumberOrName = true; // mark as set
   }
 
   /**
@@ -168,6 +200,7 @@ public void setHouseNumberOrName(String houseNumberOrName) {
    */
   public Address postalCode(String postalCode) {
     this.postalCode = postalCode;
+    isSetPostalCode = true; // mark as set
     return this;
   }
 
@@ -195,6 +228,7 @@ public String getPostalCode() {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setPostalCode(String postalCode) {
     this.postalCode = postalCode;
+    isSetPostalCode = true; // mark as set
   }
 
   /**
@@ -207,6 +241,7 @@ public void setPostalCode(String postalCode) {
    */
   public Address stateOrProvince(String stateOrProvince) {
     this.stateOrProvince = stateOrProvince;
+    isSetStateOrProvince = true; // mark as set
     return this;
   }
 
@@ -234,6 +269,7 @@ public String getStateOrProvince() {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStateOrProvince(String stateOrProvince) {
     this.stateOrProvince = stateOrProvince;
+    isSetStateOrProvince = true; // mark as set
   }
 
   /**
@@ -247,6 +283,7 @@ public void setStateOrProvince(String stateOrProvince) {
    */
   public Address street(String street) {
     this.street = street;
+    isSetStreet = true; // mark as set
     return this;
   }
 
@@ -276,6 +313,27 @@ public String getStreet() {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStreet(String street) {
     this.street = street;
+    isSetStreet = true; // mark as set
+  }
+
+  /**
+   * Configures whether null values are explicitly serialized in the JSON payload. Default is false.
+   */
+  public Address includeNullValues(boolean includeNullValues) {
+    this.includeNullValues = includeNullValues;
+    return this;
+  }
+
+  /** Returns whether null values are explicitly serialized in the JSON payload. */
+  public boolean isIncludeNullValues() {
+    return includeNullValues;
+  }
+
+  /**
+   * Sets whether null values should be explicitly serialized in the JSON payload. Default is false.
+   */
+  public void setIncludeNullValues(boolean includeNullValues) {
+    this.includeNullValues = includeNullValues;
   }
 
   /** Return true if this Address object is equal to o. */
@@ -289,16 +347,34 @@ public boolean equals(Object o) {
     }
     Address address = (Address) o;
     return Objects.equals(this.city, address.city)
+        && Objects.equals(this.isSetCity, address.isSetCity)
         && Objects.equals(this.country, address.country)
+        && Objects.equals(this.isSetCountry, address.isSetCountry)
         && Objects.equals(this.houseNumberOrName, address.houseNumberOrName)
+        && Objects.equals(this.isSetHouseNumberOrName, address.isSetHouseNumberOrName)
         && Objects.equals(this.postalCode, address.postalCode)
+        && Objects.equals(this.isSetPostalCode, address.isSetPostalCode)
         && Objects.equals(this.stateOrProvince, address.stateOrProvince)
-        && Objects.equals(this.street, address.street);
+        && Objects.equals(this.isSetStateOrProvince, address.isSetStateOrProvince)
+        && Objects.equals(this.street, address.street)
+        && Objects.equals(this.isSetStreet, address.isSetStreet);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(city, country, houseNumberOrName, postalCode, stateOrProvince, street);
+    return Objects.hash(
+        city,
+        isSetCity,
+        country,
+        isSetCountry,
+        houseNumberOrName,
+        isSetHouseNumberOrName,
+        postalCode,
+        isSetPostalCode,
+        stateOrProvince,
+        isSetStateOrProvince,
+        street,
+        isSetStreet);
   }
 
   @Override
@@ -325,6 +401,45 @@ private String toIndentedString(Object o) {
     return o.toString().replace("\n", "\n    ");
   }
 
+  /** Returns a map of properties to be merged into the JSON payload as explicit null values. */
+  @JsonInclude(JsonInclude.Include.ALWAYS)
+  @JsonAnyGetter
+  public Map<String, Object> getExplicitNulls() {
+    if (!this.includeNullValues) {
+      return Collections.emptyMap();
+    }
+
+    Map<String, Object> nulls = new HashMap<>();
+
+    if (isSetCity) {
+      addIfNull(nulls, JSON_PROPERTY_CITY, this.city);
+    }
+    if (isSetCountry) {
+      addIfNull(nulls, JSON_PROPERTY_COUNTRY, this.country);
+    }
+    if (isSetHouseNumberOrName) {
+      addIfNull(nulls, JSON_PROPERTY_HOUSE_NUMBER_OR_NAME, this.houseNumberOrName);
+    }
+    if (isSetPostalCode) {
+      addIfNull(nulls, JSON_PROPERTY_POSTAL_CODE, this.postalCode);
+    }
+    if (isSetStateOrProvince) {
+      addIfNull(nulls, JSON_PROPERTY_STATE_OR_PROVINCE, this.stateOrProvince);
+    }
+    if (isSetStreet) {
+      addIfNull(nulls, JSON_PROPERTY_STREET, this.street);
+    }
+
+    return nulls;
+  }
+
+  // add to map when value is null
+  private void addIfNull(Map<String, Object> map, String key, Object value) {
+    if (value == null) {
+      map.put(key, null);
+    }
+  }
+
   /**
    * Create an instance of Address given an JSON string
    *