Repository: oozie Updated Branches: refs/heads/master 25b13a35a -> f7b674268
OOZIE-3098 Allow to use the rest api to get the creation time of the Coordinator (chiwen via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f7b67426 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f7b67426 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f7b67426 Branch: refs/heads/master Commit: f7b6742680704d2e6bffa954bd0a901e26ba80bc Parents: 25b13a3 Author: Andras Piros <[email protected]> Authored: Mon Oct 30 16:25:08 2017 +0100 Committer: Andras Piros <[email protected]> Committed: Mon Oct 30 16:25:08 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/oozie/client/CoordinatorJob.java | 7 +++++++ .../src/main/java/org/apache/oozie/client/rest/JsonTags.java | 1 + .../main/java/org/apache/oozie/client/rest/JsonToBean.java | 1 + .../java/org/apache/oozie/client/rest/TestJsonToBean.java | 2 ++ core/src/main/java/org/apache/oozie/CoordinatorJobBean.java | 1 + release-log.txt | 1 + 6 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/f7b67426/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java b/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java index d98a6ac..e4e8ae0 100644 --- a/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java +++ b/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java @@ -132,6 +132,13 @@ public interface CoordinatorJob extends Job { Date getNextMaterializedTime(); /** + * Return the creation time for the application. + * + * @return the creation time for the application. + */ + Date getCreatedTime(); + + /** * Return the application start time. * * @return the application start time. http://git-wip-us.apache.org/repos/asf/oozie/blob/f7b67426/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java b/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java index 3ec4cca..d684799 100644 --- a/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java +++ b/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java @@ -105,6 +105,7 @@ public interface JsonTags { String COORDINATOR_JOB_CONF = "conf"; String COORDINATOR_JOB_STATUS = "status"; String COORDINATOR_JOB_EXECUTIONPOLICY = "executionPolicy"; + String COORDINATOR_JOB_CREATED_TIME = "createdTime"; String COORDINATOR_JOB_START_TIME = "startTime"; String COORDINATOR_JOB_END_TIME = "endTime"; String COORDINATOR_JOB_PAUSE_TIME = "pauseTime"; http://git-wip-us.apache.org/repos/asf/oozie/blob/f7b67426/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java b/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java index 4c65392..57dbfe9 100644 --- a/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java +++ b/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java @@ -165,6 +165,7 @@ public class JsonToBean { COORD_JOB.put("getLastActionTime", new Property(JsonTags.COORDINATOR_JOB_LAST_ACTION_TIME, Date.class)); COORD_JOB.put("getNextMaterializedTime", new Property(JsonTags.COORDINATOR_JOB_NEXT_MATERIALIZED_TIME, Date.class)); + COORD_JOB.put("getCreatedTime", new Property(JsonTags.COORDINATOR_JOB_CREATED_TIME, Date.class)); COORD_JOB.put("getStartTime", new Property(JsonTags.COORDINATOR_JOB_START_TIME, Date.class)); COORD_JOB.put("getEndTime", new Property(JsonTags.COORDINATOR_JOB_END_TIME, Date.class)); COORD_JOB.put("getPauseTime", new Property(JsonTags.COORDINATOR_JOB_PAUSE_TIME, Date.class)); http://git-wip-us.apache.org/repos/asf/oozie/blob/f7b67426/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java ---------------------------------------------------------------------- diff --git a/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java b/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java index a102699..7326778 100644 --- a/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java +++ b/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java @@ -266,6 +266,7 @@ public class TestJsonToBean extends TestCase { json.put(JsonTags.COORDINATOR_JOB_TIMEOUT, (long)3); json.put(JsonTags.COORDINATOR_JOB_LAST_ACTION_TIME, LAST_ACTION); json.put(JsonTags.COORDINATOR_JOB_NEXT_MATERIALIZED_TIME, NEXT_MATERIALIZED); + json.put(JsonTags.COORDINATOR_JOB_CREATED_TIME, CREATED_TIME); json.put(JsonTags.COORDINATOR_JOB_START_TIME, START_TIME); json.put(JsonTags.COORDINATOR_JOB_PAUSE_TIME, PAUSE_TIME); json.put(JsonTags.COORDINATOR_JOB_END_TIME, END_TIME); @@ -305,6 +306,7 @@ public class TestJsonToBean extends TestCase { assertEquals(3, job.getTimeout()); assertEquals(JsonUtils.parseDateRfc822(LAST_ACTION), job.getLastActionTime()); assertEquals(JsonUtils.parseDateRfc822(NEXT_MATERIALIZED), job.getNextMaterializedTime()); + assertEquals(JsonUtils.parseDateRfc822(CREATED_TIME), job.getCreatedTime()); assertEquals(JsonUtils.parseDateRfc822(START_TIME), job.getStartTime()); assertEquals(JsonUtils.parseDateRfc822(END_TIME), job.getEndTime()); assertEquals(JsonUtils.parseDateRfc822(PAUSE_TIME), job.getPauseTime()); http://git-wip-us.apache.org/repos/asf/oozie/blob/f7b67426/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java b/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java index 7dda508..b6e0b7e 100644 --- a/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java +++ b/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java @@ -1117,6 +1117,7 @@ public class CoordinatorJobBean implements Writable, CoordinatorJob, JsonBean { json.put(JsonTags.COORDINATOR_JOB_LAST_ACTION_TIME, JsonUtils.formatDateRfc822(getLastActionTime(), timeZoneId)); json.put(JsonTags.COORDINATOR_JOB_NEXT_MATERIALIZED_TIME, JsonUtils.formatDateRfc822(getNextMaterializedTime(), timeZoneId)); + json.put(JsonTags.COORDINATOR_JOB_CREATED_TIME, JsonUtils.formatDateRfc822(getCreatedTime(), timeZoneId)); json.put(JsonTags.COORDINATOR_JOB_START_TIME, JsonUtils.formatDateRfc822(getStartTime(), timeZoneId)); json.put(JsonTags.COORDINATOR_JOB_END_TIME, JsonUtils.formatDateRfc822(getEndTime(), timeZoneId)); json.put(JsonTags.COORDINATOR_JOB_PAUSE_TIME, JsonUtils.formatDateRfc822(getPauseTime(), timeZoneId)); http://git-wip-us.apache.org/repos/asf/oozie/blob/f7b67426/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 9b94ee9..ad20443 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3098 Allow to use the rest api to get the creation time of the Coordinator (chiwen via andras.piros) OOZIE-3100 Upgrade javax.mail:mail to 1.4.7 (andras.piros) OOZIE-2929 Coordinator SLA should support configuration variable (chiwen via andras.piros) OOZIE-2896 Ensure compatibility for existing LauncherMapper settings (andras.piros)
