diff --git a/pom.xml b/pom.xml index c328697..e3a945d 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,8 @@ 3.0 3.0.0-M1 - 4.3.1 + + 5.1.0 @@ -204,18 +205,21 @@ - ${project.basedir}/src/main/resources/specification/account-info-openapi.yaml + - + ${project.basedir}/src/main/resources/specification/vrp-openapi.yaml ${project.build.directory}/generated-sources/swagger spring - uk.org.openbanking.datamodel.account + uk.org.openbanking.datamodel.vrp + + com.forgerock.openbanking.aspsp.rs.api.vrp + false joda diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBCashAccountDebtorWithName.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBCashAccountDebtorWithName.java index 42348c7..338f44a 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBCashAccountDebtorWithName.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBCashAccountDebtorWithName.java @@ -31,151 +31,146 @@ * ^ Only incuded in the response if `Data. ReadRefundAccount` is set to `Yes` in the consent. */ @ApiModel(description = "^ Only incuded in the response if `Data. ReadRefundAccount` is set to `Yes` in the consent.") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBCashAccountDebtorWithName { - @JsonProperty("SchemeName") - private String schemeName; + @JsonProperty("SchemeName") + private String schemeName; + + @JsonProperty("Identification") + private String identification; + + @JsonProperty("Name") + private String name; + + @JsonProperty("SecondaryIdentification") + private String secondaryIdentification; + + public OBCashAccountDebtorWithName schemeName(String schemeName) { + this.schemeName = schemeName; + return this; + } + + /** + * ^ Name of the identification scheme, in a coded form as published in an external list. | Namespaced Enumeration OBExternalAccountIdentification4Code + * @return schemeName + */ + @ApiModelProperty(required = true, value = "^ Name of the identification scheme, in a coded form as published in an external list. | Namespaced Enumeration OBExternalAccountIdentification4Code") + @NotNull + + + public String getSchemeName() { + return schemeName; + } + + public void setSchemeName(String schemeName) { + this.schemeName = schemeName; + } + + public OBCashAccountDebtorWithName identification(String identification) { + this.identification = identification; + return this; + } + + /** + * ^ Identification assigned by an institution to identify an account. This identification is known by the account owner. | Max256Text + * @return identification + */ + @ApiModelProperty(required = true, value = "^ Identification assigned by an institution to identify an account. This identification is known by the account owner. | Max256Text") + @NotNull + + + public String getIdentification() { + return identification; + } + + public void setIdentification(String identification) { + this.identification = identification; + } + + public OBCashAccountDebtorWithName name(String name) { + this.name = name; + return this; + } + + /** + * ^ Name of the account, as assigned by the account servicing institution. Usage The account name is the name or names of the account owner(s) represented at an account level. The account name is not the product name or the nickname of the account. + * @return name + */ + @ApiModelProperty(required = true, value = "^ Name of the account, as assigned by the account servicing institution. Usage The account name is the name or names of the account owner(s) represented at an account level. The account name is not the product name or the nickname of the account.") + @NotNull + - @JsonProperty("Identification") - private String identification; + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } - @JsonProperty("Name") - private String name; + public OBCashAccountDebtorWithName secondaryIdentification(String secondaryIdentification) { + this.secondaryIdentification = secondaryIdentification; + return this; + } + + /** + * ^ This is secondary identification of the account, as assigned by the account servicing institution. This can be used by building societies to additionally identify accounts with a roll number (in addition to a sort code and account number combination) | Max34Text + * @return secondaryIdentification + */ + @ApiModelProperty(value = "^ This is secondary identification of the account, as assigned by the account servicing institution. This can be used by building societies to additionally identify accounts with a roll number (in addition to a sort code and account number combination) | Max34Text") + + + public String getSecondaryIdentification() { + return secondaryIdentification; + } - @JsonProperty("SecondaryIdentification") - private String secondaryIdentification; - - public OBCashAccountDebtorWithName schemeName(String schemeName) { - this.schemeName = schemeName; - return this; - } - - /** - * ^ Name of the identification scheme, in a coded form as published in an external list. | Namespaced Enumeration OBExternalAccountIdentification4Code - * - * @return schemeName - */ - @ApiModelProperty(required = true, value = "^ Name of the identification scheme, in a coded form as published in an external list. | Namespaced Enumeration OBExternalAccountIdentification4Code") - @NotNull - - - public String getSchemeName() { - return schemeName; - } - - public void setSchemeName(String schemeName) { - this.schemeName = schemeName; - } - - public OBCashAccountDebtorWithName identification(String identification) { - this.identification = identification; - return this; - } - - /** - * ^ Identification assigned by an institution to identify an account. This identification is known by the account owner. | Max256Text - * - * @return identification - */ - @ApiModelProperty(required = true, value = "^ Identification assigned by an institution to identify an account. This identification is known by the account owner. | Max256Text") - @NotNull - - - public String getIdentification() { - return identification; - } - - public void setIdentification(String identification) { - this.identification = identification; - } - - public OBCashAccountDebtorWithName name(String name) { - this.name = name; - return this; - } - - /** - * ^ Name of the account, as assigned by the account servicing institution. Usage The account name is the name or names of the account owner(s) represented at an account level. The account name is not the product name or the nickname of the account. - * - * @return name - */ - @ApiModelProperty(required = true, value = "^ Name of the account, as assigned by the account servicing institution. Usage The account name is the name or names of the account owner(s) represented at an account level. The account name is not the product name or the nickname of the account.") - @NotNull - - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public OBCashAccountDebtorWithName secondaryIdentification(String secondaryIdentification) { - this.secondaryIdentification = secondaryIdentification; - return this; - } - - /** - * ^ This is secondary identification of the account, as assigned by the account servicing institution. This can be used by building societies to additionally identify accounts with a roll number (in addition to a sort code and account number combination) | Max34Text - * - * @return secondaryIdentification - */ - @ApiModelProperty(value = "^ This is secondary identification of the account, as assigned by the account servicing institution. This can be used by building societies to additionally identify accounts with a roll number (in addition to a sort code and account number combination) | Max34Text") - - - public String getSecondaryIdentification() { - return secondaryIdentification; - } - - public void setSecondaryIdentification(String secondaryIdentification) { - this.secondaryIdentification = secondaryIdentification; - } - - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - OBCashAccountDebtorWithName obCashAccountDebtorWithName = (OBCashAccountDebtorWithName) o; - return Objects.equals(this.schemeName, obCashAccountDebtorWithName.schemeName) && - Objects.equals(this.identification, obCashAccountDebtorWithName.identification) && - Objects.equals(this.name, obCashAccountDebtorWithName.name) && - Objects.equals(this.secondaryIdentification, obCashAccountDebtorWithName.secondaryIdentification); - } - - @Override - public int hashCode() { - return Objects.hash(schemeName, identification, name, secondaryIdentification); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OBCashAccountDebtorWithName {\n"); - - sb.append(" schemeName: ").append(toIndentedString(schemeName)).append("\n"); - sb.append(" identification: ").append(toIndentedString(identification)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" secondaryIdentification: ").append(toIndentedString(secondaryIdentification)).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 "); - } + public void setSecondaryIdentification(String secondaryIdentification) { + this.secondaryIdentification = secondaryIdentification; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBCashAccountDebtorWithName obCashAccountDebtorWithName = (OBCashAccountDebtorWithName) o; + return Objects.equals(this.schemeName, obCashAccountDebtorWithName.schemeName) && + Objects.equals(this.identification, obCashAccountDebtorWithName.identification) && + Objects.equals(this.name, obCashAccountDebtorWithName.name) && + Objects.equals(this.secondaryIdentification, obCashAccountDebtorWithName.secondaryIdentification); + } + + @Override + public int hashCode() { + return Objects.hash(schemeName, identification, name, secondaryIdentification); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBCashAccountDebtorWithName {\n"); + + sb.append(" schemeName: ").append(toIndentedString(schemeName)).append("\n"); + sb.append(" identification: ").append(toIndentedString(identification)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" secondaryIdentification: ").append(toIndentedString(secondaryIdentification)).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 "); + } } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBCharge2.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBCharge2.java index 0783635..65d5a9b 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBCharge2.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBCharge2.java @@ -31,72 +31,71 @@ /** * OBCharge2 */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBCharge2 { - @JsonProperty("ChargeBearer") - private OBChargeBearerType1Code chargeBearer; // use existing OBChargeBearerType1Code, rather than duplicating for VRPs + @JsonProperty("ChargeBearer") + private OBChargeBearerType1Code chargeBearer; // use existing OBChargeBearerType1Code, rather than duplicating for + // VRPs - public OBCharge2 chargeBearer(OBChargeBearerType1Code chargeBearer) { - this.chargeBearer = chargeBearer; - return this; - } + public OBCharge2 chargeBearer(OBChargeBearerType1Code chargeBearer) { + this.chargeBearer = chargeBearer; + return this; + } - /** - * Get chargeBearer - * - * @return chargeBearer - */ - @ApiModelProperty(required = true, value = "") - @NotNull + /** + * Get chargeBearer + * @return chargeBearer + */ + @ApiModelProperty(required = true, value = "") + @NotNull - @Valid + @Valid - public OBChargeBearerType1Code getChargeBearer() { - return chargeBearer; - } + public OBChargeBearerType1Code getChargeBearer() { + return chargeBearer; + } - public void setChargeBearer(OBChargeBearerType1Code chargeBearer) { - this.chargeBearer = chargeBearer; - } + public void setChargeBearer(OBChargeBearerType1Code chargeBearer) { + this.chargeBearer = chargeBearer; + } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBCharge2 obCharge2 = (OBCharge2) o; + return Objects.equals(this.chargeBearer, obCharge2.chargeBearer); } - if (o == null || getClass() != o.getClass()) { - return false; - } - OBCharge2 obCharge2 = (OBCharge2) o; - return Objects.equals(this.chargeBearer, obCharge2.chargeBearer); - } - @Override - public int hashCode() { - return Objects.hash(chargeBearer); - } + @Override + public int hashCode() { + return Objects.hash(chargeBearer); + } - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OBCharge2 {\n"); + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBCharge2 {\n"); - sb.append(" chargeBearer: ").append(toIndentedString(chargeBearer)).append("\n"); - sb.append("}"); - return sb.toString(); - } + sb.append(" chargeBearer: ").append(toIndentedString(chargeBearer)).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"; + /** + * 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 "); } - return o.toString().replace("\n", "\n "); - } } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentRequest.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentRequest.java index 8323486..859083e 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentRequest.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentRequest.java @@ -31,100 +31,97 @@ /** * OBDomesticVRPConsentRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPConsentRequest { - @JsonProperty("Data") - private OBDomesticVRPConsentRequestData data; - - @JsonProperty("Risk") - private OBRisk1 risk; // use existing OBRisk1, rather than duplicating for VRPs - - public OBDomesticVRPConsentRequest data(OBDomesticVRPConsentRequestData data) { - this.data = data; - return this; - } - - /** - * Get data - * - * @return data - */ - @ApiModelProperty(required = true, value = "") - @NotNull - - @Valid - - public OBDomesticVRPConsentRequestData getData() { - return data; - } - - public void setData(OBDomesticVRPConsentRequestData data) { - this.data = data; - } - - public OBDomesticVRPConsentRequest risk(OBRisk1 risk) { - this.risk = risk; - return this; - } - - /** - * Get risk - * - * @return risk - */ - @ApiModelProperty(required = true, value = "") - @NotNull - - @Valid - - public OBRisk1 getRisk() { - return risk; - } - - public void setRisk(OBRisk1 risk) { - this.risk = risk; - } - - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @JsonProperty("Data") + private OBDomesticVRPConsentRequestData data; + + @JsonProperty("Risk") + private OBRisk1 risk; // use existing OBRisk1, rather than duplicating for VRPs + + public OBDomesticVRPConsentRequest data(OBDomesticVRPConsentRequestData data) { + this.data = data; + return this; } - if (o == null || getClass() != o.getClass()) { - return false; + + /** + * Get data + * @return data + */ + @ApiModelProperty(required = true, value = "") + @NotNull + + @Valid + + public OBDomesticVRPConsentRequestData getData() { + return data; } - OBDomesticVRPConsentRequest obDomesticVRPConsentRequest = (OBDomesticVRPConsentRequest) o; - return Objects.equals(this.data, obDomesticVRPConsentRequest.data) && - Objects.equals(this.risk, obDomesticVRPConsentRequest.risk); - } - - @Override - public int hashCode() { - return Objects.hash(data, risk); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OBDomesticVRPConsentRequest {\n"); - - sb.append(" data: ").append(toIndentedString(data)).append("\n"); - sb.append(" risk: ").append(toIndentedString(risk)).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"; + + public void setData(OBDomesticVRPConsentRequestData data) { + this.data = data; + } + + public OBDomesticVRPConsentRequest risk(OBRisk1 risk) { + this.risk = risk; + return this; + } + + /** + * Get risk + * @return risk + */ + @ApiModelProperty(required = true, value = "") + @NotNull + + @Valid + + public OBRisk1 getRisk() { + return risk; + } + + public void setRisk(OBRisk1 risk) { + this.risk = risk; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBDomesticVRPConsentRequest obDomesticVRPConsentRequest = (OBDomesticVRPConsentRequest) o; + return Objects.equals(this.data, obDomesticVRPConsentRequest.data) && + Objects.equals(this.risk, obDomesticVRPConsentRequest.risk); + } + + @Override + public int hashCode() { + return Objects.hash(data, risk); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBDomesticVRPConsentRequest {\n"); + + sb.append(" data: ").append(toIndentedString(data)).append("\n"); + sb.append(" risk: ").append(toIndentedString(risk)).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 "); } - return o.toString().replace("\n", "\n "); - } } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentRequestData.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentRequestData.java index 0f5e97d..2e4e484 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentRequestData.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentRequestData.java @@ -20,8 +20,11 @@ */ package uk.org.openbanking.datamodel.vrp; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModelProperty; + import uk.org.openbanking.datamodel.payment.OBReadRefundAccountEnum; import javax.validation.Valid; @@ -31,12 +34,12 @@ /** * OBDomesticVRPConsentRequestData */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPConsentRequestData { @JsonProperty("ReadRefundAccount") - private OBReadRefundAccountEnum readRefundAccount; // use existing enum for Payments, rather than duplicating it for VRPs + private OBReadRefundAccountEnum readRefundAccount; // use existing enum for Payments, rather than duplicating it for + // VRPs @JsonProperty("ControlParameters") private OBDomesticVRPControlParameters controlParameters; @@ -51,7 +54,6 @@ public OBDomesticVRPConsentRequestData readRefundAccount(OBReadRefundAccountEnum /** * Indicates whether information about RefundAccount should be included in the payment response. - * * @return readRefundAccount */ @ApiModelProperty(value = "Indicates whether information about RefundAccount should be included in the payment response. ") @@ -72,7 +74,6 @@ public OBDomesticVRPConsentRequestData controlParameters(OBDomesticVRPControlPar /** * Get controlParameters - * * @return controlParameters */ @ApiModelProperty(required = true, value = "") @@ -95,7 +96,6 @@ public OBDomesticVRPConsentRequestData initiation(OBDomesticVRPInitiation initia /** * Get initiation - * * @return initiation */ @ApiModelProperty(required = true, value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentResponse.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentResponse.java index 3bc62ee..58fc8b9 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentResponse.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentResponse.java @@ -33,8 +33,7 @@ /** * OBDomesticVRPConsentResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPConsentResponse { @JsonProperty("Data") private OBDomesticVRPConsentResponseData data; @@ -55,7 +54,6 @@ public OBDomesticVRPConsentResponse data(OBDomesticVRPConsentResponseData data) /** * Get data - * * @return data */ @ApiModelProperty(required = true, value = "") @@ -78,7 +76,6 @@ public OBDomesticVRPConsentResponse risk(OBRisk1 risk) { /** * Get risk - * * @return risk */ @ApiModelProperty(required = true, value = "") @@ -101,7 +98,6 @@ public OBDomesticVRPConsentResponse links(Links links) { /** * Get links - * * @return links */ @ApiModelProperty(required = true, value = "") @@ -124,13 +120,11 @@ public OBDomesticVRPConsentResponse meta(Meta meta) { /** * Meta Data relevant to the payload. At present no fields are used for VRP. - * * @return meta */ @ApiModelProperty(required = true, value = "Meta Data relevant to the payload. At present no fields are used for VRP.") @NotNull - @Valid public Meta getMeta() { return meta; diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentResponseData.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentResponseData.java index 0efa617..0471e99 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentResponseData.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPConsentResponseData.java @@ -20,7 +20,9 @@ */ package uk.org.openbanking.datamodel.vrp; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModelProperty; import org.joda.time.DateTime; import uk.org.openbanking.datamodel.payment.OBReadRefundAccountEnum; @@ -32,267 +34,258 @@ /** * OBDomesticVRPConsentResponseData */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPConsentResponseData { - @JsonProperty("ReadRefundAccount") - private OBReadRefundAccountEnum readRefundAccount; // use existing enum, rather than duplicating for VRPs - - @JsonProperty("ConsentId") - private String consentId; - @JsonProperty("CreationDateTime") - @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) - private DateTime creationDateTime; + @JsonProperty("ReadRefundAccount") + private OBReadRefundAccountEnum readRefundAccount; // use existing enum, rather than duplicating for VRPs + + @JsonProperty("ConsentId") + private String consentId; + + @JsonProperty("CreationDateTime") + @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) + private DateTime creationDateTime; + + @JsonProperty("Status") + private String status; + + @JsonProperty("StatusUpdateDateTime") + @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) + private DateTime statusUpdateDateTime; - @JsonProperty("Status") - private String status; + @JsonProperty("ControlParameters") + private OBDomesticVRPControlParameters controlParameters; - @JsonProperty("StatusUpdateDateTime") - @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) - private DateTime statusUpdateDateTime; + @JsonProperty("Initiation") + private OBDomesticVRPInitiation initiation; - @JsonProperty("ControlParameters") - private OBDomesticVRPControlParameters controlParameters; + @JsonProperty("DebtorAccount") + private OBCashAccountDebtorWithName debtorAccount; - @JsonProperty("Initiation") - private OBDomesticVRPInitiation initiation; - - @JsonProperty("DebtorAccount") - private OBCashAccountDebtorWithName debtorAccount; - - public OBDomesticVRPConsentResponseData readRefundAccount(OBReadRefundAccountEnum readRefundAccount) { - this.readRefundAccount = readRefundAccount; - return this; - } - - /** - * Indicates whether information about RefundAccount should be included in the payment response. - * - * @return readRefundAccount - */ - @ApiModelProperty(value = "Indicates whether information about RefundAccount should be included in the payment response. ") + public OBDomesticVRPConsentResponseData readRefundAccount(OBReadRefundAccountEnum readRefundAccount) { + this.readRefundAccount = readRefundAccount; + return this; + } + + /** + * Indicates whether information about RefundAccount should be included in the payment response. + * @return readRefundAccount + */ + @ApiModelProperty(value = "Indicates whether information about RefundAccount should be included in the payment response. ") + + + public OBReadRefundAccountEnum getReadRefundAccount() { + return readRefundAccount; + } - - public OBReadRefundAccountEnum getReadRefundAccount() { - return readRefundAccount; - } - - public void setReadRefundAccount(OBReadRefundAccountEnum readRefundAccount) { - this.readRefundAccount = readRefundAccount; - } - - public OBDomesticVRPConsentResponseData consentId(String consentId) { - this.consentId = consentId; - return this; - } - - /** - * Unique identification as assigned by the ASPSP to uniquely identify the consent resource. | Max128Text - * - * @return consentId - */ - @ApiModelProperty(required = true, value = "Unique identification as assigned by the ASPSP to uniquely identify the consent resource. | Max128Text ") - @NotNull - - - public String getConsentId() { - return consentId; - } - - public void setConsentId(String consentId) { - this.consentId = consentId; - } - - public OBDomesticVRPConsentResponseData creationDateTime(DateTime creationDateTime) { - this.creationDateTime = creationDateTime; - return this; - } - - /** - * Date and time at which the resource was created.|ISODateTime - * - * @return creationDateTime - */ - @ApiModelProperty(required = true, value = "Date and time at which the resource was created.|ISODateTime ") - @NotNull - - @Valid - - public DateTime getCreationDateTime() { - return creationDateTime; - } - - public void setCreationDateTime(DateTime creationDateTime) { - this.creationDateTime = creationDateTime; - } - - public OBDomesticVRPConsentResponseData status(String status) { - this.status = status; - return this; - } - - /** - * Specifies the status of resource in code form. |Authorised AwaitingAuthorisation Rejected Revoked Expired - * - * @return status - */ - @ApiModelProperty(required = true, value = "Specifies the status of resource in code form. |Authorised AwaitingAuthorisation Rejected Revoked Expired ") - @NotNull - - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public OBDomesticVRPConsentResponseData statusUpdateDateTime(DateTime statusUpdateDateTime) { - this.statusUpdateDateTime = statusUpdateDateTime; - return this; - } - - /** - * Date and time at which the resource status was updated. | ISODateTime - * - * @return statusUpdateDateTime - */ - @ApiModelProperty(required = true, value = "Date and time at which the resource status was updated. | ISODateTime ") - @NotNull - - @Valid - - public DateTime getStatusUpdateDateTime() { - return statusUpdateDateTime; - } - - public void setStatusUpdateDateTime(DateTime statusUpdateDateTime) { - this.statusUpdateDateTime = statusUpdateDateTime; - } - - public OBDomesticVRPConsentResponseData controlParameters(OBDomesticVRPControlParameters controlParameters) { - this.controlParameters = controlParameters; - return this; - } - - /** - * Get controlParameters - * - * @return controlParameters - */ - @ApiModelProperty(required = true, value = "") - @NotNull - - @Valid - - public OBDomesticVRPControlParameters getControlParameters() { - return controlParameters; - } - - public void setControlParameters(OBDomesticVRPControlParameters controlParameters) { - this.controlParameters = controlParameters; - } - - public OBDomesticVRPConsentResponseData initiation(OBDomesticVRPInitiation initiation) { - this.initiation = initiation; - return this; - } - - /** - * Get initiation - * - * @return initiation - */ - @ApiModelProperty(required = true, value = "") - @NotNull - - @Valid - - public OBDomesticVRPInitiation getInitiation() { - return initiation; - } - - public void setInitiation(OBDomesticVRPInitiation initiation) { - this.initiation = initiation; - } - - public OBDomesticVRPConsentResponseData debtorAccount(OBCashAccountDebtorWithName debtorAccount) { - this.debtorAccount = debtorAccount; - return this; - } - - /** - * Get debtorAccount - * - * @return debtorAccount - */ - @ApiModelProperty(required = true, value = "") - @NotNull - - @Valid - - public OBCashAccountDebtorWithName getDebtorAccount() { - return debtorAccount; - } - - public void setDebtorAccount(OBCashAccountDebtorWithName debtorAccount) { - this.debtorAccount = debtorAccount; - } - - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + public void setReadRefundAccount(OBReadRefundAccountEnum readRefundAccount) { + this.readRefundAccount = readRefundAccount; } - if (o == null || getClass() != o.getClass()) { - return false; + + public OBDomesticVRPConsentResponseData consentId(String consentId) { + this.consentId = consentId; + return this; + } + + /** + * Unique identification as assigned by the ASPSP to uniquely identify the consent resource. | Max128Text + * @return consentId + */ + @ApiModelProperty(required = true, value = "Unique identification as assigned by the ASPSP to uniquely identify the consent resource. | Max128Text ") + @NotNull + + + public String getConsentId() { + return consentId; + } + + public void setConsentId(String consentId) { + this.consentId = consentId; + } + + public OBDomesticVRPConsentResponseData creationDateTime(DateTime creationDateTime) { + this.creationDateTime = creationDateTime; + return this; } - OBDomesticVRPConsentResponseData obDomesticVRPConsentResponseData = (OBDomesticVRPConsentResponseData) o; - return Objects.equals(this.readRefundAccount, obDomesticVRPConsentResponseData.readRefundAccount) && - Objects.equals(this.consentId, obDomesticVRPConsentResponseData.consentId) && - Objects.equals(this.creationDateTime, obDomesticVRPConsentResponseData.creationDateTime) && - Objects.equals(this.status, obDomesticVRPConsentResponseData.status) && - Objects.equals(this.statusUpdateDateTime, obDomesticVRPConsentResponseData.statusUpdateDateTime) && - Objects.equals(this.controlParameters, obDomesticVRPConsentResponseData.controlParameters) && - Objects.equals(this.initiation, obDomesticVRPConsentResponseData.initiation) && - Objects.equals(this.debtorAccount, obDomesticVRPConsentResponseData.debtorAccount); - } - - @Override - public int hashCode() { - return Objects.hash(readRefundAccount, consentId, creationDateTime, status, statusUpdateDateTime, controlParameters, initiation, debtorAccount); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OBDomesticVRPConsentResponseData {\n"); - - sb.append(" readRefundAccount: ").append(toIndentedString(readRefundAccount)).append("\n"); - sb.append(" consentId: ").append(toIndentedString(consentId)).append("\n"); - sb.append(" creationDateTime: ").append(toIndentedString(creationDateTime)).append("\n"); - sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" statusUpdateDateTime: ").append(toIndentedString(statusUpdateDateTime)).append("\n"); - sb.append(" controlParameters: ").append(toIndentedString(controlParameters)).append("\n"); - sb.append(" initiation: ").append(toIndentedString(initiation)).append("\n"); - sb.append(" debtorAccount: ").append(toIndentedString(debtorAccount)).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"; + + /** + * Date and time at which the resource was created.|ISODateTime + * @return creationDateTime + */ + @ApiModelProperty(required = true, value = "Date and time at which the resource was created.|ISODateTime ") + @NotNull + + @Valid + + public DateTime getCreationDateTime() { + return creationDateTime; + } + + public void setCreationDateTime(DateTime creationDateTime) { + this.creationDateTime = creationDateTime; + } + + public OBDomesticVRPConsentResponseData status(String status) { + this.status = status; + return this; + } + + /** + * Specifies the status of resource in code form. |Authorised AwaitingAuthorisation Rejected Revoked Expired + * @return status + */ + @ApiModelProperty(required = true, value = "Specifies the status of resource in code form. |Authorised AwaitingAuthorisation Rejected Revoked Expired ") + @NotNull + + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public OBDomesticVRPConsentResponseData statusUpdateDateTime(DateTime statusUpdateDateTime) { + this.statusUpdateDateTime = statusUpdateDateTime; + return this; + } + + /** + * Date and time at which the resource status was updated. | ISODateTime + * @return statusUpdateDateTime + */ + @ApiModelProperty(required = true, value = "Date and time at which the resource status was updated. | ISODateTime ") + @NotNull + + @Valid + + public DateTime getStatusUpdateDateTime() { + return statusUpdateDateTime; + } + + public void setStatusUpdateDateTime(DateTime statusUpdateDateTime) { + this.statusUpdateDateTime = statusUpdateDateTime; + } + + public OBDomesticVRPConsentResponseData controlParameters(OBDomesticVRPControlParameters controlParameters) { + this.controlParameters = controlParameters; + return this; + } + + /** + * Get controlParameters + * @return controlParameters + */ + @ApiModelProperty(required = true, value = "") + @NotNull + + @Valid + + public OBDomesticVRPControlParameters getControlParameters() { + return controlParameters; + } + + public void setControlParameters(OBDomesticVRPControlParameters controlParameters) { + this.controlParameters = controlParameters; + } + + public OBDomesticVRPConsentResponseData initiation(OBDomesticVRPInitiation initiation) { + this.initiation = initiation; + return this; + } + + /** + * Get initiation + * @return initiation + */ + @ApiModelProperty(required = true, value = "") + @NotNull + + @Valid + + public OBDomesticVRPInitiation getInitiation() { + return initiation; + } + + public void setInitiation(OBDomesticVRPInitiation initiation) { + this.initiation = initiation; + } + + public OBDomesticVRPConsentResponseData debtorAccount(OBCashAccountDebtorWithName debtorAccount) { + this.debtorAccount = debtorAccount; + return this; + } + + /** + * Get debtorAccount + * @return debtorAccount + */ + @ApiModelProperty(value = "") + + @Valid + + public OBCashAccountDebtorWithName getDebtorAccount() { + return debtorAccount; + } + + public void setDebtorAccount(OBCashAccountDebtorWithName debtorAccount) { + this.debtorAccount = debtorAccount; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBDomesticVRPConsentResponseData obDomesticVRPConsentResponseData = (OBDomesticVRPConsentResponseData) o; + return Objects.equals(this.readRefundAccount, obDomesticVRPConsentResponseData.readRefundAccount) && + Objects.equals(this.consentId, obDomesticVRPConsentResponseData.consentId) && + Objects.equals(this.creationDateTime, obDomesticVRPConsentResponseData.creationDateTime) && + Objects.equals(this.status, obDomesticVRPConsentResponseData.status) && + Objects.equals(this.statusUpdateDateTime, obDomesticVRPConsentResponseData.statusUpdateDateTime) && + Objects.equals(this.controlParameters, obDomesticVRPConsentResponseData.controlParameters) && + Objects.equals(this.initiation, obDomesticVRPConsentResponseData.initiation) && + Objects.equals(this.debtorAccount, obDomesticVRPConsentResponseData.debtorAccount); + } + + @Override + public int hashCode() { + return Objects.hash(readRefundAccount, consentId, creationDateTime, status, statusUpdateDateTime, controlParameters, initiation, debtorAccount); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBDomesticVRPConsentResponseData {\n"); + + sb.append(" readRefundAccount: ").append(toIndentedString(readRefundAccount)).append("\n"); + sb.append(" consentId: ").append(toIndentedString(consentId)).append("\n"); + sb.append(" creationDateTime: ").append(toIndentedString(creationDateTime)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" statusUpdateDateTime: ").append(toIndentedString(statusUpdateDateTime)).append("\n"); + sb.append(" controlParameters: ").append(toIndentedString(controlParameters)).append("\n"); + sb.append(" initiation: ").append(toIndentedString(initiation)).append("\n"); + sb.append(" debtorAccount: ").append(toIndentedString(debtorAccount)).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 "); } - return o.toString().replace("\n", "\n "); - } } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParameters.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParameters.java index dc97a6c..e4eb93a 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParameters.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParameters.java @@ -35,8 +35,7 @@ /** * OBDomesticVRPControlParameters */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPControlParameters { @JsonProperty("ValidFromDateTime") @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) @@ -62,7 +61,7 @@ public class OBDomesticVRPControlParameters { private List psUAuthenticationMethods = null; @JsonProperty("SupplementaryData") - private OBSupplementaryData1 supplementaryData; // use existing OBSupplementaryData1 for Payments + private OBSupplementaryData1 supplementaryData; // use existing OBSupplementaryData1 for Payments public OBDomesticVRPControlParameters validFromDateTime(DateTime validFromDateTime) { this.validFromDateTime = validFromDateTime; @@ -71,7 +70,6 @@ public OBDomesticVRPControlParameters validFromDateTime(DateTime validFromDateTi /** * ^ Start date time for which the consent remains valid. | ISODateTime - * * @return validFromDateTime */ @ApiModelProperty(value = "^ Start date time for which the consent remains valid. | ISODateTime") @@ -93,7 +91,6 @@ public OBDomesticVRPControlParameters validToDateTime(DateTime validToDateTime) /** * ^ End date time for which the consent remains valid. | ISODateTime - * * @return validToDateTime */ @ApiModelProperty(value = "^ End date time for which the consent remains valid. | ISODateTime") @@ -115,7 +112,6 @@ public OBDomesticVRPControlParameters maximumIndividualAmount(OBDomesticVRPContr /** * Get maximumIndividualAmount - * * @return maximumIndividualAmount */ @ApiModelProperty(value = "") @@ -145,7 +141,6 @@ public OBDomesticVRPControlParameters addPeriodicLimitsItem(OBDomesticVRPControl /** * Get periodicLimits - * * @return periodicLimits */ @ApiModelProperty(value = "") @@ -172,7 +167,6 @@ public OBDomesticVRPControlParameters addVrPTypeItem(String vrPTypeItem) { /** * ^ The types of payments that can be made under this VRP consent. This can be used to indicate whether this include sweeping payment or other ecommerce payments. | OBVRPConsentType - Namespaced Enumeration - * * @return vrPType */ @ApiModelProperty(required = true, value = "^ The types of payments that can be made under this VRP consent. This can be used to indicate whether this include sweeping payment or other ecommerce payments. | OBVRPConsentType - Namespaced Enumeration") @@ -202,7 +196,6 @@ public OBDomesticVRPControlParameters addPsUAuthenticationMethodsItem(String psU /** * ^ Indicates that the PSU authentication methods supported. | OBVRPAuthenticationMethods - Namespaced Enumeration - * * @return psUAuthenticationMethods */ @ApiModelProperty(value = "^ Indicates that the PSU authentication methods supported. | OBVRPAuthenticationMethods - Namespaced Enumeration") @@ -223,12 +216,10 @@ public OBDomesticVRPControlParameters supplementaryData(OBSupplementaryData1 sup /** * ^ Additional information that can not be captured in the structured fields and/or any other specific block - * * @return supplementaryData */ @ApiModelProperty(value = "^ Additional information that can not be captured in the structured fields and/or any other specific block") - @Valid public OBSupplementaryData1 getSupplementaryData() { return supplementaryData; diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParametersMaximumIndividualAmount.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParametersMaximumIndividualAmount.java index 2469aa7..1d50a0b 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParametersMaximumIndividualAmount.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParametersMaximumIndividualAmount.java @@ -29,8 +29,7 @@ /** * OBDomesticVRPControlParametersMaximumIndividualAmount */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPControlParametersMaximumIndividualAmount { @JsonProperty("Amount") private String amount; @@ -45,7 +44,6 @@ public OBDomesticVRPControlParametersMaximumIndividualAmount amount(String amoun /** * ^ A number of monetary units specified in an active currency where the unit of currency is explicit and compliant with ISO 4217. - * * @return amount */ @ApiModelProperty(required = true, value = "^ A number of monetary units specified in an active currency where the unit of currency is explicit and compliant with ISO 4217.") @@ -67,7 +65,6 @@ public OBDomesticVRPControlParametersMaximumIndividualAmount currency(String cur /** * ^ A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\". | ActiveOrHistoricCurrencyCode - * * @return currency */ @ApiModelProperty(required = true, value = "^ A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\". | ActiveOrHistoricCurrencyCode") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParametersPeriodicLimits.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParametersPeriodicLimits.java index 3c40a91..53fb919 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParametersPeriodicLimits.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPControlParametersPeriodicLimits.java @@ -31,8 +31,7 @@ /** * OBDomesticVRPControlParametersPeriodicLimits */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPControlParametersPeriodicLimits { /** * ^ Period type for this period limit @@ -131,7 +130,6 @@ public OBDomesticVRPControlParametersPeriodicLimits periodType(PeriodTypeEnum pe /** * ^ Period type for this period limit - * * @return periodType */ @ApiModelProperty(required = true, value = "^ Period type for this period limit") @@ -153,7 +151,6 @@ public OBDomesticVRPControlParametersPeriodicLimits periodAlignment(PeriodAlignm /** * ^ Specifies whether the period starts on the date of consent creation or lines up with a calendar - * * @return periodAlignment */ @ApiModelProperty(required = true, value = "^ Specifies whether the period starts on the date of consent creation or lines up with a calendar") @@ -175,7 +172,6 @@ public OBDomesticVRPControlParametersPeriodicLimits amount(String amount) { /** * ^ A number of monetary units specified in an active currency where the unit of currency is explicit and compliant with ISO 4217. - * * @return amount */ @ApiModelProperty(required = true, value = "^ A number of monetary units specified in an active currency where the unit of currency is explicit and compliant with ISO 4217.") @@ -197,7 +193,6 @@ public OBDomesticVRPControlParametersPeriodicLimits currency(String currency) { /** * ^ A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\". | ActiveOrHistoricCurrencyCode - * * @return currency */ @ApiModelProperty(required = true, value = "^ A code allocated to a currency by a Maintenance Agency under an international identification scheme, as described in the latest edition of the international standard ISO 4217 \"Codes for the representation of currencies and funds\". | ActiveOrHistoricCurrencyCode") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetails.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetails.java index 4590ef4..69dac2c 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetails.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetails.java @@ -29,71 +29,69 @@ /** * OBDomesticVRPDetails */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPDetails { - @JsonProperty("Data") - private OBDomesticVRPDetailsData data; + @JsonProperty("Data") + private OBDomesticVRPDetailsData data; - public OBDomesticVRPDetails data(OBDomesticVRPDetailsData data) { - this.data = data; - return this; - } + public OBDomesticVRPDetails data(OBDomesticVRPDetailsData data) { + this.data = data; + return this; + } - /** - * Get data - * - * @return data - */ - @ApiModelProperty(value = "") + /** + * Get data + * @return data + */ + @ApiModelProperty(value = "") - @Valid + @Valid - public OBDomesticVRPDetailsData getData() { - return data; - } + public OBDomesticVRPDetailsData getData() { + return data; + } - public void setData(OBDomesticVRPDetailsData data) { - this.data = data; - } + public void setData(OBDomesticVRPDetailsData data) { + this.data = data; + } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBDomesticVRPDetails obDomesticVRPDetails = (OBDomesticVRPDetails) o; + return Objects.equals(this.data, obDomesticVRPDetails.data); } - if (o == null || getClass() != o.getClass()) { - return false; - } - OBDomesticVRPDetails obDomesticVRPDetails = (OBDomesticVRPDetails) o; - return Objects.equals(this.data, obDomesticVRPDetails.data); - } - @Override - public int hashCode() { - return Objects.hash(data); - } + @Override + public int hashCode() { + return Objects.hash(data); + } - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OBDomesticVRPDetails {\n"); + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBDomesticVRPDetails {\n"); - sb.append(" data: ").append(toIndentedString(data)).append("\n"); - sb.append("}"); - return sb.toString(); - } + sb.append(" data: ").append(toIndentedString(data)).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"; + /** + * 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 "); } - return o.toString().replace("\n", "\n "); - } } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsData.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsData.java index cb14bbe..acb541a 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsData.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsData.java @@ -31,8 +31,7 @@ /** * OBDomesticVRPDetailsData */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPDetailsData { @JsonProperty("PaymentStatus") @Valid @@ -53,7 +52,6 @@ public OBDomesticVRPDetailsData addPaymentStatusItem(OBDomesticVRPDetailsDataPay /** * Get paymentStatus - * * @return paymentStatus */ @ApiModelProperty(value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsDataPaymentStatus.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsDataPaymentStatus.java index 70baef0..e6395db 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsDataPaymentStatus.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsDataPaymentStatus.java @@ -34,8 +34,7 @@ /** * OBDomesticVRPDetailsDataPaymentStatus */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPDetailsDataPaymentStatus { @JsonProperty("PaymentTransactionId") private String paymentTransactionId; @@ -128,7 +127,6 @@ public OBDomesticVRPDetailsDataPaymentStatus paymentTransactionId(String payment /** * Unique identifier for the transaction within an servicing institution. This identifier is both unique and immutable. - * * @return paymentTransactionId */ @ApiModelProperty(required = true, value = "Unique identifier for the transaction within an servicing institution. This identifier is both unique and immutable.") @@ -150,7 +148,6 @@ public OBDomesticVRPDetailsDataPaymentStatus status(StatusEnum status) { /** * Status of a transfer, as assigned by the transaction administrator. - * * @return status */ @ApiModelProperty(required = true, value = "Status of a transfer, as assigned by the transaction administrator.") @@ -172,7 +169,6 @@ public OBDomesticVRPDetailsDataPaymentStatus statusUpdateDateTime(DateTime statu /** * Date and time at which the status was assigned to the transfer. - * * @return statusUpdateDateTime */ @ApiModelProperty(required = true, value = "Date and time at which the status was assigned to the transfer. ") @@ -195,7 +191,6 @@ public OBDomesticVRPDetailsDataPaymentStatus statusDetail(OBDomesticVRPDetailsDa /** * Get statusDetail - * * @return statusDetail */ @ApiModelProperty(value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsDataStatusDetail.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsDataStatusDetail.java index 08db13a..9df4b9e 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsDataStatusDetail.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPDetailsDataStatusDetail.java @@ -32,8 +32,7 @@ /** * OBDomesticVRPDetailsDataStatusDetail */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPDetailsDataStatusDetail { @JsonProperty("LocalInstrument") private String localInstrument; @@ -99,7 +98,6 @@ public OBDomesticVRPDetailsDataStatusDetail localInstrument(String localInstrume /** * User community specific instrument. Usage: This element is used to specify a local instrument, local clearing option and/or further qualify the service or service level. - * * @return localInstrument */ @ApiModelProperty(value = "User community specific instrument. Usage: This element is used to specify a local instrument, local clearing option and/or further qualify the service or service level.") @@ -120,7 +118,6 @@ public OBDomesticVRPDetailsDataStatusDetail status(String status) { /** * Status of a transfer, as assigned by the transaction administrator. - * * @return status */ @ApiModelProperty(required = true, value = "Status of a transfer, as assigned by the transaction administrator.") @@ -142,7 +139,6 @@ public OBDomesticVRPDetailsDataStatusDetail statusReason(StatusReasonEnum status /** * Reason Code provided for the status of a transfer. - * * @return statusReason */ @ApiModelProperty(value = "Reason Code provided for the status of a transfer.") @@ -163,7 +159,6 @@ public OBDomesticVRPDetailsDataStatusDetail statusReasonDescription(String statu /** * Reason provided for the status of a transfer. - * * @return statusReasonDescription */ @ApiModelProperty(value = "Reason provided for the status of a transfer.") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInitiation.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInitiation.java index a6b3128..b2ef749 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInitiation.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInitiation.java @@ -24,7 +24,6 @@ import io.swagger.annotations.ApiModelProperty; import uk.org.openbanking.datamodel.payment.OBBranchAndFinancialInstitutionIdentification6; import uk.org.openbanking.datamodel.payment.OBCashAccountCreditor3; -import uk.org.openbanking.datamodel.payment.OBRemittanceInformation1; import javax.validation.Valid; import java.util.Objects; @@ -32,20 +31,22 @@ /** * OBDomesticVRPInitiation */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPInitiation { @JsonProperty("DebtorAccount") private OBCashAccountDebtorWithName debtorAccount; @JsonProperty("CreditorAgent") - private OBBranchAndFinancialInstitutionIdentification6 creditorAgent; // use existing one for Payments, rather than duplicating it for VRPs + private OBBranchAndFinancialInstitutionIdentification6 creditorAgent; // use existing one for Payments, rather than + // duplicating it for VRPs @JsonProperty("CreditorAccount") - private OBCashAccountCreditor3 creditorAccount; // use existing one for Payments, rather than duplicating it for VRPs + private OBCashAccountCreditor3 creditorAccount; // use existing one for Payments, rather than duplicating it for + // VRPs @JsonProperty("RemittanceInformation") - private OBRemittanceInformation1 remittanceInformation; // use existing RemittanceInformation1, rather than duplicating it for VRPs + private OBDomesticVRPInitiationRemittanceInformation remittanceInformation; // use existing + // RemittanceInformation1, rather than duplicating it for VRPs public OBDomesticVRPInitiation debtorAccount(OBCashAccountDebtorWithName debtorAccount) { this.debtorAccount = debtorAccount; @@ -54,7 +55,6 @@ public OBDomesticVRPInitiation debtorAccount(OBCashAccountDebtorWithName debtorA /** * Get debtorAccount - * * @return debtorAccount */ @ApiModelProperty(value = "") @@ -76,7 +76,6 @@ public OBDomesticVRPInitiation creditorAgent(OBBranchAndFinancialInstitutionIden /** * Get creditorAgent - * * @return creditorAgent */ @ApiModelProperty(value = "") @@ -98,7 +97,6 @@ public OBDomesticVRPInitiation creditorAccount(OBCashAccountCreditor3 creditorAc /** * Get creditorAccount - * * @return creditorAccount */ @ApiModelProperty(value = "") @@ -113,25 +111,24 @@ public void setCreditorAccount(OBCashAccountCreditor3 creditorAccount) { this.creditorAccount = creditorAccount; } - public OBDomesticVRPInitiation remittanceInformation(OBRemittanceInformation1 remittanceInformation) { + public OBDomesticVRPInitiation remittanceInformation(OBDomesticVRPInitiationRemittanceInformation remittanceInformation) { this.remittanceInformation = remittanceInformation; return this; } /** * Get remittanceInformation - * * @return remittanceInformation */ @ApiModelProperty(value = "") @Valid - public OBRemittanceInformation1 getRemittanceInformation() { + public OBDomesticVRPInitiationRemittanceInformation getRemittanceInformation() { return remittanceInformation; } - public void setRemittanceInformation(OBRemittanceInformation1 remittanceInformation) { + public void setRemittanceInformation(OBDomesticVRPInitiationRemittanceInformation remittanceInformation) { this.remittanceInformation = remittanceInformation; } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInitiationRemittanceInformation.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInitiationRemittanceInformation.java new file mode 100644 index 0000000..b83aa15 --- /dev/null +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInitiationRemittanceInformation.java @@ -0,0 +1,123 @@ +/** + * Copyright 2019 ForgeRock AS. + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package uk.org.openbanking.datamodel.vrp; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.Size; +import java.util.Objects; + +/** + * ^ Information supplied to enable the matching of an entry with the items that the transfer is intended to settle, such as commercial invoices in an accounts' receivable system. + */ +@ApiModel(description = "^ Information supplied to enable the matching of an entry with the items that the transfer is intended to settle, such as commercial invoices in an accounts' receivable system.") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") +public class OBDomesticVRPInitiationRemittanceInformation { + @JsonProperty("Unstructured") + private String unstructured; + + @JsonProperty("Reference") + private String reference; + + public OBDomesticVRPInitiationRemittanceInformation unstructured(String unstructured) { + this.unstructured = unstructured; + return this; + } + + /** + * ^ Information supplied to enable the matching/reconciliation of an entry with the items that the payment is intended to settle, such as commercial invoices in an accounts' receivable system, in an unstructured form. + * @return unstructured + */ + @ApiModelProperty(value = "^ Information supplied to enable the matching/reconciliation of an entry with the items that the payment is intended to settle, such as commercial invoices in an accounts' receivable system, in an unstructured form.") + + @Size(max = 140) + public String getUnstructured() { + return unstructured; + } + + public void setUnstructured(String unstructured) { + this.unstructured = unstructured; + } + + public OBDomesticVRPInitiationRemittanceInformation reference(String reference) { + this.reference = reference; + return this; + } + + /** + * ^ Unique reference, as assigned by the creditor, to unambiguously refer to the payment transaction. Usage - If available, the initiating party should provide this reference in the structured remittance information, to enable reconciliation by the creditor upon receipt of the amount of money. If the business context requires the use of a creditor reference or a payment remit identification, and only one identifier can be passed through the end-to-end chain, the creditor's reference or payment remittance identification should be quoted in the end-to-end transaction identification. + * @return reference + */ + @ApiModelProperty(value = "^ Unique reference, as assigned by the creditor, to unambiguously refer to the payment transaction. Usage - If available, the initiating party should provide this reference in the structured remittance information, to enable reconciliation by the creditor upon receipt of the amount of money. If the business context requires the use of a creditor reference or a payment remit identification, and only one identifier can be passed through the end-to-end chain, the creditor's reference or payment remittance identification should be quoted in the end-to-end transaction identification.") + + @Size(max = 35) + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBDomesticVRPInitiationRemittanceInformation obDomesticVRPInitiationRemittanceInformation = (OBDomesticVRPInitiationRemittanceInformation) o; + return Objects.equals(this.unstructured, obDomesticVRPInitiationRemittanceInformation.unstructured) && + Objects.equals(this.reference, obDomesticVRPInitiationRemittanceInformation.reference); + } + + @Override + public int hashCode() { + return Objects.hash(unstructured, reference); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBDomesticVRPInitiationRemittanceInformation {\n"); + + sb.append(" unstructured: ").append(toIndentedString(unstructured)).append("\n"); + sb.append(" reference: ").append(toIndentedString(reference)).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 "); + } +} + diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInstruction.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInstruction.java index 5955e55..b5139c6 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInstruction.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPInstruction.java @@ -22,7 +22,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; -import uk.org.openbanking.datamodel.payment.*; +import uk.org.openbanking.datamodel.payment.OBActiveOrHistoricCurrencyAndAmount; +import uk.org.openbanking.datamodel.payment.OBBranchAndFinancialInstitutionIdentification6; +import uk.org.openbanking.datamodel.payment.OBCashAccountCreditor3; +import uk.org.openbanking.datamodel.payment.OBSupplementaryData1; import javax.validation.Valid; import javax.validation.constraints.NotNull; @@ -32,8 +35,7 @@ /** * OBDomesticVRPInstruction */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPInstruction { @JsonProperty("InstructionIdentification") private String instructionIdentification; @@ -42,19 +44,23 @@ public class OBDomesticVRPInstruction { private String endToEndIdentification; @JsonProperty("RemittanceInformation") - private OBRemittanceInformation1 remittanceInformation; // use existing RemittanceInformation1, rather than duplicating it for VRPs + private OBVRPRemittanceInformation remittanceInformation; + // duplicating it for VRPs @JsonProperty("LocalInstrument") private String localInstrument; @JsonProperty("InstructedAmount") - private OBActiveOrHistoricCurrencyAndAmount instructedAmount; // use existing one for Payments, rather than duplicating it for VRPs + private OBActiveOrHistoricCurrencyAndAmount instructedAmount; // use existing one for Payments, rather than + // duplicating it for VRPs @JsonProperty("CreditorAgent") - private OBBranchAndFinancialInstitutionIdentification6 creditorAgent; // use existing one for Payments, rather than duplicating it for VRPs + private OBBranchAndFinancialInstitutionIdentification6 creditorAgent; // use existing one for Payments, rather than + // duplicating it for VRPs @JsonProperty("CreditorAccount") - private OBCashAccountCreditor3 creditorAccount; // use existing one for Payments, rather than duplicating it for VRPs + private OBCashAccountCreditor3 creditorAccount; // use existing one for Payments, rather than duplicating it for + // VRPs @JsonProperty("SupplementaryData") private OBSupplementaryData1 supplementaryData; // use existing one for Payments, rather than duplicating it for VRPs @@ -66,7 +72,6 @@ public OBDomesticVRPInstruction instructionIdentification(String instructionIden /** * Unique identification as assigned by an instructing party for an instructed party to unambiguously identify the instruction. Usage: the instruction identification is a point to point reference that can be used between the instructing party and the instructed party to refer to the individual instruction. It can be included in several messages related to the instruction. - * * @return instructionIdentification */ @ApiModelProperty(required = true, value = "Unique identification as assigned by an instructing party for an instructed party to unambiguously identify the instruction. Usage: the instruction identification is a point to point reference that can be used between the instructing party and the instructed party to refer to the individual instruction. It can be included in several messages related to the instruction.") @@ -88,7 +93,6 @@ public OBDomesticVRPInstruction endToEndIdentification(String endToEndIdentifica /** * Unique identification assigned by the initiating party to unambiguously identify the transaction. This identification is passed on, unchanged, throughout the entire end-to-end chain. Usage: The end-to-end identification can be used for reconciliation or to link tasks relating to the transaction. It can be included in several messages related to the transaction. OB: The Faster Payments Scheme can only access 31 characters for the EndToEndIdentification field - * * @return endToEndIdentification */ @ApiModelProperty(required = true, value = "Unique identification assigned by the initiating party to unambiguously identify the transaction. This identification is passed on, unchanged, throughout the entire end-to-end chain. Usage: The end-to-end identification can be used for reconciliation or to link tasks relating to the transaction. It can be included in several messages related to the transaction. OB: The Faster Payments Scheme can only access 31 characters for the EndToEndIdentification field") @@ -103,25 +107,24 @@ public void setEndToEndIdentification(String endToEndIdentification) { this.endToEndIdentification = endToEndIdentification; } - public OBDomesticVRPInstruction remittanceInformation(OBRemittanceInformation1 remittanceInformation) { + public OBDomesticVRPInstruction remittanceInformation(OBVRPRemittanceInformation remittanceInformation) { this.remittanceInformation = remittanceInformation; return this; } /** * Get remittanceInformation - * * @return remittanceInformation */ @ApiModelProperty(value = "") @Valid - public OBRemittanceInformation1 getRemittanceInformation() { + public OBVRPRemittanceInformation getRemittanceInformation() { return remittanceInformation; } - public void setRemittanceInformation(OBRemittanceInformation1 remittanceInformation) { + public void setRemittanceInformation(OBVRPRemittanceInformation remittanceInformation) { this.remittanceInformation = remittanceInformation; } @@ -132,7 +135,6 @@ public OBDomesticVRPInstruction localInstrument(String localInstrument) { /** * User community specific instrument. Usage: This element is used to specify a local instrument, local clearing option and/or further qualify the service or service level. - * * @return localInstrument */ @ApiModelProperty(value = "User community specific instrument. Usage: This element is used to specify a local instrument, local clearing option and/or further qualify the service or service level.") @@ -153,7 +155,6 @@ public OBDomesticVRPInstruction instructedAmount(OBActiveOrHistoricCurrencyAndAm /** * Get instructedAmount - * * @return instructedAmount */ @ApiModelProperty(value = "") @@ -175,7 +176,6 @@ public OBDomesticVRPInstruction creditorAgent(OBBranchAndFinancialInstitutionIde /** * Get creditorAgent - * * @return creditorAgent */ @ApiModelProperty(value = "") @@ -197,7 +197,6 @@ public OBDomesticVRPInstruction creditorAccount(OBCashAccountCreditor3 creditorA /** * Get creditorAccount - * * @return creditorAccount */ @ApiModelProperty(required = true, value = "") @@ -220,12 +219,10 @@ public OBDomesticVRPInstruction supplementaryData(OBSupplementaryData1 supplemen /** * ^ Additional information that can not be captured in the structured fields and/or any other specific block - * * @return supplementaryData */ @ApiModelProperty(value = "^ Additional information that can not be captured in the structured fields and/or any other specific block") - @Valid public OBSupplementaryData1 getSupplementaryData() { return supplementaryData; diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPRequest.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPRequest.java index f0bf767..11bea9d 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPRequest.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPRequest.java @@ -31,8 +31,7 @@ /** * OBDomesticVRPRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPRequest { @JsonProperty("Data") private OBDomesticVRPRequestData data; @@ -47,7 +46,6 @@ public OBDomesticVRPRequest data(OBDomesticVRPRequestData data) { /** * Get data - * * @return data */ @ApiModelProperty(required = true, value = "") @@ -70,7 +68,6 @@ public OBDomesticVRPRequest risk(OBRisk1 risk) { /** * Get risk - * * @return risk */ @ApiModelProperty(required = true, value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPRequestData.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPRequestData.java index 48fc601..72b8c59 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPRequestData.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPRequestData.java @@ -31,8 +31,7 @@ /** * OBDomesticVRPRequestData */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPRequestData { @JsonProperty("ConsentId") private String consentId; @@ -53,7 +52,6 @@ public OBDomesticVRPRequestData consentId(String consentId) { /** * Identifier for the Domestic VRP Consent that this payment is made under. - * * @return consentId */ @ApiModelProperty(required = true, value = "Identifier for the Domestic VRP Consent that this payment is made under.") @@ -75,7 +73,6 @@ public OBDomesticVRPRequestData psUAuthenticationMethod(String psUAuthentication /** * ^ The authentication method that was used to authenicate the PSU. | OBVRPAuthenticationMethods - Namespaced Enumeration - * * @return psUAuthenticationMethod */ @ApiModelProperty(required = true, value = "^ The authentication method that was used to authenicate the PSU. | OBVRPAuthenticationMethods - Namespaced Enumeration") @@ -97,7 +94,6 @@ public OBDomesticVRPRequestData initiation(OBDomesticVRPInitiation initiation) { /** * Get initiation - * * @return initiation */ @ApiModelProperty(required = true, value = "") @@ -120,7 +116,6 @@ public OBDomesticVRPRequestData instruction(OBDomesticVRPInstruction instruction /** * Get instruction - * * @return instruction */ @ApiModelProperty(required = true, value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponse.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponse.java index 693b5c3..06b5077 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponse.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponse.java @@ -33,8 +33,7 @@ /** * OBDomesticVRPResponse */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPResponse { @JsonProperty("Data") private OBDomesticVRPResponseData data; @@ -55,7 +54,6 @@ public OBDomesticVRPResponse data(OBDomesticVRPResponseData data) { /** * Get data - * * @return data */ @ApiModelProperty(required = true, value = "") @@ -78,7 +76,6 @@ public OBDomesticVRPResponse risk(OBRisk1 risk) { /** * Get risk - * * @return risk */ @ApiModelProperty(required = true, value = "") @@ -101,7 +98,6 @@ public OBDomesticVRPResponse links(Links links) { /** * Get links - * * @return links */ @ApiModelProperty(required = true, value = "") @@ -124,13 +120,11 @@ public OBDomesticVRPResponse meta(Meta meta) { /** * Meta Data relevant to the payload. At present no fields are used for VRP. - * * @return meta */ @ApiModelProperty(required = true, value = "Meta Data relevant to the payload. At present no fields are used for VRP.") @NotNull - @Valid public Meta getMeta() { return meta; diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponseData.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponseData.java index c131f9f..3d1ad2f 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponseData.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponseData.java @@ -36,8 +36,7 @@ /** * OBDomesticVRPResponseData */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPResponseData { @JsonProperty("DomesticVRPId") private String domesticVRPId; @@ -130,7 +129,6 @@ public OBDomesticVRPResponseData domesticVRPId(String domesticVRPId) { /** * Unique identification as assigned by the ASPSP to uniquely identify the domestic payment resource. - * * @return domesticVRPId */ @ApiModelProperty(required = true, value = "Unique identification as assigned by the ASPSP to uniquely identify the domestic payment resource. ") @@ -152,7 +150,6 @@ public OBDomesticVRPResponseData consentId(String consentId) { /** * Identifier for the Domestic VRP Consent that this payment is made under. - * * @return consentId */ @ApiModelProperty(required = true, value = "Identifier for the Domestic VRP Consent that this payment is made under. ") @@ -174,7 +171,6 @@ public OBDomesticVRPResponseData creationDateTime(DateTime creationDateTime) { /** * Date and time at which the resource was created. - * * @return creationDateTime */ @ApiModelProperty(required = true, value = "Date and time at which the resource was created. ") @@ -197,7 +193,6 @@ public OBDomesticVRPResponseData status(StatusEnum status) { /** * Specifies the status of the payment information group. - * * @return status */ @ApiModelProperty(required = true, value = "Specifies the status of the payment information group.") @@ -219,7 +214,6 @@ public OBDomesticVRPResponseData statusUpdateDateTime(DateTime statusUpdateDateT /** * Date and time at which the resource status was updated. - * * @return statusUpdateDateTime */ @ApiModelProperty(required = true, value = "Date and time at which the resource status was updated. ") @@ -242,7 +236,6 @@ public OBDomesticVRPResponseData expectedExecutionDateTime(DateTime expectedExec /** * Expected execution date and time for the payment resource. - * * @return expectedExecutionDateTime */ @ApiModelProperty(value = "Expected execution date and time for the payment resource. ") @@ -264,7 +257,6 @@ public OBDomesticVRPResponseData expectedSettlementDateTime(DateTime expectedSet /** * Expected settlement date and time for the payment resource. - * * @return expectedSettlementDateTime */ @ApiModelProperty(value = "Expected settlement date and time for the payment resource. ") @@ -286,7 +278,6 @@ public OBDomesticVRPResponseData refund(OBCashAccountDebtorWithName refund) { /** * Get refund - * * @return refund */ @ApiModelProperty(value = "") @@ -316,7 +307,6 @@ public OBDomesticVRPResponseData addChargesItem(OBDomesticVRPResponseDataCharges /** * Get charges - * * @return charges */ @ApiModelProperty(value = "") @@ -338,7 +328,6 @@ public OBDomesticVRPResponseData initiation(OBDomesticVRPInitiation initiation) /** * Get initiation - * * @return initiation */ @ApiModelProperty(required = true, value = "") @@ -361,7 +350,6 @@ public OBDomesticVRPResponseData instruction(OBDomesticVRPInstruction instructio /** * Get instruction - * * @return instruction */ @ApiModelProperty(required = true, value = "") @@ -384,7 +372,6 @@ public OBDomesticVRPResponseData debtorAccount(OBCashAccountDebtorWithName debto /** * Get debtorAccount - * * @return debtorAccount */ @ApiModelProperty(required = true, value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponseDataCharges.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponseDataCharges.java index c8ea392..d59dc3f 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponseDataCharges.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBDomesticVRPResponseDataCharges.java @@ -34,8 +34,7 @@ * Set of elements used to provide details of a charge for the payment initiation. */ @ApiModel(description = "Set of elements used to provide details of a charge for the payment initiation.") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBDomesticVRPResponseDataCharges { @JsonProperty("ChargeBearer") private OBChargeBearerType1Code chargeBearer; // use existing class, rather than duplicating for VRPs @@ -53,7 +52,6 @@ public OBDomesticVRPResponseDataCharges chargeBearer(OBChargeBearerType1Code cha /** * Get chargeBearer - * * @return chargeBearer */ @ApiModelProperty(required = true, value = "") @@ -76,7 +74,6 @@ public OBDomesticVRPResponseDataCharges type(OBExternalPaymentChargeType1Code ty /** * Get type - * * @return type */ @ApiModelProperty(required = true, value = "") @@ -99,7 +96,6 @@ public OBDomesticVRPResponseDataCharges amount(OBActiveOrHistoricCurrencyAndAmou /** * Get amount - * * @return amount */ @ApiModelProperty(required = true, value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBExternalPaymentChargeType1Code.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBExternalPaymentChargeType1Code.java index 7c76f06..0c50a74 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBExternalPaymentChargeType1Code.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBExternalPaymentChargeType1Code.java @@ -34,7 +34,7 @@ public enum OBExternalPaymentChargeType1Code { MONEYTRANSFEROUT("UK.OBIE.MoneyTransferOut"); - private String value; + private final String value; OBExternalPaymentChargeType1Code(String value) { this.value = value; diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBExternalStatus2Code.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBExternalStatus2Code.java index 791286f..d5e2895 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBExternalStatus2Code.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBExternalStatus2Code.java @@ -28,36 +28,36 @@ */ public enum OBExternalStatus2Code { - AUTHORISED("Authorised"), + AUTHORISED("Authorised"), - AWAITINGFURTHERAUTHORISATION("AwaitingFurtherAuthorisation"), + AWAITINGFURTHERAUTHORISATION("AwaitingFurtherAuthorisation"), - REJECTED("Rejected"); + REJECTED("Rejected"); - private String value; + private final String value; - OBExternalStatus2Code(String value) { - this.value = value; - } + OBExternalStatus2Code(String value) { + this.value = value; + } - @JsonValue - public String getValue() { - return value; - } + @JsonValue + public String getValue() { + return value; + } - @Override - public String toString() { - return String.valueOf(value); - } + @Override + public String toString() { + return String.valueOf(value); + } - @JsonCreator - public static OBExternalStatus2Code fromValue(String value) { - for (OBExternalStatus2Code b : OBExternalStatus2Code.values()) { - if (b.value.equals(value)) { - return b; - } + @JsonCreator + public static OBExternalStatus2Code fromValue(String value) { + for (OBExternalStatus2Code b : OBExternalStatus2Code.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBFundsAvailableEnum.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBFundsAvailableEnum.java deleted file mode 100644 index c1a3dbc..0000000 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBFundsAvailableEnum.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Copyright 2019 ForgeRock AS. - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package uk.org.openbanking.datamodel.vrp; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonValue; - -/** - * Availaility result, clearly indicating the availability of funds given the Amount in the request. - */ -public enum OBFundsAvailableEnum { - AVAILABLE("Available"), - - NOTAVAILABLE("NotAvailable"); - - private String value; - - OBFundsAvailableEnum(String value) { - this.value = value; - } - - @JsonValue - public String getValue() { - return value; - } - - @Override - public String toString() { - return String.valueOf(value); - } - - @JsonCreator - public static OBFundsAvailableEnum fromValue(String value) { - for (OBFundsAvailableEnum b : OBFundsAvailableEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - } -} \ No newline at end of file diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBPAFundsAvailableResult1.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBPAFundsAvailableResult1.java index cb8ee46..a177999 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBPAFundsAvailableResult1.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBPAFundsAvailableResult1.java @@ -20,7 +20,9 @@ */ package uk.org.openbanking.datamodel.vrp; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.joda.time.DateTime; @@ -33,100 +35,132 @@ * Availaility result, clearly indicating the availability of funds given the Amount in the request. */ @ApiModel(description = "Availaility result, clearly indicating the availability of funds given the Amount in the request.") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBPAFundsAvailableResult1 { - @JsonProperty("FundsAvailableDateTime") - @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) - private DateTime fundsAvailableDateTime; - - @JsonProperty("FundsAvailable") - private OBFundsAvailableEnum fundsAvailable; - - public OBPAFundsAvailableResult1 fundsAvailableDateTime(DateTime fundsAvailableDateTime) { - this.fundsAvailableDateTime = fundsAvailableDateTime; - return this; - } - - /** - * Date and time at which the funds availability check was generated. - * - * @return fundsAvailableDateTime - */ - @ApiModelProperty(required = true, value = "Date and time at which the funds availability check was generated.") - @NotNull - - @Valid - - public DateTime getFundsAvailableDateTime() { - return fundsAvailableDateTime; - } - - public void setFundsAvailableDateTime(DateTime fundsAvailableDateTime) { - this.fundsAvailableDateTime = fundsAvailableDateTime; - } - - public OBPAFundsAvailableResult1 fundsAvailable(OBFundsAvailableEnum fundsAvailable) { - this.fundsAvailable = fundsAvailable; - return this; - } - - /** - * Availaility result, clearly indicating the availability of funds given the Amount in the request. - * - * @return fundsAvailable - */ - @ApiModelProperty(required = true, value = "Availaility result, clearly indicating the availability of funds given the Amount in the request.") - @NotNull - - - public OBFundsAvailableEnum getFundsAvailable() { - return fundsAvailable; - } - - public void setFundsAvailable(OBFundsAvailableEnum fundsAvailable) { - this.fundsAvailable = fundsAvailable; - } - - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @JsonProperty("FundsAvailableDateTime") + @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME) + private DateTime fundsAvailableDateTime; + + /** + * Availaility result, clearly indicating the availability of funds given the Amount in the request. + */ + public enum FundsAvailableEnum { + AVAILABLE("Available"), + + NOTAVAILABLE("NotAvailable"); + + private String value; + + FundsAvailableEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static FundsAvailableEnum fromValue(String value) { + for (FundsAvailableEnum b : FundsAvailableEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + @JsonProperty("FundsAvailable") + private FundsAvailableEnum fundsAvailable; + + public OBPAFundsAvailableResult1 fundsAvailableDateTime(DateTime fundsAvailableDateTime) { + this.fundsAvailableDateTime = fundsAvailableDateTime; + return this; + } + + /** + * Date and time at which the funds availability check was generated. + * @return fundsAvailableDateTime + */ + @ApiModelProperty(required = true, value = "Date and time at which the funds availability check was generated.") + @NotNull + + @Valid + + public DateTime getFundsAvailableDateTime() { + return fundsAvailableDateTime; + } + + public void setFundsAvailableDateTime(DateTime fundsAvailableDateTime) { + this.fundsAvailableDateTime = fundsAvailableDateTime; + } + + public OBPAFundsAvailableResult1 fundsAvailable(FundsAvailableEnum fundsAvailable) { + this.fundsAvailable = fundsAvailable; + return this; + } + + /** + * Availaility result, clearly indicating the availability of funds given the Amount in the request. + * @return fundsAvailable + */ + @ApiModelProperty(required = true, value = "Availaility result, clearly indicating the availability of funds given the Amount in the request.") + @NotNull + + + public FundsAvailableEnum getFundsAvailable() { + return fundsAvailable; } - if (o == null || getClass() != o.getClass()) { - return false; + + public void setFundsAvailable(FundsAvailableEnum fundsAvailable) { + this.fundsAvailable = fundsAvailable; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBPAFundsAvailableResult1 obPAFundsAvailableResult1 = (OBPAFundsAvailableResult1) o; + return Objects.equals(this.fundsAvailableDateTime, obPAFundsAvailableResult1.fundsAvailableDateTime) && + Objects.equals(this.fundsAvailable, obPAFundsAvailableResult1.fundsAvailable); } - OBPAFundsAvailableResult1 obPAFundsAvailableResult1 = (OBPAFundsAvailableResult1) o; - return Objects.equals(this.fundsAvailableDateTime, obPAFundsAvailableResult1.fundsAvailableDateTime) && - Objects.equals(this.fundsAvailable, obPAFundsAvailableResult1.fundsAvailable); - } - - @Override - public int hashCode() { - return Objects.hash(fundsAvailableDateTime, fundsAvailable); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OBPAFundsAvailableResult1 {\n"); - - sb.append(" fundsAvailableDateTime: ").append(toIndentedString(fundsAvailableDateTime)).append("\n"); - sb.append(" fundsAvailable: ").append(toIndentedString(fundsAvailable)).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"; + + @Override + public int hashCode() { + return Objects.hash(fundsAvailableDateTime, fundsAvailable); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBPAFundsAvailableResult1 {\n"); + + sb.append(" fundsAvailableDateTime: ").append(toIndentedString(fundsAvailableDateTime)).append("\n"); + sb.append(" fundsAvailable: ").append(toIndentedString(fundsAvailable)).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 "); } - return o.toString().replace("\n", "\n "); - } } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationRequest.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationRequest.java index 4cb3810..beeb5dd 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationRequest.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationRequest.java @@ -31,8 +31,7 @@ * The OBVRPFundsConfirmationRequest object must be used to request funds availability for a specific amount in the Debtor Account included in the VRP consents. */ @ApiModel(description = "The OBVRPFundsConfirmationRequest object must be used to request funds availability for a specific amount in the Debtor Account included in the VRP consents.") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBVRPFundsConfirmationRequest { @JsonProperty("Data") private OBVRPFundsConfirmationRequestData data; @@ -44,7 +43,6 @@ public OBVRPFundsConfirmationRequest data(OBVRPFundsConfirmationRequestData data /** * Get data - * * @return data */ @ApiModelProperty(value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationRequestData.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationRequestData.java index 22a7ad9..3e003a7 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationRequestData.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationRequestData.java @@ -32,126 +32,123 @@ /** * OBVRPFundsConfirmationRequestData */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBVRPFundsConfirmationRequestData { - @JsonProperty("ConsentId") - private String consentId; - - @JsonProperty("Reference") - private String reference; - - @JsonProperty("InstructedAmount") - private OBActiveOrHistoricCurrencyAndAmount instructedAmount; // use existing one for Payments, rather than duplicating it for VRPs - - public OBVRPFundsConfirmationRequestData consentId(String consentId) { - this.consentId = consentId; - return this; - } - - /** - * Unique identification as assigned by the ASPSP to uniquely identify the funds confirmation consent resource. - * - * @return consentId - */ - @ApiModelProperty(required = true, value = "Unique identification as assigned by the ASPSP to uniquely identify the funds confirmation consent resource.") - @NotNull - - @Size(max = 128) - public String getConsentId() { - return consentId; - } - - public void setConsentId(String consentId) { - this.consentId = consentId; - } - - public OBVRPFundsConfirmationRequestData reference(String reference) { - this.reference = reference; - return this; - } - - /** - * nique reference, as assigned by the PISP, to unambiguously refer to the request related to the payment transaction. - * - * @return reference - */ - @ApiModelProperty(required = true, value = "nique reference, as assigned by the PISP, to unambiguously refer to the request related to the payment transaction.") - @NotNull - - @Size(max = 35) - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public OBVRPFundsConfirmationRequestData instructedAmount(OBActiveOrHistoricCurrencyAndAmount instructedAmount) { - this.instructedAmount = instructedAmount; - return this; - } - - /** - * Get instructedAmount - * - * @return instructedAmount - */ - @ApiModelProperty(required = true, value = "") - @NotNull - - @Valid - - public OBActiveOrHistoricCurrencyAndAmount getInstructedAmount() { - return instructedAmount; - } - - public void setInstructedAmount(OBActiveOrHistoricCurrencyAndAmount instructedAmount) { - this.instructedAmount = instructedAmount; - } - - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; + @JsonProperty("ConsentId") + private String consentId; + + @JsonProperty("Reference") + private String reference; + + @JsonProperty("InstructedAmount") + private OBActiveOrHistoricCurrencyAndAmount instructedAmount; // use existing one for Payments, rather than + // duplicating it for VRPs + + public OBVRPFundsConfirmationRequestData consentId(String consentId) { + this.consentId = consentId; + return this; + } + + /** + * Unique identification as assigned by the ASPSP to uniquely identify the funds confirmation consent resource. + * @return consentId + */ + @ApiModelProperty(required = true, value = "Unique identification as assigned by the ASPSP to uniquely identify the funds confirmation consent resource.") + @NotNull + + @Size(max = 128) + public String getConsentId() { + return consentId; + } + + public void setConsentId(String consentId) { + this.consentId = consentId; + } + + public OBVRPFundsConfirmationRequestData reference(String reference) { + this.reference = reference; + return this; + } + + /** + * nique reference, as assigned by the PISP, to unambiguously refer to the request related to the payment transaction. + * @return reference + */ + @ApiModelProperty(required = true, value = "nique reference, as assigned by the PISP, to unambiguously refer to the request related to the payment transaction.") + @NotNull + + @Size(max = 35) + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; } - if (o == null || getClass() != o.getClass()) { - return false; + + public OBVRPFundsConfirmationRequestData instructedAmount(OBActiveOrHistoricCurrencyAndAmount instructedAmount) { + this.instructedAmount = instructedAmount; + return this; + } + + /** + * Get instructedAmount + * @return instructedAmount + */ + @ApiModelProperty(required = true, value = "") + @NotNull + + @Valid + + public OBActiveOrHistoricCurrencyAndAmount getInstructedAmount() { + return instructedAmount; + } + + public void setInstructedAmount(OBActiveOrHistoricCurrencyAndAmount instructedAmount) { + this.instructedAmount = instructedAmount; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBVRPFundsConfirmationRequestData obVRPFundsConfirmationRequestData = (OBVRPFundsConfirmationRequestData) o; + return Objects.equals(this.consentId, obVRPFundsConfirmationRequestData.consentId) && + Objects.equals(this.reference, obVRPFundsConfirmationRequestData.reference) && + Objects.equals(this.instructedAmount, obVRPFundsConfirmationRequestData.instructedAmount); + } + + @Override + public int hashCode() { + return Objects.hash(consentId, reference, instructedAmount); } - OBVRPFundsConfirmationRequestData obVRPFundsConfirmationRequestData = (OBVRPFundsConfirmationRequestData) o; - return Objects.equals(this.consentId, obVRPFundsConfirmationRequestData.consentId) && - Objects.equals(this.reference, obVRPFundsConfirmationRequestData.reference) && - Objects.equals(this.instructedAmount, obVRPFundsConfirmationRequestData.instructedAmount); - } - - @Override - public int hashCode() { - return Objects.hash(consentId, reference, instructedAmount); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class OBVRPFundsConfirmationRequestData {\n"); - - sb.append(" consentId: ").append(toIndentedString(consentId)).append("\n"); - sb.append(" reference: ").append(toIndentedString(reference)).append("\n"); - sb.append(" instructedAmount: ").append(toIndentedString(instructedAmount)).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"; + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBVRPFundsConfirmationRequestData {\n"); + + sb.append(" consentId: ").append(toIndentedString(consentId)).append("\n"); + sb.append(" reference: ").append(toIndentedString(reference)).append("\n"); + sb.append(" instructedAmount: ").append(toIndentedString(instructedAmount)).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 "); } - return o.toString().replace("\n", "\n "); - } } diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationResponse.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationResponse.java index 8e44fbf..c4c5d84 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationResponse.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationResponse.java @@ -31,8 +31,7 @@ * The confirmation of funds response contains the result of a funds availability check. */ @ApiModel(description = "The confirmation of funds response contains the result of a funds availability check.") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBVRPFundsConfirmationResponse { @JsonProperty("Data") private OBVRPFundsConfirmationResponseData data; @@ -44,7 +43,6 @@ public OBVRPFundsConfirmationResponse data(OBVRPFundsConfirmationResponseData da /** * Get data - * * @return data */ @ApiModelProperty(value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationResponseData.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationResponseData.java index 72ba631..307a39c 100644 --- a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationResponseData.java +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPFundsConfirmationResponseData.java @@ -33,8 +33,7 @@ /** * OBVRPFundsConfirmationResponseData */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-21T09:44:44.818881+01:00[Europe/London]") - +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") public class OBVRPFundsConfirmationResponseData { @JsonProperty("FundsConfirmationId") private String fundsConfirmationId; @@ -53,7 +52,8 @@ public class OBVRPFundsConfirmationResponseData { private OBPAFundsAvailableResult1 fundsAvailableResult; @JsonProperty("InstructedAmount") - private OBActiveOrHistoricCurrencyAndAmount instructedAmount; // use existing one for Payments, rather than duplicating it for VRPs + private OBActiveOrHistoricCurrencyAndAmount instructedAmount; // use existing one for Payments, rather than + // duplicating it for VRPs public OBVRPFundsConfirmationResponseData fundsConfirmationId(String fundsConfirmationId) { this.fundsConfirmationId = fundsConfirmationId; @@ -62,7 +62,6 @@ public OBVRPFundsConfirmationResponseData fundsConfirmationId(String fundsConfir /** * Unique identification as assigned by the ASPSP to uniquely identify the funds confirmation resource. - * * @return fundsConfirmationId */ @ApiModelProperty(required = true, value = "Unique identification as assigned by the ASPSP to uniquely identify the funds confirmation resource.") @@ -84,7 +83,6 @@ public OBVRPFundsConfirmationResponseData consentId(String consentId) { /** * Unique identification as assigned by the ASPSP to uniquely identify the funds confirmation consent resource. - * * @return consentId */ @ApiModelProperty(required = true, value = "Unique identification as assigned by the ASPSP to uniquely identify the funds confirmation consent resource.") @@ -106,7 +104,6 @@ public OBVRPFundsConfirmationResponseData creationDateTime(DateTime creationDate /** * Date and time at which the resource was created. - * * @return creationDateTime */ @ApiModelProperty(required = true, value = "Date and time at which the resource was created.") @@ -129,7 +126,6 @@ public OBVRPFundsConfirmationResponseData reference(String reference) { /** * Unique reference, as assigned by the CBPII, to unambiguously refer to the request related to the payment transaction. - * * @return reference */ @ApiModelProperty(required = true, value = "Unique reference, as assigned by the CBPII, to unambiguously refer to the request related to the payment transaction.") @@ -151,7 +147,6 @@ public OBVRPFundsConfirmationResponseData fundsAvailableResult(OBPAFundsAvailabl /** * Get fundsAvailableResult - * * @return fundsAvailableResult */ @ApiModelProperty(required = true, value = "") @@ -174,7 +169,6 @@ public OBVRPFundsConfirmationResponseData instructedAmount(OBActiveOrHistoricCur /** * Get instructedAmount - * * @return instructedAmount */ @ApiModelProperty(required = true, value = "") diff --git a/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPRemittanceInformation.java b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPRemittanceInformation.java new file mode 100644 index 0000000..cfce99a --- /dev/null +++ b/src/main/java/uk/org/openbanking/datamodel/vrp/OBVRPRemittanceInformation.java @@ -0,0 +1,123 @@ +/** + * Copyright 2019 ForgeRock AS. + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package uk.org.openbanking.datamodel.vrp; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.constraints.Size; +import java.util.Objects; + +/** + * Information supplied to enable the matching of an entry with the items that the transfer is intended to settle, such as commercial invoices in an accounts' receivable system. + */ +@ApiModel(description = "Information supplied to enable the matching of an entry with the items that the transfer is intended to settle, such as commercial invoices in an accounts' receivable system. ") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-11-17T16:24:12.845482Z[Europe/London]") +public class OBVRPRemittanceInformation { + @JsonProperty("Unstructured") + private String unstructured; + + @JsonProperty("Reference") + private String reference; + + public OBVRPRemittanceInformation unstructured(String unstructured) { + this.unstructured = unstructured; + return this; + } + + /** + * Information supplied to enable the matching/reconciliation of an entry with the items that the payment is intended to settle, such as commercial invoices in an accounts' receivable system, in an unstructured form. + * @return unstructured + */ + @ApiModelProperty(value = "Information supplied to enable the matching/reconciliation of an entry with the items that the payment is intended to settle, such as commercial invoices in an accounts' receivable system, in an unstructured form. ") + + @Size(max = 140) + public String getUnstructured() { + return unstructured; + } + + public void setUnstructured(String unstructured) { + this.unstructured = unstructured; + } + + public OBVRPRemittanceInformation reference(String reference) { + this.reference = reference; + return this; + } + + /** + * Unique reference, as assigned by the creditor, to unambiguously refer to the payment transaction. The PISP must populate this with the same value as specified in the ControlParameters.Reference field of the consent. + * @return reference + */ + @ApiModelProperty(value = "Unique reference, as assigned by the creditor, to unambiguously refer to the payment transaction. The PISP must populate this with the same value as specified in the ControlParameters.Reference field of the consent. ") + + @Size(max = 35) + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + OBVRPRemittanceInformation obVRPRemittanceInformation = (OBVRPRemittanceInformation) o; + return Objects.equals(this.unstructured, obVRPRemittanceInformation.unstructured) && + Objects.equals(this.reference, obVRPRemittanceInformation.reference); + } + + @Override + public int hashCode() { + return Objects.hash(unstructured, reference); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class OBVRPRemittanceInformation {\n"); + + sb.append(" unstructured: ").append(toIndentedString(unstructured)).append("\n"); + sb.append(" reference: ").append(toIndentedString(reference)).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 "); + } +} + diff --git a/src/main/resources/specification/confirmation-funds-openapi.yaml b/src/main/resources/specification/confirmation-funds-openapi.yaml index 11d10cd..32ce690 100644 --- a/src/main/resources/specification/confirmation-funds-openapi.yaml +++ b/src/main/resources/specification/confirmation-funds-openapi.yaml @@ -234,6 +234,12 @@ components: application/json; charset=utf-8: schema: $ref: "#/components/schemas/OBFundsConfirmationConsentResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBFundsConfirmationConsentResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBFundsConfirmationConsentResponse1" 200FundsConfirmationConsentsConsentIdRead: description: "Funds Confirmation Consent Read" headers: @@ -246,6 +252,12 @@ components: application/json; charset=utf-8: schema: $ref: "#/components/schemas/OBFundsConfirmationConsentResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBFundsConfirmationConsentResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBFundsConfirmationConsentResponse1" 204FundsConfirmationConsentsConsentIdDeleted: description: "Funds Confirmation Consent Deleted" headers: @@ -266,6 +278,12 @@ components: application/json; charset=utf-8: schema: $ref: "#/components/schemas/OBFundsConfirmationResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBFundsConfirmationResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBFundsConfirmationResponse1" 400Error: description: "Bad request" headers: @@ -278,6 +296,12 @@ components: application/json; charset=utf-8: schema: $ref: "#/components/schemas/OBErrorResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBErrorResponse1" 401Error: description: "Unauthorized" headers: @@ -298,6 +322,12 @@ components: application/json; charset=utf-8: schema: $ref: "#/components/schemas/OBErrorResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBErrorResponse1" 404Error: description: "Not found" headers: @@ -353,6 +383,12 @@ components: application/json; charset=utf-8: schema: $ref: "#/components/schemas/OBErrorResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBErrorResponse1" securitySchemes: TPPOAuth2Security: type: "oauth2" diff --git a/src/main/resources/specification/events-openapi.yaml b/src/main/resources/specification/events-openapi.yaml index 2305dd1..0399b6d 100644 --- a/src/main/resources/specification/events-openapi.yaml +++ b/src/main/resources/specification/events-openapi.yaml @@ -223,7 +223,7 @@ paths: 406: $ref: "#/components/responses/406Error" 415: - $ref: "/responses/415Error" + $ref: "#/components/responses/415Error" 429: $ref: "#/components/responses/429Error" 500: diff --git a/src/main/resources/specification/vrp-openapi.yaml b/src/main/resources/specification/vrp-openapi.yaml index 812784f..9671af2 100644 --- a/src/main/resources/specification/vrp-openapi.yaml +++ b/src/main/resources/specification/vrp-openapi.yaml @@ -1,64 +1,723 @@ openapi: 3.0.0 + +servers: + - url: https://tbc.com + description: abstract server + info: title: OBIE VRP Profile description: VRP OpenAPI Specification version: 3.1.8 + termsOfService: "https://www.openbanking.org.uk/terms" + contact: + name: "Service Desk" + email: "ServiceDesk@openbanking.org.uk" + license: + name: "open-licence" + url: "https://www.openbanking.org.uk/open-licence" tags: - - name: variable-recurring-payments + - name: "Domestic VRP Consents" + - name: "Domestic VRPs" + paths: /domestic-vrp-consents: post: + operationId: domesticVrpConsentsPost tags: - - variable-recurring-payments - summary: create a domestic vrp - description: create a domestic vrp + - "Domestic VRP Consents" + + summary: Create a domestic VRP consent + description: Create a domestic VRP consent + parameters: + - $ref: "#/components/parameters/x-fapi-auth-date" + - $ref: "#/components/parameters/x-fapi-customer-ip-address" + - $ref: "#/components/parameters/x-fapi-interaction-id" + - $ref: "#/components/parameters/Authorization" + - $ref: "#/components/parameters/x-idempotency-key" + - $ref: "#/components/parameters/x-jws-signature" + - $ref: "#/components/parameters/x-customer-user-agent" + responses: '201': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/OBDomesticVRPConsentResponse' + $ref: "#/components/responses/20xOBDomesticVRPConsentResponse" + '400': + $ref: "#/components/responses/400Error" + '401': + $ref: "#/components/responses/401Error" + '403': + $ref: "#/components/responses/403Error" + '405': + $ref: "#/components/responses/405Error" + '406': + $ref: "#/components/responses/406Error" + '415': + $ref: "#/components/responses/415Error" + '429': + $ref: "#/components/responses/429Error" + '500': + $ref: "#/components/responses/InternalError" + + requestBody: + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBDomesticVRPConsentRequest" + application/json: + schema: + $ref: "#/components/schemas/OBDomesticVRPConsentRequest" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBDomesticVRPConsentRequest" + description: "Default" + required: true - /domestic-vrp-consents/:consentId: + security: + - TPPOAuth2Security: + - "payments" + + /domestic-vrp-consents/{ConsentId}: get: + operationId: domesticVrpConsentsGet tags: - - variable-recurring-payments - summary: create a domestic vrp - description: create a domestic vrp + - "Domestic VRP Consents" + + summary: Retrieve a domestic VRP consent + description: Retrieve a domestic VRP consent + parameters: + - $ref: "#/components/parameters/ConsentId" + - $ref: "#/components/parameters/x-fapi-auth-date" + - $ref: "#/components/parameters/x-fapi-customer-ip-address" + - $ref: "#/components/parameters/x-fapi-interaction-id" + - $ref: "#/components/parameters/Authorization" + - $ref: "#/components/parameters/x-customer-user-agent" + responses: '200': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/OBDomesticVRPConsentResponse' + $ref: "#/components/responses/20xOBDomesticVRPConsentResponse" + '400': + $ref: "#/components/responses/400Error" + '401': + $ref: "#/components/responses/401Error" + '403': + $ref: "#/components/responses/403Error" + '405': + $ref: "#/components/responses/405Error" + '406': + $ref: "#/components/responses/406Error" + '415': + $ref: "#/components/responses/415Error" + '429': + $ref: "#/components/responses/429Error" + '500': + $ref: "#/components/responses/InternalError" + + security: + - TPPOAuth2Security: + - "payments" delete: + operationId: domesticVrpConsentsDelete tags: - - variable-recurring-payments - summary: create a domestic vrp - description: create a domestic vrp + - "Domestic VRP Consents" + + summary: Delete a domestic VRP + description: Delete a domestic VRP + parameters: + - $ref: "#/components/parameters/ConsentId" + - $ref: "#/components/parameters/x-fapi-auth-date" + - $ref: "#/components/parameters/x-fapi-customer-ip-address" + - $ref: "#/components/parameters/x-fapi-interaction-id" + - $ref: "#/components/parameters/Authorization" + - $ref: "#/components/parameters/x-customer-user-agent" + responses: '204': - description: 'all good' + description: 'delete successful' + '400': + $ref: "#/components/responses/400Error" + '401': + $ref: "#/components/responses/401Error" + '403': + $ref: "#/components/responses/403Error" + '405': + $ref: "#/components/responses/405Error" + '406': + $ref: "#/components/responses/406Error" + '415': + $ref: "#/components/responses/415Error" + '429': + $ref: "#/components/responses/429Error" + '500': + $ref: "#/components/responses/InternalError" + + security: + - TPPOAuth2Security: + - "payments" + + /domestic-vrp-consents/{ConsentId}/funds-confirmation: + post: + operationId: domesticVrpConsentsFundsConfirmation + + tags: + - "Domestic VRP Consents" + summary: Confirm availability of funds for a VRP + description: Confirm availability of funds for a VRP + + parameters: + - $ref: "#/components/parameters/ConsentId" + - $ref: "#/components/parameters/x-fapi-auth-date" + - $ref: "#/components/parameters/x-fapi-customer-ip-address" + - $ref: "#/components/parameters/x-fapi-interaction-id" + - $ref: "#/components/parameters/Authorization" + - $ref: "#/components/parameters/x-jws-signature" + - $ref: "#/components/parameters/x-customer-user-agent" + + responses: + '201': + $ref: "#/components/responses/201OBDomesticVRPFundsConfirmationResponse" + '400': + $ref: "#/components/responses/400Error" + '401': + $ref: "#/components/responses/401Error" + '403': + $ref: "#/components/responses/403Error" + '405': + $ref: "#/components/responses/405Error" + '406': + $ref: "#/components/responses/406Error" + '415': + $ref: "#/components/responses/415Error" + '429': + $ref: "#/components/responses/429Error" + '500': + $ref: "#/components/responses/InternalError" + + requestBody: + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBVRPFundsConfirmationRequest" + application/json: + schema: + $ref: "#/components/schemas/OBVRPFundsConfirmationRequest" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBVRPFundsConfirmationRequest" + description: "Default" + required: true - /domestic-vrp-consents/:consentId/funds-confirmation: + security: + - TPPOAuth2Security: + - "payments" + + /domestic-vrps: post: + operationId: domesticVrpPost + tags: + - "Domestic VRPs" + summary: Create a domestic VRP + description: Create a domestic VRP + parameters: + - $ref: "#/components/parameters/x-fapi-auth-date" + - $ref: "#/components/parameters/x-fapi-customer-ip-address" + - $ref: "#/components/parameters/x-fapi-interaction-id" + - $ref: "#/components/parameters/Authorization" + - $ref: "#/components/parameters/x-jws-signature" + - $ref: "#/components/parameters/x-customer-user-agent" + + responses: + '201': + $ref: "#/components/responses/20xOBDomesticVRPResponse" + '400': + $ref: "#/components/responses/400Error" + '401': + $ref: "#/components/responses/401Error" + '403': + $ref: "#/components/responses/403Error" + '405': + $ref: "#/components/responses/405Error" + '406': + $ref: "#/components/responses/406Error" + '415': + $ref: "#/components/responses/415Error" + '429': + $ref: "#/components/responses/429Error" + '500': + $ref: "#/components/responses/InternalError" + + requestBody: + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBDomesticVRPRequest" + application/json: + schema: + $ref: "#/components/schemas/OBDomesticVRPRequest" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBDomesticVRPRequest" + description: "Default" + required: true + + security: + - TPPOAuth2Security: + - "payments" + + /domestic-vrps/{DomesticVRPId}: + get: + operationId: domesticVrpGet + tags: + - "Domestic VRPs" + summary: Retrieve a domestic VRP + description: Retrieve a domestic VRP + parameters: + - $ref: "#/components/parameters/DomesticVRPId" + - $ref: "#/components/parameters/x-fapi-auth-date" + - $ref: "#/components/parameters/x-fapi-customer-ip-address" + - $ref: "#/components/parameters/x-fapi-interaction-id" + - $ref: "#/components/parameters/Authorization" + - $ref: "#/components/parameters/x-customer-user-agent" + + responses: + '200': + $ref: "#/components/responses/20xOBDomesticVRPResponse" + '400': + $ref: "#/components/responses/400Error" + '401': + $ref: "#/components/responses/401Error" + '403': + $ref: "#/components/responses/403Error" + '405': + $ref: "#/components/responses/405Error" + '406': + $ref: "#/components/responses/406Error" + '415': + $ref: "#/components/responses/415Error" + '429': + $ref: "#/components/responses/429Error" + '500': + $ref: "#/components/responses/InternalError" + + security: + - TPPOAuth2Security: + - "payments" + + /domestic-vrps/{DomesticVRPId}/payment-details: + get: + operationId: domesticVrpPaymentDetailsGet tags: - - variable-recurring-payments - summary: create a domestic vrp - description: create a domestic vrp + - "Domestic VRPs" + summary: Retrieve a domestic VRP + description: Retrieve a domestic VRP + parameters: + - $ref: "#/components/parameters/DomesticVRPId" + - $ref: "#/components/parameters/x-fapi-auth-date" + - $ref: "#/components/parameters/x-fapi-customer-ip-address" + - $ref: "#/components/parameters/x-fapi-interaction-id" + - $ref: "#/components/parameters/Authorization" + - $ref: "#/components/parameters/x-customer-user-agent" + responses: '200': - description: '' - content: - application/json: - schema: - $ref: '#components/schemas/OBVRPFundsConfirmationResponse' + $ref: "#/components/responses/20xOBDomesticVRPRequestDetailResponse" + '400': + $ref: "#/components/responses/400Error" + '401': + $ref: "#/components/responses/401Error" + '403': + $ref: "#/components/responses/403Error" + '405': + $ref: "#/components/responses/405Error" + '406': + $ref: "#/components/responses/406Error" + '415': + $ref: "#/components/responses/415Error" + '429': + $ref: "#/components/responses/429Error" + '500': + $ref: "#/components/responses/InternalError" + + security: + - TPPOAuth2Security: + - "payments" components: + responses: + 400Error: + description: "Bad request" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + x-jws-signature: + description: "Header containing a detached JWS signature of the body of the payload." + required: true + schema: + type: "string" + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + 401Error: + description: "Unauthorized" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + 403Error: + description: "Forbidden" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + x-jws-signature: + description: "Header containing a detached JWS signature of the body of the payload." + required: true + schema: + type: "string" + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + 404Error: + description: "Not found" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + 405Error: + description: "Method Not Allowed" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + 406Error: + description: "Not Acceptable" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + 415Error: + description: "Unsupported Media Type" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + 429Error: + description: "Too Many Requests" + headers: + Retry-After: + description: "Number in seconds to wait" + schema: + type: "integer" + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + + InternalError: + description: "Internal Server Error" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + x-jws-signature: + description: "Header containing a detached JWS signature of the body of the payload." + required: true + schema: + type: "string" + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/json: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBErrorResponse1" + + 20xOBDomesticVRPConsentResponse: + description: "Default response" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + x-jws-signature: + description: "Header containing a detached JWS signature of the body of the payload." + required: true + schema: + type: "string" + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBDomesticVRPConsentResponse" + application/json: + schema: + $ref: "#/components/schemas/OBDomesticVRPConsentResponse" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBDomesticVRPConsentResponse" + + 201OBDomesticVRPFundsConfirmationResponse: + description: "Default response" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + x-jws-signature: + description: "Header containing a detached JWS signature of the body of the payload." + required: true + schema: + type: "string" + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBVRPFundsConfirmationResponse" + application/json: + schema: + $ref: "#/components/schemas/OBVRPFundsConfirmationResponse" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBVRPFundsConfirmationResponse" + + 20xOBDomesticVRPResponse: + description: "Default response" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + x-jws-signature: + description: "Header containing a detached JWS signature of the body of the payload." + required: true + schema: + type: "string" + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBDomesticVRPResponse" + application/json: + schema: + $ref: "#/components/schemas/OBDomesticVRPResponse" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBDomesticVRPResponse" + + 20xOBDomesticVRPRequestDetailResponse: + description: "Default response" + headers: + x-fapi-interaction-id: + description: "An RFC4122 UID used as a correlation id." + required: true + schema: + type: "string" + x-jws-signature: + description: "Header containing a detached JWS signature of the body of the payload." + required: true + schema: + type: "string" + content: + application/json; charset=utf-8: + schema: + $ref: "#/components/schemas/OBDomesticVRPDetails" + application/json: + schema: + $ref: "#/components/schemas/OBDomesticVRPDetails" + application/jose+jwe: + schema: + $ref: "#/components/schemas/OBDomesticVRPDetails" + + + + parameters: + ConsentId: + name: "ConsentId" + in: "path" + description: "ConsentId" + required: true + schema: + type: "string" + DomesticVRPId: + name: "DomesticVRPId" + in: "path" + description: "DomesticVRPId" + required: true + schema: + type: "string" + Authorization: + in: "header" + name: "Authorization" + required: true + description: "An Authorisation Token as per https://tools.ietf.org/html/rfc6750" + schema: + type: "string" + x-customer-user-agent: + in: "header" + name: "x-customer-user-agent" + description: "Indicates the user-agent that the PSU is using." + required: false + schema: + type: "string" + x-fapi-customer-ip-address: + in: "header" + name: "x-fapi-customer-ip-address" + required: false + description: "The PSU's IP address if the PSU is currently logged in with the TPP." + schema: + type: "string" + x-fapi-auth-date: + in: "header" + name: "x-fapi-auth-date" + required: false + description: "The time when the PSU last logged in with the TPP. \nAll dates in the HTTP headers are represented as RFC 7231 Full Dates. An example is below: \nSun, 10 Sep 2017 19:43:31 UTC" + schema: + type: "string" + pattern: "^(Mon|Tue|Wed|Thu|Fri|Sat|Sun), \\d{2} (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \\d{4} \\d{2}:\\d{2}:\\d{2} (GMT|UTC)$" + x-fapi-interaction-id: + in: "header" + name: "x-fapi-interaction-id" + required: false + description: "An RFC4122 UID used as a correlation id." + schema: + type: "string" + x-idempotency-key: + name: "x-idempotency-key" + in: "header" + description: "Every request will be processed only once per x-idempotency-key. The\nIdempotency Key will be valid for 24 hours.\n" + required: true + schema: + type: "string" + maxLength: 40 + pattern: "^(?!\\s)(.*)(\\S)$" + x-jws-signature: + in: "header" + name: "x-jws-signature" + required: true + description: "A detached JWS signature of the body of the payload." + schema: + type: "string" + schemas: + OBError1: + type: "object" + additionalProperties: false + properties: + ErrorCode: + description: "Low level textual error code, e.g., UK.OBIE.Field.Missing" + type: "string" + x-namespaced-enum: + - "UK.OBIE.Field.Expected" + - "UK.OBIE.Field.Invalid" + - "UK.OBIE.Field.InvalidDate" + - "UK.OBIE.Field.Missing" + - "UK.OBIE.Field.Unexpected" + - "UK.OBIE.Header.Invalid" + - "UK.OBIE.Header.Missing" + - "UK.OBIE.Reauthenticate" + - "UK.OBIE.Resource.ConsentMismatch" + - "UK.OBIE.Resource.InvalidConsentStatus" + - "UK.OBIE.Resource.InvalidFormat" + - "UK.OBIE.Resource.NotFound" + - "UK.OBIE.Rules.AfterCutOffDateTime" + - "UK.OBIE.Rules.DuplicateReference" + - "UK.OBIE.Rules.FailsControlParameters" + - "UK.OBIE.Signature.Invalid" + - "UK.OBIE.Signature.InvalidClaim" + - "UK.OBIE.Signature.Malformed" + - "UK.OBIE.Signature.Missing" + - "UK.OBIE.Signature.MissingClaim" + - "UK.OBIE.Signature.Unexpected" + - "UK.OBIE.UnexpectedError" + - "UK.OBIE.Unsupported.AccountIdentifier" + - "UK.OBIE.Unsupported.AccountSecondaryIdentifier" + - "UK.OBIE.Unsupported.Currency" + - "UK.OBIE.Unsupported.Frequency" + - "UK.OBIE.Unsupported.LocalInstrument" + - "UK.OBIE.Unsupported.Scheme" + Message: + description: "A description of the error that occurred. e.g., 'A mandatory field isn't supplied' or 'RequestedExecutionDateTime must be in future'\nOBIE doesn't standardise this field" + type: "string" + minLength: 1 + maxLength: 500 + Path: + description: "Recommended but optional reference to the JSON Path of the field with error, e.g., Data.Initiation.InstructedAmount.Currency" + type: "string" + minLength: 1 + maxLength: 500 + Url: + description: "URL to help remediate the problem, or provide more information, or to API Reference, or help etc" + type: "string" + required: + - "ErrorCode" + - "Message" + minProperties: 1 + + OBErrorResponse1: + description: "An array of detail error codes, and messages, and URLs to documentation to help remediation." + type: "object" + additionalProperties: false + properties: + Code: + description: "High level textual error code, to help categorize the errors." + type: "string" + minLength: 1 + maxLength: 40 + Id: + description: "A unique reference for the error instance, for audit purposes, in case of unknown/unclassified errors." + type: "string" + minLength: 1 + maxLength: 40 + Message: + description: "Brief Error message, e.g., 'There is something wrong with the request parameters provided'" + type: "string" + minLength: 1 + maxLength: 500 + Errors: + items: + $ref: "#/components/schemas/OBError1" + type: "array" + minItems: 1 + required: + - "Code" + - "Message" + - "Errors" + + OBDomesticVRPConsentResponse: type: object required: @@ -77,7 +736,6 @@ components: - StatusUpdateDateTime - ControlParameters - Initiation - - DebtorAccount properties: ReadRefundAccount: type: string @@ -109,6 +767,7 @@ components: Initiation: $ref: '#/components/schemas/OBDomesticVRPInitiation' DebtorAccount: + description: The value must be populated for GET responses once the consent is approved. $ref: '#/components/schemas/OBCashAccountDebtorWithName' Risk: $ref: '#/components/schemas/OBRisk1' @@ -375,8 +1034,6 @@ components: required: - Data - Risk - - Links - - Meta properties: Data: type: object @@ -940,4 +1597,4 @@ components: tokenUrl: https://authserver.example/token scopes: payments: Generic payment scope - \ No newline at end of file +