You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2014/09/30 20:34:08 UTC
git commit: HBASE-12099 TestScannerModel fails if using jackson
1.9.13 (Esteban Gutierrez)
Repository: hbase
Updated Branches:
refs/heads/master 26dcd96b6 -> e241d9dd8
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/e241d9dd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e241d9dd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e241d9dd
Branch: refs/heads/master
Commit: e241d9dd818848ac18ffc3b649240927cab0af7e
Parents: 26dcd96
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Sep 30 11:33:58 2014 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Sep 30 11:33:58 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/e241d9dd/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/e241d9dd/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 ef0696d..a5ac2ca 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
@@ -45,7 +45,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=\","