X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Forg%2Fmxchange%2Fjjobs%2Fmodel%2Fjobskill%2FJobPositionSkill.java;h=410ae68680774c0d4a93c5d35056390f4376e066;hb=0344d5091cf75c41751f7661f836ac5d3143088e;hp=872a383bcd84853bf60b8e979a4c5c88c9e5c206;hpb=8f3f99e03151d1ac98e62ea0b0ef16df3bbc6249;p=jjobs-core.git

diff --git a/src/org/mxchange/jjobs/model/jobskill/JobPositionSkill.java b/src/org/mxchange/jjobs/model/jobskill/JobPositionSkill.java
index 872a383..410ae68 100644
--- a/src/org/mxchange/jjobs/model/jobskill/JobPositionSkill.java
+++ b/src/org/mxchange/jjobs/model/jobskill/JobPositionSkill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 - 2020 Free Software Foundation
+ * Copyright (C) 2016 - 2022 Free Software Foundation
  *
  * 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
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jjobs.model.jobskill;
 
+import java.text.MessageFormat;
 import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
@@ -68,9 +69,9 @@ public class JobPositionSkill implements SkillableJobPosition {
 	 * When this entry has been created
 	 */
 	@Basic (optional = false)
-	@Column (name = "skill_job_created", nullable = false, updatable = false)
+	@Column (name = "skill_job_entry_created", nullable = false, updatable = false)
 	@Temporal (TemporalType.TIMESTAMP)
-	private Date jobPositionSkillCreated;
+	private Date jobPositionSkillEntryCreated;
 
 	/**
 	 * Id number (primary key
@@ -118,14 +119,38 @@ public class JobPositionSkill implements SkillableJobPosition {
 	/**
 	 * Constructor with all required entity properties
 	 * <p>
-	 * @param jobPosition An instance of a HireableJobPosition class
-	 * @param jobSkill An instance of a Skillable class
+	 * @param jobPosition     An instance of a HireableJobPosition class
+	 * @param jobSkill        An instance of a Skillable class
 	 * @param skillImportance Importance level
 	 */
 	public JobPositionSkill (final HireableJobPosition jobPosition, final Skillable jobSkill, final Short skillImportance) {
 		// Invoke default constructor
 		this();
 
+		// Validate all parameter
+		if (null == jobPosition) {
+			// ThroW NPE
+			throw new NullPointerException("jobPosition is null"); //NOI18N
+		} else if (jobPosition.getJobPositionId() == null) {
+			// Throw it again
+			throw new NullPointerException("jobPosition.jobPositionId is null"); //NOI18N
+		} else if (jobPosition.getJobPositionId() < 1) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("jobPosition.jobPositionId={0} is invalid", jobPosition.getJobPositionId())); //NOI18N
+		} else if (null == jobSkill) {
+			// Throw NPE
+			throw new NullPointerException("jobSill is null"); //NOI18N
+		} else if (jobSkill.getSkillId() == null) {
+			// Throw it again
+			throw new NullPointerException("jobSill.skillId is null"); //NOI18N
+		} else if (jobSkill.getSkillId() < 1) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("jobSill.skillId={0} is invalid", jobSkill.getSkillId())); //NOI18N
+		} else if (null == skillImportance) {
+			// Throw NPE
+			throw new NullPointerException("skillImportance is null"); //NOI18N
+		}
+
 		// Set fields
 		this.jobPosition = jobPosition;
 		this.jobSkill = jobSkill;
@@ -142,18 +167,21 @@ public class JobPositionSkill implements SkillableJobPosition {
 			return false;
 		}
 
-		final SkillableJobPosition jobPosition = (SkillableJobPosition) object;
+		// Cast to wanted type
+		final SkillableJobPosition position = (SkillableJobPosition) object;
 
-		if (!Objects.equals(this.getSkillImportance(), jobPosition.getSkillImportance())) {
+		// Check all false conditions
+		if (!Objects.equals(this.getSkillImportance(), position.getSkillImportance())) {
 			return false;
-		} else if (!Objects.equals(this.getJobPosition(), jobPosition.getJobPosition())) {
+		} else if (!Objects.equals(this.getJobPosition(), position.getJobPosition())) {
 			return false;
-		} else if (!Objects.equals(this.getJobSkill(), jobPosition.getJobSkill())) {
+		} else if (!Objects.equals(this.getJobSkill(), position.getJobSkill())) {
 			return false;
-		} else if (!Objects.equals(this.getJobPositionSkillId(), jobPosition.getJobPositionSkillId())) {
+		} else if (!Objects.equals(this.getJobPositionSkillId(), position.getJobPositionSkillId())) {
 			return false;
 		}
 
+		// Okay, entities are matching (not objects)
 		return true;
 	}
 
@@ -169,14 +197,14 @@ public class JobPositionSkill implements SkillableJobPosition {
 
 	@Override
 	@SuppressWarnings ("ReturnOfDateField")
-	public Date getJobPositionSkillCreated () {
-		return this.jobPositionSkillCreated;
+	public Date getJobPositionSkillEntryCreated () {
+		return this.jobPositionSkillEntryCreated;
 	}
 
 	@Override
 	@SuppressWarnings ("AssignmentToDateFieldFromParameter")
-	public void setJobPositionSkillCreated (final Date jobPositionSkillCreated) {
-		this.jobPositionSkillCreated = jobPositionSkillCreated;
+	public void setJobPositionSkillEntryCreated (final Date jobPositionSkillEntryCreated) {
+		this.jobPositionSkillEntryCreated = jobPositionSkillEntryCreated;
 	}
 
 	@Override