From: Roland Häder Date: Sat, 5 Nov 2022 06:52:48 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=693c650b236e8f2e923be6e1739fff33e66380c1;p=juser-core.git Continued: - added Apache Lang3 3.12.0 - compare userName and userConfirmKey with Apache's StringUtils utilities class - also compare primary key from email_change entity - first optional constructor now requires status being provided (please use EmailChangeStatus.NEW where possible) --- diff --git a/lib/commons-lang3/commons-lang3-3.12.0.jar b/lib/commons-lang3/commons-lang3-3.12.0.jar new file mode 100644 index 0000000..4d434a2 Binary files /dev/null and b/lib/commons-lang3/commons-lang3-3.12.0.jar differ diff --git a/lib/commons-lang3/commons-lang3_LICENSE.txt b/lib/commons-lang3/commons-lang3_LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/lib/commons-lang3/commons-lang3_LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties index 83792b7..f57e303 100644 --- a/lib/nblibraries.properties +++ b/lib/nblibraries.properties @@ -3,6 +3,11 @@ libs.commons-codec.classpath=\ libs.commons-codec.displayName=Commons Codec 1.15 libs.commons-codec.javadoc=\ https://commons.apache.org/proper/commons-codec/archives/1.15/apidocs/ +libs.commons-lang3.classpath=\ + ${base}/commons-lang3/commons-lang3-3.12.0.jar +libs.commons-lang3.displayName=Commons Lang3 3.12.0 +libs.commons-lang3.javadoc=\ + https://commons.apache.org/proper/commons-lang/javadocs/api-release/ libs.CopyLibs.classpath=\ ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar libs.CopyLibs.displayName=CopyLibs Task diff --git a/nbproject/project.properties b/nbproject/project.properties index 1f307fe..b7d9f3e 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -40,6 +40,7 @@ javac.classpath=\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.jcore-utils.jar}:\ ${libs.commons-codec.classpath}:\ + ${libs.commons-lang3.classpath}:\ ${libs.jpa20-persistence.classpath} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation diff --git a/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java b/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java index 6e278ed..0fed053 100644 --- a/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java +++ b/src/org/mxchange/jusercore/model/email_address/EmailAddressChange.java @@ -118,17 +118,16 @@ public class EmailAddressChange implements ChangeableEmailAddress { * Default constructor */ public EmailAddressChange () { - // Set default email change status - this.emailChangeStatus = EmailChangeStatus.NEW; } /** * Constructor with user and email address *

- * @param user User instance - * @param emailAddress Email address + * @param user User instance + * @param emailAddress Email address + * @param emailChangeStatus Email change status */ - public EmailAddressChange (final User user, final String emailAddress) { + public EmailAddressChange (final User user, final String emailAddress, final EmailChangeStatus emailChangeStatus) { // Call other constructor this(); @@ -148,11 +147,15 @@ public class EmailAddressChange implements ChangeableEmailAddress { } else if (emailAddress.isEmpty()) { // Throw IAE throw new IllegalArgumentException("emailAddress is empty"); //NOI18N + } else if (null == emailChangeStatus) { + // Throw NPE + throw new NullPointerException("emailChangeStatus is null"); //NOI18N } // Set all this.emailChangeUser = user; this.emailAddress = emailAddress; + this.emailChangeStatus = emailChangeStatus; } @Override @@ -171,6 +174,8 @@ public class EmailAddressChange implements ChangeableEmailAddress { return false; } else if (!Objects.equals(this.getEmailChangeHash(), otherEmail.getEmailChangeHash())) { return false; + } else if (!Objects.equals(this.getEmailChangeId(), otherEmail.getEmailChangeId())) { + return false; } else if (!Objects.equals(this.getEmailChangeStatus(), otherEmail.getEmailChangeStatus())) { return false; } else if (!Objects.equals(this.getEmailChangeUser(), otherEmail.getEmailChangeUser())) { @@ -260,6 +265,7 @@ public class EmailAddressChange implements ChangeableEmailAddress { hash = 71 * hash + Objects.hashCode(this.getEmailAddress()); hash = 71 * hash + Objects.hashCode(this.getEmailChangeHash()); + hash = 71 * hash + Objects.hashCode(this.getEmailChangeId()); hash = 71 * hash + Objects.hashCode(this.getEmailChangeStatus()); hash = 71 * hash + Objects.hashCode(this.getEmailChangeUser()); diff --git a/src/org/mxchange/jusercore/model/user/LoginUser.java b/src/org/mxchange/jusercore/model/user/LoginUser.java index 5d05817..134d6dc 100644 --- a/src/org/mxchange/jusercore/model/user/LoginUser.java +++ b/src/org/mxchange/jusercore/model/user/LoginUser.java @@ -37,6 +37,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; +import org.apache.commons.lang3.StringUtils; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontacts.model.utils.ContactUtils; @@ -232,7 +233,7 @@ public class LoginUser implements User { // First contact ContactUtils.compare(this.getUserContact(), user.getUserContact()), // ... then user name (case-insensitive) - this.getUserName().compareToIgnoreCase(user.getUserName()), + StringUtils.compareIgnoreCase(this.getUserName(), user.getUserName()), // ... account status this.getUserAccountStatus().compareTo(user.getUserAccountStatus()), // ... profile mode @@ -240,7 +241,7 @@ public class LoginUser implements User { // ... "must change password" flag this.getUserMustChangePassword().compareTo(user.getUserMustChangePassword()), // ... confirm key - this.getUserConfirmKey().compareTo(user.getUserConfirmKey()) + StringUtils.compare(this.getUserConfirmKey(), user.getUserConfirmKey()) }; // Check all values