From: Roland Häder <roland@mxchange.org>
Date: Sat, 5 Nov 2022 04:39:57 +0000 (+0100)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bbe6d414aa8a996062ec7d718879dbfb41799221;p=addressbook-war.git

Please cherry-pick:
- updated to latest changes in constructor (order of parameters)
- also used newly added constructor with all optional class fields, except
  contactId, fax/land-line/mobile number and created/updated fields
---

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
index 0ed6037b..e40ff96d 100644
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
@@ -422,19 +422,21 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookBean i
 					  this.getPersonalTitle(),
 					  this.getFirstName(),
 					  this.getFamilyName(),
-					  this.getContactCountry()
+					  this.getContactCountry(),
+					  Boolean.FALSE,
+					  this.getStreet(),
+					  this.getHouseNumber(),
+					  this.getHouseNumberExtension(),
+					  this.getZipCode(),
+					  this.getCity(),
+					  this.getEmailAddress(),
+					  this.getAcademicTitle(),
+					  this.getBirthday(),
+					  this.getComment()
 			  );
 
-		// Add all others
-		localContact.setContactBirthday(this.getBirthday());
-		localContact.setContactCity(this.getCity());
-		localContact.setContactComment(this.getComment());
-		localContact.setContactEmailAddress(this.getEmailAddress());
-		localContact.setContactHouseNumber(this.getHouseNumber());
+		// Add missing fields
 		localContact.setContactId(this.getContactId());
-		localContact.setContactStreet(this.getStreet());
-		localContact.setContactTitle(this.getAcademicTitle());
-		localContact.setContactZipCode(this.getZipCode());
 
 		// Don't set null or wrong references
 		if ((landLine instanceof DialableLandLineNumber) && (landLine.getPhoneCountry() instanceof Country) && (this.getLandLineAreaCode() != null) && (this.getLandLineNumber() != null) && (this.getLandLineAreaCode() > 0) && (this.getLandLineNumber() > 0)) {
diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java
index 4bcf24cf..eec15965 100644
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java
@@ -497,7 +497,8 @@ public class AddressbookContactWebRequestBean extends BaseAddressbookBean implem
 					  this.getPersonalTitle(),
 					  this.getFirstName(),
 					  this.getFamilyName(),
-					  this.getCountry()
+					  this.getCountry(),
+					  Boolean.FALSE
 			  );
 
 		// Don't set null or wrong references