From 11d1e059f63f714c26adf4cf41158e3fa3efa80a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 19 Aug 2017 20:33:19 +0200 Subject: [PATCH] Continued: - moved business (basic) data related exceptions to own package - added exception when a company employee was not found - some auto-formatting MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../employee/CompanyEmployee.java | 2 +- .../BusinessDataAlreadyAddedException.java | 2 +- .../BusinessDataNotFoundException.java | 6 +- .../CompanyEmployeeNotFoundException.java | 65 +++++++++++++++++++ .../opening_times/BusinessOpeningTimes.java | 18 ++--- 5 files changed, 79 insertions(+), 14 deletions(-) rename src/org/mxchange/jcontactsbusiness/exceptions/{ => basicdata}/BusinessDataAlreadyAddedException.java (96%) rename src/org/mxchange/jcontactsbusiness/exceptions/{ => basicdata}/BusinessDataNotFoundException.java (93%) create mode 100644 src/org/mxchange/jcontactsbusiness/exceptions/employee/CompanyEmployeeNotFoundException.java diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index 8901552..e702921 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -33,6 +33,7 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; +import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.branch.BranchOffice; import org.mxchange.jcontactsbusiness.branch.CompanyBranchOffice; @@ -46,7 +47,6 @@ import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; /** * A POJO for company employees (including CEO) diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java similarity index 96% rename from src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataAlreadyAddedException.java rename to src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java index 50b2aaa..a60459c 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataAlreadyAddedException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.exceptions; +package org.mxchange.jcontactsbusiness.exceptions.basicdata; import java.text.MessageFormat; import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java similarity index 93% rename from src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataNotFoundException.java rename to src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java index 918db2f..a0f9977 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/BusinessDataNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BusinessDataNotFoundException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.exceptions; +package org.mxchange.jcontactsbusiness.exceptions.basicdata; import java.text.MessageFormat; @@ -44,7 +44,7 @@ public class BusinessDataNotFoundException extends Exception { * Constructor with business contact id and causing exception *

* @param businessContactId Business contact id - * @param cause Causing exception + * @param cause Causing exception */ public BusinessDataNotFoundException (final Long businessContactId, final Throwable cause) { // Call super constructor with message and cause @@ -55,7 +55,7 @@ public class BusinessDataNotFoundException extends Exception { * Constructor with email address and causing exception *

* @param emailAddress Email address - * @param cause Causing exception + * @param cause Causing exception */ public BusinessDataNotFoundException (final String emailAddress, final Throwable cause) { // Call super constructor with message and cause diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/employee/CompanyEmployeeNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/employee/CompanyEmployeeNotFoundException.java new file mode 100644 index 0000000..40ac5a4 --- /dev/null +++ b/src/org/mxchange/jcontactsbusiness/exceptions/employee/CompanyEmployeeNotFoundException.java @@ -0,0 +1,65 @@ +/* + * 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.jcontactsbusiness.exceptions.employee; + +import java.text.MessageFormat; + +/** + * An exception thrown when a contact (entity) has not found. + *

+ * @author Roland Häder + */ +public class CompanyEmployeeNotFoundException extends Exception { + + /** + * Serial number + */ + private static final long serialVersionUID = 23_759_801_876_416_568L; + + /** + * Constructor with company employee id + *

+ * @param employeeId Company employee id + */ + public CompanyEmployeeNotFoundException (final Long employeeId) { + // Call super constructor with message and cause + super(MessageFormat.format("Company employee with id {0} was not found.", employeeId)); //NOI18N + } + + /** + * Constructor with company employee id and causing exception + *

+ * @param employeeId Company employee id + * @param cause Causing exception + */ + public CompanyEmployeeNotFoundException (final Long employeeId, final Throwable cause) { + // Call super constructor with message and cause + super(MessageFormat.format("Company employee with id {0} was not found.", employeeId), cause); //NOI18N + } + + /** + * Constructor with email address and causing exception + *

+ * @param emailAddress Email address + * @param cause Causing exception + */ + public CompanyEmployeeNotFoundException (final String emailAddress, final Throwable cause) { + // Call super constructor with message and cause + super(MessageFormat.format("Company employee with email address {0} was not found.", emailAddress), cause); //NOI18N + } + +} diff --git a/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java b/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java index ca8cc13..1262030 100644 --- a/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java +++ b/src/org/mxchange/jcontactsbusiness/opening_times/BusinessOpeningTimes.java @@ -52,7 +52,7 @@ public class BusinessOpeningTimes implements OpeningTimes { * Ending day of opening hours (if applyable) */ @Column (name = "opening_times_end_day") - @Enumerated(EnumType.STRING) + @Enumerated (EnumType.STRING) private DayOfTheWeek endDay; /** @@ -76,7 +76,7 @@ public class BusinessOpeningTimes implements OpeningTimes { */ @Basic (optional = false) @Column (name = "opening_times_start_day", nullable = false) - @Enumerated(EnumType.STRING) + @Enumerated (EnumType.STRING) private DayOfTheWeek startDay; /** @@ -96,10 +96,10 @@ public class BusinessOpeningTimes implements OpeningTimes { /** * Constructor with all field *

- * @param endDay End day - * @param endTime End time - * @param id Id number - * @param startDay Start day + * @param endDay End day + * @param endTime End time + * @param id Id number + * @param startDay Start day * @param startTime Start time */ public BusinessOpeningTimes (final DayOfTheWeek endDay, final Calendar endTime, final Long id, final DayOfTheWeek startDay, final Calendar startTime) { @@ -113,9 +113,9 @@ public class BusinessOpeningTimes implements OpeningTimes { /** * Constructor with all fields except id number *

- * @param endDay End day - * @param endTime End time - * @param startDay Start day + * @param endDay End day + * @param endTime End time + * @param startDay Start day * @param startTime Start time */ public BusinessOpeningTimes (final DayOfTheWeek endDay, final Calendar endTime, final DayOfTheWeek startDay, final Calendar startTime) { -- 2.39.5