From: Roland Häder Date: Sat, 3 Jun 2017 16:18:26 +0000 (+0200) Subject: Continued a bit: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4467c080c44c5a2150b488d56fb7b04a4c779c98;p=jfinancials-core.git Continued a bit: - renamed interface/class - updated copyright - updated jar(s) Signed-off-by: Roland Häder --- diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index a0ca53b..6de9037 100644 Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index eaa2463..54a8731 100644 Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar index c804648..3e757cd 100644 Binary files a/lib/jcore-logger-lib.jar and b/lib/jcore-logger-lib.jar differ diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 7f47a54..1c4dbec 100644 Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 5cbad45..e91ed0a 100644 Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ diff --git a/lib/jmailer-ee.jar b/lib/jmailer-ee.jar index 8452960..9b3912f 100644 Binary files a/lib/jmailer-ee.jar and b/lib/jmailer-ee.jar differ diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 9587335..6f596cc 100644 Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar index 081cf1f..58afdc5 100644 Binary files a/lib/jproduct-core.jar and b/lib/jproduct-core.jar differ diff --git a/lib/juser-core.jar b/lib/juser-core.jar index aa8a723..fd411f9 100644 Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ diff --git a/src/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java b/src/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java index e9a8b35..4d8d833 100644 --- a/src/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java +++ b/src/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Roland Häder + * Copyright (C) 2016, 2017 Roland Häder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/receipt/Billable.java b/src/org/mxchange/jfinancials/model/receipt/Billable.java deleted file mode 100644 index fe2f70c..0000000 --- a/src/org/mxchange/jfinancials/model/receipt/Billable.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2017 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jfinancials.model.receipt; - -import java.io.Serializable; -import java.util.Calendar; -import org.mxchange.jcontactsbusiness.BusinessContact; -import org.mxchange.jproduct.model.payment.PaymentType; -import org.mxchange.jusercore.model.user.User; - -/** - * An interface for receipts - *

- * @author Roland Häder - */ -public interface Billable extends Serializable { - - /** - * Getter for when this receipt has been created in database - *

- * @return Receipt creation timestamp - */ - Calendar getReceiptCreated (); - - /** - * Setter for when this receipt has been created in database - *

- * @param receiptCreated Receipt creation timestamp - */ - void setReceiptCreated (final Calendar receiptCreated); - - /** - * Getter for primary key - *

- * @return Primary key - */ - Long getReceiptId (); - - /** - * Setter for primary key - *

- * @param receiptId Primary key - */ - void setReceiptId (final Long receiptId); - - /** - * Getter for receipt's user - *

- * @return Receipt's user - */ - User getReceiptUser (); - - /** - * Setter for receipt's user - *

- * @param receiptUser Receipt's user - */ - void setReceiptUser (final User receiptUser); - - /** - * Getter for seller instance - *

- * @return Seller instance - */ - BusinessContact getReceiptSeller (); - - /** - * Setter for seller instance - *

- * @param receiptSeller Seller instance - */ - void setReceiptSeller (final BusinessContact receiptSeller); - - /** - * Getter for payment type - *

- * @return Payment type - */ - PaymentType getReceiptPaymentType (); - - /** - * Setter for payment type - *

- * @param receiptPaymentType Payment type - */ - void setReceiptPaymentType (final PaymentType receiptPaymentType); - - @Override - boolean equals (final Object object); - - @Override - int hashCode (); - -} diff --git a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java new file mode 100644 index 0000000..a7b49c4 --- /dev/null +++ b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2016, 2017 Roland Häder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jfinancials.model.receipt; + +import java.io.Serializable; +import java.util.Calendar; +import org.mxchange.jcontactsbusiness.BusinessContact; +import org.mxchange.jproduct.model.payment.PaymentType; +import org.mxchange.jusercore.model.user.User; + +/** + * An interface for receipts + *

+ * @author Roland Häder + */ +public interface BillableReceipt extends Serializable { + + /** + * Getter for when this receipt has been created in database + *

+ * @return Receipt creation timestamp + */ + Calendar getReceiptCreated (); + + /** + * Setter for when this receipt has been created in database + *

+ * @param receiptCreated Receipt creation timestamp + */ + void setReceiptCreated (final Calendar receiptCreated); + + /** + * Getter for primary key + *

+ * @return Primary key + */ + Long getReceiptId (); + + /** + * Setter for primary key + *

+ * @param receiptId Primary key + */ + void setReceiptId (final Long receiptId); + + /** + * Getter for receipt's user + *

+ * @return Receipt's user + */ + User getReceiptUser (); + + /** + * Setter for receipt's user + *

+ * @param receiptUser Receipt's user + */ + void setReceiptUser (final User receiptUser); + + /** + * Getter for seller instance + *

+ * @return Seller instance + */ + BusinessContact getReceiptSeller (); + + /** + * Setter for seller instance + *

+ * @param receiptSeller Seller instance + */ + void setReceiptSeller (final BusinessContact receiptSeller); + + /** + * Getter for payment type + *

+ * @return Payment type + */ + PaymentType getReceiptPaymentType (); + + /** + * Setter for payment type + *

+ * @param receiptPaymentType Payment type + */ + void setReceiptPaymentType (final PaymentType receiptPaymentType); + + @Override + boolean equals (final Object object); + + @Override + int hashCode (); + +} diff --git a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java new file mode 100644 index 0000000..34fdc9c --- /dev/null +++ b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2016, 2017 Roland Häder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jfinancials.model.receipt; + +import java.util.Calendar; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import org.mxchange.jcontactsbusiness.BusinessContact; +import org.mxchange.jcontactsbusiness.CompanyContact; +import org.mxchange.jproduct.model.payment.PaymentType; +import org.mxchange.jusercore.model.user.LoginUser; +import org.mxchange.jusercore.model.user.User; + +/** + * + * @author Roland Häder + */ +@Entity (name = "receipts") +@Table ( + name = "receipts" +) +@SuppressWarnings ("PersistenceUnitPresent") +public class FinancialReceipt implements BillableReceipt { + + /** + * Serial number + */ + @Transient + private static final long serialVersionUID = 185_867_217_461L; + + /** + * When this receipt has been created + */ + @Basic (optional = false) + @Temporal (TemporalType.TIMESTAMP) + @Column (name = "receipt_created", nullable = false) + private Calendar receiptCreated; + + /** + * Primary key + */ + @Id + @GeneratedValue (strategy = GenerationType.IDENTITY) + @Column (name = "receipt_id", nullable = false, updatable = false) + private Long receiptId; + + /** + * Payment type (cash, credit card, EC card ...) + */ + @Basic (optional = false) + @Column (name = "receipt_payment_type", nullable = false) + @Enumerated (EnumType.STRING) + private PaymentType receiptPaymentType; + + /** + * Seller instance + */ + @JoinColumn (name = "receipt_seller_id", referencedColumnName = "company_id", nullable = false, updatable = false) + @OneToOne (targetEntity = CompanyContact.class, cascade = CascadeType.REFRESH, optional = false) + private BusinessContact receiptSeller; + + /** + * Which user this receipt belongs to + */ + @JoinColumn (name = "receipt_user_id", referencedColumnName = "user_id", nullable = false, updatable = false) + @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false) + private User receiptUser; + + /** + * Default constructor + */ + public FinancialReceipt () { + } + + /** + * Constructor with payment type, seller and user + *

+ * @param receiptPaymentType Payment type + * @param receiptSeller Seller instance + * @param receiptUser User instance + */ + public FinancialReceipt (final PaymentType receiptPaymentType, final BusinessContact receiptSeller, final User receiptUser) { + // Call other constructor first + this(); + + // Set all + this.receiptPaymentType = receiptPaymentType; + this.receiptSeller = receiptSeller; + this.receiptUser = receiptUser; + } + + @Override + public boolean equals (final Object object) { + if (this == object) { + return true; + } + if (null == object) { + return false; + } else if (this.getClass() != object.getClass()) { + return false; + } + + final BillableReceipt receipt = (BillableReceipt) object; + + if (!Objects.equals(this.getReceiptId(), receipt.getReceiptId())) { + return false; + } else if (this.getReceiptPaymentType() != receipt.getReceiptPaymentType()) { + return false; + } else if (!Objects.equals(this.getReceiptSeller(), receipt.getReceiptSeller())) { + return false; + } else if (!Objects.equals(this.getReceiptUser(), receipt.getReceiptUser())) { + return false; + } + + return true; + } + + @Override + @SuppressWarnings ("ReturnOfDateField") + public Calendar getReceiptCreated () { + return this.receiptCreated; + } + + @Override + @SuppressWarnings ("AssignmentToDateFieldFromParameter") + public void setReceiptCreated (final Calendar receiptCreated) { + this.receiptCreated = receiptCreated; + } + + @Override + public Long getReceiptId () { + return this.receiptId; + } + + @Override + public void setReceiptId (final Long receiptId) { + this.receiptId = receiptId; + } + + @Override + public PaymentType getReceiptPaymentType () { + return this.receiptPaymentType; + } + + @Override + public void setReceiptPaymentType (final PaymentType receiptPaymentType) { + this.receiptPaymentType = receiptPaymentType; + } + + @Override + public BusinessContact getReceiptSeller () { + return this.receiptSeller; + } + + @Override + public void setReceiptSeller (final BusinessContact receiptSeller) { + this.receiptSeller = receiptSeller; + } + + @Override + public User getReceiptUser () { + return this.receiptUser; + } + + @Override + public void setReceiptUser (final User receiptUser) { + this.receiptUser = receiptUser; + } + + @Override + public int hashCode () { + int hash = 5; + + hash = 89 * hash + Objects.hashCode(this.getReceiptId()); + hash = 89 * hash + Objects.hashCode(this.getReceiptPaymentType()); + hash = 89 * hash + Objects.hashCode(this.getReceiptSeller()); + hash = 89 * hash + Objects.hashCode(this.getReceiptUser()); + + return hash; + } + +} diff --git a/src/org/mxchange/jfinancials/model/receipt/Receipt.java b/src/org/mxchange/jfinancials/model/receipt/Receipt.java deleted file mode 100644 index e3d1057..0000000 --- a/src/org/mxchange/jfinancials/model/receipt/Receipt.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * Copyright (C) 2017 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jfinancials.model.receipt; - -import java.util.Calendar; -import java.util.Objects; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import org.mxchange.jcontactsbusiness.BusinessContact; -import org.mxchange.jcontactsbusiness.CompanyContact; -import org.mxchange.jproduct.model.payment.PaymentType; -import org.mxchange.jusercore.model.user.LoginUser; -import org.mxchange.jusercore.model.user.User; - -/** - * - * @author Roland Häder - */ -@Entity (name = "receipts") -@Table ( - name = "receipts" -) -@SuppressWarnings ("PersistenceUnitPresent") -public class Receipt implements Billable { - - /** - * Serial number - */ - @Transient - private static final long serialVersionUID = 185_867_217_461L; - - /** - * When this receipt has been created - */ - @Basic (optional = false) - @Temporal (TemporalType.TIMESTAMP) - @Column (name = "receipt_created", nullable = false) - private Calendar receiptCreated; - - /** - * Primary key - */ - @Id - @GeneratedValue (strategy = GenerationType.IDENTITY) - @Column (name = "receipt_id", nullable = false, updatable = false) - private Long receiptId; - - /** - * Payment type (cash, credit card, EC card ...) - */ - @Basic (optional = false) - @Column (name = "receipt_payment_type", nullable = false) - @Enumerated (EnumType.STRING) - private PaymentType receiptPaymentType; - - /** - * Seller instance - */ - @JoinColumn (name = "receipt_seller_id", referencedColumnName = "company_id", nullable = false, updatable = false) - @OneToOne (targetEntity = CompanyContact.class, cascade = CascadeType.REFRESH, optional = false) - private BusinessContact receiptSeller; - - /** - * Which user this receipt belongs to - */ - @JoinColumn (name = "receipt_user_id", referencedColumnName = "user_id", nullable = false, updatable = false) - @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false) - private User receiptUser; - - /** - * Default constructor - */ - public Receipt () { - } - - /** - * Constructor with payment type, seller and user - *

- * @param receiptPaymentType Payment type - * @param receiptSeller Seller instance - * @param receiptUser User instance - */ - public Receipt (final PaymentType receiptPaymentType, final BusinessContact receiptSeller, final User receiptUser) { - // Call other constructor first - this(); - - // Set all - this.receiptPaymentType = receiptPaymentType; - this.receiptSeller = receiptSeller; - this.receiptUser = receiptUser; - } - - @Override - public boolean equals (final Object object) { - if (this == object) { - return true; - } - if (null == object) { - return false; - } else if (this.getClass() != object.getClass()) { - return false; - } - - final Billable receipt = (Billable) object; - - if (!Objects.equals(this.getReceiptId(), receipt.getReceiptId())) { - return false; - } else if (this.getReceiptPaymentType() != receipt.getReceiptPaymentType()) { - return false; - } else if (!Objects.equals(this.getReceiptSeller(), receipt.getReceiptSeller())) { - return false; - } else if (!Objects.equals(this.getReceiptUser(), receipt.getReceiptUser())) { - return false; - } - - return true; - } - - @Override - @SuppressWarnings ("ReturnOfDateField") - public Calendar getReceiptCreated () { - return this.receiptCreated; - } - - @Override - @SuppressWarnings ("AssignmentToDateFieldFromParameter") - public void setReceiptCreated (final Calendar receiptCreated) { - this.receiptCreated = receiptCreated; - } - - @Override - public Long getReceiptId () { - return this.receiptId; - } - - @Override - public void setReceiptId (final Long receiptId) { - this.receiptId = receiptId; - } - - @Override - public PaymentType getReceiptPaymentType () { - return this.receiptPaymentType; - } - - @Override - public void setReceiptPaymentType (final PaymentType receiptPaymentType) { - this.receiptPaymentType = receiptPaymentType; - } - - @Override - public BusinessContact getReceiptSeller () { - return this.receiptSeller; - } - - @Override - public void setReceiptSeller (final BusinessContact receiptSeller) { - this.receiptSeller = receiptSeller; - } - - @Override - public User getReceiptUser () { - return this.receiptUser; - } - - @Override - public void setReceiptUser (final User receiptUser) { - this.receiptUser = receiptUser; - } - - @Override - public int hashCode () { - int hash = 5; - - hash = 89 * hash + Objects.hashCode(this.getReceiptId()); - hash = 89 * hash + Objects.hashCode(this.getReceiptPaymentType()); - hash = 89 * hash + Objects.hashCode(this.getReceiptSeller()); - hash = 89 * hash + Objects.hashCode(this.getReceiptUser()); - - return hash; - } - -} diff --git a/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java b/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java index 6f066e7..8dbbfa5 100644 --- a/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java +++ b/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2016, 2017 Roland Häder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,8 +18,8 @@ package org.mxchange.jfinancials.model.receipt.entry; import java.io.Serializable; import java.util.Calendar; -import org.mxchange.jfinancials.model.receipt.Billable; import org.mxchange.jproduct.model.product.Product; +import org.mxchange.jfinancials.model.receipt.BillableReceipt; /** * An interface for receipt entries @@ -61,14 +61,14 @@ public interface BillableReceiptEntry extends Serializable { *

* @return Receipt instance */ - Billable getEntryReceipt (); + BillableReceipt getEntryReceipt (); /** * Setter for receipt instance *

* @param entryReceipt Receipt instance */ - void setEntryReceipt (final Billable entryReceipt); + void setEntryReceipt (final BillableReceipt entryReceipt); /** * Getter for linked product diff --git a/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java b/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java index db4ee70..6fb49b9 100644 --- a/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java +++ b/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2016, 2017 Roland Häder * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,10 +33,10 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.mxchange.jfinancials.model.receipt.Billable; -import org.mxchange.jfinancials.model.receipt.Receipt; +import org.mxchange.jfinancials.model.receipt.FinancialReceipt; import org.mxchange.jproduct.model.product.GenericProduct; import org.mxchange.jproduct.model.product.Product; +import org.mxchange.jfinancials.model.receipt.BillableReceipt; /** * A class for entryReceipt entries @@ -102,8 +102,8 @@ public class ReceiptEntry implements BillableReceiptEntry { * Connected entryReceipt entry */ @JoinColumn (name = "entry_receipt_id", referencedColumnName = "receipt_id", nullable = false, updatable = false, unique = true) - @OneToOne (targetEntity = Receipt.class, cascade = CascadeType.REFRESH, optional = false) - private Billable entryReceipt; + @OneToOne (targetEntity = FinancialReceipt.class, cascade = CascadeType.REFRESH, optional = false) + private BillableReceipt entryReceipt; /** * Default constructor @@ -117,9 +117,9 @@ public class ReceiptEntry implements BillableReceiptEntry { * @param entryProduct Product instance * @param entryProductPrice Product price (copied) * @param entryProductQuantity Product quantity - * @param entryReceipt Receipt instance + * @param entryReceipt FinancialReceipt instance */ - public ReceiptEntry (final Product entryProduct, final Float entryProductPrice, final Long entryProductQuantity, final Billable entryReceipt) { + public ReceiptEntry (final Product entryProduct, final Float entryProductPrice, final Long entryProductQuantity, final BillableReceipt entryReceipt) { this.entryProduct = entryProduct; this.entryProductPrice = entryProductPrice; this.entryProductQuantity = entryProductQuantity; @@ -206,12 +206,12 @@ public class ReceiptEntry implements BillableReceiptEntry { } @Override - public Billable getEntryReceipt () { + public BillableReceipt getEntryReceipt () { return this.entryReceipt; } @Override - public void setEntryReceipt (final Billable entryReceipt) { + public void setEntryReceipt (final BillableReceipt entryReceipt) { this.entryReceipt = entryReceipt; }