RecurringApi generation with OpenAPI Generator v7.11.0 (#1466)

* Generate Recurring API

* Deprecate old RecurringApi

* Update test to use new RecurringApi

* Update tests to use new BinLookUpApi

Author: gcatanese

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

@@ -1,5 +1,5 @@
 /*
- * Adyen Recurring API (deprecated)
+ * Adyen Recurring API
  *
  * The version of the OpenAPI document: 68
  * 
@@ -13,7 +13,6 @@
 package com.adyen.model.recurring;
 
 import java.util.Objects;
-import java.lang.reflect.Type;
 import java.util.Map;
 import jakarta.ws.rs.core.GenericType;
 
@@ -22,7 +21,6 @@
 /**
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
-
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -34,6 +32,11 @@ public abstract class AbstractOpenApiSchema {
     // schema type (e.g. oneOf, anyOf)
     private final String schemaType;
 
+    /**
+     *
+     * @param schemaType the schema type
+     * @param isNullable whether the instance is nullable
+    */
     public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
         this.schemaType = schemaType;
         this.isNullable = isNullable;
@@ -44,7 +47,7 @@ public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
      *
      * @return an instance of the actual schema/object
      */
-    public abstract Map<String, GenericType> getSchemas();
+    public abstract Map<String, GenericType<?>> getSchemas();
 
     /**
      * Get the actual instance
@@ -144,4 +147,4 @@ public Boolean isNullable() {
 
 
 
-}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Adyen Recurring API (deprecated)
+ * Adyen Recurring API
  *
  * The version of the OpenAPI document: 68
  * 
@@ -13,16 +13,14 @@
 package com.adyen.model.recurring;
 
 import java.util.Objects;
-import java.util.Arrays;
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
@@ -64,7 +62,7 @@ public Address() {
   /**
    * The name of the city. Maximum length: 3000 characters.
    *
-   * @param city
+   * @param city The name of the city. Maximum length: 3000 characters.
    * @return the current {@code Address} instance, allowing for method chaining
    */
   public Address city(String city) {
@@ -74,9 +72,8 @@ public Address city(String city) {
 
   /**
    * The name of the city. Maximum length: 3000 characters.
-   * @return city
+   * @return city The name of the city. Maximum length: 3000 characters.
    */
-  @ApiModelProperty(required = true, value = "The name of the city. Maximum length: 3000 characters.")
   @JsonProperty(JSON_PROPERTY_CITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getCity() {
@@ -86,8 +83,8 @@ public String getCity() {
   /**
    * The name of the city. Maximum length: 3000 characters.
    *
-   * @param city
-   */ 
+   * @param city The name of the city. Maximum length: 3000 characters.
+   */
   @JsonProperty(JSON_PROPERTY_CITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCity(String city) {
@@ -97,7 +94,7 @@ public void setCity(String city) {
   /**
    * The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.
    *
-   * @param country
+   * @param country The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.
    * @return the current {@code Address} instance, allowing for method chaining
    */
   public Address country(String country) {
@@ -107,9 +104,8 @@ public Address country(String country) {
 
   /**
    * The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.
-   * @return country
+   * @return country The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.
    */
-  @ApiModelProperty(required = true, value = "The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.")
   @JsonProperty(JSON_PROPERTY_COUNTRY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getCountry() {
@@ -119,8 +115,8 @@ public String getCountry() {
   /**
    * The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.
    *
-   * @param country
-   */ 
+   * @param country The two-character ISO-3166-1 alpha-2 country code. For example, **US**. > If you don't know the country or are not collecting the country from the shopper, provide `country` as `ZZ`.
+   */
   @JsonProperty(JSON_PROPERTY_COUNTRY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCountry(String country) {
@@ -130,7 +126,7 @@ public void setCountry(String country) {
   /**
    * The number or name of the house. Maximum length: 3000 characters.
    *
-   * @param houseNumberOrName
+   * @param houseNumberOrName The number or name of the house. Maximum length: 3000 characters.
    * @return the current {@code Address} instance, allowing for method chaining
    */
   public Address houseNumberOrName(String houseNumberOrName) {
@@ -140,9 +136,8 @@ public Address houseNumberOrName(String houseNumberOrName) {
 
   /**
    * The number or name of the house. Maximum length: 3000 characters.
-   * @return houseNumberOrName
+   * @return houseNumberOrName The number or name of the house. Maximum length: 3000 characters.
    */
-  @ApiModelProperty(required = true, value = "The number or name of the house. Maximum length: 3000 characters.")
   @JsonProperty(JSON_PROPERTY_HOUSE_NUMBER_OR_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getHouseNumberOrName() {
@@ -152,8 +147,8 @@ public String getHouseNumberOrName() {
   /**
    * The number or name of the house. Maximum length: 3000 characters.
    *
-   * @param houseNumberOrName
-   */ 
+   * @param houseNumberOrName The number or name of the house. Maximum length: 3000 characters.
+   */
   @JsonProperty(JSON_PROPERTY_HOUSE_NUMBER_OR_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setHouseNumberOrName(String houseNumberOrName) {
@@ -163,7 +158,7 @@ public void setHouseNumberOrName(String houseNumberOrName) {
   /**
    * A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.
    *
-   * @param postalCode
+   * @param postalCode A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.
    * @return the current {@code Address} instance, allowing for method chaining
    */
   public Address postalCode(String postalCode) {
@@ -173,9 +168,8 @@ public Address postalCode(String postalCode) {
 
   /**
    * A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.
-   * @return postalCode
+   * @return postalCode A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.
    */
-  @ApiModelProperty(required = true, value = "A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.")
   @JsonProperty(JSON_PROPERTY_POSTAL_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getPostalCode() {
@@ -185,8 +179,8 @@ public String getPostalCode() {
   /**
    * A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.
    *
-   * @param postalCode
-   */ 
+   * @param postalCode A maximum of five digits for an address in the US, or a maximum of ten characters for an address in all other countries.
+   */
   @JsonProperty(JSON_PROPERTY_POSTAL_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setPostalCode(String postalCode) {
@@ -196,7 +190,7 @@ public void setPostalCode(String postalCode) {
   /**
    * The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.
    *
-   * @param stateOrProvince
+   * @param stateOrProvince The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.
    * @return the current {@code Address} instance, allowing for method chaining
    */
   public Address stateOrProvince(String stateOrProvince) {
@@ -206,9 +200,8 @@ public Address stateOrProvince(String stateOrProvince) {
 
   /**
    * The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.
-   * @return stateOrProvince
+   * @return stateOrProvince The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.
    */
-  @ApiModelProperty(value = "The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.")
   @JsonProperty(JSON_PROPERTY_STATE_OR_PROVINCE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getStateOrProvince() {
@@ -218,8 +211,8 @@ public String getStateOrProvince() {
   /**
    * The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.
    *
-   * @param stateOrProvince
-   */ 
+   * @param stateOrProvince The two-character ISO 3166-2 state or province code. For example, **CA** in the US or **ON** in Canada. > Required for the US and Canada.
+   */
   @JsonProperty(JSON_PROPERTY_STATE_OR_PROVINCE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStateOrProvince(String stateOrProvince) {
@@ -229,7 +222,7 @@ public void setStateOrProvince(String stateOrProvince) {
   /**
    * The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.
    *
-   * @param street
+   * @param street The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.
    * @return the current {@code Address} instance, allowing for method chaining
    */
   public Address street(String street) {
@@ -239,9 +232,8 @@ public Address street(String street) {
 
   /**
    * The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.
-   * @return street
+   * @return street The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.
    */
-  @ApiModelProperty(required = true, value = "The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.")
   @JsonProperty(JSON_PROPERTY_STREET)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getStreet() {
@@ -251,8 +243,8 @@ public String getStreet() {
   /**
    * The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.
    *
-   * @param street
-   */ 
+   * @param street The name of the street. Maximum length: 3000 characters. > The house number should not be included in this field; it should be separately provided via `houseNumberOrName`.
+   */
   @JsonProperty(JSON_PROPERTY_STREET)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStreet(String street) {

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

@@ -1,5 +1,5 @@
 /*
- * Adyen Recurring API (deprecated)
+ * Adyen Recurring API
  *
  * The version of the OpenAPI document: 68
  * 
@@ -13,16 +13,14 @@
 package com.adyen.model.recurring;
 
 import java.util.Objects;
-import java.util.Arrays;
 import java.util.Map;
 import java.util.HashMap;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import java.util.Arrays;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
@@ -48,7 +46,7 @@ public Amount() {
   /**
    * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).
    *
-   * @param currency
+   * @param currency The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).
    * @return the current {@code Amount} instance, allowing for method chaining
    */
   public Amount currency(String currency) {
@@ -58,9 +56,8 @@ public Amount currency(String currency) {
 
   /**
    * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).
-   * @return currency
+   * @return currency The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).
    */
-  @ApiModelProperty(required = true, value = "The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).")
   @JsonProperty(JSON_PROPERTY_CURRENCY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getCurrency() {
@@ -70,8 +67,8 @@ public String getCurrency() {
   /**
    * The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).
    *
-   * @param currency
-   */ 
+   * @param currency The three-character [ISO currency code](https://docs.adyen.com/development-resources/currency-codes#currency-codes).
+   */
   @JsonProperty(JSON_PROPERTY_CURRENCY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCurrency(String currency) {
@@ -81,7 +78,7 @@ public void setCurrency(String currency) {
   /**
    * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
    *
-   * @param value
+   * @param value The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
    * @return the current {@code Amount} instance, allowing for method chaining
    */
   public Amount value(Long value) {
@@ -91,9 +88,8 @@ public Amount value(Long value) {
 
   /**
    * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
-   * @return value
+   * @return value The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
    */
-  @ApiModelProperty(required = true, value = "The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).")
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getValue() {
@@ -103,8 +99,8 @@ public Long getValue() {
   /**
    * The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
    *
-   * @param value
-   */ 
+   * @param value The amount of the transaction, in [minor units](https://docs.adyen.com/development-resources/currency-codes#minor-units).
+   */
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setValue(Long value) {