Updated copyright year

[jjobs-core.git] / src / org / mxchange / jjobs / model / skill / JobSkill.java

diff --git a/src/org/mxchange/jjobs/model/skill/JobSkill.java b/src/org/mxchange/jjobs/model/skill/JobSkill.java
index f3774ba1f2df4d72ab38c45a6feb383f6beaa25a..8a5aba7c837c618dc90a379568500dd916aa5407 100644 (file)
--- a/src/org/mxchange/jjobs/model/skill/JobSkill.java
+++ b/src/org/mxchange/jjobs/model/skill/JobSkill.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 - 2020 Free Software Foundation
+ * Copyright (C) 2016 - 2024 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,7 +16,6 @@
  */
 package org.mxchange.jjobs.model.skill;
 
-import org.mxchange.jjobs.model.skill.status.SkillStatus;
 import java.util.Date;
 import java.util.Objects;
 import javax.persistence.Basic;
@@ -27,10 +26,16 @@ import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
+import org.apache.commons.lang3.StringUtils;
+import org.mxchange.jcoreutils.comparable.ComparableUtils;
+import org.mxchange.jcoreutils.enums.EnumUtils;
+import org.mxchange.jjobs.model.skill.status.SkillStatus;
 
 /**
  * A POJO entity for skills
@@ -41,6 +46,9 @@ import javax.persistence.Transient;
 @Table (
                name = "skills"
 )
+@NamedQueries (
+               @NamedQuery (name = "AllSkills", query = "SELECT s FROM skills AS s ORDER BY s.skillId")
+)
 @SuppressWarnings ("PersistenceUnitPresent")
 public class JobSkill implements Skillable {
 
@@ -48,15 +56,22 @@ public class JobSkill implements Skillable {
         * Serial number
         */
        @Transient
-       private static final long serialVersionUID = 185435718692L;
+       private static final long serialVersionUID = 185_435_718_692L;
 
        /**
         * When this entry has been created
         */
        @Basic (optional = false)
-       @Column (name = "skill_created", nullable = false, updatable = false)
+       @Column (name = "skill_entry_created", nullable = false, updatable = false)
        @Temporal (TemporalType.TIMESTAMP)
-       private Date skillCreated;
+       private Date skillEntryCreated;
+
+       /**
+        * When this entry has been updated
+        */
+       @Column (name = "skill_entry_updated", insertable = false)
+       @Temporal (TemporalType.TIMESTAMP)
+       private Date skillEntryUpdated;
 
        /**
         * Id number (primary key)
@@ -88,13 +103,6 @@ public class JobSkill implements Skillable {
        @Column (name = "skill_status", nullable = false)
        private SkillStatus skillStatus;
 
-       /**
-        * When this entry has been updated
-        */
-       @Column (name = "skill_updated", insertable = false)
-       @Temporal (TemporalType.TIMESTAMP)
-       private Date skillUpdated;
-
        /**
         * Default constructor, required for the JPA.
         */
@@ -105,7 +113,7 @@ public class JobSkill implements Skillable {
        /**
         * Constructor with required fields
         * <p>
-        * @param skillName Name of skill
+        * @param skillName   Name of skill
         * @param skillStatus Status
         */
        public JobSkill (final String skillName, final SkillStatus skillStatus) {
@@ -129,6 +137,32 @@ public class JobSkill implements Skillable {
                this.skillStatus = skillStatus;
        }
 
+       @Override
+       public int compareTo (final Skillable skill) {
+               // Checkparameter and return 0 if equal
+               if (null == skill) {
+                       // Should not happen
+                       throw new NullPointerException("Parameter 'skill' is null"); //NOI18N
+               } else if (Objects.equals(this, skill)) {
+                       // Same object
+                       return 0;
+               }
+
+               // Init comparitors
+               final int comparitors[] = {
+                       // First compare status
+                       EnumUtils.compare(this.getSkillStatus(), skill.getSkillStatus()),
+                       // ... next name
+                       StringUtils.compare(this.getSkillName(), skill.getSkillName())
+               };
+
+               // Check all values
+               final int comparison = ComparableUtils.checkAll(comparitors);
+
+               // Return value
+               return comparison;
+       }
+
        @Override
        public boolean equals (final Object object) {
                if (this == object) {
@@ -154,14 +188,26 @@ public class JobSkill implements Skillable {
 
        @Override
        @SuppressWarnings ("ReturnOfDateField")
-       public Date getSkillCreated () {
-               return this.skillCreated;
+       public Date getSkillEntryCreated () {
+               return this.skillEntryCreated;
+       }
+
+       @Override
+       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
+       public void setSkillEntryCreated (final Date skillEntryCreated) {
+               this.skillEntryCreated = skillEntryCreated;
+       }
+
+       @Override
+       @SuppressWarnings ("ReturnOfDateField")
+       public Date getSkillEntryUpdated () {
+               return this.skillEntryUpdated;
        }
 
        @Override
        @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setSkillCreated (final Date skillCreated) {
-               this.skillCreated = skillCreated;
+       public void setSkillEntryUpdated (final Date skillEntryUpdated) {
+               this.skillEntryUpdated = skillEntryUpdated;
        }
 
        @Override
@@ -206,18 +252,6 @@ public class JobSkill implements Skillable {
                this.skillStatus = skillStatus;
        }
 
-       @Override
-       @SuppressWarnings ("ReturnOfDateField")
-       public Date getSkillUpdated () {
-               return this.skillUpdated;
-       }
-
-       @Override
-       @SuppressWarnings ("AssignmentToDateFieldFromParameter")
-       public void setSkillUpdated (final Date skillUpdated) {
-               this.skillUpdated = skillUpdated;
-       }
-
        @Override
        public int hashCode () {
                int hash = 7;