Skip to content

Commit

Permalink
update to latest schemas
Browse files Browse the repository at this point in the history
  • Loading branch information
pmarschik committed Feb 5, 2021
1 parent d958501 commit 0f6ebea
Show file tree
Hide file tree
Showing 42 changed files with 832 additions and 164 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

group = "com.ixopay"
version = "2.1.1"
version = "2.2.0"

sourceCompatibility = 1.8
targetCompatibility = 1.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -60,6 +61,7 @@
"currency",
"scheduleId",
"scheduleStatus",
"scheduleMerchantMetaData",
"customerProfile",
"errors",
"chargebackData",
Expand All @@ -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;
Expand All @@ -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<ExtraDataType> 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<ExtraDataType> extraData, final String merchantMetaData, final ReturnDataType returnData, final CustomerDataType customerData) {
this.result = result;
this.referenceId = referenceId;
this.transactionId = transactionId;
Expand All @@ -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;
Expand Down Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -45,6 +47,7 @@
* &lt;element name="emailVerified" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
* &lt;element name="ipAddress" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;element name="nationalId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;element name="extraData" type="{http://gateway.ixopay.com/Schema/V2/Callback}extraDataType" maxOccurs="unbounded" minOccurs="0"/&gt;
* &lt;/sequence&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;
Expand Down Expand Up @@ -81,7 +84,8 @@
"email",
"emailVerified",
"ipAddress",
"nationalId"
"nationalId",
"extraData"
})
public class CustomerDataType {

Expand Down Expand Up @@ -114,6 +118,7 @@ public class CustomerDataType {
protected Boolean emailVerified;
protected String ipAddress;
protected String nationalId;
protected List<ExtraDataType> extraData;

/**
* Default no-arg constructor
Expand All @@ -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<ExtraDataType> extraData) {
this.identification = identification;
this.firstName = firstName;
this.lastName = lastName;
Expand Down Expand Up @@ -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;
}

/**
Expand Down Expand Up @@ -805,4 +811,33 @@ public void setNationalId(String value) {
this.nationalId = value;
}

/**
* Gets the value of the extraData property.
*
* <p>
* 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 <CODE>set</CODE> method for the extraData property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
* getExtraData().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link ExtraDataType }
*
*
*/
public List<ExtraDataType> getExtraData() {
if (extraData == null) {
extraData = new ArrayList<ExtraDataType>();
}
return this.extraData;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* &lt;element name="password" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
* &lt;choice&gt;
* &lt;element name="startSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}startScheduleType"/&gt;
* &lt;element name="updateSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}updateScheduleType"/&gt;
* &lt;element name="showSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}showScheduleType"/&gt;
* &lt;element name="pauseSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}pauseScheduleType"/&gt;
* &lt;element name="continueSchedule" type="{http://gateway.ixopay.com/Schema/V2/Schedule}continueScheduleType"/&gt;
Expand All @@ -40,6 +41,7 @@
"username",
"password",
"startSchedule",
"updateSchedule",
"showSchedule",
"pauseSchedule",
"continueSchedule",
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* &lt;element name="newStatus" type="{http://gateway.ixopay.com/Schema/V2/ScheduleResult}scheduleStatusType" minOccurs="0"/&gt;
* &lt;element name="scheduledAt" type="{http://gateway.ixopay.com/Schema/V2/ScheduleResult}scheduleDateTime" minOccurs="0"/&gt;
* &lt;element name="errors" type="{http://gateway.ixopay.com/Schema/V2/ScheduleResult}errorsType" minOccurs="0"/&gt;
* &lt;element name="merchantMetaData" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;/sequence&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;
Expand All @@ -41,7 +42,8 @@
"oldStatus",
"newStatus",
"scheduledAt",
"errors"
"errors",
"merchantMetaData"
})
@XmlRootElement(name = "schedule")
public class ScheduleResultType {
Expand All @@ -55,6 +57,7 @@ public class ScheduleResultType {
protected ScheduleStatusType newStatus;
protected String scheduledAt;
protected ErrorsType errors;
protected String merchantMetaData;

/**
* Default no-arg constructor
Expand All @@ -68,14 +71,15 @@ 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;
this.oldStatus = oldStatus;
this.newStatus = newStatus;
this.scheduledAt = scheduledAt;
this.errors = errors;
this.merchantMetaData = merchantMetaData;
}

/**
Expand Down Expand Up @@ -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;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* &lt;element name="periodLength" type="{http://www.w3.org/2001/XMLSchema}unsignedInt"/&gt;
* &lt;element name="periodUnit" type="{http://gateway.ixopay.com/Schema/V2/Schedule}periodUnitType"/&gt;
* &lt;element name="startDateTime" type="{http://gateway.ixopay.com/Schema/V2/Schedule}scheduleDateTime"/&gt;
* &lt;element name="merchantMetaData" type="{http://gateway.ixopay.com/Schema/V2/Schedule}merchantMetaDataType" minOccurs="0"/&gt;
* &lt;/sequence&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;
Expand All @@ -40,7 +41,8 @@
"currency",
"periodLength",
"periodUnit",
"startDateTime"
"startDateTime",
"merchantMetaData"
})
public class StartScheduleType {

Expand All @@ -57,6 +59,7 @@ public class StartScheduleType {
protected PeriodUnitType periodUnit;
@XmlElement(required = true)
protected String startDateTime;
protected String merchantMetaData;

/**
* Default no-arg constructor
Expand All @@ -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;
}

/**
Expand Down Expand Up @@ -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;
}

}
Loading

0 comments on commit 0f6ebea

Please sign in to comment.