falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajayyad...@apache.org
Subject falcon git commit: FALCON-1152 Names of Xml attributes and Class member variables are inconsistent. Contributed by Ajay Yadava
Date Mon, 20 Apr 2015 09:23:18 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 1dd301810 -> 74ce00b1e


FALCON-1152 Names of Xml attributes and Class member variables are inconsistent. Contributed
by Ajay Yadava


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/74ce00b1
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/74ce00b1
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/74ce00b1

Branch: refs/heads/master
Commit: 74ce00b1e1e90ed6f6dd5571028fda71c7ec7a37
Parents: 1dd3018
Author: Ajay Yadava <ajaynsit@gmail.com>
Authored: Mon Apr 20 14:52:50 2015 +0530
Committer: Ajay Yadava <ajaynsit@gmail.com>
Committed: Mon Apr 20 14:52:50 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                        | 2 ++
 .../src/main/java/org/apache/falcon/resource/FeedLookupResult.java | 2 +-
 .../src/main/java/org/apache/falcon/resource/InstancesResult.java  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/74ce00b1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9cd3f2d..e7105dd 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ Trunk (Unreleased)
   IMPROVEMENTS
     FALCON-1142 ClusterEntityParserTest.testClusterWithOnlyStaging
     fails when run alone(Pallavi Rao via Suhas Vasu)
+    FALCON-1152 Names of Xml attributes and Class member variables
+    are inconsistent(Ajay Yadava)
 
   OPTIMIZATIONS
 

http://git-wip-us.apache.org/repos/asf/falcon/blob/74ce00b1/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java b/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java
index d2bf259..72b088d 100644
--- a/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java
+++ b/client/src/main/java/org/apache/falcon/resource/FeedLookupResult.java
@@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @edu.umd.cs.findbugs.annotations.SuppressWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
 public class FeedLookupResult extends APIResult {
 
-    @XmlElement(name = "feed")
+    @XmlElement(name = "elements")
     private FeedProperties[] elements;
 
     //For JAXB

http://git-wip-us.apache.org/repos/asf/falcon/blob/74ce00b1/client/src/main/java/org/apache/falcon/resource/InstancesResult.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/resource/InstancesResult.java b/client/src/main/java/org/apache/falcon/resource/InstancesResult.java
index fc99bba..76bb4b0 100644
--- a/client/src/main/java/org/apache/falcon/resource/InstancesResult.java
+++ b/client/src/main/java/org/apache/falcon/resource/InstancesResult.java
@@ -114,7 +114,7 @@ public class InstancesResult extends APIResult {
         @XmlElement
         public InstanceAction[] actions;
 
-        @XmlElement(name="params")
+        @XmlElement(name="wfParams")
         public KeyValuePair[] wfParams;
 
         public Instance() {


Mime
View raw message