You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by rs...@apache.org on 2016/02/18 11:16:47 UTC
[1/2] incubator-batchee git commit: BATCHEE-96 removed @Temporal from
java.sql.Timestamp fields
Repository: incubator-batchee
Updated Branches:
refs/heads/master 8ba4db1ab -> 987e7134f
BATCHEE-96 removed @Temporal from java.sql.Timestamp fields
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/7f6b2c33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/7f6b2c33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/7f6b2c33
Branch: refs/heads/master
Commit: 7f6b2c3362251c360c3302fe922bde784476ea23
Parents: 8ba4db1
Author: Reinhard Sandtner <rs...@apache.org>
Authored: Thu Feb 18 10:48:12 2016 +0100
Committer: Reinhard Sandtner <rs...@apache.org>
Committed: Thu Feb 18 10:48:12 2016 +0100
----------------------------------------------------------------------
.../services/persistence/jpa/domain/JobExecutionEntity.java | 6 ------
.../services/persistence/jpa/domain/StepExecutionEntity.java | 4 ----
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/7f6b2c33/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobExecutionEntity.java
----------------------------------------------------------------------
diff --git a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobExecutionEntity.java b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobExecutionEntity.java
index 66051fa..84cdac0 100644
--- a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobExecutionEntity.java
+++ b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobExecutionEntity.java
@@ -27,8 +27,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
import java.sql.Timestamp;
import java.util.Arrays;
import java.util.List;
@@ -61,16 +59,12 @@ public class JobExecutionEntity {
@GeneratedValue
private long executionId;
- @Temporal(TemporalType.TIMESTAMP)
private Timestamp createTime;
- @Temporal(TemporalType.TIMESTAMP)
private Timestamp startTime;
- @Temporal(TemporalType.TIMESTAMP)
private Timestamp endTime;
- @Temporal(TemporalType.TIMESTAMP)
private Timestamp updateTime;
@Enumerated(EnumType.STRING)
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/7f6b2c33/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java
----------------------------------------------------------------------
diff --git a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java
index f2706cf..e0f087f 100644
--- a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java
+++ b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java
@@ -28,8 +28,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
import java.sql.Timestamp;
@Entity
@@ -85,10 +83,8 @@ public class StepExecutionEntity {
@Column(name="exec_writeskip")
private long writeSkip;
- @Temporal(TemporalType.TIMESTAMP)
private Timestamp startTime;
- @Temporal(TemporalType.TIMESTAMP)
private Timestamp endTime;
@Lob
[2/2] incubator-batchee git commit: BATCHEE-97 fixed queries
Posted by rs...@apache.org.
BATCHEE-97 fixed queries
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/987e7134
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/987e7134
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/987e7134
Branch: refs/heads/master
Commit: 987e7134fcf227f4c5310827bb8e242585590d40
Parents: 7f6b2c3
Author: Reinhard Sandtner <rs...@apache.org>
Authored: Thu Feb 18 11:05:41 2016 +0100
Committer: Reinhard Sandtner <rs...@apache.org>
Committed: Thu Feb 18 11:05:41 2016 +0100
----------------------------------------------------------------------
.../services/persistence/jpa/domain/JobInstanceEntity.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/987e7134/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobInstanceEntity.java
----------------------------------------------------------------------
diff --git a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobInstanceEntity.java b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobInstanceEntity.java
index f8261c4..a4e8862 100644
--- a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobInstanceEntity.java
+++ b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/JobInstanceEntity.java
@@ -35,11 +35,11 @@ import java.util.List;
@Entity
@NamedQueries({
- @NamedQuery(name = JobInstanceEntity.Queries.COUNT_BY_NAME_AND_TAG, query = "select count(j) from JobInstanceEntity j where j.name = :name and j.tag = tag"),
+ @NamedQuery(name = JobInstanceEntity.Queries.COUNT_BY_NAME_AND_TAG, query = "select count(j) from JobInstanceEntity j where j.name = :name and j.tag = :tag"),
@NamedQuery(name = JobInstanceEntity.Queries.COUNT_BY_NAME, query = "select count(j) from JobInstanceEntity j where j.name = :name"),
@NamedQuery(name = JobInstanceEntity.Queries.FIND_FROM_EXECUTION, query = "select j from JobInstanceEntity j inner join j.executions e where e.executionId = :executionId"),
@NamedQuery(name = JobInstanceEntity.Queries.FIND_EXTERNALS, query = "select j from JobInstanceEntity j where j.name not like :pattern"),
- @NamedQuery(name = JobInstanceEntity.Queries.FIND_BY_NAME_AND_TAG, query = "select j from JobInstanceEntity j where j.name = :name and j.tag = tag"),
+ @NamedQuery(name = JobInstanceEntity.Queries.FIND_BY_NAME_AND_TAG, query = "select j from JobInstanceEntity j where j.name = :name and j.tag = :tag"),
@NamedQuery(name = JobInstanceEntity.Queries.FIND_BY_NAME, query = "select j from JobInstanceEntity j where j.name = :name"),
@NamedQuery(name = JobInstanceEntity.Queries.DELETE_BY_INSTANCE_ID, query = "delete from JobInstanceEntity e where e.jobInstanceId = :instanceId"),
@NamedQuery(