From 8ea148d012f65610ff284c08db79851a3d1da386 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 16 Oct 2017 20:28:23 +0200 Subject: [PATCH] Continued: - no other employees than company/business employees will be there ... - renamed Employee interface to a much nicer Employable name - renamed CompanyDepartment -> BusinessDepartment as there will be other kinds of departments (e.g. fire/police) - renamed more company -> business, but not all MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AdminAddedBusinessBasicDataEvent.java | 8 +- ...vableAdminAddedBusinessBasicDataEvent.java | 4 +- .../employee/added/EmployeeAddedEvent.java | 8 +- .../added/ObservableEmployeeAddedEvent.java | 6 +- ...va => BasicDataAlreadyAddedException.java} | 10 +- ...n.java => BasicDataNotFoundException.java} | 8 +- ...on.java => EmployeeNotFoundException.java} | 20 +- .../model/basicdata/BasicData.java | 252 ++++++++++ .../model/basicdata/BusinessBasicData.java | 440 ++++++++++++------ .../model/basicdata/CompanyBasicData.java | 394 ---------------- .../model/branchoffice/BranchOffice.java | 18 +- ...hOffice.java => BusinessBranchOffice.java} | 36 +- ...epartment.java => BusinessDepartment.java} | 34 +- .../model/department/Department.java | 20 +- ...anyEmployee.java => BusinessEmployee.java} | 42 +- .../{Employee.java => Employable.java} | 48 +- 16 files changed, 674 insertions(+), 674 deletions(-) rename src/org/mxchange/jcontactsbusiness/exceptions/basicdata/{BasicCompanyDataAlreadyAddedException.java => BasicDataAlreadyAddedException.java} (79%) rename src/org/mxchange/jcontactsbusiness/exceptions/basicdata/{BasicCompanyDataNotFoundException.java => BasicDataNotFoundException.java} (85%) rename src/org/mxchange/jcontactsbusiness/exceptions/employee/{CompanyEmployeeNotFoundException.java => EmployeeNotFoundException.java} (64%) create mode 100644 src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java delete mode 100644 src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java rename src/org/mxchange/jcontactsbusiness/model/branchoffice/{CompanyBranchOffice.java => BusinessBranchOffice.java} (92%) rename src/org/mxchange/jcontactsbusiness/model/department/{CompanyDepartment.java => BusinessDepartment.java} (86%) rename src/org/mxchange/jcontactsbusiness/model/employee/{CompanyEmployee.java => BusinessEmployee.java} (86%) rename src/org/mxchange/jcontactsbusiness/model/employee/{Employee.java => Employable.java} (79%) diff --git a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java index 44debeb..f608497 100644 --- a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/AdminAddedBusinessBasicDataEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.events.basicdata.added; import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * An event being thrown when new basic business data has been added. @@ -35,14 +35,14 @@ public class AdminAddedBusinessBasicDataEvent implements ObservableAdminAddedBus * Basic data instance just being created. It must bear aside company name * also a primary key. */ - private final BusinessBasicData basicData; + private final BasicData basicData; /** * Constructor with basic data *

* @param basicData Basic data with at least company name and primary key */ - public AdminAddedBusinessBasicDataEvent (final BusinessBasicData basicData) { + public AdminAddedBusinessBasicDataEvent (final BasicData basicData) { // Is company name and primary key set? if (null == basicData) { // Throw NPE @@ -66,7 +66,7 @@ public class AdminAddedBusinessBasicDataEvent implements ObservableAdminAddedBus } @Override - public BusinessBasicData getBasicData () { + public BasicData getBasicData () { return this.basicData; } diff --git a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java index b8051d6..67dc3f6 100644 --- a/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/basicdata/added/ObservableAdminAddedBusinessBasicDataEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.events.basicdata.added; import java.io.Serializable; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * An interface for events being fired when new basic business data has been @@ -32,6 +32,6 @@ public interface ObservableAdminAddedBusinessBasicDataEvent extends Serializable *

* @return Basic business data entity */ - BusinessBasicData getBasicData (); + BasicData getBasicData (); } diff --git a/src/org/mxchange/jcontactsbusiness/events/employee/added/EmployeeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/employee/added/EmployeeAddedEvent.java index 483ee51..6acb434 100644 --- a/src/org/mxchange/jcontactsbusiness/events/employee/added/EmployeeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/employee/added/EmployeeAddedEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.events.employee.added; import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.employee.Employable; /** * An event being fired when a employee has been added @@ -34,7 +34,7 @@ public class EmployeeAddedEvent implements ObservableEmployeeAddedEvent { /** * Branch office instance being added */ - private final Employee employee; + private final Employable employee; /** * Constructor with employee instance @@ -42,7 +42,7 @@ public class EmployeeAddedEvent implements ObservableEmployeeAddedEvent { * @param employee Branch office instance * @throws NullPointerException If the parameter is null */ - public EmployeeAddedEvent (final Employee employee) { + public EmployeeAddedEvent (final Employable employee) { // Check parameter if (null == employee) { // Throw NPE @@ -60,7 +60,7 @@ public class EmployeeAddedEvent implements ObservableEmployeeAddedEvent { } @Override - public Employee getEmployee () { + public Employable getEmployee () { return this.employee; } diff --git a/src/org/mxchange/jcontactsbusiness/events/employee/added/ObservableEmployeeAddedEvent.java b/src/org/mxchange/jcontactsbusiness/events/employee/added/ObservableEmployeeAddedEvent.java index d7bac1a..395b683 100644 --- a/src/org/mxchange/jcontactsbusiness/events/employee/added/ObservableEmployeeAddedEvent.java +++ b/src/org/mxchange/jcontactsbusiness/events/employee/added/ObservableEmployeeAddedEvent.java @@ -17,7 +17,7 @@ package org.mxchange.jcontactsbusiness.events.employee.added; import java.io.Serializable; -import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.employee.Employable; /** * An interface for events being triggered when a employee has been added. @@ -29,8 +29,8 @@ public interface ObservableEmployeeAddedEvent extends Serializable { /** * Getter for employee instance *

- * @return Employee instance + * @return Employable instance */ - Employee getEmployee (); + Employable getEmployee (); } diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataAlreadyAddedException.java similarity index 79% rename from src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java rename to src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataAlreadyAddedException.java index f489c7f..9dc55b1 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataAlreadyAddedException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataAlreadyAddedException.java @@ -17,14 +17,14 @@ package org.mxchange.jcontactsbusiness.exceptions.basicdata; import java.text.MessageFormat; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** - * Thrown if the given BusinessBasicData instance is already added + * Thrown if the given BasicData instance is already added *

* @author Roland Häder */ -public class BasicCompanyDataAlreadyAddedException extends Exception { +public class BasicDataAlreadyAddedException extends Exception { /** * Serial number @@ -36,14 +36,14 @@ public class BasicCompanyDataAlreadyAddedException extends Exception { *

* @param businessContact Business contact that is already added */ - public BasicCompanyDataAlreadyAddedException (final BusinessBasicData businessContact) { + public BasicDataAlreadyAddedException (final BasicData businessContact) { super(MessageFormat.format("Business contact with comanyName={0} already added.", businessContact.getCompanyName())); //NOI18N } /** * Default constructor, may be used if no contact instance is available */ - public BasicCompanyDataAlreadyAddedException () { + public BasicDataAlreadyAddedException () { super("Business contact already added"); //NOI18N } diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataNotFoundException.java similarity index 85% rename from src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java rename to src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataNotFoundException.java index 8f214c9..2b70164 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicCompanyDataNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/basicdata/BasicDataNotFoundException.java @@ -23,7 +23,7 @@ import java.text.MessageFormat; *

* @author Roland Häder */ -public class BasicCompanyDataNotFoundException extends Exception { +public class BasicDataNotFoundException extends Exception { /** * Serial number @@ -35,7 +35,7 @@ public class BasicCompanyDataNotFoundException extends Exception { *

* @param businessContactId Business contact id */ - public BasicCompanyDataNotFoundException (final Long businessContactId) { + public BasicDataNotFoundException (final Long businessContactId) { // Call super constructor with message and cause super(MessageFormat.format("Business contact with id {0} was not found.", businessContactId)); //NOI18N } @@ -46,7 +46,7 @@ public class BasicCompanyDataNotFoundException extends Exception { * @param businessContactId Business contact id * @param cause Causing exception */ - public BasicCompanyDataNotFoundException (final Long businessContactId, final Throwable cause) { + public BasicDataNotFoundException (final Long businessContactId, final Throwable cause) { // Call super constructor with message and cause super(MessageFormat.format("Business contact with id {0} was not found.", businessContactId), cause); //NOI18N } @@ -57,7 +57,7 @@ public class BasicCompanyDataNotFoundException extends Exception { * @param emailAddress Email address * @param cause Causing exception */ - public BasicCompanyDataNotFoundException (final String emailAddress, final Throwable cause) { + public BasicDataNotFoundException (final String emailAddress, final Throwable cause) { // Call super constructor with message and cause super(MessageFormat.format("Business contact with email address {0} was not found.", emailAddress), cause); //NOI18N } diff --git a/src/org/mxchange/jcontactsbusiness/exceptions/employee/CompanyEmployeeNotFoundException.java b/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeNotFoundException.java similarity index 64% rename from src/org/mxchange/jcontactsbusiness/exceptions/employee/CompanyEmployeeNotFoundException.java rename to src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeNotFoundException.java index 21ee750..64b2b97 100644 --- a/src/org/mxchange/jcontactsbusiness/exceptions/employee/CompanyEmployeeNotFoundException.java +++ b/src/org/mxchange/jcontactsbusiness/exceptions/employee/EmployeeNotFoundException.java @@ -19,11 +19,11 @@ package org.mxchange.jcontactsbusiness.exceptions.employee; import java.text.MessageFormat; /** - * An exception thrown when a company employee (entity) has not found. + * An exception thrown when a employee (entity) has not found. *

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

- * @param employeeId Company employee id + * @param employeeId Employee id */ - public CompanyEmployeeNotFoundException (final Long employeeId) { + public EmployeeNotFoundException (final Long employeeId) { // Call super constructor with message and cause - super(MessageFormat.format("Company employee with id {0} was not found.", employeeId)); //NOI18N + super(MessageFormat.format("Employee with id {0} was not found.", employeeId)); //NOI18N } /** @@ -46,9 +46,9 @@ public class CompanyEmployeeNotFoundException extends Exception { * @param employeeId Company employee id * @param cause Causing exception */ - public CompanyEmployeeNotFoundException (final Long employeeId, final Throwable cause) { + public EmployeeNotFoundException (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 + super(MessageFormat.format("Employee with id {0} was not found.", employeeId), cause); //NOI18N } /** @@ -57,9 +57,9 @@ public class CompanyEmployeeNotFoundException extends Exception { * @param emailAddress Email address * @param cause Causing exception */ - public CompanyEmployeeNotFoundException (final String emailAddress, final Throwable cause) { + public EmployeeNotFoundException (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 + super(MessageFormat.format("Employee with email address {0} was not found.", emailAddress), cause); //NOI18N } } diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java new file mode 100644 index 0000000..6eef651 --- /dev/null +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicData.java @@ -0,0 +1,252 @@ +/* + * 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.model.basicdata; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; +import org.mxchange.jcontactsbusiness.model.employee.Employable; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; +import org.mxchange.jcontactsbusiness.model.logo.BusinessLogo; +import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jusercore.model.user.User; + +/** + * A POJI for business contact classes + *

+ * @author Roland Häder + */ +public interface BasicData extends Serializable { + + /** + * Getter for branches list + *

+ * @return Branches list + */ + List getBrancheOffices (); + + /** + * Setter for branches list + *

+ * @param branches Branches list + */ + void setBrancheOffices (final List branches); + + /** + * Getter for company contact person + *

+ * @return Company contact person + */ + Employable getCompanyContactEmployee (); + + /** + * Setter for company contact person + *

+ * @param companyContact Company contact person + */ + void setCompanyContactEmployee (final Employable companyContact); + + /** + * Getter for business contact id + *

+ * @return Business contact id + */ + Long getBasicDataId (); + + /** + * Setter for business contact id + *

+ * @param businessContactId Business contact id + */ + void setBasicDataId (final Long businessContactId); + + /** + * Getter for company founder + *

+ * @return Company founder + */ + Employable getCompanyFounder (); + + /** + * Setter for company founder + *

+ * @param companyFounder Company founder + */ + void setCompanyFounder (final Employable companyFounder); + + /** + * Getter for headquarters data + *

+ * @return Headquarters data + */ + HeadquartersData getCompanyHeadQuartersData (); + + /** + * Setter for headquarters data + *

+ * @param headQuartersData Headquarters data + */ + void setCompanyHeadQuartersData (final HeadquartersData headQuartersData); + + /** + * Getter for user owner instance + *

+ * @return User owner instance + */ + User getCompanyUserOwner (); + + /** + * Setter for user owner instance + *

+ * @param contactUserOwner User owner instance + */ + void setCompanyUserOwner (final User contactUserOwner); + + /** + * Getter for timestamp when this entry has been created + *

+ * @return Timestamp when this entry has been created + */ + Date getCompanyCreated (); + + /** + * Setter for timestamp when this entry has been created + *

+ * @param contactCreated Timestamp when this entry has been created + */ + void setCompanyCreated (final Date contactCreated); + + /** + * Getter for comments + *

+ * @return Comments + */ + String getCompanyComments (); + + /** + * Setter for comments + *

+ * @param companyComments Comments + */ + void setCompanyComments (final String companyComments); + + /** + * Getter for email address + *

+ * @return Email address + */ + String getCompanyEmailAddress (); + + /** + * Setter for email address + *

+ * @param companyEmailAddress Email address + */ + void setCompanyEmailAddress (final String companyEmailAddress); + + /** + * Getter for list of fax number + *

+ * @return Fax numbers + */ + DialableFaxNumber getCompanyFaxNumber (); + + /** + * Setter for list of fax number + *

+ * @param companyFaxNumber Fax numbers + */ + void setCompanyFaxNumber (final DialableFaxNumber companyFaxNumber); + + /** + * Getter for company logo + *

+ * @return Company logo + */ + BusinessLogo getCompanyLogo (); + + /** + * Setter for company logo + *

+ * @param companyLogo Company logo + */ + void setCompanyLogo (final BusinessLogo companyLogo); + + /** + * Getter for company name + *

+ * @return Company name + */ + String getCompanyName (); + + /** + * Setter for company name + *

+ * @param companyName Company name + */ + void setCompanyName (final String companyName); + + /** + * Getter for list of phone number + *

+ * @return Phone numbers + */ + DialableLandLineNumber getCompanyLandLineNumber (); + + /** + * Setter for list of phone number + *

+ * @param companyPhoneNumber Phone numbers + */ + void setCompanyLandLineNumber (final DialableLandLineNumber companyPhoneNumber); + + /** + * Getter for tax number + *

+ * @return Tax number + */ + String getCompanyTaxNumber (); + + /** + * Setter for tax number + *

+ * @param companyTaxNumber Tax number + */ + void setCompanyTaxNumber (final String companyTaxNumber); + + /** + * Getter for website URL + *

+ * @return Website URL + */ + String getCompanyWebsiteUrl (); + + /** + * Setter for website URL + *

+ * @param companyWebsiteUrl Website URL + */ + void setCompanyWebsiteUrl (final String companyWebsiteUrl); + + @Override + boolean equals (final Object object); + + @Override + int hashCode (); +} diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java index e41f883..9f844f1 100644 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BusinessBasicData.java @@ -16,237 +16,379 @@ */ package org.mxchange.jcontactsbusiness.model.basicdata; -import java.io.Serializable; import java.util.Date; import java.util.List; +import java.util.Objects; +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee; +import org.mxchange.jcontactsbusiness.model.employee.Employable; +import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.logo.BusinessLogo; +import org.mxchange.jcontactsbusiness.model.logo.CompanyLogo; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; +import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; +import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; /** - * A POJI for business contact classes + * A POJO for business basic data *

* @author Roland Häder */ -public interface BusinessBasicData extends Serializable { +@Entity (name = "company_basic_data") +@Table (name = "company_basic_data") +@NamedQueries ( + { + @NamedQuery (name = "AllBusinessData", query = "SELECT b FROM company_basic_data AS b ORDER BY b.basicDataId"), + @NamedQuery (name = "SearchBusinessDataById", query = "SELECT b FROM company_basic_data AS b WHERE b.basicDataId = :basicDataId") + } +) +@SuppressWarnings ("PersistenceUnitPresent") +public class BusinessBasicData implements BasicData { /** - * Getter for branches list - *

- * @return Branches list + * Serial number */ - List getBrancheOffices (); + @Transient + private static final long serialVersionUID = 470_375_172_748_691L; /** - * Setter for branches list - *

- * @param branches Branches list + * Id number */ - void setBrancheOffices (final List branches); + @Id + @Column (name = "company_data_id", nullable = false, updatable = false) + @GeneratedValue (strategy = GenerationType.IDENTITY) + private Long basicDataId; /** - * Getter for company contact person - *

- * @return Company contact person + * Reference to company branch offices */ - Employee getCompanyContactEmployee (); + @Transient + private List brancheOffices; /** - * Setter for company contact person - *

- * @param companyContact Company contact person + * Comments (any) */ - void setCompanyContactEmployee (final Employee companyContact); + @Lob + @Column (name = "company_comments") + private String companyComments; /** - * Getter for business contact id - *

- * @return Business contact id + * Reference to contact person */ - Long getBasicDataId (); + @JoinColumn (name = "company_contact_employee_id") + @OneToOne (targetEntity = BusinessEmployee.class, cascade = CascadeType.ALL) + private Employable companyContactEmployee; /** - * Setter for business contact id - *

- * @param businessContactId Business contact id + * Timestamp when this entry has been created */ - void setBasicDataId (final Long businessContactId); + @Basic (optional = false) + @Temporal (TemporalType.TIMESTAMP) + @Column (name = "company_entry_created", nullable = false, updatable = false) + private Date companyCreated; /** - * Getter for company founder - *

- * @return Company founder + * Company's main email address (example: info@company.com) */ - Employee getCompanyFounder (); + @Column (name = "company_email_address", length = 100) + private String companyEmailAddress; /** - * Setter for company founder - *

- * @param companyFounder Company founder + * Company's main fax numbers: +ccxxxxxxxxxx */ - void setCompanyFounder (final Employee companyFounder); + @JoinColumn (name = "company_fax_number_id") + @OneToOne (targetEntity = FaxNumber.class, cascade = CascadeType.ALL) + private DialableFaxNumber companyFaxNumber; /** - * Getter for headquarters data - *

- * @return Headquarters data + * Reference to CEO "employee" */ - HeadquartersData getCompanyHeadQuartersData (); + @JoinColumn (name = "company_founder_id") + @OneToOne (targetEntity = BusinessEmployee.class, cascade = CascadeType.ALL) + private Employable companyFounder; /** - * Setter for headquarters data - *

- * @param headQuartersData Headquarters data + * Reference to headquarters data */ - void setCompanyHeadQuartersData (final HeadquartersData headQuartersData); + @JoinColumn (name = "company_headquarters_data_id") + @OneToOne (targetEntity = CompanyHeadquartersData.class, cascade = CascadeType.ALL) + private HeadquartersData companyHeadQuartersData; /** - * Getter for user owner instance - *

- * @return User owner instance + * Company's main phone number: +ccxxxxxxxxxx */ - User getCompanyUserOwner (); + @JoinColumn (name = "company_landline_number_id") + @OneToOne (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL) + private DialableLandLineNumber companyLandLineNumber; /** - * Setter for user owner instance - *

- * @param contactUserOwner User owner instance + * Id number of company logo */ - void setCompanyUserOwner (final User contactUserOwner); + @JoinColumn (name = "company_logo_id") + @OneToOne (targetEntity = CompanyLogo.class, cascade = CascadeType.ALL) + private BusinessLogo companyLogo; /** - * Getter for timestamp when this entry has been created - *

- * @return Timestamp when this entry has been created + * Company name */ - Date getCompanyCreated (); + @Basic (optional = false) + @Column (name = "company_name", length = 100, nullable = false, unique = true) + private String companyName; /** - * Setter for timestamp when this entry has been created - *

- * @param contactCreated Timestamp when this entry has been created + * Tax number */ - void setCompanyCreated (final Date contactCreated); + @Column (name = "company_tax_number", length = 30) + private String companyTaxNumber; /** - * Getter for comments - *

- * @return Comments + * User owner instance */ - String getCompanyComments (); + @JoinColumn (name = "company_owner_user_id") + @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH) + private User companyUserOwner; /** - * Setter for comments - *

- * @param companyComments Comments + * URL for company website */ - void setCompanyComments (final String companyComments); + @Column (name = "company_website_url") + private String companyWebsiteUrl; /** - * Getter for email address - *

- * @return Email address + * Default constructor, required for JPA */ - String getCompanyEmailAddress (); + public BusinessBasicData () { + } /** - * Setter for email address + * Constructor with company name *

- * @param companyEmailAddress Email address + * @param companyName Company name */ - void setCompanyEmailAddress (final String companyEmailAddress); + public BusinessBasicData (final String companyName) { + // First, validate all parameter + if (companyName == null) { + // Is null + throw new NullPointerException("companyName is null"); //NOI18N + } else if (companyName.isEmpty()) { + // Is null + throw new IllegalArgumentException("companyName is empty"); //NOI18N + } + + // Set company name + this.companyName = companyName; + } - /** - * Getter for list of fax number - *

- * @return Fax numbers - */ - DialableFaxNumber getCompanyFaxNumber (); + @Override + public boolean equals (final Object object) { + if (null == object) { + return false; + } else if (this.getClass() != object.getClass()) { + return false; + } + + final BasicData other = (BasicData) object; + + if (!Objects.equals(this.getBasicDataId(), other.getBasicDataId())) { + return false; + } else if (!Objects.equals(this.getCompanyName(), other.getCompanyName())) { + return false; + } else if (!Objects.equals(this.getCompanyHeadQuartersData(), other.getCompanyHeadQuartersData())) { + return false; + } else if (!Objects.equals(this.getCompanyContactEmployee(), other.getCompanyContactEmployee())) { + return false; + } else if (!Objects.equals(this.getCompanyFounder(), other.getCompanyFounder())) { + return false; + } + + return true; + } - /** - * Setter for list of fax number - *

- * @param companyFaxNumber Fax numbers - */ - void setCompanyFaxNumber (final DialableFaxNumber companyFaxNumber); + @Override + public Long getBasicDataId () { + return this.basicDataId; + } - /** - * Getter for company logo - *

- * @return Company logo - */ - BusinessLogo getCompanyLogo (); + @Override + public void setBasicDataId (final Long basicDataId) { + this.basicDataId = basicDataId; + } - /** - * Setter for company logo - *

- * @param companyLogo Company logo - */ - void setCompanyLogo (final BusinessLogo companyLogo); + @Override + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public List getBrancheOffices () { + return this.brancheOffices; + } - /** - * Getter for company name - *

- * @return Company name - */ - String getCompanyName (); + @Override + @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter") + public void setBrancheOffices (final List brancheOffices) { + this.brancheOffices = brancheOffices; + } - /** - * Setter for company name - *

- * @param companyName Company name - */ - void setCompanyName (final String companyName); + @Override + public String getCompanyComments () { + return this.companyComments; + } - /** - * Getter for list of phone number - *

- * @return Phone numbers - */ - DialableLandLineNumber getCompanyLandLineNumber (); + @Override + public void setCompanyComments (final String companyComments) { + this.companyComments = companyComments; + } - /** - * Setter for list of phone number - *

- * @param companyPhoneNumber Phone numbers - */ - void setCompanyLandLineNumber (final DialableLandLineNumber companyPhoneNumber); + @Override + public Employable getCompanyContactEmployee () { + return this.companyContactEmployee; + } - /** - * Getter for tax number - *

- * @return Tax number - */ - String getCompanyTaxNumber (); + @Override + public void setCompanyContactEmployee (final Employable companyContactEmployee) { + this.companyContactEmployee = companyContactEmployee; + } - /** - * Setter for tax number - *

- * @param companyTaxNumber Tax number - */ - void setCompanyTaxNumber (final String companyTaxNumber); + @Override + @SuppressWarnings ("ReturnOfDateField") + public Date getCompanyCreated () { + return this.companyCreated; + } - /** - * Getter for website URL - *

- * @return Website URL - */ - String getCompanyWebsiteUrl (); + @Override + @SuppressWarnings ("AssignmentToDateFieldFromParameter") + public void setCompanyCreated (final Date companyCreated) { + this.companyCreated = companyCreated; + } - /** - * Setter for website URL - *

- * @param companyWebsiteUrl Website URL - */ - void setCompanyWebsiteUrl (final String companyWebsiteUrl); + @Override + public String getCompanyEmailAddress () { + return this.companyEmailAddress; + } @Override - boolean equals (final Object object); + public void setCompanyEmailAddress (final String companyEmailAddress) { + this.companyEmailAddress = companyEmailAddress; + } @Override - int hashCode (); + public DialableFaxNumber getCompanyFaxNumber () { + return this.companyFaxNumber; + } + + @Override + public void setCompanyFaxNumber (final DialableFaxNumber companyFaxNumber) { + this.companyFaxNumber = companyFaxNumber; + } + + @Override + public Employable getCompanyFounder () { + return this.companyFounder; + } + + @Override + public void setCompanyFounder (final Employable companyFounder) { + this.companyFounder = companyFounder; + } + + @Override + public HeadquartersData getCompanyHeadQuartersData () { + return this.companyHeadQuartersData; + } + + @Override + public void setCompanyHeadQuartersData (final HeadquartersData companyHeadQuartersData) { + this.companyHeadQuartersData = companyHeadQuartersData; + } + + @Override + public DialableLandLineNumber getCompanyLandLineNumber () { + return this.companyLandLineNumber; + } + + @Override + public void setCompanyLandLineNumber (final DialableLandLineNumber companyLandLineNumber) { + this.companyLandLineNumber = companyLandLineNumber; + } + + @Override + public BusinessLogo getCompanyLogo () { + return this.companyLogo; + } + + @Override + public void setCompanyLogo (final BusinessLogo companyLogoId) { + this.companyLogo = companyLogoId; + } + + @Override + public String getCompanyName () { + return this.companyName; + } + + @Override + public void setCompanyName (final String companyName) { + this.companyName = companyName; + } + + @Override + public String getCompanyTaxNumber () { + return this.companyTaxNumber; + } + + @Override + public void setCompanyTaxNumber (final String companyTaxNumber) { + this.companyTaxNumber = companyTaxNumber; + } + + @Override + public User getCompanyUserOwner () { + return this.companyUserOwner; + } + + @Override + public void setCompanyUserOwner (final User companyUserOwner) { + this.companyUserOwner = companyUserOwner; + } + + @Override + public String getCompanyWebsiteUrl () { + return this.companyWebsiteUrl; + } + + @Override + public void setCompanyWebsiteUrl (final String companyWebsiteUrl) { + this.companyWebsiteUrl = companyWebsiteUrl; + } + + @Override + public int hashCode () { + int hash = 3; + + hash = 37 * hash + Objects.hashCode(this.getBasicDataId()); + hash = 37 * hash + Objects.hashCode(this.getCompanyName()); + hash = 37 * hash + Objects.hashCode(this.getCompanyHeadQuartersData()); + hash = 37 * hash + Objects.hashCode(this.getCompanyContactEmployee()); + hash = 37 * hash + Objects.hashCode(this.getCompanyFounder()); + + return hash; + } + } diff --git a/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java deleted file mode 100644 index b8ff97a..0000000 --- a/src/org/mxchange/jcontactsbusiness/model/basicdata/CompanyBasicData.java +++ /dev/null @@ -1,394 +0,0 @@ -/* - * 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.model.basicdata; - -import java.util.Date; -import java.util.List; -import java.util.Objects; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; -import org.mxchange.jcontactsbusiness.model.employee.Employee; -import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; -import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; -import org.mxchange.jcontactsbusiness.model.logo.BusinessLogo; -import org.mxchange.jcontactsbusiness.model.logo.CompanyLogo; -import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.model.phonenumbers.fax.FaxNumber; -import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; -import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; -import org.mxchange.jusercore.model.user.LoginUser; -import org.mxchange.jusercore.model.user.User; - -/** - * A POJO for business basic data - *

- * @author Roland Häder - */ -@Entity (name = "company_basic_data") -@Table (name = "company_basic_data") -@NamedQueries ( - { - @NamedQuery (name = "AllBusinessData", query = "SELECT b FROM company_basic_data AS b ORDER BY b.basicDataId"), - @NamedQuery (name = "SearchBusinessDataById", query = "SELECT b FROM company_basic_data AS b WHERE b.basicDataId = :basicDataId") - } -) -@SuppressWarnings ("PersistenceUnitPresent") -public class CompanyBasicData implements BusinessBasicData { - - /** - * Serial number - */ - @Transient - private static final long serialVersionUID = 470_375_172_748_691L; - - /** - * Id number - */ - @Id - @Column (name = "company_data_id", nullable = false, updatable = false) - @GeneratedValue (strategy = GenerationType.IDENTITY) - private Long basicDataId; - - /** - * Reference to company branch offices - */ - @Transient - private List brancheOffices; - - /** - * Comments (any) - */ - @Lob - @Column (name = "company_comments") - private String companyComments; - - /** - * Reference to contact person - */ - @JoinColumn (name = "company_contact_employee_id") - @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.ALL) - private Employee companyContactEmployee; - - /** - * Timestamp when this entry has been created - */ - @Basic (optional = false) - @Temporal (TemporalType.TIMESTAMP) - @Column (name = "company_entry_created", nullable = false, updatable = false) - private Date companyCreated; - - /** - * Company's main email address (example: info@company.com) - */ - @Column (name = "company_email_address", length = 100) - private String companyEmailAddress; - - /** - * Company's main fax numbers: +ccxxxxxxxxxx - */ - @JoinColumn (name = "company_fax_number_id") - @OneToOne (targetEntity = FaxNumber.class, cascade = CascadeType.ALL) - private DialableFaxNumber companyFaxNumber; - - /** - * Reference to CEO "employee" - */ - @JoinColumn (name = "company_founder_id") - @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.ALL) - private Employee companyFounder; - - /** - * Reference to headquarters data - */ - @JoinColumn (name = "company_headquarters_data_id") - @OneToOne (targetEntity = CompanyHeadquartersData.class, cascade = CascadeType.ALL) - private HeadquartersData companyHeadQuartersData; - - /** - * Company's main phone number: +ccxxxxxxxxxx - */ - @JoinColumn (name = "company_landline_number_id") - @OneToOne (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL) - private DialableLandLineNumber companyLandLineNumber; - - /** - * Id number of company logo - */ - @JoinColumn (name = "company_logo_id") - @OneToOne (targetEntity = CompanyLogo.class, cascade = CascadeType.ALL) - private BusinessLogo companyLogo; - - /** - * Company name - */ - @Basic (optional = false) - @Column (name = "company_name", length = 100, nullable = false, unique = true) - private String companyName; - - /** - * Tax number - */ - @Column (name = "company_tax_number", length = 30) - private String companyTaxNumber; - - /** - * User owner instance - */ - @JoinColumn (name = "company_owner_user_id") - @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH) - private User companyUserOwner; - - /** - * URL for company website - */ - @Column (name = "company_website_url") - private String companyWebsiteUrl; - - /** - * Default constructor, required for JPA - */ - public CompanyBasicData () { - } - - /** - * Constructor with company name - *

- * @param companyName Company name - */ - public CompanyBasicData (final String companyName) { - // First, validate all parameter - if (companyName == null) { - // Is null - throw new NullPointerException("companyName is null"); //NOI18N - } else if (companyName.isEmpty()) { - // Is null - throw new IllegalArgumentException("companyName is empty"); //NOI18N - } - - // Set company name - this.companyName = companyName; - } - - @Override - public boolean equals (final Object object) { - if (null == object) { - return false; - } else if (this.getClass() != object.getClass()) { - return false; - } - - final BusinessBasicData other = (BusinessBasicData) object; - - if (!Objects.equals(this.getBasicDataId(), other.getBasicDataId())) { - return false; - } else if (!Objects.equals(this.getCompanyName(), other.getCompanyName())) { - return false; - } else if (!Objects.equals(this.getCompanyHeadQuartersData(), other.getCompanyHeadQuartersData())) { - return false; - } else if (!Objects.equals(this.getCompanyContactEmployee(), other.getCompanyContactEmployee())) { - return false; - } else if (!Objects.equals(this.getCompanyFounder(), other.getCompanyFounder())) { - return false; - } - - return true; - } - - @Override - public Long getBasicDataId () { - return this.basicDataId; - } - - @Override - public void setBasicDataId (final Long basicDataId) { - this.basicDataId = basicDataId; - } - - @Override - @SuppressWarnings ("ReturnOfCollectionOrArrayField") - public List getBrancheOffices () { - return this.brancheOffices; - } - - @Override - @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter") - public void setBrancheOffices (final List brancheOffices) { - this.brancheOffices = brancheOffices; - } - - @Override - public String getCompanyComments () { - return this.companyComments; - } - - @Override - public void setCompanyComments (final String companyComments) { - this.companyComments = companyComments; - } - - @Override - public Employee getCompanyContactEmployee () { - return this.companyContactEmployee; - } - - @Override - public void setCompanyContactEmployee (final Employee companyContactEmployee) { - this.companyContactEmployee = companyContactEmployee; - } - - @Override - @SuppressWarnings ("ReturnOfDateField") - public Date getCompanyCreated () { - return this.companyCreated; - } - - @Override - @SuppressWarnings ("AssignmentToDateFieldFromParameter") - public void setCompanyCreated (final Date companyCreated) { - this.companyCreated = companyCreated; - } - - @Override - public String getCompanyEmailAddress () { - return this.companyEmailAddress; - } - - @Override - public void setCompanyEmailAddress (final String companyEmailAddress) { - this.companyEmailAddress = companyEmailAddress; - } - - @Override - public DialableFaxNumber getCompanyFaxNumber () { - return this.companyFaxNumber; - } - - @Override - public void setCompanyFaxNumber (final DialableFaxNumber companyFaxNumber) { - this.companyFaxNumber = companyFaxNumber; - } - - @Override - public Employee getCompanyFounder () { - return this.companyFounder; - } - - @Override - public void setCompanyFounder (final Employee companyFounder) { - this.companyFounder = companyFounder; - } - - @Override - public HeadquartersData getCompanyHeadQuartersData () { - return this.companyHeadQuartersData; - } - - @Override - public void setCompanyHeadQuartersData (final HeadquartersData companyHeadQuartersData) { - this.companyHeadQuartersData = companyHeadQuartersData; - } - - @Override - public DialableLandLineNumber getCompanyLandLineNumber () { - return this.companyLandLineNumber; - } - - @Override - public void setCompanyLandLineNumber (final DialableLandLineNumber companyLandLineNumber) { - this.companyLandLineNumber = companyLandLineNumber; - } - - @Override - public BusinessLogo getCompanyLogo () { - return this.companyLogo; - } - - @Override - public void setCompanyLogo (final BusinessLogo companyLogoId) { - this.companyLogo = companyLogoId; - } - - @Override - public String getCompanyName () { - return this.companyName; - } - - @Override - public void setCompanyName (final String companyName) { - this.companyName = companyName; - } - - @Override - public String getCompanyTaxNumber () { - return this.companyTaxNumber; - } - - @Override - public void setCompanyTaxNumber (final String companyTaxNumber) { - this.companyTaxNumber = companyTaxNumber; - } - - @Override - public User getCompanyUserOwner () { - return this.companyUserOwner; - } - - @Override - public void setCompanyUserOwner (final User companyUserOwner) { - this.companyUserOwner = companyUserOwner; - } - - @Override - public String getCompanyWebsiteUrl () { - return this.companyWebsiteUrl; - } - - @Override - public void setCompanyWebsiteUrl (final String companyWebsiteUrl) { - this.companyWebsiteUrl = companyWebsiteUrl; - } - - @Override - public int hashCode () { - int hash = 3; - - hash = 37 * hash + Objects.hashCode(this.getBasicDataId()); - hash = 37 * hash + Objects.hashCode(this.getCompanyName()); - hash = 37 * hash + Objects.hashCode(this.getCompanyHeadQuartersData()); - hash = 37 * hash + Objects.hashCode(this.getCompanyContactEmployee()); - hash = 37 * hash + Objects.hashCode(this.getCompanyFounder()); - - return hash; - } - -} diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java index 11eef96..0e09c86 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java @@ -19,13 +19,13 @@ package org.mxchange.jcontactsbusiness.model.branchoffice; import java.io.Serializable; import java.util.Date; import java.util.List; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.employee.Employable; +import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * A POJI for branch offices @@ -179,14 +179,14 @@ public interface BranchOffice extends Serializable { *

* @return Owning employee */ - Employee getBranchOwnerEmployee (); + Employable getBranchOwnerEmployee (); /** * Setter for branch office owning employee *

* @param branchOwnerEmployee Owning employee */ - void setBranchOwnerEmployee (final Employee branchOwnerEmployee); + void setBranchOwnerEmployee (final Employable branchOwnerEmployee); /** * Getter for branch office's ZIP code @@ -235,28 +235,28 @@ public interface BranchOffice extends Serializable { *

* @return Branch office's company */ - BusinessBasicData getBranchCompany (); + BasicData getBranchCompany (); /** * Setter for branch office's company *

* @param branchCompany Branch office's company */ - void setBranchCompany (final BusinessBasicData branchCompany); + void setBranchCompany (final BasicData branchCompany); /** * Getter branch office's contact person *

* @return Branch office's contact person */ - Employee getBranchContactEmployee (); + Employable getBranchContactEmployee (); /** * Setter branch office's contact person *

* @param branchEmployee Branch office's contact person */ - void setBranchContactEmployee (final Employee branchEmployee); + void setBranchContactEmployee (final Employable branchEmployee); /** * Getter for user owner instance diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java similarity index 92% rename from src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java rename to src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java index 76240d6..23e4114 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/CompanyBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java @@ -38,9 +38,8 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; -import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; -import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee; +import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcountry.model.data.Country; @@ -51,6 +50,7 @@ import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * A POJO for company branch offices @@ -66,7 +66,7 @@ import org.mxchange.jusercore.model.user.User; } ) @SuppressWarnings ("PersistenceUnitPresent") -public class CompanyBranchOffice implements BranchOffice { +public class BusinessBranchOffice implements BranchOffice { /** * Serial number @@ -85,15 +85,15 @@ public class CompanyBranchOffice implements BranchOffice { * Company that has this branch office */ @JoinColumn (name = "branch_company_id", nullable = false, updatable = false) - @OneToOne (targetEntity = CompanyBasicData.class, optional = false, cascade = CascadeType.REFRESH) - private BusinessBasicData branchCompany; + @OneToOne (targetEntity = BusinessBasicData.class, optional = false, cascade = CascadeType.REFRESH) + private BasicData branchCompany; /** * Reference to contact person */ @JoinColumn (name = "branch_contact_employee_id", referencedColumnName = "employee_id") - @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.REFRESH) - private Employee branchContactEmployee; + @OneToOne (targetEntity = BusinessEmployee.class, cascade = CascadeType.REFRESH) + private Employable branchContactEmployee; /** * Branch office's country code @@ -164,8 +164,8 @@ public class CompanyBranchOffice implements BranchOffice { * will own one or more branch offices. */ @JoinColumn (name = "branch_owner_employee_id", referencedColumnName = "employee_id") - @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.REFRESH) - private Employee branchOwnerEmployee; + @OneToOne (targetEntity = BusinessEmployee.class, cascade = CascadeType.REFRESH) + private Employable branchOwnerEmployee; /** * Branch office's store (if multiple-store building) @@ -203,7 +203,7 @@ public class CompanyBranchOffice implements BranchOffice { /** * Default constructor for JPA */ - public CompanyBranchOffice () { + public BusinessBranchOffice () { } /** @@ -217,7 +217,7 @@ public class CompanyBranchOffice implements BranchOffice { * @param branchZipCode Branch office's ZIP code * @param branchHouseNumber Branch office's house number */ - public CompanyBranchOffice (final String branchCity, final BusinessBasicData branchCompany, final Country branchCountry, final String branchStreet, final Integer branchZipCode, final Short branchHouseNumber) { + public BusinessBranchOffice (final String branchCity, final BasicData branchCompany, final Country branchCountry, final String branchStreet, final Integer branchZipCode, final Short branchHouseNumber) { // Call other constructor this(); @@ -319,22 +319,22 @@ public class CompanyBranchOffice implements BranchOffice { } @Override - public BusinessBasicData getBranchCompany () { + public BasicData getBranchCompany () { return this.branchCompany; } @Override - public void setBranchCompany (final BusinessBasicData branchCompany) { + public void setBranchCompany (final BasicData branchCompany) { this.branchCompany = branchCompany; } @Override - public Employee getBranchContactEmployee () { + public Employable getBranchContactEmployee () { return this.branchContactEmployee; } @Override - public void setBranchContactEmployee (final Employee branchContactEmployee) { + public void setBranchContactEmployee (final Employable branchContactEmployee) { this.branchContactEmployee = branchContactEmployee; } @@ -433,12 +433,12 @@ public class CompanyBranchOffice implements BranchOffice { } @Override - public Employee getBranchOwnerEmployee () { + public Employable getBranchOwnerEmployee () { return this.branchOwnerEmployee; } @Override - public void setBranchOwnerEmployee (final Employee branchOwnerEmployee) { + public void setBranchOwnerEmployee (final Employable branchOwnerEmployee) { this.branchOwnerEmployee = branchOwnerEmployee; } diff --git a/src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.java b/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java similarity index 86% rename from src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.java rename to src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java index 8929753..a569a44 100644 --- a/src/org/mxchange/jcontactsbusiness/model/department/CompanyDepartment.java +++ b/src/org/mxchange/jcontactsbusiness/model/department/BusinessDepartment.java @@ -35,15 +35,15 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice; -import org.mxchange.jcontactsbusiness.model.employee.CompanyEmployee; -import org.mxchange.jcontactsbusiness.model.employee.Employee; +import org.mxchange.jcontactsbusiness.model.branchoffice.BusinessBranchOffice; +import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee; import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jcontactsbusiness.model.employee.Employable; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * A POJO for company departments @@ -58,7 +58,7 @@ import org.mxchange.jusercore.model.user.User; } ) @SuppressWarnings ("PersistenceUnitPresent") -public class CompanyDepartment implements Department { +public class BusinessDepartment implements Department { /** * Serial number @@ -70,15 +70,15 @@ public class CompanyDepartment implements Department { * Where this department is located */ @JoinColumn (name = "department_branch_id") - @ManyToOne (targetEntity = CompanyBranchOffice.class, cascade = CascadeType.REFRESH) + @ManyToOne (targetEntity = BusinessBranchOffice.class, cascade = CascadeType.REFRESH) private BranchOffice departmentBranchOffice; /** - * Connection to company contact + * Connection to business contact */ @JoinColumn (name = "department_company_id", nullable = false, updatable = false) - @ManyToOne (targetEntity = CompanyBasicData.class, cascade = CascadeType.REFRESH, optional = false) - private BusinessBasicData departmentCompany; + @ManyToOne (targetEntity = BusinessBasicData.class, cascade = CascadeType.REFRESH, optional = false) + private BasicData departmentCompany; /** * Timestamp when this entry has been created @@ -114,8 +114,8 @@ public class CompanyDepartment implements Department { * Department lead employee */ @JoinColumn (name = "department_lead_id") - @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.REFRESH) - private Employee departmentLead; + @OneToOne (targetEntity = BusinessEmployee.class, cascade = CascadeType.REFRESH) + private Employable departmentLead; /** * User owner instance @@ -127,7 +127,7 @@ public class CompanyDepartment implements Department { /** * Default constructor */ - public CompanyDepartment () { + public BusinessDepartment () { } /** @@ -136,7 +136,7 @@ public class CompanyDepartment implements Department { * @param departmentCompany Basic data instance * @param departmentName Department name */ - public CompanyDepartment (final BusinessBasicData departmentCompany, final String departmentName) { + public BusinessDepartment (final BasicData departmentCompany, final String departmentName) { // Call other constructor this(); @@ -189,12 +189,12 @@ public class CompanyDepartment implements Department { } @Override - public BusinessBasicData getDepartmentCompany () { + public BasicData getDepartmentCompany () { return this.departmentCompany; } @Override - public void setDepartmentCompany (final BusinessBasicData departmentCompany) { + public void setDepartmentCompany (final BasicData departmentCompany) { this.departmentCompany = departmentCompany; } @@ -241,12 +241,12 @@ public class CompanyDepartment implements Department { } @Override - public Employee getDepartmentLead () { + public Employable getDepartmentLead () { return this.departmentLead; } @Override - public void setDepartmentLead (final Employee departmentLead) { + public void setDepartmentLead (final Employable departmentLead) { this.departmentLead = departmentLead; } diff --git a/src/org/mxchange/jcontactsbusiness/model/department/Department.java b/src/org/mxchange/jcontactsbusiness/model/department/Department.java index 9583a73..7c75dcb 100644 --- a/src/org/mxchange/jcontactsbusiness/model/department/Department.java +++ b/src/org/mxchange/jcontactsbusiness/model/department/Department.java @@ -18,11 +18,11 @@ package org.mxchange.jcontactsbusiness.model.department; import java.io.Serializable; import java.util.Date; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.model.employee.Employee; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jcontactsbusiness.model.employee.Employable; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * A POJI for company departments @@ -32,18 +32,18 @@ import org.mxchange.jusercore.model.user.User; public interface Department extends Serializable { /** - * Getter for connection to company contact + * Getter for connection to business contact *

- * @return Connection to company contact + * @return Connection to business contact */ - BusinessBasicData getDepartmentCompany (); + BasicData getDepartmentCompany (); /** - * Setter for connection to company contact + * Setter for connection to business contact *

- * @param departmentCompany Connection to company contact + * @param departmentCompany Connection to business contact */ - void setDepartmentCompany (final BusinessBasicData departmentCompany); + void setDepartmentCompany (final BasicData departmentCompany); /** * Getter for connection to company headquarters @@ -92,14 +92,14 @@ public interface Department extends Serializable { *

* @return Department lead employee */ - Employee getDepartmentLead (); + Employable getDepartmentLead (); /** * Setter for department lead employee *

* @param departmentLead Department lead employee */ - void setDepartmentLead (final Employee departmentLead); + void setDepartmentLead (final Employable departmentLead); /** * Getter for department i18n key diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java similarity index 86% rename from src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java rename to src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java index 327144b..d821779 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/BusinessEmployee.java @@ -36,10 +36,9 @@ import javax.persistence.Transient; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.contact.UserContact; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; -import org.mxchange.jcontactsbusiness.model.branchoffice.CompanyBranchOffice; -import org.mxchange.jcontactsbusiness.model.department.CompanyDepartment; +import org.mxchange.jcontactsbusiness.model.branchoffice.BusinessBranchOffice; +import org.mxchange.jcontactsbusiness.model.department.BusinessDepartment; import org.mxchange.jcontactsbusiness.model.department.Department; import org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersData; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; @@ -49,6 +48,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * A POJO for company employees (including CEO) @@ -59,12 +59,12 @@ import org.mxchange.jusercore.model.user.User; @Table (name = "company_employees") @NamedQueries ( { - @NamedQuery (name = "AllCompanyEmployees", query = "SELECT e FROM company_employees AS e ORDER BY e.employeeId ASC"), - @NamedQuery (name = "SearchCompanyEmployeeById", query = "SELECT e FROM company_employees AS e WHERE e.employeeId = :employeeId") + @NamedQuery (name = "AllEmployees", query = "SELECT e FROM company_employees AS e ORDER BY e.employeeId ASC"), + @NamedQuery (name = "SearchEmployeeById", query = "SELECT e FROM company_employees AS e WHERE e.employeeId = :employeeId") } ) @SuppressWarnings ("PersistenceUnitPresent") -public class CompanyEmployee implements Employee { +public class BusinessEmployee implements Employable { /** * Serial number @@ -76,15 +76,15 @@ public class CompanyEmployee implements Employee { * Branch office (if the employee works there) */ @JoinColumn (name = "employee_branch_id") - @OneToOne (targetEntity = CompanyBranchOffice.class, cascade = CascadeType.REFRESH) + @OneToOne (targetEntity = BusinessBranchOffice.class, cascade = CascadeType.REFRESH) private BranchOffice employeeBranchOffice; /** * Company the employee is working at */ @JoinColumn (name = "employee_company_id", nullable = false, updatable = false) - @OneToOne (targetEntity = CompanyBasicData.class, cascade = CascadeType.REFRESH, optional = false) - private BusinessBasicData employeeCompany; + @OneToOne (targetEntity = BusinessBasicData.class, cascade = CascadeType.REFRESH, optional = false) + private BasicData employeeCompany; /** * Timestamp when this entry has been created @@ -98,11 +98,11 @@ public class CompanyEmployee implements Employee { * Department the employee works at */ @JoinColumn (name = "employee_department_id") - @OneToOne (targetEntity = CompanyDepartment.class, cascade = CascadeType.REFRESH) + @OneToOne (targetEntity = BusinessDepartment.class, cascade = CascadeType.REFRESH) private Department employeeDepartment; /** - * Employee's email address + * Employable's email address */ @Column (name = "employee_email_address", length = 30) private String employeeEmailAddress; @@ -123,33 +123,33 @@ public class CompanyEmployee implements Employee { private Long employeeId; /** - * Employee's business mobile number + * Employable's business mobile number */ @JoinColumn (name = "employee_mobile_number_id") @OneToOne (targetEntity = MobileNumber.class, cascade = CascadeType.REFRESH) private DialableMobileNumber employeeMobileNumber; /** - * Employee's staff number + * Employable's staff number */ @Column (name = "employee_staff_number", length = 20) private String employeeNumber; /** - * Employee's personal data + * Employable's personal data */ @JoinColumn (name = "employee_personal_data_id") @OneToOne (targetEntity = UserContact.class, cascade = CascadeType.REFRESH) private Contact employeePersonalData; /** - * Employee's phone extension (or number if different) + * Employable's phone extension (or number if different) */ @Column (name = "employee_phone_extension", length = 10) private Integer employeePhoneExtension; /** - * Employee's position (example: CEO) + * Employable's position (example: CEO) */ @JoinColumn (name = "employee_position_id") @OneToOne (targetEntity = EmployeePosition.class, cascade = CascadeType.REFRESH) @@ -165,10 +165,10 @@ public class CompanyEmployee implements Employee { /** * Default constructor */ - public CompanyEmployee () { + public BusinessEmployee () { } - public CompanyEmployee (final BusinessBasicData employeeCompany, final String employeeNumber, final Contact employeePersonalData) { + public BusinessEmployee (final BasicData employeeCompany, final String employeeNumber, final Contact employeePersonalData) { // Call other constructor this(); @@ -195,7 +195,7 @@ public class CompanyEmployee implements Employee { return false; } - final Employee other = (Employee) object; + final Employable other = (Employable) object; if (!Objects.equals(this.getEmployeeId(), other.getEmployeeId())) { return false; @@ -221,12 +221,12 @@ public class CompanyEmployee implements Employee { } @Override - public BusinessBasicData getEmployeeCompany () { + public BasicData getEmployeeCompany () { return this.employeeCompany; } @Override - public void setEmployeeCompany (final BusinessBasicData employeeCompany) { + public void setEmployeeCompany (final BasicData employeeCompany) { this.employeeCompany = employeeCompany; } diff --git a/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java b/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java similarity index 79% rename from src/org/mxchange/jcontactsbusiness/model/employee/Employee.java rename to src/org/mxchange/jcontactsbusiness/model/employee/Employable.java index 965573c..d4eecde 100644 --- a/src/org/mxchange/jcontactsbusiness/model/employee/Employee.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/Employable.java @@ -19,32 +19,32 @@ package org.mxchange.jcontactsbusiness.model.employee; import java.io.Serializable; import java.util.Date; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import org.mxchange.jcontactsbusiness.model.department.Department; import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import org.mxchange.jcontactsbusiness.model.jobposition.JobPosition; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * A POJI for employees *

* @author Roland Häder */ -public interface Employee extends Serializable { +public interface Employable extends Serializable { /** * Getter for employee's branch office *

- * @return Employee's branch office + * @return Employable's branch office */ BranchOffice getEmployeeBranchOffice (); /** * Setter for employee's branch office *

- * @param employeeBranchOffice Employee's branch office + * @param employeeBranchOffice Employable's branch office */ void setEmployeeBranchOffice (final BranchOffice employeeBranchOffice); @@ -53,138 +53,138 @@ public interface Employee extends Serializable { *

* @return Company instance */ - BusinessBasicData getEmployeeCompany (); + BasicData getEmployeeCompany (); /** * Setter for employee's company *

* @param employeeCompany Company instance */ - void setEmployeeCompany (final BusinessBasicData employeeCompany); + void setEmployeeCompany (final BasicData employeeCompany); /** * Getter for employee's department *

- * @return Employee's department + * @return Employable's department */ Department getEmployeeDepartment (); /** * Setter for employee's department *

- * @param employeeDepartment Employee's department + * @param employeeDepartment Employable's department */ void setEmployeeDepartment (final Department employeeDepartment); /** * Getter for employee's head quarters *

- * @return Employee's head quarters + * @return Employable's head quarters */ HeadquartersData getEmployeeHeadquarter (); /** * Getter for employee's head quarters *

- * @param employeeHeadquarter Employee's head quarters + * @param employeeHeadquarter Employable's head quarters */ void setEmployeeHeadquarter (final HeadquartersData employeeHeadquarter); /** * Getter for employee's email address *

- * @return Employee's email address + * @return Employable's email address */ String getEmployeeEmailAddress (); /** * Setter for employee's email address *

- * @param employeeEmailAddress Employee's email address + * @param employeeEmailAddress Employable's email address */ void setEmployeeEmailAddress (final String employeeEmailAddress); /** * Getter for employee's id number *

- * @return Employee's id number + * @return Employable's id number */ Long getEmployeeId (); /** * Setter for employee's id number *

- * @param employeeId Employee's id number + * @param employeeId Employable's id number */ void setEmployeeId (final Long employeeId); /** * Getter for employee's mobile number *

- * @return Employee's mobile number + * @return Employable's mobile number */ DialableMobileNumber getEmployeeMobileNumber (); /** * Setter for employee's mobile number *

- * @param employeeMobileNumber Employee's mobile number + * @param employeeMobileNumber Employable's mobile number */ void setEmployeeMobileNumber (final DialableMobileNumber employeeMobileNumber); /** * Getter for employee's number *

- * @return Employee's number + * @return Employable's number */ String getEmployeeNumber (); /** * Setter for employee's number *

- * @param employeeNumber Employee's number + * @param employeeNumber Employable's number */ void setEmployeeNumber (final String employeeNumber); /** * Getter for employee's personal data *

- * @return Employee's personal data + * @return Employable's personal data */ Contact getEmployeePersonalData (); /** * Setter for employee's personal data *

- * @param employeePersonalData Employee's personal data + * @param employeePersonalData Employable's personal data */ void setEmployeePersonalData (final Contact employeePersonalData); /** * Getter for employee's phone number/extension *

- * @return Employee's phone number/extension + * @return Employable's phone number/extension */ Integer getEmployeePhoneExtension (); /** * Setter for employee's phone number/extension *

- * @param employeePhoneExtension Employee's phone number/extension + * @param employeePhoneExtension Employable's phone number/extension */ void setEmployeePhoneExtension (final Integer employeePhoneExtension); /** * Getter for employee's position *

- * @return Employee's position + * @return Employable's position */ JobPosition getEmployeePosition (); /** * Setter for employee's position *

- * @param employeePosition Employee's position + * @param employeePosition Employable's position */ void setEmployeePosition (final JobPosition employeePosition); -- 2.39.5