-
Notifications
You must be signed in to change notification settings - Fork 145
[capital] Code generation: update services and models #1664
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,310 @@ | ||
| /* | ||
| * Capital API | ||
| * | ||
| * The version of the OpenAPI document: 1 | ||
| * | ||
| * | ||
| * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). | ||
| * https://openapi-generator.tech | ||
| * Do not edit the class manually. | ||
| */ | ||
|
|
||
| package com.adyen.model.capital; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonAnyGetter; | ||
| import com.fasterxml.jackson.annotation.JsonIgnore; | ||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.annotation.JsonPropertyOrder; | ||
| import com.fasterxml.jackson.annotation.JsonTypeInfo; | ||
| import com.fasterxml.jackson.core.JsonProcessingException; | ||
| import java.util.*; | ||
|
|
||
| /** AULocalAccountIdentification */ | ||
| @JsonPropertyOrder({ | ||
| AULocalAccountIdentification.JSON_PROPERTY_ACCOUNT_NUMBER, | ||
| AULocalAccountIdentification.JSON_PROPERTY_BSB_CODE, | ||
| AULocalAccountIdentification.JSON_PROPERTY_TYPE | ||
| }) | ||
| @JsonIgnoreProperties( | ||
| value = | ||
| "type", // ignore manually set type, it will be automatically generated by Jackson during | ||
| // serialization | ||
| allowSetters = true // allows the type to be set during deserialization | ||
| ) | ||
| @JsonTypeInfo( | ||
| use = JsonTypeInfo.Id.NAME, | ||
| include = JsonTypeInfo.As.PROPERTY, | ||
| property = "type", | ||
| visible = true) | ||
| public class AULocalAccountIdentification extends BankAccountIdentification { | ||
| public static final String JSON_PROPERTY_ACCOUNT_NUMBER = "accountNumber"; | ||
| private String accountNumber; | ||
|
|
||
| /** Mark when the attribute has been explicitly set. */ | ||
| private boolean isSetAccountNumber = false; | ||
|
|
||
| public static final String JSON_PROPERTY_BSB_CODE = "bsbCode"; | ||
| private String bsbCode; | ||
|
|
||
| /** Mark when the attribute has been explicitly set. */ | ||
| private boolean isSetBsbCode = false; | ||
|
|
||
| public static final String JSON_PROPERTY_TYPE = "type"; | ||
| private String type; | ||
|
|
||
| /** Mark when the attribute has been explicitly set. */ | ||
| private boolean isSetType = false; | ||
|
|
||
| /** | ||
| * Sets whether attributes with null values should be explicitly included in the JSON payload. | ||
| * Default is false. | ||
| */ | ||
| @JsonIgnore private boolean includeNullValues = false; | ||
|
|
||
| public AULocalAccountIdentification() {} | ||
|
|
||
| /** | ||
| * The bank account number, without separators or whitespace. | ||
| * | ||
| * @param accountNumber The bank account number, without separators or whitespace. | ||
| * @return the current {@code AULocalAccountIdentification} instance, allowing for method chaining | ||
| */ | ||
| public AULocalAccountIdentification accountNumber(String accountNumber) { | ||
| this.accountNumber = accountNumber; | ||
| isSetAccountNumber = true; // mark as set | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * The bank account number, without separators or whitespace. | ||
| * | ||
| * @return accountNumber The bank account number, without separators or whitespace. | ||
| */ | ||
| @JsonProperty(JSON_PROPERTY_ACCOUNT_NUMBER) | ||
| @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) | ||
| public String getAccountNumber() { | ||
| return accountNumber; | ||
| } | ||
|
|
||
| /** | ||
| * The bank account number, without separators or whitespace. | ||
| * | ||
| * @param accountNumber The bank account number, without separators or whitespace. | ||
| */ | ||
| @JsonProperty(JSON_PROPERTY_ACCOUNT_NUMBER) | ||
| @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) | ||
| public void setAccountNumber(String accountNumber) { | ||
| this.accountNumber = accountNumber; | ||
| isSetAccountNumber = true; // mark as set | ||
| } | ||
|
|
||
| /** | ||
| * The 6-digit [Bank State Branch (BSB) code](https://en.wikipedia.org/wiki/Bank_state_branch), | ||
| * without separators or whitespace. | ||
| * | ||
| * @param bsbCode The 6-digit [Bank State Branch (BSB) | ||
| * code](https://en.wikipedia.org/wiki/Bank_state_branch), without separators or whitespace. | ||
| * @return the current {@code AULocalAccountIdentification} instance, allowing for method chaining | ||
| */ | ||
| public AULocalAccountIdentification bsbCode(String bsbCode) { | ||
| this.bsbCode = bsbCode; | ||
| isSetBsbCode = true; // mark as set | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * The 6-digit [Bank State Branch (BSB) code](https://en.wikipedia.org/wiki/Bank_state_branch), | ||
| * without separators or whitespace. | ||
| * | ||
| * @return bsbCode The 6-digit [Bank State Branch (BSB) | ||
| * code](https://en.wikipedia.org/wiki/Bank_state_branch), without separators or whitespace. | ||
| */ | ||
| @JsonProperty(JSON_PROPERTY_BSB_CODE) | ||
| @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) | ||
| public String getBsbCode() { | ||
| return bsbCode; | ||
| } | ||
|
|
||
| /** | ||
| * The 6-digit [Bank State Branch (BSB) code](https://en.wikipedia.org/wiki/Bank_state_branch), | ||
| * without separators or whitespace. | ||
| * | ||
| * @param bsbCode The 6-digit [Bank State Branch (BSB) | ||
| * code](https://en.wikipedia.org/wiki/Bank_state_branch), without separators or whitespace. | ||
| */ | ||
| @JsonProperty(JSON_PROPERTY_BSB_CODE) | ||
| @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) | ||
| public void setBsbCode(String bsbCode) { | ||
| this.bsbCode = bsbCode; | ||
| isSetBsbCode = true; // mark as set | ||
| } | ||
|
|
||
| /** | ||
| * **auLocal** | ||
| * | ||
| * @param type **auLocal** | ||
| * @return the current {@code AULocalAccountIdentification} instance, allowing for method chaining | ||
| */ | ||
| public AULocalAccountIdentification type(String type) { | ||
| this.type = type; | ||
| isSetType = true; // mark as set | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * **auLocal** | ||
| * | ||
| * @return type **auLocal** | ||
| */ | ||
| @JsonProperty(JSON_PROPERTY_TYPE) | ||
| @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) | ||
| public String getType() { | ||
| return type; | ||
| } | ||
|
|
||
| /** | ||
| * **auLocal** | ||
| * | ||
| * @param type **auLocal** | ||
| */ | ||
| @JsonProperty(JSON_PROPERTY_TYPE) | ||
| @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) | ||
| public void setType(String type) { | ||
| this.type = type; | ||
| isSetType = true; // mark as set | ||
| } | ||
|
|
||
| /** | ||
| * Configures whether null values are explicitly serialized in the JSON payload. Default is false. | ||
| */ | ||
| public AULocalAccountIdentification 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 AULocalAccountIdentification object is equal to o. */ | ||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| AULocalAccountIdentification auLocalAccountIdentification = (AULocalAccountIdentification) o; | ||
| return Objects.equals(this.accountNumber, auLocalAccountIdentification.accountNumber) | ||
| && Objects.equals(this.isSetAccountNumber, auLocalAccountIdentification.isSetAccountNumber) | ||
| && Objects.equals(this.bsbCode, auLocalAccountIdentification.bsbCode) | ||
| && Objects.equals(this.isSetBsbCode, auLocalAccountIdentification.isSetBsbCode) | ||
| && Objects.equals(this.type, auLocalAccountIdentification.type) | ||
| && Objects.equals(this.isSetType, auLocalAccountIdentification.isSetType) | ||
| && super.equals(o); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash( | ||
| accountNumber, | ||
| isSetAccountNumber, | ||
| bsbCode, | ||
| isSetBsbCode, | ||
| type, | ||
| isSetType, | ||
| super.hashCode()); | ||
| } | ||
|
Comment on lines
+219
to
+228
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The @Override
public int hashCode() {
return Objects.hash(
accountNumber,
bsbCode,
type,
super.hashCode());
} |
||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append("class AULocalAccountIdentification {\n"); | ||
| sb.append(" ").append(toIndentedString(super.toString())).append("\n"); | ||
| sb.append(" accountNumber: ").append(toIndentedString(accountNumber)).append("\n"); | ||
| sb.append(" bsbCode: ").append(toIndentedString(bsbCode)).append("\n"); | ||
| sb.append(" type: ").append(toIndentedString(type)).append("\n"); | ||
| sb.append("}"); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Convert the given object to string with each line indented by 4 spaces (except the first line). | ||
| */ | ||
| private String toIndentedString(Object o) { | ||
| if (o == null) { | ||
| return "null"; | ||
| } | ||
| return o.toString().replace("\n", "\n "); | ||
| } | ||
|
|
||
| static { | ||
| // Initialize and register the discriminator mappings. | ||
| Map<String, Class<?>> mappings = new HashMap<>(); | ||
| mappings.put("AULocalAccountIdentification", AULocalAccountIdentification.class); | ||
| JSON.registerDiscriminator(AULocalAccountIdentification.class, "type", mappings); | ||
| } | ||
|
|
||
| /** 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 (isSetAccountNumber) { | ||
| addIfNull(nulls, JSON_PROPERTY_ACCOUNT_NUMBER, this.accountNumber); | ||
| } | ||
| if (isSetBsbCode) { | ||
| addIfNull(nulls, JSON_PROPERTY_BSB_CODE, this.bsbCode); | ||
| } | ||
| if (isSetType) { | ||
| addIfNull(nulls, JSON_PROPERTY_TYPE, this.type); | ||
| } | ||
|
|
||
| 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 AULocalAccountIdentification given an JSON string | ||
| * | ||
| * @param jsonString JSON string | ||
| * @return An instance of AULocalAccountIdentification | ||
| * @throws JsonProcessingException if the JSON string is invalid with respect to | ||
| * AULocalAccountIdentification | ||
| */ | ||
| public static AULocalAccountIdentification fromJson(String jsonString) | ||
| throws JsonProcessingException { | ||
| return JSON.getMapper().readValue(jsonString, AULocalAccountIdentification.class); | ||
| } | ||
|
|
||
| /** | ||
| * Convert an instance of AULocalAccountIdentification to an JSON string | ||
| * | ||
| * @return JSON string | ||
| */ | ||
| public String toJson() throws JsonProcessingException { | ||
| return JSON.getMapper().writeValueAsString(this); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
equals()method incorrectly includes theisSet...flags in its comparison. These flags are likely intended for serialization logic and should not affect object equality. Two objects with the same field values should be considered equal regardless of how those values were set. Including these flags violates theequalscontract and can lead to unexpected behavior, especially when using these objects in collections likeHashSet. This issue appears to be systematic across many of the generated model classes and should ideally be fixed in the code generator template.