diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java
index 2d4b25f..553d6a2 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderAccount.java
@@ -16,34 +16,23 @@
package com.ning.billing.payment.api;
-import org.apache.commons.lang.StringUtils;
-
import com.google.common.base.Objects;
public class PaymentProviderAccount {
private final String id;
private final String accountNumber;
- private final String firstName;
- private final String lastName;
- private final String email;
- private final String currency;
+ private final String accountName;
private final String phoneNumber;
private final String defaultPaymentMethodId;
public PaymentProviderAccount(String id,
String accountNumber,
- String firstName,
- String lastName,
- String email,
- String currency,
+ String accountName,
String phoneNumber,
String defaultPaymentMethodId) {
this.id = id;
this.accountNumber = accountNumber;
- this.firstName = StringUtils.substring(firstName, 0, 100);
- this.lastName = StringUtils.substring(lastName, 0, 100);
- this.email = StringUtils.substring(lastName, 0, 80);
- this.currency = currency;
+ this.accountName = accountName;
this.phoneNumber = phoneNumber;
this.defaultPaymentMethodId = defaultPaymentMethodId;
}
@@ -56,20 +45,8 @@ public class PaymentProviderAccount {
return accountNumber;
}
- public String getFirstName() {
- return firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public String getCurrency() {
- return currency;
- }
-
- public String getEmail() {
- return email;
+ public String getAccountName() {
+ return accountName;
}
public String getPhoneNumber() {
@@ -83,10 +60,7 @@ public class PaymentProviderAccount {
public static class Builder {
private String id;
private String accountNumber;
- private String firstName;
- private String lastName;
- private String email;
- private String currency;
+ private String accountName;
private String phoneNumber;
private String defaultPaymentMethodId;
@@ -100,23 +74,8 @@ public class PaymentProviderAccount {
return this;
}
- public Builder setFirstName(String firstName) {
- this.firstName = firstName;
- return this;
- }
-
- public Builder setLastName(String lastName) {
- this.lastName = lastName;
- return this;
- }
-
- public Builder setEmail(String email) {
- this.email = email;
- return this;
- }
-
- public Builder setCurrency(String currency) {
- this.currency = currency;
+ public Builder setAccountName(String accountName) {
+ this.accountName = accountName;
return this;
}
@@ -131,7 +90,7 @@ public class PaymentProviderAccount {
}
public PaymentProviderAccount build() {
- return new PaymentProviderAccount(id, accountNumber, firstName, lastName, email, currency, phoneNumber, defaultPaymentMethodId);
+ return new PaymentProviderAccount(id, accountNumber, accountName, phoneNumber, defaultPaymentMethodId);
}
}
@@ -140,8 +99,7 @@ public class PaymentProviderAccount {
public int hashCode() {
return Objects.hashCode(id,
accountNumber,
- firstName,
- lastName,
+ accountName,
phoneNumber,
defaultPaymentMethodId);
}
diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentProviderContactData.java b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderContactData.java
new file mode 100644
index 0000000..a16ab37
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentProviderContactData.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning 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 com.ning.billing.payment.api;
+
+import org.apache.commons.lang.StringUtils;
+
+import com.google.common.base.Objects;
+
+public class PaymentProviderContactData {
+ private final String firstName;
+ private final String lastName;
+ private final String email;
+ private final String phoneNumber;
+ private final String externalKey;
+
+ public PaymentProviderContactData(String firstName,
+ String lastName,
+ String email,
+ String phoneNumber,
+ String externalKey) {
+ this.firstName = StringUtils.substring(firstName, 0, 100);
+ this.lastName = StringUtils.substring(lastName, 0, 100);
+ this.email = StringUtils.substring(email, 0, 80);
+ this.phoneNumber = phoneNumber;
+ this.externalKey = externalKey;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+
+ public String getExternalKey() {
+ return externalKey;
+ }
+
+ public static class Builder {
+ private String firstName;
+ private String lastName;
+ private String email;
+ private String phoneNumber;
+ private String externalKey;
+
+ public Builder setExternalKey(String externalKey) {
+ this.externalKey = externalKey;
+ return this;
+ }
+
+ public Builder setFirstName(String firstName) {
+ this.firstName = firstName;
+ return this;
+ }
+
+ public Builder setLastName(String lastName) {
+ this.lastName = lastName;
+ return this;
+ }
+
+ public Builder setEmail(String email) {
+ this.email = email;
+ return this;
+ }
+
+ public Builder setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ return this;
+ }
+
+ public PaymentProviderContactData build() {
+ return new PaymentProviderContactData(firstName, lastName, email, phoneNumber, externalKey);
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(firstName,
+ lastName,
+ email,
+ phoneNumber,
+ externalKey);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (getClass() == obj.getClass()) {
+ PaymentProviderContactData other = (PaymentProviderContactData)obj;
+ if (obj == other) {
+ return true;
+ }
+ else {
+ return Objects.equal(firstName, other.firstName) &&
+ Objects.equal(lastName, other.lastName) &&
+ Objects.equal(email, other.email) &&
+ Objects.equal(phoneNumber, other.phoneNumber) &&
+ Objects.equal(externalKey, other.externalKey);
+ }
+ }
+ return false;
+ }
+
+}
