Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Enis Soztutar 2014-09-30 11:33:58 -07:00
parent 26dcd96b60
commit e241d9dd81
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java
View File

@ -640,7 +640,7 @@ public class ScannerModel implements ProtobufMessageHandler, Serializable {
return columns;
}
@XmlElement(name="label")
@XmlElement(name="labels")
public List<String> getLabels() {
return labels;
}

2
hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
View File

@ -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=\","