TSK-134: Updated to Java 8 Time-API. Removed valid_from/valid_until from

classification.

Author: MLengl

lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java

@@ -64,8 +64,7 @@ public void testCommit() throws SQLException, ClassNotFoundException, NamingExce
                 resultCount++;
             }
         }
-
-        Assert.assertEquals(1, resultCount);
+        Assert.assertEquals(0, resultCount);
     }
 
     @Test

lib/taskana-core/pom.xml

@@ -121,7 +121,7 @@
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis</artifactId>
-			<version>3.4.4</version>
+			<version>3.4.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

lib/taskana-core/src/main/java/pro/taskana/Attachment.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.Map;
 
 import pro.taskana.model.ObjectReference;
@@ -27,16 +27,16 @@ public interface Attachment {
     /**
      * Returns the time when the attachment was created.
      *
-     * @return the created time as {@link Timestamp}
+     * @return the created time as {@link Instant}
      */
-    Timestamp getCreated();
+    Instant getCreated();
 
     /**
      * Returns the time when the attachment was last modified.
      *
-     * @return modified {@link Timestamp} of the attachment
+     * @return modified {@link Instant} of the attachment
      */
-    Timestamp getModified();
+    Instant getModified();
 
     /**
      * Returns the classification summary of the attachment.
@@ -86,17 +86,17 @@ public interface Attachment {
     /**
      * Returns the time when this attachment was received.
      *
-     * @return received time as exact {@link Timestamp}
+     * @return received time as exact {@link Instant}
      */
-    Timestamp getReceived();
+    Instant getReceived();
 
     /**
      * Sets the time when the attachment was received.
      *
      * @param received
-     *            the time as {@link Timestamp} when the attachment was received
+     *            the time as {@link Instant} when the attachment was received
      **/
-    void setReceived(Timestamp received);
+    void setReceived(Instant received);
 
     /**
      * Returns the custom attributes of this attachment.

lib/taskana-core/src/main/java/pro/taskana/AttachmentSummary.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 
 /**
  * Interface for AttachmentSummaries. This is a specific short model-object which only contains the most important
@@ -25,16 +25,16 @@ public interface AttachmentSummary {
     /**
      * Gets the time when the attachment was created.
      *
-     * @return the created timestamp
+     * @return the created Instant
      */
-    Timestamp getCreated();
+    Instant getCreated();
 
     /**
      * Gets the time when the attachment was last modified.
      *
-     * @return the last modified timestamp
+     * @return the last modified Instant
      */
-    Timestamp getModified();
+    Instant getModified();
 
     /**
      * Gets the classificationSummary of the attachment.
@@ -46,8 +46,7 @@ public interface AttachmentSummary {
     /**
      * Gets the time when the attachment was received.
      *
-     * @return received timestamp
+     * @return received Instant
      */
-    Timestamp getReceived();
-
+    Instant getReceived();
 }

lib/taskana-core/src/main/java/pro/taskana/Classification.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import java.sql.Date;
+import java.time.Instant;
 
 /**
  * Interface used to specify the Classification-Model.
@@ -79,9 +79,9 @@ public interface Classification {
     /**
      * Get the Date when this classification was as created.
      *
-     * @return created as date
+     * @return created as instant
      */
-    Date getCreated();
+    Instant getCreated();
 
     /**
      * Get the classification name.
@@ -279,25 +279,10 @@ public interface Classification {
      */
     void setCustom8(String custom8);
 
-    /**
-     * Get the sql-date since/when the classification is valid from.
-     *
-     * @return validFrom
-     */
-    Date getValidFrom();
-
-    /**
-     * Get the sql-date until the classification is valid.
-     *
-     * @return validUntil
-     */
-    Date getValidUntil();
-
     /**
      * Return a summary of the current Classification.
      *
      * @return the ClassificationSummary object for the current classification
      */
     ClassificationSummary asSummary();
-
 }

lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import java.util.Date;
+import java.time.Instant;
 
 /**
  * ClassificationQuery for generating dynamic sql.
@@ -65,10 +65,10 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
      * Add your created-Dates to your query.
      *
      * @param created
-     *            date of classification creation.
+     *            date (as instant) of classification creation.
      * @return the query
      */
-    ClassificationQuery created(Date... created);
+    ClassificationQuery created(Instant... created);
 
     /**
      * Add your name to your query.
@@ -124,22 +124,4 @@ public interface ClassificationQuery extends BaseQuery<ClassificationSummary> {
      * @return the query
      */
     ClassificationQuery customFields(String... customFields);
-
-    /**
-     * Define after which date the classifications should be valid.
-     *
-     * @param validFrom
-     *            date when the classification was valid from
-     * @return the query
-     */
-    ClassificationQuery validFrom(Date... validFrom);
-
-    /**
-     * Define until which date the classifications should be valid.
-     *
-     * @param validUntil
-     *            date until the classification will be or was valid
-     * @return the query
-     */
-    ClassificationQuery validUntil(Date... validUntil);
 }

lib/taskana-core/src/main/java/pro/taskana/ClassificationSummary.java

@@ -1,7 +1,5 @@
 package pro.taskana;
 
-import java.sql.Timestamp;
-
 /**
  * Interface for ClassificationSummaries. This is a specific short model-object which only requieres the most important
  * informations. Specific ones can be load afterwards via ID.
@@ -49,11 +47,4 @@ public interface ClassificationSummary {
      * @return classificationName
      */
     String getName();
-
-    /**
-     * Gets the timestamp until the classification is/was valid.
-     *
-     * @return validUntil as timestamp
-     */
-    Timestamp getValidUntil();
 }

lib/taskana-core/src/main/java/pro/taskana/Task.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 
@@ -22,52 +22,52 @@ public interface Task {
     /**
      * Returns the time when the task was {@link TaskState#READY}.
      *
-     * @return created as exact {@link Timestamp}
+     * @return created as exact {@link Instant}
      */
-    Timestamp getCreated();
+    Instant getCreated();
 
     /**
      * Returns the time when the task was set to {@link TaskState#CLAIMED} by/to a user.
      *
-     * @return claimed as exact {@link Timestamp}
+     * @return claimed as exact {@link Instant}
      */
-    Timestamp getClaimed();
+    Instant getClaimed();
 
     /**
      * Returns the time when the task was set into {@link TaskState#COMPLETED}.
      *
-     * @return completed as exact {@link Timestamp}
+     * @return completed as exact {@link Instant}
      */
-    Timestamp getCompleted();
+    Instant getCompleted();
 
     /**
      * Returns the time when the task was modified the last time.
      *
-     * @return modified as exact {@link Timestamp}
+     * @return modified as exact {@link Instant}
      */
-    Timestamp getModified();
+    Instant getModified();
 
     /**
      * Returns the time when the work on this task was planned to be started.
      *
-     * @return planned as exact {@link Timestamp}
+     * @return planned as exact {@link Instant}
      */
-    Timestamp getPlanned();
+    Instant getPlanned();
 
     /**
      * Sets the time when the work on this task should be started.
      *
      * @param planned
-     *            as exact {@link Timestamp}
+     *            as exact {@link Instant}
      */
-    void setPlanned(Timestamp planned);
+    void setPlanned(Instant planned);
 
     /**
      * Returns the time when this task should be finished.
      *
-     * @return due as exact {@link Timestamp}
+     * @return due as exact {@link Instant}
      */
-    Timestamp getDue();
+    Instant getDue();
 
     /**
      * Return the name of the current task.

lib/taskana-core/src/main/java/pro/taskana/TaskMonitorService.java

@@ -60,5 +60,4 @@ public interface TaskMonitorService {
      * @return a {@link Report} object
      */
     Report getWorkbasketLevelReport(List<Workbasket> workbaskets, List<TaskState> states);
-
 }

lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java

@@ -221,5 +221,4 @@ public interface TaskQuery extends BaseQuery<TaskSummary> {
      * @return a {@link ObjectReferenceQuery}
      */
     ObjectReferenceQuery createObjectReferenceQuery();
-
 }

lib/taskana-core/src/main/java/pro/taskana/TaskSummary.java

@@ -1,6 +1,6 @@
 package pro.taskana;
 
-import java.sql.Timestamp;
+import java.time.Instant;
 
 import pro.taskana.model.ObjectReference;
 import pro.taskana.model.TaskState;
@@ -20,44 +20,44 @@ public interface TaskSummary {
     /**
      * Gets the time when the task was created.
      *
-     * @return the created timestamp
+     * @return the created Instant
      */
-    Timestamp getCreated();
+    Instant getCreated();
 
     /**
      * Gets the time when the task was claimed.
      *
-     * @return the claimed timestamp
+     * @return the claimed Instant
      */
-    Timestamp getClaimed();
+    Instant getClaimed();
 
     /**
      * Gets the time when the task was completed.
      *
-     * @return the completed timestamp
+     * @return the completed Instant
      */
-    Timestamp getCompleted();
+    Instant getCompleted();
 
     /**
      * Gets the time when the task was last modified.
      *
-     * @return the last modified timestamp
+     * @return the last modified Instant
      */
-    Timestamp getModified();
+    Instant getModified();
 
     /**
      * Gets the time when the task is planned to be executed.
      *
-     * @return the planned timestamp
+     * @return the planned Instant
      */
-    Timestamp getPlanned();
+    Instant getPlanned();
 
     /**
      * Gets the time when the task is due.
      *
-     * @return the due timestamp
+     * @return the due Instant
      */
-    Timestamp getDue();
+    Instant getDue();
 
     /**
      * Gets the name of the task.
@@ -219,5 +219,4 @@ public interface TaskSummary {
      * @return the task's custom10 property
      */
     String getCustom10();
-
 }

lib/taskana-core/src/main/java/pro/taskana/TaskanaEngine.java

@@ -80,5 +80,4 @@ enum ConnectionManagementMode {
         AUTOCOMMIT,
         EXPLICIT
     }
-
 }