From 20880d53fe4edd9a4e97f87c138dd0acae8848db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 5 Nov 2022 05:39:57 +0100 Subject: [PATCH] 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 --- .../PizzaAdminContactWebRequestBean.java | 22 ++++++++++--------- .../contact/PizzaContactWebRequestBean.java | 3 ++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java index efe9ab64..8b86356c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaAdminContactWebRequestBean.java @@ -422,19 +422,21 @@ public class PizzaAdminContactWebRequestBean extends BasePizzaBean implements Pi 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/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java index 5ec23a3d..3c2b3a46 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebRequestBean.java @@ -497,7 +497,8 @@ public class PizzaContactWebRequestBean extends BasePizzaBean implements PizzaCo this.getPersonalTitle(), this.getFirstName(), this.getFamilyName(), - this.getCountry() + this.getCountry(), + Boolean.FALSE ); // Don't set null or wrong references -- 2.39.5