Details
diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceItem.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceItem.java
index 03cb50c..357f4d1 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceItem.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceItem.java
@@ -31,21 +31,20 @@ import com.ning.billing.invoice.api.InvoiceItem;
public class BusinessInvoiceItem {
private final UUID itemId;
private final DateTime createdDate;
-
- private DateTime updatedDate;
- private UUID invoiceId;
- private String itemType;
- private String externalKey;
- private String productName;
- private String productType;
- private String productCategory;
- private String slug;
- private String phase;
- private String billingPeriod;
- private DateTime startDate;
- private DateTime endDate;
- private BigDecimal amount;
- private Currency currency;
+ private final DateTime updatedDate;
+ private final UUID invoiceId;
+ private final String itemType;
+ private final String externalKey;
+ private final String productName;
+ private final String productType;
+ private final String productCategory;
+ private final String slug;
+ private final String phase;
+ private final String billingPeriod;
+ private final DateTime startDate;
+ private final DateTime endDate;
+ private final BigDecimal amount;
+ private final Currency currency;
public BusinessInvoiceItem(final BigDecimal amount, final String billingPeriod, final DateTime createdDate,
final Currency currency, final DateTime endDate, final String externalKey,
@@ -89,114 +88,58 @@ public class BusinessInvoiceItem {
return amount;
}
- public void setAmount(final BigDecimal amount) {
- this.amount = amount;
- }
-
public String getBillingPeriod() {
return billingPeriod;
}
- public void setBillingPeriod(final String billingPeriod) {
- this.billingPeriod = billingPeriod;
- }
-
public Currency getCurrency() {
return currency;
}
- public void setCurrency(final Currency currency) {
- this.currency = currency;
- }
-
public DateTime getEndDate() {
return endDate;
}
- public void setEndDate(final DateTime endDate) {
- this.endDate = endDate;
- }
-
public String getExternalKey() {
return externalKey;
}
- public void setExternalKey(final String externalKey) {
- this.externalKey = externalKey;
- }
-
public UUID getInvoiceId() {
return invoiceId;
}
- public void setInvoiceId(final UUID invoiceId) {
- this.invoiceId = invoiceId;
- }
-
public String getItemType() {
return itemType;
}
- public void setItemType(final String itemType) {
- this.itemType = itemType;
- }
-
public String getPhase() {
return phase;
}
- public void setPhase(final String phase) {
- this.phase = phase;
- }
-
public String getProductCategory() {
return productCategory;
}
- public void setProductCategory(final String productCategory) {
- this.productCategory = productCategory;
- }
-
public String getProductName() {
return productName;
}
- public void setProductName(final String productName) {
- this.productName = productName;
- }
-
public String getProductType() {
return productType;
}
- public void setProductType(final String productType) {
- this.productType = productType;
- }
-
public String getSlug() {
return slug;
}
- public void setSlug(final String slug) {
- this.slug = slug;
- }
-
public DateTime getStartDate() {
return startDate;
}
- public void setStartDate(final DateTime startDate) {
- this.startDate = startDate;
- }
-
public DateTime getUpdatedDate() {
return updatedDate;
}
- public void setUpdatedDate(final DateTime updatedDate) {
- this.updatedDate = updatedDate;
- }
-
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePayment.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePayment.java
index 2622437..56e59a4 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePayment.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePayment.java
@@ -28,21 +28,20 @@ public class BusinessInvoicePayment {
private final UUID paymentId;
private final DateTime createdDate;
private final UUID attemptId;
-
- private DateTime updatedDate;
- private String accountKey;
- private UUID invoiceId;
- private DateTime effectiveDate;
- private BigDecimal amount;
- private Currency currency;
- private String paymentError;
- private String processingStatus;
- private BigDecimal requestedAmount;
- private String pluginName;
- private String paymentType;
- private String paymentMethod;
- private String cardType;
- private String cardCountry;
+ private final DateTime updatedDate;
+ private final String accountKey;
+ private final UUID invoiceId;
+ private final DateTime effectiveDate;
+ private final BigDecimal amount;
+ private final Currency currency;
+ private final String paymentError;
+ private final String processingStatus;
+ private final BigDecimal requestedAmount;
+ private final String pluginName;
+ private final String paymentType;
+ private final String paymentMethod;
+ private final String cardType;
+ private final String cardCountry;
public BusinessInvoicePayment(final String accountKey, final BigDecimal amount, final UUID attemptId,
final String cardCountry, final String cardType, final DateTime createdDate,
@@ -85,114 +84,58 @@ public class BusinessInvoicePayment {
return accountKey;
}
- public void setAccountKey(final String accountKey) {
- this.accountKey = accountKey;
- }
-
public BigDecimal getAmount() {
return amount;
}
- public void setAmount(final BigDecimal amount) {
- this.amount = amount;
- }
-
public String getCardCountry() {
return cardCountry;
}
- public void setCardCountry(final String cardCountry) {
- this.cardCountry = cardCountry;
- }
-
public String getCardType() {
return cardType;
}
- public void setCardType(final String cardType) {
- this.cardType = cardType;
- }
-
public Currency getCurrency() {
return currency;
}
- public void setCurrency(final Currency currency) {
- this.currency = currency;
- }
-
public DateTime getEffectiveDate() {
return effectiveDate;
}
- public void setEffectiveDate(final DateTime effectiveDate) {
- this.effectiveDate = effectiveDate;
- }
-
public UUID getInvoiceId() {
return invoiceId;
}
- public void setInvoiceId(final UUID invoiceId) {
- this.invoiceId = invoiceId;
- }
-
public String getPaymentError() {
return paymentError;
}
- public void setPaymentError(final String paymentError) {
- this.paymentError = paymentError;
- }
-
public String getPaymentMethod() {
return paymentMethod;
}
- public void setPaymentMethod(final String paymentMethod) {
- this.paymentMethod = paymentMethod;
- }
-
public String getPaymentType() {
return paymentType;
}
- public void setPaymentType(final String paymentType) {
- this.paymentType = paymentType;
- }
-
public String getPluginName() {
return pluginName;
}
- public void setPluginName(final String pluginName) {
- this.pluginName = pluginName;
- }
-
public String getProcessingStatus() {
return processingStatus;
}
- public void setProcessingStatus(final String processingStatus) {
- this.processingStatus = processingStatus;
- }
-
public BigDecimal getRequestedAmount() {
return requestedAmount;
}
- public void setRequestedAmount(final BigDecimal requestedAmount) {
- this.requestedAmount = requestedAmount;
- }
-
public DateTime getUpdatedDate() {
return updatedDate;
}
- public void setUpdatedDate(final DateTime updatedDate) {
- this.updatedDate = updatedDate;
- }
-
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java
index 5a04b38..4d4a324 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java
@@ -59,15 +59,6 @@ public class TestBusinessInvoiceItemSqlDao extends TestWithEmbeddedDB {
Assert.assertEquals(invoiceItemSqlDao.getInvoiceItemsForInvoice(invoiceItem.getInvoiceId().toString()).size(), 1);
Assert.assertEquals(invoiceItemSqlDao.getInvoiceItemsForInvoice(invoiceItem.getInvoiceId().toString()).get(0), invoiceItem);
- // Update and retrieve it
- invoiceItem.setProductName(UUID.randomUUID().toString().substring(0, 20));
- Assert.assertEquals(invoiceItemSqlDao.updateInvoiceItem(invoiceItem), 1);
- Assert.assertEquals(invoiceItemSqlDao.getInvoiceItem(invoiceItem.getItemId().toString()), invoiceItem);
- Assert.assertEquals(invoiceItemSqlDao.getInvoiceItemsForBundleByKey(invoiceItem.getExternalKey()).size(), 1);
- Assert.assertEquals(invoiceItemSqlDao.getInvoiceItemsForBundleByKey(invoiceItem.getExternalKey()).get(0), invoiceItem);
- Assert.assertEquals(invoiceItemSqlDao.getInvoiceItemsForInvoice(invoiceItem.getInvoiceId().toString()).size(), 1);
- Assert.assertEquals(invoiceItemSqlDao.getInvoiceItemsForInvoice(invoiceItem.getInvoiceId().toString()).get(0), invoiceItem);
-
// Delete it
Assert.assertEquals(invoiceItemSqlDao.deleteInvoiceItem(invoiceItem.getItemId().toString()), 1);
Assert.assertNull(invoiceItemSqlDao.getInvoiceItem(invoiceItem.getItemId().toString()));
diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java
index ad7a85a..c7414f6 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java
@@ -59,15 +59,6 @@ public class TestBusinessInvoicePaymentSqlDao extends TestWithEmbeddedDB {
Assert.assertEquals(invoicePaymentSqlDao.getInvoicePaymentsForPayment(invoicePayment.getPaymentId().toString()).size(), 1);
Assert.assertEquals(invoicePaymentSqlDao.getInvoicePaymentsForPayment(invoicePayment.getPaymentId().toString()).get(0), invoicePayment);
- // Update and retrieve it
- invoicePayment.setCardType(UUID.randomUUID().toString().substring(0, 20));
- Assert.assertEquals(invoicePaymentSqlDao.updateInvoicePaymentForPaymentAttempt(invoicePayment), 1);
- Assert.assertEquals(invoicePaymentSqlDao.getInvoicePaymentForPaymentAttempt(invoicePayment.getAttemptId().toString()), invoicePayment);
- Assert.assertEquals(invoicePaymentSqlDao.getInvoicePaymentsForAccountByKey(invoicePayment.getAccountKey()).size(), 1);
- Assert.assertEquals(invoicePaymentSqlDao.getInvoicePaymentsForAccountByKey(invoicePayment.getAccountKey()).get(0), invoicePayment);
- Assert.assertEquals(invoicePaymentSqlDao.getInvoicePaymentsForPayment(invoicePayment.getPaymentId().toString()).size(), 1);
- Assert.assertEquals(invoicePaymentSqlDao.getInvoicePaymentsForPayment(invoicePayment.getPaymentId().toString()).get(0), invoicePayment);
-
// Delete it
Assert.assertEquals(invoicePaymentSqlDao.deleteInvoicePaymentForPaymentAttempt(invoicePayment.getAttemptId().toString()), 1);
Assert.assertNull(invoicePaymentSqlDao.getInvoicePaymentForPaymentAttempt(invoicePayment.getAttemptId().toString()));
diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java
index e4460f6..50fac73 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java
@@ -73,22 +73,5 @@ public class TestBusinessInvoiceItem extends AnalyticsTestSuite {
final BusinessInvoiceItem otherInvoiceItem = new BusinessInvoiceItem(null, null, createdDate, null, null, null, null, itemId,
null, null, null, null, null, null, null, null);
Assert.assertFalse(invoiceItem.equals(otherInvoiceItem));
-
- // Test setters
- otherInvoiceItem.setAmount(amount);
- otherInvoiceItem.setBillingPeriod(billingPeriod);
- otherInvoiceItem.setCurrency(currency);
- otherInvoiceItem.setEndDate(endDate);
- otherInvoiceItem.setExternalKey(externalKey);
- otherInvoiceItem.setInvoiceId(invoiceId);
- otherInvoiceItem.setItemType(itemType);
- otherInvoiceItem.setPhase(phase);
- otherInvoiceItem.setProductCategory(productCategory);
- otherInvoiceItem.setProductName(productName);
- otherInvoiceItem.setProductType(productType);
- otherInvoiceItem.setSlug(slug);
- otherInvoiceItem.setStartDate(startDate);
- otherInvoiceItem.setUpdatedDate(updatedDate);
- Assert.assertTrue(invoiceItem.equals(otherInvoiceItem));
}
}
diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java
index 709db0f..5b4b7f2 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java
@@ -78,22 +78,5 @@ public class TestBusinessInvoicePayment extends AnalyticsTestSuite {
null, null, null, null, paymentId, null,
null, null, null, null, null);
Assert.assertFalse(invoicePayment.equals(otherInvoicePayment));
-
- // Test setters
- otherInvoicePayment.setAccountKey(accountKey);
- otherInvoicePayment.setAmount(amount);
- otherInvoicePayment.setCardCountry(cardCountry);
- otherInvoicePayment.setCardType(cardType);
- otherInvoicePayment.setCurrency(currency);
- otherInvoicePayment.setEffectiveDate(effectiveDate);
- otherInvoicePayment.setInvoiceId(invoiceId);
- otherInvoicePayment.setPaymentError(paymentError);
- otherInvoicePayment.setPaymentMethod(paymentMethod);
- otherInvoicePayment.setPaymentType(paymentType);
- otherInvoicePayment.setPluginName(pluginName);
- otherInvoicePayment.setProcessingStatus(processingStatus);
- otherInvoicePayment.setRequestedAmount(requestedAmount);
- otherInvoicePayment.setUpdatedDate(updatedDate);
- Assert.assertTrue(invoicePayment.equals(otherInvoicePayment));
}
}
