You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2015/06/10 14:47:29 UTC
falcon git commit: FALCON-1264 Fix validity parsing in
ProcessWizardPage. Contributed by Paul Isaychuk
Repository: falcon
Updated Branches:
refs/heads/master a152e078a -> b936a69b4
FALCON-1264 Fix validity parsing in ProcessWizardPage. Contributed by Paul Isaychuk
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/b936a69b
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/b936a69b
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/b936a69b
Branch: refs/heads/master
Commit: b936a69b4d99646aca65741343a458e30dfef1c2
Parents: a152e07
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Wed Jun 10 15:45:51 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Wed Jun 10 15:45:58 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/ui/search/ProcessWizardPage.java | 9 +++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/b936a69b/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 233d45e..6d93db2 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -351,6 +351,8 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-1264 Fix validity parsing in ProcessWizardPage (Paul Isaychuk via Ruslan Ostafiychuk)
+
FALCON-1263 Fix waitTillInstanceReachState for EntityType.PROCESS (Ruslan Ostafiychuk)
FALCON-1258 Fix feed validity and fortify ELExpFutureAndLatestTest (Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/falcon/blob/b936a69b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java
index 2321ccf..42e2f12 100644
--- a/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java
+++ b/falcon-regression/merlin/src/main/java/org/apache/falcon/regression/ui/search/ProcessWizardPage.java
@@ -891,15 +891,14 @@ public class ProcessWizardPage extends AbstractSearchPage {
//remove the part which was used
currentBlock = currentBlock.substring(currentBlock.indexOf("Validity"));
//get validity
- String start = getProperty(currentBlock, "Validity", "End", 2).split(" ")[1];
+ String start = getProperty(currentBlock, "Validity", "End", 2);
//check if there are other clusters
last = currentBlock.indexOf("Name");
String innerBlock = currentBlock.substring(currentBlock.indexOf("End"),
last != -1 ? last : currentBlock.length() - 1).trim();
- parts = innerBlock.trim().split("\\n");
- String end = parts[1].split(" ")[1];
+ String end = innerBlock.trim().split("\\n")[1];
Validity validity = new Validity();
- DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'SSS'Z'");
+ DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy'-'MM'-'dd' 'HH':'mm'");
validity.setStart(formatter.parseDateTime(start.replaceAll("\"", "")).toDate());
validity.setEnd(formatter.parseDateTime(end.replaceAll("\"", "")).toDate());
cluster.setValidity(validity);
@@ -942,6 +941,8 @@ public class ProcessWizardPage extends AbstractSearchPage {
output.setInstance(getProperty(currentBlock, "Instance", "Name", 2));
draft.getOutputs().getOutputs().add(output);
}
+ //check compulsory process properties
+ Assert.assertNotNull(draft.getACL(), "ACL is empty (null).");
return draft;
}