From 0f6ebead5570c1a0ec338e422ca7913caed78dae Mon Sep 17 00:00:00 2001 From: Patrick Marschik Date: Fri, 5 Feb 2021 12:54:06 +0100 Subject: [PATCH] update to latest schemas --- build.gradle | 2 +- .../client/model/callback/CallbackType.java | 30 +- .../model/callback/CustomerDataType.java | 39 ++- .../client/model/schedule/ObjectFactory.java | 8 + .../model/schedule/ScheduleRequestType.java | 30 +- .../model/schedule/ScheduleResultType.java | 32 +- .../model/schedule/StartScheduleType.java | 32 +- .../model/schedule/UpdateScheduleType.java | 278 ++++++++++++++++++ .../client/model/status/ObjectFactory.java | 102 ------- .../client/model/status/StatusType.java | 2 +- .../client/model/status/package-info.java | 2 +- .../ChargebackDataType.java | 2 +- .../ChargebackReversalDataType.java | 2 +- .../CreditcardDataType.java | 2 +- .../CustomerDataType.java | 2 +- .../{status => status_result}/ErrorType.java | 2 +- .../{status => status_result}/ErrorsType.java | 2 +- .../ExtraDataType.java | 2 +- .../{status => status_result}/GenderType.java | 2 +- .../IbanDataType.java | 2 +- .../model/status_result/ObjectFactory.java | 137 +++++++++ .../PhoneDataType.java | 2 +- .../ReturnDataType.java | 2 +- .../ReturnDataTypeEnum.java | 2 +- .../ScheduleStatusType.java | 2 +- .../StatusResultType.java | 34 ++- .../ThreeDSecureType.java | 2 +- .../TransactionMethodType.java | 2 +- .../TransactionStatusType.java | 2 +- .../model/status_result/package-info.java | 2 + .../client/model/transaction/PayoutType.java | 89 +++++- .../model/transaction/RegisterType.java | 31 +- .../model/transaction/ScheduleType.java | 32 +- .../transaction/TransactionIndicatorType.java | 4 +- .../xjc/resources/META-INF/sun-jaxb.episode | 39 +-- .../client/model/GatewayModelTypes.java | 2 +- .../ixopay/client/bindings/java-ixopay.xjb | 4 +- .../com/ixopay/client/schemas/callback.xsd | 2 + .../com/ixopay/client/schemas/schedule.xsd | 19 ++ .../ixopay/client/schemas/scheduleResult.xsd | 1 + .../ixopay/client/schemas/statusResult.xsd | 1 + .../com/ixopay/client/schemas/transaction.xsd | 10 +- 42 files changed, 832 insertions(+), 164 deletions(-) create mode 100644 build/generated/sources/xjc/java/com/ixopay/client/model/schedule/UpdateScheduleType.java rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ChargebackDataType.java (99%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ChargebackReversalDataType.java (99%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/CreditcardDataType.java (99%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/CustomerDataType.java (99%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ErrorType.java (98%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ErrorsType.java (97%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ExtraDataType.java (97%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/GenderType.java (93%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/IbanDataType.java (98%) create mode 100644 build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ObjectFactory.java rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/PhoneDataType.java (98%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ReturnDataType.java (98%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ReturnDataTypeEnum.java (96%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ScheduleStatusType.java (96%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/StatusResultType.java (92%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/ThreeDSecureType.java (94%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/TransactionMethodType.java (97%) rename build/generated/sources/xjc/java/com/ixopay/client/model/{status => status_result}/TransactionStatusType.java (95%) create mode 100644 build/generated/sources/xjc/java/com/ixopay/client/model/status_result/package-info.java diff --git a/build.gradle b/build.gradle index cbab049..192eaac 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group = "com.ixopay" -version = "2.1.1" +version = "2.2.0" sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/callback/CallbackType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/callback/CallbackType.java index 476417d..04cbb59 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/callback/CallbackType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/callback/CallbackType.java @@ -32,6 +32,7 @@ * <element name="currency" type="{http://gateway.ixopay.com/Schema/V2/Callback}currencyType" minOccurs="0"/> * <element name="scheduleId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="scheduleStatus" type="{http://gateway.ixopay.com/Schema/V2/Callback}scheduleStatusType" minOccurs="0"/> + * <element name="scheduleMerchantMetaData" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="customerProfile" type="{http://gateway.ixopay.com/Schema/V2/Callback}customerProfileDataType" minOccurs="0"/> * <element name="errors" type="{http://gateway.ixopay.com/Schema/V2/Callback}errorsType" minOccurs="0"/> * <element name="chargebackData" type="{http://gateway.ixopay.com/Schema/V2/Callback}chargebackDataType" minOccurs="0"/> @@ -60,6 +61,7 @@ "currency", "scheduleId", "scheduleStatus", + "scheduleMerchantMetaData", "customerProfile", "errors", "chargebackData", @@ -86,6 +88,7 @@ public class CallbackType { protected String scheduleId; @XmlSchemaType(name = "string") protected ScheduleStatusType scheduleStatus; + protected String scheduleMerchantMetaData; protected CustomerProfileDataType customerProfile; protected ErrorsType errors; protected ChargebackDataType chargebackData; @@ -107,7 +110,7 @@ public CallbackType() { * Fully-initialising value constructor * */ - public CallbackType(final ResultType result, final String referenceId, final String transactionId, final String purchaseId, final TransactionMethodType transactionType, final String paymentMethod, final BigDecimal amount, final String currency, final String scheduleId, final ScheduleStatusType scheduleStatus, final CustomerProfileDataType customerProfile, final ErrorsType errors, final ChargebackDataType chargebackData, final ChargebackReversalDataType chargebackReversalData, final List extraData, final String merchantMetaData, final ReturnDataType returnData, final CustomerDataType customerData) { + public CallbackType(final ResultType result, final String referenceId, final String transactionId, final String purchaseId, final TransactionMethodType transactionType, final String paymentMethod, final BigDecimal amount, final String currency, final String scheduleId, final ScheduleStatusType scheduleStatus, final String scheduleMerchantMetaData, final CustomerProfileDataType customerProfile, final ErrorsType errors, final ChargebackDataType chargebackData, final ChargebackReversalDataType chargebackReversalData, final List extraData, final String merchantMetaData, final ReturnDataType returnData, final CustomerDataType customerData) { this.result = result; this.referenceId = referenceId; this.transactionId = transactionId; @@ -118,6 +121,7 @@ public CallbackType(final ResultType result, final String referenceId, final Str this.currency = currency; this.scheduleId = scheduleId; this.scheduleStatus = scheduleStatus; + this.scheduleMerchantMetaData = scheduleMerchantMetaData; this.customerProfile = customerProfile; this.errors = errors; this.chargebackData = chargebackData; @@ -368,6 +372,30 @@ public void setScheduleStatus(ScheduleStatusType value) { this.scheduleStatus = value; } + /** + * Gets the value of the scheduleMerchantMetaData property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScheduleMerchantMetaData() { + return scheduleMerchantMetaData; + } + + /** + * Sets the value of the scheduleMerchantMetaData property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScheduleMerchantMetaData(String value) { + this.scheduleMerchantMetaData = value; + } + /** * Gets the value of the customerProfile property. * diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/callback/CustomerDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/callback/CustomerDataType.java index b4cad38..2aabab9 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/callback/CustomerDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/callback/CustomerDataType.java @@ -1,6 +1,8 @@ package com.ixopay.client.model.callback; +import java.util.ArrayList; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlSchemaType; @@ -45,6 +47,7 @@ * <element name="emailVerified" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="ipAddress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="nationalId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="extraData" type="{http://gateway.ixopay.com/Schema/V2/Callback}extraDataType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -81,7 +84,8 @@ "email", "emailVerified", "ipAddress", - "nationalId" + "nationalId", + "extraData" }) public class CustomerDataType { @@ -114,6 +118,7 @@ public class CustomerDataType { protected Boolean emailVerified; protected String ipAddress; protected String nationalId; + protected List extraData; /** * Default no-arg constructor @@ -127,7 +132,7 @@ public CustomerDataType() { * Fully-initialising value constructor * */ - public CustomerDataType(final String identification, final String firstName, final String lastName, final XMLGregorianCalendar birthDate, final GenderType gender, final String billingAddress1, final String billingAddress2, final String billingCity, final String billingPostcode, final String billingState, final String billingCountry, final String billingPhone, final String shippingFirstName, final String shippingLastName, final String shippingCompany, final String shippingAddress1, final String shippingAddress2, final String shippingCity, final String shippingPostcode, final String shippingState, final String shippingCountry, final String shippingPhone, final String company, final String email, final Boolean emailVerified, final String ipAddress, final String nationalId) { + public CustomerDataType(final String identification, final String firstName, final String lastName, final XMLGregorianCalendar birthDate, final GenderType gender, final String billingAddress1, final String billingAddress2, final String billingCity, final String billingPostcode, final String billingState, final String billingCountry, final String billingPhone, final String shippingFirstName, final String shippingLastName, final String shippingCompany, final String shippingAddress1, final String shippingAddress2, final String shippingCity, final String shippingPostcode, final String shippingState, final String shippingCountry, final String shippingPhone, final String company, final String email, final Boolean emailVerified, final String ipAddress, final String nationalId, final List extraData) { this.identification = identification; this.firstName = firstName; this.lastName = lastName; @@ -155,6 +160,7 @@ public CustomerDataType(final String identification, final String firstName, fin this.emailVerified = emailVerified; this.ipAddress = ipAddress; this.nationalId = nationalId; + this.extraData = extraData; } /** @@ -805,4 +811,33 @@ public void setNationalId(String value) { this.nationalId = value; } + /** + * Gets the value of the extraData property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the extraData property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getExtraData().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link ExtraDataType } + * + * + */ + public List getExtraData() { + if (extraData == null) { + extraData = new ArrayList(); + } + return this.extraData; + } + } diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ObjectFactory.java b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ObjectFactory.java index 331ff5f..4a83a65 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ObjectFactory.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ObjectFactory.java @@ -50,6 +50,14 @@ public StartScheduleType createStartScheduleType() { return new StartScheduleType(); } + /** + * Create an instance of {@link UpdateScheduleType } + * + */ + public UpdateScheduleType createUpdateScheduleType() { + return new UpdateScheduleType(); + } + /** * Create an instance of {@link ShowScheduleType } * diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ScheduleRequestType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ScheduleRequestType.java index 31be18d..8f3d754 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ScheduleRequestType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ScheduleRequestType.java @@ -22,6 +22,7 @@ * <element name="password" type="{http://www.w3.org/2001/XMLSchema}string"/> * <choice> * <element name="startSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}startScheduleType"/> + * <element name="updateSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}updateScheduleType"/> * <element name="showSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}showScheduleType"/> * <element name="pauseSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}pauseScheduleType"/> * <element name="continueSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}continueScheduleType"/> @@ -40,6 +41,7 @@ "username", "password", "startSchedule", + "updateSchedule", "showSchedule", "pauseSchedule", "continueSchedule", @@ -53,6 +55,7 @@ public class ScheduleRequestType { @XmlElement(required = true) protected String password; protected StartScheduleType startSchedule; + protected UpdateScheduleType updateSchedule; protected ShowScheduleType showSchedule; protected PauseScheduleType pauseSchedule; protected ContinueScheduleType continueSchedule; @@ -70,10 +73,11 @@ public ScheduleRequestType() { * Fully-initialising value constructor * */ - public ScheduleRequestType(final String username, final String password, final StartScheduleType startSchedule, final ShowScheduleType showSchedule, final PauseScheduleType pauseSchedule, final ContinueScheduleType continueSchedule, final CancelScheduleType cancelSchedule) { + public ScheduleRequestType(final String username, final String password, final StartScheduleType startSchedule, final UpdateScheduleType updateSchedule, final ShowScheduleType showSchedule, final PauseScheduleType pauseSchedule, final ContinueScheduleType continueSchedule, final CancelScheduleType cancelSchedule) { this.username = username; this.password = password; this.startSchedule = startSchedule; + this.updateSchedule = updateSchedule; this.showSchedule = showSchedule; this.pauseSchedule = pauseSchedule; this.continueSchedule = continueSchedule; @@ -152,6 +156,30 @@ public void setStartSchedule(StartScheduleType value) { this.startSchedule = value; } + /** + * Gets the value of the updateSchedule property. + * + * @return + * possible object is + * {@link UpdateScheduleType } + * + */ + public UpdateScheduleType getUpdateSchedule() { + return updateSchedule; + } + + /** + * Sets the value of the updateSchedule property. + * + * @param value + * allowed object is + * {@link UpdateScheduleType } + * + */ + public void setUpdateSchedule(UpdateScheduleType value) { + this.updateSchedule = value; + } + /** * Gets the value of the showSchedule property. * diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ScheduleResultType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ScheduleResultType.java index 2a3ec78..b48186b 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ScheduleResultType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/ScheduleResultType.java @@ -25,6 +25,7 @@ * <element name="newStatus" type="{http://gateway.ixopay.com/Schema/V2/ScheduleResult}scheduleStatusType" minOccurs="0"/> * <element name="scheduledAt" type="{http://gateway.ixopay.com/Schema/V2/ScheduleResult}scheduleDateTime" minOccurs="0"/> * <element name="errors" type="{http://gateway.ixopay.com/Schema/V2/ScheduleResult}errorsType" minOccurs="0"/> + * <element name="merchantMetaData" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -41,7 +42,8 @@ "oldStatus", "newStatus", "scheduledAt", - "errors" + "errors", + "merchantMetaData" }) @XmlRootElement(name = "schedule") public class ScheduleResultType { @@ -55,6 +57,7 @@ public class ScheduleResultType { protected ScheduleStatusType newStatus; protected String scheduledAt; protected ErrorsType errors; + protected String merchantMetaData; /** * Default no-arg constructor @@ -68,7 +71,7 @@ public ScheduleResultType() { * Fully-initialising value constructor * */ - public ScheduleResultType(final boolean operationSuccess, final String scheduleId, final String registrationId, final ScheduleStatusType oldStatus, final ScheduleStatusType newStatus, final String scheduledAt, final ErrorsType errors) { + public ScheduleResultType(final boolean operationSuccess, final String scheduleId, final String registrationId, final ScheduleStatusType oldStatus, final ScheduleStatusType newStatus, final String scheduledAt, final ErrorsType errors, final String merchantMetaData) { this.operationSuccess = operationSuccess; this.scheduleId = scheduleId; this.registrationId = registrationId; @@ -76,6 +79,7 @@ public ScheduleResultType(final boolean operationSuccess, final String scheduleI this.newStatus = newStatus; this.scheduledAt = scheduledAt; this.errors = errors; + this.merchantMetaData = merchantMetaData; } /** @@ -238,4 +242,28 @@ public void setErrors(ErrorsType value) { this.errors = value; } + /** + * Gets the value of the merchantMetaData property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMerchantMetaData() { + return merchantMetaData; + } + + /** + * Sets the value of the merchantMetaData property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMerchantMetaData(String value) { + this.merchantMetaData = value; + } + } diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/StartScheduleType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/StartScheduleType.java index ab45b8b..c7ced60 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/StartScheduleType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/StartScheduleType.java @@ -25,6 +25,7 @@ * <element name="periodLength" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/> * <element name="periodUnit" type="{http://gateway.ixopay.com/Schema/V2/Schedule}periodUnitType"/> * <element name="startDateTime" type="{http://gateway.ixopay.com/Schema/V2/Schedule}scheduleDateTime"/> + * <element name="merchantMetaData" type="{http://gateway.ixopay.com/Schema/V2/Schedule}merchantMetaDataType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -40,7 +41,8 @@ "currency", "periodLength", "periodUnit", - "startDateTime" + "startDateTime", + "merchantMetaData" }) public class StartScheduleType { @@ -57,6 +59,7 @@ public class StartScheduleType { protected PeriodUnitType periodUnit; @XmlElement(required = true) protected String startDateTime; + protected String merchantMetaData; /** * Default no-arg constructor @@ -70,13 +73,14 @@ public StartScheduleType() { * Fully-initialising value constructor * */ - public StartScheduleType(final String registrationId, final BigDecimal amount, final String currency, final long periodLength, final PeriodUnitType periodUnit, final String startDateTime) { + public StartScheduleType(final String registrationId, final BigDecimal amount, final String currency, final long periodLength, final PeriodUnitType periodUnit, final String startDateTime, final String merchantMetaData) { this.registrationId = registrationId; this.amount = amount; this.currency = currency; this.periodLength = periodLength; this.periodUnit = periodUnit; this.startDateTime = startDateTime; + this.merchantMetaData = merchantMetaData; } /** @@ -215,4 +219,28 @@ public void setStartDateTime(String value) { this.startDateTime = value; } + /** + * Gets the value of the merchantMetaData property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMerchantMetaData() { + return merchantMetaData; + } + + /** + * Sets the value of the merchantMetaData property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMerchantMetaData(String value) { + this.merchantMetaData = value; + } + } diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/UpdateScheduleType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/UpdateScheduleType.java new file mode 100644 index 0000000..edda141 --- /dev/null +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/schedule/UpdateScheduleType.java @@ -0,0 +1,278 @@ + +package com.ixopay.client.model.schedule; + +import java.math.BigDecimal; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for updateScheduleType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="updateScheduleType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="scheduleId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="registrationId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="amount" type="{http://gateway.ixopay.com/Schema/V2/Schedule}amountType" minOccurs="0"/>
+ *         <element name="currency" type="{http://gateway.ixopay.com/Schema/V2/Schedule}currencyType" minOccurs="0"/>
+ *         <element name="periodLength" type="{http://www.w3.org/2001/XMLSchema}unsignedInt" minOccurs="0"/>
+ *         <element name="periodUnit" type="{http://gateway.ixopay.com/Schema/V2/Schedule}periodUnitType" minOccurs="0"/>
+ *         <element name="startDateTime" type="{http://gateway.ixopay.com/Schema/V2/Schedule}scheduleDateTime" minOccurs="0"/>
+ *         <element name="merchantMetaData" type="{http://gateway.ixopay.com/Schema/V2/Schedule}merchantMetaDataType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "updateScheduleType", propOrder = { + "scheduleId", + "registrationId", + "amount", + "currency", + "periodLength", + "periodUnit", + "startDateTime", + "merchantMetaData" +}) +public class UpdateScheduleType { + + @XmlElement(required = true) + protected String scheduleId; + protected String registrationId; + protected BigDecimal amount; + protected String currency; + @XmlSchemaType(name = "unsignedInt") + protected Long periodLength; + @XmlSchemaType(name = "string") + protected PeriodUnitType periodUnit; + protected String startDateTime; + protected String merchantMetaData; + + /** + * Default no-arg constructor + * + */ + public UpdateScheduleType() { + super(); + } + + /** + * Fully-initialising value constructor + * + */ + public UpdateScheduleType(final String scheduleId, final String registrationId, final BigDecimal amount, final String currency, final Long periodLength, final PeriodUnitType periodUnit, final String startDateTime, final String merchantMetaData) { + this.scheduleId = scheduleId; + this.registrationId = registrationId; + this.amount = amount; + this.currency = currency; + this.periodLength = periodLength; + this.periodUnit = periodUnit; + this.startDateTime = startDateTime; + this.merchantMetaData = merchantMetaData; + } + + /** + * Gets the value of the scheduleId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScheduleId() { + return scheduleId; + } + + /** + * Sets the value of the scheduleId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScheduleId(String value) { + this.scheduleId = value; + } + + /** + * Gets the value of the registrationId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRegistrationId() { + return registrationId; + } + + /** + * Sets the value of the registrationId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRegistrationId(String value) { + this.registrationId = value; + } + + /** + * Gets the value of the amount property. + * + * @return + * possible object is + * {@link BigDecimal } + * + */ + public BigDecimal getAmount() { + return amount; + } + + /** + * Sets the value of the amount property. + * + * @param value + * allowed object is + * {@link BigDecimal } + * + */ + public void setAmount(BigDecimal value) { + this.amount = value; + } + + /** + * Gets the value of the currency property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCurrency() { + return currency; + } + + /** + * Sets the value of the currency property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCurrency(String value) { + this.currency = value; + } + + /** + * Gets the value of the periodLength property. + * + * @return + * possible object is + * {@link Long } + * + */ + public Long getPeriodLength() { + return periodLength; + } + + /** + * Sets the value of the periodLength property. + * + * @param value + * allowed object is + * {@link Long } + * + */ + public void setPeriodLength(Long value) { + this.periodLength = value; + } + + /** + * Gets the value of the periodUnit property. + * + * @return + * possible object is + * {@link PeriodUnitType } + * + */ + public PeriodUnitType getPeriodUnit() { + return periodUnit; + } + + /** + * Sets the value of the periodUnit property. + * + * @param value + * allowed object is + * {@link PeriodUnitType } + * + */ + public void setPeriodUnit(PeriodUnitType value) { + this.periodUnit = value; + } + + /** + * Gets the value of the startDateTime property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStartDateTime() { + return startDateTime; + } + + /** + * Sets the value of the startDateTime property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStartDateTime(String value) { + this.startDateTime = value; + } + + /** + * Gets the value of the merchantMetaData property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMerchantMetaData() { + return merchantMetaData; + } + + /** + * Sets the value of the merchantMetaData property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMerchantMetaData(String value) { + this.merchantMetaData = value; + } + +} diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ObjectFactory.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status/ObjectFactory.java index 81eae31..346a272 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ObjectFactory.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status/ObjectFactory.java @@ -25,7 +25,6 @@ public class ObjectFactory { private final static QName _Status_QNAME = new QName("http://gateway.ixopay.com/Schema/V2/Status", "status"); - private final static QName _StatusResult_QNAME = new QName("http://gateway.ixopay.com/Schema/V2/StatusResult", "statusResult"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.ixopay.client.model.status @@ -42,94 +41,6 @@ public StatusType createStatusType() { return new StatusType(); } - /** - * Create an instance of {@link StatusResultType } - * - */ - public StatusResultType createStatusResultType() { - return new StatusResultType(); - } - - /** - * Create an instance of {@link ExtraDataType } - * - */ - public ExtraDataType createExtraDataType() { - return new ExtraDataType(); - } - - /** - * Create an instance of {@link ErrorsType } - * - */ - public ErrorsType createErrorsType() { - return new ErrorsType(); - } - - /** - * Create an instance of {@link ErrorType } - * - */ - public ErrorType createErrorType() { - return new ErrorType(); - } - - /** - * Create an instance of {@link ChargebackDataType } - * - */ - public ChargebackDataType createChargebackDataType() { - return new ChargebackDataType(); - } - - /** - * Create an instance of {@link ChargebackReversalDataType } - * - */ - public ChargebackReversalDataType createChargebackReversalDataType() { - return new ChargebackReversalDataType(); - } - - /** - * Create an instance of {@link ReturnDataType } - * - */ - public ReturnDataType createReturnDataType() { - return new ReturnDataType(); - } - - /** - * Create an instance of {@link CreditcardDataType } - * - */ - public CreditcardDataType createCreditcardDataType() { - return new CreditcardDataType(); - } - - /** - * Create an instance of {@link PhoneDataType } - * - */ - public PhoneDataType createPhoneDataType() { - return new PhoneDataType(); - } - - /** - * Create an instance of {@link IbanDataType } - * - */ - public IbanDataType createIbanDataType() { - return new IbanDataType(); - } - - /** - * Create an instance of {@link CustomerDataType } - * - */ - public CustomerDataType createCustomerDataType() { - return new CustomerDataType(); - } - /** * Create an instance of {@link JAXBElement }{@code <}{@link StatusType }{@code >} * @@ -143,17 +54,4 @@ public JAXBElement createStatus(StatusType value) { return new JAXBElement(_Status_QNAME, StatusType.class, null, value); } - /** - * Create an instance of {@link JAXBElement }{@code <}{@link StatusResultType }{@code >} - * - * @param value - * Java instance representing xml element's value. - * @return - * the new instance of {@link JAXBElement }{@code <}{@link StatusResultType }{@code >} - */ - @XmlElementDecl(namespace = "http://gateway.ixopay.com/Schema/V2/StatusResult", name = "statusResult") - public JAXBElement createStatusResult(StatusResultType value) { - return new JAXBElement(_StatusResult_QNAME, StatusResultType.class, null, value); - } - } diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/StatusType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status/StatusType.java index 75a9bba..5714879 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/StatusType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status/StatusType.java @@ -33,7 +33,7 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "statusType", namespace = "http://gateway.ixopay.com/Schema/V2/Status", propOrder = { +@XmlType(name = "statusType", propOrder = { "username", "password", "transactionUuid", diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/package-info.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status/package-info.java index 7017fd7..a36b679 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/package-info.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://gateway.ixopay.com/Schema/V2/StatusResult", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@javax.xml.bind.annotation.XmlSchema(namespace = "http://gateway.ixopay.com/Schema/V2/Status", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package com.ixopay.client.model.status; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ChargebackDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ChargebackDataType.java similarity index 99% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ChargebackDataType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ChargebackDataType.java index 1ec4d72..c725d81 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ChargebackDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ChargebackDataType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import java.math.BigDecimal; import javax.xml.bind.annotation.XmlAccessType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ChargebackReversalDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ChargebackReversalDataType.java similarity index 99% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ChargebackReversalDataType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ChargebackReversalDataType.java index a8ec78c..a70df0c 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ChargebackReversalDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ChargebackReversalDataType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import java.math.BigDecimal; import javax.xml.bind.annotation.XmlAccessType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/CreditcardDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/CreditcardDataType.java similarity index 99% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/CreditcardDataType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/CreditcardDataType.java index 77eaa24..d76960b 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/CreditcardDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/CreditcardDataType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/CustomerDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/CustomerDataType.java similarity index 99% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/CustomerDataType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/CustomerDataType.java index 37420f9..d8fc2dd 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/CustomerDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/CustomerDataType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ErrorType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ErrorType.java similarity index 98% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ErrorType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ErrorType.java index e5d9d1d..1674c1a 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ErrorType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ErrorType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ErrorsType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ErrorsType.java similarity index 97% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ErrorsType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ErrorsType.java index 0dfd3d6..923a246 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ErrorsType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ErrorsType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import java.util.ArrayList; import java.util.List; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ExtraDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ExtraDataType.java similarity index 97% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ExtraDataType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ExtraDataType.java index f51c818..cbd93f5 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ExtraDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ExtraDataType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/GenderType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/GenderType.java similarity index 93% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/GenderType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/GenderType.java index 8bbcdf5..4ffa70d 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/GenderType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/GenderType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/IbanDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/IbanDataType.java similarity index 98% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/IbanDataType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/IbanDataType.java index ee40130..cab4803 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/IbanDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/IbanDataType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ObjectFactory.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ObjectFactory.java new file mode 100644 index 0000000..ba9a040 --- /dev/null +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ObjectFactory.java @@ -0,0 +1,137 @@ + +package com.ixopay.client.model.status_result; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.ixopay.client.model.status_result package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _StatusResult_QNAME = new QName("http://gateway.ixopay.com/Schema/V2/StatusResult", "statusResult"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.ixopay.client.model.status_result + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link StatusResultType } + * + */ + public StatusResultType createStatusResultType() { + return new StatusResultType(); + } + + /** + * Create an instance of {@link ExtraDataType } + * + */ + public ExtraDataType createExtraDataType() { + return new ExtraDataType(); + } + + /** + * Create an instance of {@link ErrorsType } + * + */ + public ErrorsType createErrorsType() { + return new ErrorsType(); + } + + /** + * Create an instance of {@link ErrorType } + * + */ + public ErrorType createErrorType() { + return new ErrorType(); + } + + /** + * Create an instance of {@link ChargebackDataType } + * + */ + public ChargebackDataType createChargebackDataType() { + return new ChargebackDataType(); + } + + /** + * Create an instance of {@link ChargebackReversalDataType } + * + */ + public ChargebackReversalDataType createChargebackReversalDataType() { + return new ChargebackReversalDataType(); + } + + /** + * Create an instance of {@link ReturnDataType } + * + */ + public ReturnDataType createReturnDataType() { + return new ReturnDataType(); + } + + /** + * Create an instance of {@link CreditcardDataType } + * + */ + public CreditcardDataType createCreditcardDataType() { + return new CreditcardDataType(); + } + + /** + * Create an instance of {@link PhoneDataType } + * + */ + public PhoneDataType createPhoneDataType() { + return new PhoneDataType(); + } + + /** + * Create an instance of {@link IbanDataType } + * + */ + public IbanDataType createIbanDataType() { + return new IbanDataType(); + } + + /** + * Create an instance of {@link CustomerDataType } + * + */ + public CustomerDataType createCustomerDataType() { + return new CustomerDataType(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link StatusResultType }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link StatusResultType }{@code >} + */ + @XmlElementDecl(namespace = "http://gateway.ixopay.com/Schema/V2/StatusResult", name = "statusResult") + public JAXBElement createStatusResult(StatusResultType value) { + return new JAXBElement(_StatusResult_QNAME, StatusResultType.class, null, value); + } + +} diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/PhoneDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/PhoneDataType.java similarity index 98% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/PhoneDataType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/PhoneDataType.java index e5145dc..ee979a7 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/PhoneDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/PhoneDataType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ReturnDataType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ReturnDataType.java similarity index 98% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ReturnDataType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ReturnDataType.java index 03345c2..17b4334 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ReturnDataType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ReturnDataType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ReturnDataTypeEnum.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ReturnDataTypeEnum.java similarity index 96% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ReturnDataTypeEnum.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ReturnDataTypeEnum.java index 71c35ec..1447b93 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ReturnDataTypeEnum.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ReturnDataTypeEnum.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ScheduleStatusType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ScheduleStatusType.java similarity index 96% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ScheduleStatusType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ScheduleStatusType.java index 05d1c40..0d991b1 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ScheduleStatusType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ScheduleStatusType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/StatusResultType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/StatusResultType.java similarity index 92% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/StatusResultType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/StatusResultType.java index 0705036..0698f2f 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/StatusResultType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/StatusResultType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import java.math.BigDecimal; import java.util.ArrayList; @@ -32,6 +32,7 @@ * <element name="currency" type="{http://gateway.ixopay.com/Schema/V2/StatusResult}currencyType" minOccurs="0"/> * <element name="scheduleId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="scheduleStatus" type="{http://gateway.ixopay.com/Schema/V2/StatusResult}scheduleStatusType" minOccurs="0"/> + * <element name="scheduleMerchantMetaData" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="errors" type="{http://gateway.ixopay.com/Schema/V2/StatusResult}errorsType" minOccurs="0"/> * <element name="chargebackData" type="{http://gateway.ixopay.com/Schema/V2/StatusResult}chargebackDataType" minOccurs="0"/> * <element name="chargebackReversalData" type="{http://gateway.ixopay.com/Schema/V2/StatusResult}chargebackReversalDataType" minOccurs="0"/> @@ -60,6 +61,7 @@ "currency", "scheduleId", "scheduleStatus", + "scheduleMerchantMetaData", "errors", "chargebackData", "chargebackReversalData", @@ -68,7 +70,7 @@ "returnData", "customerData" }) -@XmlRootElement(name = "status") +@XmlRootElement(name = "statusResult") public class StatusResultType { protected boolean operationSuccess; @@ -85,6 +87,7 @@ public class StatusResultType { protected String scheduleId; @XmlSchemaType(name = "string") protected ScheduleStatusType scheduleStatus; + protected String scheduleMerchantMetaData; protected ErrorsType errors; protected ChargebackDataType chargebackData; protected ChargebackReversalDataType chargebackReversalData; @@ -105,7 +108,7 @@ public StatusResultType() { * Fully-initialising value constructor * */ - public StatusResultType(final boolean operationSuccess, final TransactionStatusType transactionStatus, final String transactionUuid, final String merchantTransactionId, final String purchaseId, final TransactionMethodType transactionType, final String paymentMethod, final BigDecimal amount, final String currency, final String scheduleId, final ScheduleStatusType scheduleStatus, final ErrorsType errors, final ChargebackDataType chargebackData, final ChargebackReversalDataType chargebackReversalData, final List extraData, final String merchantMetaData, final ReturnDataType returnData, final CustomerDataType customerData) { + public StatusResultType(final boolean operationSuccess, final TransactionStatusType transactionStatus, final String transactionUuid, final String merchantTransactionId, final String purchaseId, final TransactionMethodType transactionType, final String paymentMethod, final BigDecimal amount, final String currency, final String scheduleId, final ScheduleStatusType scheduleStatus, final String scheduleMerchantMetaData, final ErrorsType errors, final ChargebackDataType chargebackData, final ChargebackReversalDataType chargebackReversalData, final List extraData, final String merchantMetaData, final ReturnDataType returnData, final CustomerDataType customerData) { this.operationSuccess = operationSuccess; this.transactionStatus = transactionStatus; this.transactionUuid = transactionUuid; @@ -117,6 +120,7 @@ public StatusResultType(final boolean operationSuccess, final TransactionStatusT this.currency = currency; this.scheduleId = scheduleId; this.scheduleStatus = scheduleStatus; + this.scheduleMerchantMetaData = scheduleMerchantMetaData; this.errors = errors; this.chargebackData = chargebackData; this.chargebackReversalData = chargebackReversalData; @@ -382,6 +386,30 @@ public void setScheduleStatus(ScheduleStatusType value) { this.scheduleStatus = value; } + /** + * Gets the value of the scheduleMerchantMetaData property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScheduleMerchantMetaData() { + return scheduleMerchantMetaData; + } + + /** + * Sets the value of the scheduleMerchantMetaData property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScheduleMerchantMetaData(String value) { + this.scheduleMerchantMetaData = value; + } + /** * Gets the value of the errors property. * diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ThreeDSecureType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ThreeDSecureType.java similarity index 94% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/ThreeDSecureType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ThreeDSecureType.java index eb94b98..e1ad6bc 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/ThreeDSecureType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/ThreeDSecureType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/TransactionMethodType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/TransactionMethodType.java similarity index 97% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/TransactionMethodType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/TransactionMethodType.java index 9ec87cc..6a5d1ec 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/TransactionMethodType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/TransactionMethodType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status/TransactionStatusType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/TransactionStatusType.java similarity index 95% rename from build/generated/sources/xjc/java/com/ixopay/client/model/status/TransactionStatusType.java rename to build/generated/sources/xjc/java/com/ixopay/client/model/status_result/TransactionStatusType.java index f1eabcf..b9c70f7 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/status/TransactionStatusType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/TransactionStatusType.java @@ -1,5 +1,5 @@ -package com.ixopay.client.model.status; +package com.ixopay.client.model.status_result; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/package-info.java b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/package-info.java new file mode 100644 index 0000000..20f76c7 --- /dev/null +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/status_result/package-info.java @@ -0,0 +1,2 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = "http://gateway.ixopay.com/Schema/V2/StatusResult", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package com.ixopay.client.model.status_result; diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/PayoutType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/PayoutType.java index 2ab8f99..fee44c4 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/PayoutType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/PayoutType.java @@ -20,8 +20,7 @@ * <extension base="{http://gateway.ixopay.com/Schema/V2/Transaction}baseTransactionWithReferenceType"> * <sequence> * <group ref="{http://gateway.ixopay.com/Schema/V2/Transaction}amountableGroup"/> - * <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="callbackUrl" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/> + * <group ref="{http://gateway.ixopay.com/Schema/V2/Transaction}offsiteGroup"/> * <group ref="{http://gateway.ixopay.com/Schema/V2/Transaction}itemsGroup"/> * </sequence> * </extension> @@ -36,6 +35,9 @@ "amount", "currency", "description", + "successUrl", + "cancelUrl", + "errorUrl", "callbackUrl", "items" }) @@ -47,6 +49,12 @@ public class PayoutType protected String currency; protected String description; @XmlSchemaType(name = "anyURI") + protected String successUrl; + @XmlSchemaType(name = "anyURI") + protected String cancelUrl; + @XmlSchemaType(name = "anyURI") + protected String errorUrl; + @XmlSchemaType(name = "anyURI") protected String callbackUrl; protected ItemsType items; @@ -62,11 +70,14 @@ public PayoutType() { * Fully-initialising value constructor * */ - public PayoutType(final String transactionToken, final String transactionId, final String additionalId1, final String additionalId2, final CustomerType customer, final CreditCardCustomerType creditCardCustomer, final IbanCustomerType ibanCustomer, final List extraData, final String merchantMetaData, final RequestType request, final String referenceTransactionId, final String referenceCustomerId, final String referenceId2, final String referenceId3, final String referenceId4, final BigDecimal amount, final String currency, final String description, final String callbackUrl, final ItemsType items) { + public PayoutType(final String transactionToken, final String transactionId, final String additionalId1, final String additionalId2, final CustomerType customer, final CreditCardCustomerType creditCardCustomer, final IbanCustomerType ibanCustomer, final List extraData, final String merchantMetaData, final RequestType request, final String referenceTransactionId, final String referenceCustomerId, final String referenceId2, final String referenceId3, final String referenceId4, final BigDecimal amount, final String currency, final String description, final String successUrl, final String cancelUrl, final String errorUrl, final String callbackUrl, final ItemsType items) { super(transactionToken, transactionId, additionalId1, additionalId2, customer, creditCardCustomer, ibanCustomer, extraData, merchantMetaData, request, referenceTransactionId, referenceCustomerId, referenceId2, referenceId3, referenceId4); this.amount = amount; this.currency = currency; this.description = description; + this.successUrl = successUrl; + this.cancelUrl = cancelUrl; + this.errorUrl = errorUrl; this.callbackUrl = callbackUrl; this.items = items; } @@ -143,6 +154,78 @@ public void setDescription(String value) { this.description = value; } + /** + * Gets the value of the successUrl property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSuccessUrl() { + return successUrl; + } + + /** + * Sets the value of the successUrl property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSuccessUrl(String value) { + this.successUrl = value; + } + + /** + * Gets the value of the cancelUrl property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCancelUrl() { + return cancelUrl; + } + + /** + * Sets the value of the cancelUrl property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCancelUrl(String value) { + this.cancelUrl = value; + } + + /** + * Gets the value of the errorUrl property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getErrorUrl() { + return errorUrl; + } + + /** + * Sets the value of the errorUrl property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setErrorUrl(String value) { + this.errorUrl = value; + } + /** * Gets the value of the callbackUrl property. * diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/RegisterType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/RegisterType.java index 68f173c..5f9a1fa 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/RegisterType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/RegisterType.java @@ -19,6 +19,7 @@ * <extension base="{http://gateway.ixopay.com/Schema/V2/Transaction}baseTransactionType"> * <sequence> * <group ref="{http://gateway.ixopay.com/Schema/V2/Transaction}offsiteGroup"/> + * <element name="transactionIndicator" type="{http://gateway.ixopay.com/Schema/V2/Transaction}transactionIndicatorType" minOccurs="0"/> * <element name="startSchedule" type="{http://gateway.ixopay.com/Schema/V2/Transaction}scheduleType" minOccurs="0"/> * <element name="addToCustomerProfile" type="{http://gateway.ixopay.com/Schema/V2/Transaction}addToCustomerProfileType" minOccurs="0"/> * </sequence> @@ -36,6 +37,7 @@ "cancelUrl", "errorUrl", "callbackUrl", + "transactionIndicator", "startSchedule", "addToCustomerProfile" }) @@ -52,6 +54,8 @@ public class RegisterType protected String errorUrl; @XmlSchemaType(name = "anyURI") protected String callbackUrl; + @XmlSchemaType(name = "string") + protected TransactionIndicatorType transactionIndicator; protected ScheduleType startSchedule; protected AddToCustomerProfileType addToCustomerProfile; @@ -67,13 +71,14 @@ public RegisterType() { * Fully-initialising value constructor * */ - public RegisterType(final String transactionToken, final String transactionId, final String additionalId1, final String additionalId2, final CustomerType customer, final CreditCardCustomerType creditCardCustomer, final IbanCustomerType ibanCustomer, final List extraData, final String merchantMetaData, final RequestType request, final String description, final String successUrl, final String cancelUrl, final String errorUrl, final String callbackUrl, final ScheduleType startSchedule, final AddToCustomerProfileType addToCustomerProfile) { + public RegisterType(final String transactionToken, final String transactionId, final String additionalId1, final String additionalId2, final CustomerType customer, final CreditCardCustomerType creditCardCustomer, final IbanCustomerType ibanCustomer, final List extraData, final String merchantMetaData, final RequestType request, final String description, final String successUrl, final String cancelUrl, final String errorUrl, final String callbackUrl, final TransactionIndicatorType transactionIndicator, final ScheduleType startSchedule, final AddToCustomerProfileType addToCustomerProfile) { super(transactionToken, transactionId, additionalId1, additionalId2, customer, creditCardCustomer, ibanCustomer, extraData, merchantMetaData, request); this.description = description; this.successUrl = successUrl; this.cancelUrl = cancelUrl; this.errorUrl = errorUrl; this.callbackUrl = callbackUrl; + this.transactionIndicator = transactionIndicator; this.startSchedule = startSchedule; this.addToCustomerProfile = addToCustomerProfile; } @@ -198,6 +203,30 @@ public void setCallbackUrl(String value) { this.callbackUrl = value; } + /** + * Gets the value of the transactionIndicator property. + * + * @return + * possible object is + * {@link TransactionIndicatorType } + * + */ + public TransactionIndicatorType getTransactionIndicator() { + return transactionIndicator; + } + + /** + * Sets the value of the transactionIndicator property. + * + * @param value + * allowed object is + * {@link TransactionIndicatorType } + * + */ + public void setTransactionIndicator(TransactionIndicatorType value) { + this.transactionIndicator = value; + } + /** * Gets the value of the startSchedule property. * diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/ScheduleType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/ScheduleType.java index 104e2ea..1eeccd6 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/ScheduleType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/ScheduleType.java @@ -24,6 +24,7 @@ * <element name="periodLength" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/> * <element name="periodUnit" type="{http://gateway.ixopay.com/Schema/V2/Transaction}periodUnitType"/> * <element name="startDateTime" type="{http://gateway.ixopay.com/Schema/V2/Transaction}scheduleDateTime" minOccurs="0"/> + * <element name="merchantMetaData" type="{http://gateway.ixopay.com/Schema/V2/Transaction}merchantMetaDataType" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -38,7 +39,8 @@ "currency", "periodLength", "periodUnit", - "startDateTime" + "startDateTime", + "merchantMetaData" }) public class ScheduleType { @@ -52,6 +54,7 @@ public class ScheduleType { @XmlSchemaType(name = "string") protected PeriodUnitType periodUnit; protected String startDateTime; + protected String merchantMetaData; /** * Default no-arg constructor @@ -65,12 +68,13 @@ public ScheduleType() { * Fully-initialising value constructor * */ - public ScheduleType(final BigDecimal amount, final String currency, final long periodLength, final PeriodUnitType periodUnit, final String startDateTime) { + public ScheduleType(final BigDecimal amount, final String currency, final long periodLength, final PeriodUnitType periodUnit, final String startDateTime, final String merchantMetaData) { this.amount = amount; this.currency = currency; this.periodLength = periodLength; this.periodUnit = periodUnit; this.startDateTime = startDateTime; + this.merchantMetaData = merchantMetaData; } /** @@ -185,4 +189,28 @@ public void setStartDateTime(String value) { this.startDateTime = value; } + /** + * Gets the value of the merchantMetaData property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMerchantMetaData() { + return merchantMetaData; + } + + /** + * Sets the value of the merchantMetaData property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMerchantMetaData(String value) { + this.merchantMetaData = value; + } + } diff --git a/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/TransactionIndicatorType.java b/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/TransactionIndicatorType.java index 61c52f1..cfff72e 100644 --- a/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/TransactionIndicatorType.java +++ b/build/generated/sources/xjc/java/com/ixopay/client/model/transaction/TransactionIndicatorType.java @@ -19,6 +19,7 @@ * <enumeration value="RECURRING"/> * <enumeration value="CARDONFILE"/> * <enumeration value="CARDONFILE-MERCHANT-INITIATED"/> + * <enumeration value="MOTO"/> * </restriction> * </simpleType> * @@ -33,7 +34,8 @@ public enum TransactionIndicatorType { RECURRING("RECURRING"), CARDONFILE("CARDONFILE"), @XmlEnumValue("CARDONFILE-MERCHANT-INITIATED") - CARDONFILE_MERCHANT_INITIATED("CARDONFILE-MERCHANT-INITIATED"); + CARDONFILE_MERCHANT_INITIATED("CARDONFILE-MERCHANT-INITIATED"), + MOTO("MOTO"); private final String value; TransactionIndicatorType(String v) { diff --git a/build/generated/sources/xjc/resources/META-INF/sun-jaxb.episode b/build/generated/sources/xjc/resources/META-INF/sun-jaxb.episode index 3bcbfb6..b645e40 100644 --- a/build/generated/sources/xjc/resources/META-INF/sun-jaxb.episode +++ b/build/generated/sources/xjc/resources/META-INF/sun-jaxb.episode @@ -28,6 +28,9 @@ + + + @@ -116,58 +119,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/main/java/com/ixopay/client/model/GatewayModelTypes.java b/src/main/java/com/ixopay/client/model/GatewayModelTypes.java index 99f945f..891b401 100644 --- a/src/main/java/com/ixopay/client/model/GatewayModelTypes.java +++ b/src/main/java/com/ixopay/client/model/GatewayModelTypes.java @@ -12,7 +12,7 @@ private GatewayModelTypes(){} com.ixopay.client.model.result.ResultType.class, com.ixopay.client.model.schedule.ScheduleRequestType.class, com.ixopay.client.model.schedule.ScheduleResultType.class, - com.ixopay.client.model.status.StatusResultType.class, + com.ixopay.client.model.status_result.StatusResultType.class, com.ixopay.client.model.status.StatusType.class, com.ixopay.client.model.transaction.TransactionType.class }; diff --git a/src/main/resources/com/ixopay/client/bindings/java-ixopay.xjb b/src/main/resources/com/ixopay/client/bindings/java-ixopay.xjb index 52a0664..e495d83 100644 --- a/src/main/resources/com/ixopay/client/bindings/java-ixopay.xjb +++ b/src/main/resources/com/ixopay/client/bindings/java-ixopay.xjb @@ -78,11 +78,11 @@ - + - + diff --git a/src/main/resources/com/ixopay/client/schemas/callback.xsd b/src/main/resources/com/ixopay/client/schemas/callback.xsd index 212876a..f0571b9 100644 --- a/src/main/resources/com/ixopay/client/schemas/callback.xsd +++ b/src/main/resources/com/ixopay/client/schemas/callback.xsd @@ -19,6 +19,7 @@ + @@ -260,6 +261,7 @@ + \ No newline at end of file diff --git a/src/main/resources/com/ixopay/client/schemas/schedule.xsd b/src/main/resources/com/ixopay/client/schemas/schedule.xsd index 66ad876..3600755 100644 --- a/src/main/resources/com/ixopay/client/schemas/schedule.xsd +++ b/src/main/resources/com/ixopay/client/schemas/schedule.xsd @@ -13,6 +13,7 @@ + @@ -44,6 +45,11 @@ + + + + + @@ -52,6 +58,19 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/com/ixopay/client/schemas/scheduleResult.xsd b/src/main/resources/com/ixopay/client/schemas/scheduleResult.xsd index a480450..c31ea81 100644 --- a/src/main/resources/com/ixopay/client/schemas/scheduleResult.xsd +++ b/src/main/resources/com/ixopay/client/schemas/scheduleResult.xsd @@ -16,6 +16,7 @@ + diff --git a/src/main/resources/com/ixopay/client/schemas/statusResult.xsd b/src/main/resources/com/ixopay/client/schemas/statusResult.xsd index 33ce7c3..673b695 100644 --- a/src/main/resources/com/ixopay/client/schemas/statusResult.xsd +++ b/src/main/resources/com/ixopay/client/schemas/statusResult.xsd @@ -20,6 +20,7 @@ + diff --git a/src/main/resources/com/ixopay/client/schemas/transaction.xsd b/src/main/resources/com/ixopay/client/schemas/transaction.xsd index 4f4d6c6..29da272 100644 --- a/src/main/resources/com/ixopay/client/schemas/transaction.xsd +++ b/src/main/resources/com/ixopay/client/schemas/transaction.xsd @@ -57,7 +57,7 @@ - + @@ -78,6 +78,7 @@ + @@ -105,6 +106,7 @@ + @@ -291,6 +293,7 @@ + @@ -337,8 +340,7 @@ - - + @@ -357,4 +359,4 @@ - \ No newline at end of file +