hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject git commit: HBASE-12099 TestScannerModel fails if using jackson 1.9.13 (Esteban Gutierrez)
Date Tue, 30 Sep 2014 18:49:47 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 33a00c130 -> 2814f3b16


HBASE-12099 TestScannerModel fails if using jackson 1.9.13 (Esteban Gutierrez)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2814f3b1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2814f3b1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2814f3b1

Branch: refs/heads/branch-1
Commit: 2814f3b16907ee800b261778bbfcd92d31e30128
Parents: 33a00c1
Author: Enis Soztutar <enis@apache.org>
Authored: Tue Sep 30 11:33:58 2014 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Tue Sep 30 11:34:34 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java | 2 +-
 .../java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2814f3b1/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
index 6067b30..2ffdd4f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
@@ -640,7 +640,7 @@ public class ScannerModel implements ProtobufMessageHandler, Serializable
{
     return columns;
   }
   
-  @XmlElement(name="label")
+  @XmlElement(name="labels")
   public List<String> getLabels() {
     return labels;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/2814f3b1/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
index 3102bfd..988872e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
@@ -44,7 +44,7 @@ public class TestScannerModel extends TestModelBase<ScannerModel>
{
         + "endTime=\"1245393318192\" maxVersions=\"2147483647\" startRow=\"YWJyYWNhZGFicmE=\"
"
         + "startTime=\"1245219839331\">"
         + "<column>Y29sdW1uMQ==</column><column>Y29sdW1uMjpmb28=</column>"
-        + "<label>private</label><label>public</label>"
+        + "<labels>private</labels><labels>public</labels>"
         + "</Scanner>";
 
     AS_JSON = "{\"batch\":100,\"caching\":1000,\"cacheBlocks\":false,\"endRow\":\"enp5eng=\","


Mime
View raw message