From: Roland Häder Date: Fri, 22 Sep 2017 22:20:50 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7d7e1ad07275501173ba6151f31c75089ce510b5;p=jfinancials-ejb.git Please cherry-pick: - need to change java.util.Calendar (bye bye) to java.util.Date in favour of PrimeFaces' p:calendar [!] tag Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java index d4939b7..9af0235 100644 --- a/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/contact/FinancialsAdminContactSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.model.contact; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import javax.ejb.Stateless; import javax.persistence.NoResultException; import javax.persistence.Query; @@ -64,7 +64,7 @@ public class FinancialsAdminContactSessionBean extends BaseFinancialsDatabaseBea } // Set created timestamp - contact.setContactCreated(new GregorianCalendar()); + contact.setContactCreated(new Date()); // Set all created timestamps, if instance is there this.setAllContactPhoneEntriesCreated(contact); diff --git a/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java index 432bcb8..cf500f7 100644 --- a/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/phone/FinancialsAdminContactPhoneSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jcontacts.model.phone; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import java.util.Objects; import javax.ejb.EJB; import javax.ejb.Stateless; @@ -264,7 +264,7 @@ public class FinancialsAdminContactPhoneSessionBean extends BaseFinancialsDataba } // Set created instance - faxNumber.setPhoneEntryCreated(new GregorianCalendar()); + faxNumber.setPhoneEntryCreated(new Date()); // Set fax number in contact contact.setContactFaxNumber(faxNumber); @@ -321,7 +321,7 @@ public class FinancialsAdminContactPhoneSessionBean extends BaseFinancialsDataba } // Set created instance - landLineNumber.setPhoneEntryCreated(new GregorianCalendar()); + landLineNumber.setPhoneEntryCreated(new Date()); // Set landLine number in contact contact.setContactLandLineNumber(landLineNumber); @@ -372,7 +372,7 @@ public class FinancialsAdminContactPhoneSessionBean extends BaseFinancialsDataba } // Set created instance - mobileNumber.setPhoneEntryCreated(new GregorianCalendar()); + mobileNumber.setPhoneEntryCreated(new Date()); // Set mobile number in contact contact.setContactMobileNumber(mobileNumber); diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java index 678e157..893ca4e 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/FinancialsAdminBusinessDataSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.model.basicdata; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import java.util.List; import java.util.Objects; import javax.ejb.EJB; @@ -72,7 +72,7 @@ public class FinancialsAdminBusinessDataSessionBean extends BaseFinancialsDataba } // Now add current date - basicData.setCompanyCreated(new GregorianCalendar()); + basicData.setCompanyCreated(new Date()); // Is there a owner set? if (basicData.getCompanyUserOwner() instanceof User) { diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java index df383d1..6f98e46 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/FinancialsAdminBranchOfficeSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.model.branchoffice; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import java.util.List; import javax.ejb.EJB; import javax.ejb.Stateless; @@ -72,7 +72,7 @@ public class FinancialsAdminBranchOfficeSessionBean extends BaseFinancialsDataba } // Add created timestamp - branchOffice.setBranchCreated(new GregorianCalendar()); + branchOffice.setBranchCreated(new Date()); // Is user instance set? if (branchOffice.getBranchCompany() instanceof BusinessBasicData) { diff --git a/src/java/org/mxchange/jcountry/model/data/FinancialsCountrySingletonBean.java b/src/java/org/mxchange/jcountry/model/data/FinancialsCountrySingletonBean.java index 7b15935..91c17dc 100644 --- a/src/java/org/mxchange/jcountry/model/data/FinancialsCountrySingletonBean.java +++ b/src/java/org/mxchange/jcountry/model/data/FinancialsCountrySingletonBean.java @@ -17,7 +17,7 @@ package org.mxchange.jcountry.model.data; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import java.util.List; import javax.ejb.Singleton; import javax.ejb.Startup; @@ -72,7 +72,7 @@ public class FinancialsCountrySingletonBean extends BaseFinancialsDatabaseBean i } // Add timestamp - country.setCountryEntryCreated(new GregorianCalendar()); + country.setCountryEntryCreated(new Date()); // It is not added, so persist it this.getEntityManager().persist(country); diff --git a/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java b/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java index f594688..3485a51 100644 --- a/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java +++ b/src/java/org/mxchange/jfinancials/database/BaseFinancialsDatabaseBean.java @@ -17,7 +17,7 @@ package org.mxchange.jfinancials.database; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import java.util.Objects; import java.util.Properties; import javax.ejb.EJBException; @@ -109,7 +109,7 @@ public abstract class BaseFinancialsDatabaseBean extends BaseDatabaseBean { this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntriesCreated: Setting created timestamp for land-line number ..."); //NOI18N // Set updated timestamp - landLineNumber.setPhoneEntryCreated(new GregorianCalendar()); + landLineNumber.setPhoneEntryCreated(new Date()); } // Is a fax number instance set? @@ -118,7 +118,7 @@ public abstract class BaseFinancialsDatabaseBean extends BaseDatabaseBean { this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntriesCreated: Setting created timestamp for fax number ..."); //NOI18N // Set updated timestamp - faxNumber.setPhoneEntryCreated(new GregorianCalendar()); + faxNumber.setPhoneEntryCreated(new Date()); } // Is a mobile number instance set? @@ -127,7 +127,7 @@ public abstract class BaseFinancialsDatabaseBean extends BaseDatabaseBean { this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntriesCreated: Setting created timestamp for mobile number ..."); //NOI18N // Set updated timestamp - mobileNumber.setPhoneEntryCreated(new GregorianCalendar()); + mobileNumber.setPhoneEntryCreated(new Date()); } // Trace message @@ -491,7 +491,7 @@ public abstract class BaseFinancialsDatabaseBean extends BaseDatabaseBean { } // Set updated timestamp - detachedContact.setContactUpdated(new GregorianCalendar()); + detachedContact.setContactUpdated(new Date()); // Get contact from it and find it final Contact foundContact = this.getEntityManager().find(detachedContact.getClass(), detachedContact.getContactId()); @@ -857,7 +857,7 @@ public abstract class BaseFinancialsDatabaseBean extends BaseDatabaseBean { this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntriesUpdated: Setting updated timestamp for land-line number ..."); //NOI18N // Set updated timestamp - landLineNumber.setPhoneEntryUpdated(new GregorianCalendar()); + landLineNumber.setPhoneEntryUpdated(new Date()); } // Is a fax number instance set? @@ -866,7 +866,7 @@ public abstract class BaseFinancialsDatabaseBean extends BaseDatabaseBean { this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntriesUpdated: Setting updated timestamp for fax number ..."); //NOI18N // Set updated timestamp - faxNumber.setPhoneEntryUpdated(new GregorianCalendar()); + faxNumber.setPhoneEntryUpdated(new Date()); } // Is a mobile number instance set? @@ -875,7 +875,7 @@ public abstract class BaseFinancialsDatabaseBean extends BaseDatabaseBean { this.getLoggerBeanLocal().logDebug("setAllContactPhoneEntriesUpdated: Setting updated timestamp for mobile number ..."); //NOI18N // Set updated timestamp - mobileNumber.setPhoneEntryUpdated(new GregorianCalendar()); + mobileNumber.setPhoneEntryUpdated(new Date()); } // Trace message diff --git a/src/java/org/mxchange/jfinancials/model/receipt/FinancialAdminReceiptSessionBean.java b/src/java/org/mxchange/jfinancials/model/receipt/FinancialAdminReceiptSessionBean.java new file mode 100644 index 0000000..8b4b615 --- /dev/null +++ b/src/java/org/mxchange/jfinancials/model/receipt/FinancialAdminReceiptSessionBean.java @@ -0,0 +1,185 @@ +/* + * 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 Affero 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +package org.mxchange.jfinancials.model.receipt; + +import java.text.MessageFormat; +import java.util.GregorianCalendar; +import java.util.List; +import java.util.Objects; +import javax.ejb.Stateless; +import javax.persistence.Query; +import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; +import org.mxchange.jfinancials.exceptions.ReceiptAlreadyAddedException; +import org.mxchange.jusercore.model.user.User; + +/** + * A stateless bean for general purposes for receipts + *

+ * @author Roland Häder + */ +@Stateless (name = "financialReceipt", description = "A stateless session bean for handling receipts.") +public class FinancialReceiptSessionBean extends BaseFinancialsDatabaseBean implements FinancialReceiptSessionBeanRemote { + + /** + * Serial number + */ + private static final long serialVersionUID = 659_868_076_723_741L; + + @Override + public BillableReceipt addReceipt (final BillableReceipt receipt) throws ReceiptAlreadyAddedException { + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addReceipt(): receipt={1} - CALLED!", this.getClass().getSimpleName(), receipt)); + + // Validate parameter + if (null == receipt) { + // Throw NPE + throw new NullPointerException("receipt is null"); + } else if (receipt.getReceiptId() != null) { + // Throw IAE + throw new IllegalArgumentException(MessageFormat.format("receipt.receiptId={0} is not expected.", receipt.getReceiptId())); + } else if (receipt.getReceiptIssued() == null) { + // Throw NPE again + throw new NullPointerException("receipt.receiptIssued is null"); + } else if (receipt.getReceiptBranchOffice() == null) { + // Throw it again + throw new NullPointerException("receipt.receiptBranchOffice is null"); + } else if (receipt.getReceiptBranchOffice().getBranchId() == null) { + // Throw it again + throw new NullPointerException("receipt.receiptBranchOffice.branchId is null"); + } else if (receipt.getReceiptBranchOffice().getBranchId() < 1) { + // Throw IAE + throw new IllegalArgumentException(MessageFormat.format("receipt.receiptBranchOffice.branchId={0} is not valid.", receipt.getReceiptBranchOffice().getBranchId())); + } else if (receipt.getReceiptPaymentType() == null) { + // Throw NPE + throw new NullPointerException("receipt.receiptPaymentType is null"); + } else if ((receipt.getReceiptUser() instanceof User) && receipt.getReceiptUser().getUserId() == null) { + // Throw NPE again + throw new NullPointerException("receipt.receiptUser.userId is null"); + } else if ((receipt.getReceiptUser() instanceof User) && receipt.getReceiptUser().getUserId() < 1) { + // Throw NPE again + throw new NullPointerException(MessageFormat.format("receipt.receiptUser.userId={0} is not valid", receipt.getReceiptUser().getUserId())); + } else if (this.isReceiptRegistered(receipt)) { + // Has already been registered + throw new ReceiptAlreadyAddedException(receipt); + } + + // Add created instance + receipt.setReceiptCreated(new GregorianCalendar()); + + // Persist it + this.getEntityManager().persist(receipt); + + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.addReceipt(): receipt.receiptId={1} - EXIT!", this.getClass().getSimpleName(), receipt.getReceiptId())); + + // Return it + return receipt; + } + + @Override + @SuppressWarnings ("unchecked") + public List allReceipts () { + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allReceipts(): CALLED!", this.getClass().getSimpleName())); + + // Query all + final Query query = this.getEntityManager().createNamedQuery("AllReceipts"); + + // Get all + final List receipts = query.getResultList(); + + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allReceipts(): receipts.size()={1} EXIT!", this.getClass().getSimpleName(), receipts.size())); + + // Return it + return receipts; + } + + @Override + @SuppressWarnings ("unchecked") + public List allUsersReceipts (final User user) { + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allUsersReceipts(): user={1} - CALLED!", this.getClass().getSimpleName(), user)); + + // Validate parameter + if (null == user) { + // Throw NPE + throw new NullPointerException("user is null"); + } else if (user.getUserId() == null) { + // Throw it again + throw new NullPointerException("user.userId is null"); + } else if (user.getUserId() < 1) { + // Throw IAE + throw new IllegalArgumentException(MessageFormat.format("user.userId={0} is not valid", user.getUserId())); + } + + // Query all + final Query query = this.getEntityManager().createNamedQuery("SearchAllUserReceipts"); + + // Add parameter + query.setParameter("receiptUser", user); + + // Get all + final List receipts = query.getResultList(); + + // Trace message + this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.allUsersReceipts(): receipts.size()={1} EXIT!", this.getClass().getSimpleName(), receipts.size())); + + // Return it + return receipts; + } + + /** + * Checks if given receipt is already persisted by checking receipt number + * and branch office combination. + *

+ * @param receipt Receipt instance + *

+ * @return Whether the receipt has already been registered + */ + private boolean isReceiptRegistered (final BillableReceipt receipt) { + // Get all receipts + final List receipts = this.allReceipts(); + + // Is the list empty? + if (receipts.isEmpty()) { + // Abort here + return false; + } + + // Default is not found + boolean isFound = false; + + // Now, check each entry + for (final BillableReceipt foundReceipt : receipts) { + // Is same entity or same receipt number and branch office found? + if (Objects.equals(foundReceipt, receipt)) { + // Yes, then stop searching + isFound = true; + break; + } else if (Receipts.isSameReceipt(foundReceipt, receipt)){ + // Yes, then stop searching + isFound = true; + break; + } + } + + // Return flag + return isFound; + } + +} diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java index 6d8fdc6..5d015c3 100644 --- a/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobileprovider/FinancialsAdminMobileProviderSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.model.phonenumbers.mobileprovider; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import javax.ejb.Stateless; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; @@ -79,7 +79,7 @@ public class FinancialsAdminMobileProviderSessionBean extends BaseFinancialsData } // Set creation timestamp - mobileProvider.setProviderEntryCreated(new GregorianCalendar()); + mobileProvider.setProviderEntryCreated(new Date()); // Persist it this.getEntityManager().persist(mobileProvider); diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java index 0277f2c..be388f8 100644 --- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java +++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/FinancialsAdminPhoneSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jphone.model.phonenumbers.phone; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import javax.ejb.Stateless; import org.mxchange.jfinancials.database.BaseFinancialsDatabaseBean; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; @@ -235,7 +235,7 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsDatabaseBean // Set updated timestamp FaxNumbers.copyAll(faxNumber, managedNumber); - managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); + managedNumber.setPhoneEntryUpdated(new Date()); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateFaxData: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N @@ -293,7 +293,7 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsDatabaseBean // Set updated timestamp LandLineNumbers.copyAll(landLineNumber, managedNumber); - managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); + managedNumber.setPhoneEntryUpdated(new Date()); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateLandLineData: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N @@ -345,7 +345,7 @@ public class FinancialsAdminPhoneSessionBean extends BaseFinancialsDatabaseBean // Set updated timestamp MobileNumbers.copyAll(mobileNumber, managedNumber); - managedNumber.setPhoneEntryUpdated(new GregorianCalendar()); + managedNumber.setPhoneEntryUpdated(new Date()); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateMobileData: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java index a63d80a..f0924d4 100644 --- a/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/FinancialsAdminUserSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jusercore.model.user; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import javax.ejb.EJB; import javax.ejb.Stateless; import org.mxchange.jcontacts.model.contact.Contact; @@ -88,8 +88,8 @@ public class FinancialsAdminUserSessionBean extends BaseFinancialsDatabaseBean i } // Set created timestamp - user.setUserCreated(new GregorianCalendar()); - user.getUserContact().setContactCreated(new GregorianCalendar()); + user.setUserCreated(new Date()); + user.getUserContact().setContactCreated(new Date()); // Update mobile, land-line and fax instance this.setAllContactPhoneEntriesCreated(user.getUserContact()); @@ -185,7 +185,7 @@ public class FinancialsAdminUserSessionBean extends BaseFinancialsDatabaseBean i user.setUserContact(foundContact); // Set timestamp - user.setUserCreated(new GregorianCalendar()); + user.setUserCreated(new Date()); // Perist it this.getEntityManager().persist(user); @@ -246,7 +246,7 @@ public class FinancialsAdminUserSessionBean extends BaseFinancialsDatabaseBean i // Set as locked, set timestamp and lock reason user.setUserAccountStatus(UserAccountStatus.LOCKED); - user.setUserLastLocked(new GregorianCalendar()); + user.setUserLastLocked(new Date()); user.setUserLastLockedReason(userLockReason); // Update user diff --git a/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java index 8d7bf57..bb99c45 100644 --- a/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/FinancialsUserSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jusercore.model.user; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import java.util.List; import javax.ejb.EJB; import javax.ejb.EJBException; @@ -188,7 +188,7 @@ public class FinancialsUserSessionBean extends BaseFinancialsDatabaseBean implem // Update user status and remove confirmation key managedUser.setUserAccountStatus(UserAccountStatus.CONFIRMED); managedUser.setUserConfirmKey(null); - managedUser.setUserUpdated(new GregorianCalendar()); + managedUser.setUserUpdated(new Date()); // Send out email this.sendEmail("User account confirmed", "user_account_confirmed", managedUser, baseUrl, null); //NOI18N @@ -595,7 +595,7 @@ public class FinancialsUserSessionBean extends BaseFinancialsDatabaseBean implem UserUtils.copyAll(managedUser, managedUser); // Set as updated - managedUser.setUserUpdated(new GregorianCalendar()); + managedUser.setUserUpdated(new Date()); // Trace message this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateUserData: managedUser={1} - CALLED!", this.getClass().getSimpleName(), managedUser)); //NOI18N @@ -655,13 +655,13 @@ public class FinancialsUserSessionBean extends BaseFinancialsDatabaseBean implem final User managedUser = this.updateUserData(user); // Update user account - managedUser.setUserUpdated(new GregorianCalendar()); + managedUser.setUserUpdated(new Date()); // Create history entry PasswordHistory entry = new UserPasswordHistory(user.getUserEncryptedPassword(), managedUser); // Set created timestamp - entry.setUserPasswordHistoryCreated(new GregorianCalendar()); + entry.setUserPasswordHistoryCreated(new Date()); // Merge user to make sure it is not re-persisted final User mergedUser = this.getEntityManager().merge(managedUser); @@ -713,8 +713,8 @@ public class FinancialsUserSessionBean extends BaseFinancialsDatabaseBean implem UserUtils.copyAll(user, managedUser); // Set as updated - managedUser.setUserUpdated(new GregorianCalendar()); - managedUser.getUserContact().setContactUpdated(new GregorianCalendar()); + managedUser.setUserUpdated(new Date()); + managedUser.getUserContact().setContactUpdated(new Date()); // Get contact from it and find it final Contact foundContact = this.getEntityManager().find(managedUser.getUserContact().getClass(), managedUser.getUserContact().getContactId()); diff --git a/src/java/org/mxchange/jusercore/model/user/email_address/FinancialsUserEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/user/email_address/FinancialsUserEmailChangeSessionBean.java index 7cc0c20..9c74ab2 100644 --- a/src/java/org/mxchange/jusercore/model/user/email_address/FinancialsUserEmailChangeSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/email_address/FinancialsUserEmailChangeSessionBean.java @@ -17,7 +17,7 @@ package org.mxchange.jusercore.model.user.email_address; import java.text.MessageFormat; -import java.util.GregorianCalendar; +import java.util.Date; import java.util.List; import javax.ejb.EJB; import javax.ejb.EJBException; @@ -106,7 +106,7 @@ public class FinancialsUserEmailChangeSessionBean extends BaseFinancialsDatabase } // The email change is not (yet) there, add secure hash and "created" timestamp - emailChange.setEmailChangeCreated(new GregorianCalendar()); + emailChange.setEmailChangeCreated(new Date()); this.generateSecureHash(emailChange); // Persist it