Repository: falcon Updated Branches: refs/heads/master f2e546268 -> 591c2fe88
FALCON-1052 pipeline feature is not able to group by through CLI. Contributed by Pallavi Rao Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/591c2fe8 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/591c2fe8 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/591c2fe8 Branch: refs/heads/master Commit: 591c2fe8895a7a8c268f07b5ee85b3c3dd582468 Parents: f2e5462 Author: Suhas Vasu <[email protected]> Authored: Tue Mar 3 18:04:00 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Tue Mar 3 18:04:00 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../java/org/apache/falcon/resource/EntityList.java | 12 ++++++------ .../apache/falcon/resource/AbstractEntityManager.java | 2 +- .../org/apache/falcon/resource/EntityManagerTest.java | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/591c2fe8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ebf4391..a081a00 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -89,6 +89,9 @@ Trunk (Unreleased) (Suhas vasu) BUG FIXES + FALCON-1052 pipeline feature is not able to group by through CLI + (Pallavi Rao via Suhas Vasu) + FALCON-1047 Feed Instance Listing doesn't return any output or error (Pallavi Rao via Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/591c2fe8/client/src/main/java/org/apache/falcon/resource/EntityList.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/resource/EntityList.java b/client/src/main/java/org/apache/falcon/resource/EntityList.java index 243c119..d43418c 100644 --- a/client/src/main/java/org/apache/falcon/resource/EntityList.java +++ b/client/src/main/java/org/apache/falcon/resource/EntityList.java @@ -65,10 +65,10 @@ public class EntityList { public String name; @XmlElement public String status; - @XmlElementWrapper(name = "list") + @XmlElementWrapper(name = "tags") public List<String> tag; - @XmlElementWrapper(name = "list") - public List<String> pipelines; + @XmlElementWrapper(name = "pipelines") + public List<String> pipeline; //RESUME CHECKSTYLE CHECK VisibilityModifierCheck @Override @@ -82,8 +82,8 @@ public class EntityList { outString += " - " + tag.toString(); } - if (pipelines != null && !pipelines.isEmpty()) { - outString += " - " + pipelines.toString(); + if (pipeline != null && !pipeline.isEmpty()) { + outString += " - " + pipeline.toString(); } outString += "\n"; return outString; @@ -114,7 +114,7 @@ public class EntityList { element.name = e.getName(); element.status = null; element.tag = new ArrayList<String>(); - element.pipelines = new ArrayList<String>(); + element.pipeline = new ArrayList<String>(); return element; } http://git-wip-us.apache.org/repos/asf/falcon/blob/591c2fe8/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java index 424bada..9a044d9 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java @@ -923,7 +923,7 @@ public abstract class AbstractEntityManager { elem.status = getStatusString(entity); } if (fields.contains("pipelines")) { - elem.pipelines = EntityUtil.getPipelines(entity); + elem.pipeline = EntityUtil.getPipelines(entity); } if (fields.contains("tags")) { elem.tag = EntityUtil.getTags(entity); http://git-wip-us.apache.org/repos/asf/falcon/blob/591c2fe8/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java ---------------------------------------------------------------------- diff --git a/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java b/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java index 470f866..9504d3f 100644 --- a/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java +++ b/prism/src/test/java/org/apache/falcon/resource/EntityManagerTest.java @@ -203,8 +203,8 @@ public class EntityManagerTest extends AbstractEntityManager { Assert.assertNotNull(entityList.getElements()); Assert.assertEquals(entityList.getElements().length, 2); Assert.assertEquals(entityList.getElements()[1].name, "process2"); - Assert.assertEquals(entityList.getElements()[1].pipelines.size(), 2); - Assert.assertEquals(entityList.getElements()[1].pipelines.get(0), "testPipeline"); + Assert.assertEquals(entityList.getElements()[1].pipeline.size(), 2); + Assert.assertEquals(entityList.getElements()[1].pipeline.get(0), "testPipeline"); Assert.assertEquals(entityList.getElements()[0].tag, null); entityList = this.getEntityList("process", "pipelines", "",
