diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java index 6067b30..2ffdd4f 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java +++ 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 getLabels() { return labels; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java index ef0696d..a5ac2ca 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java @@ -45,7 +45,7 @@ public class TestScannerModel extends TestModelBase { + "endTime=\"1245393318192\" maxVersions=\"2147483647\" startRow=\"YWJyYWNhZGFicmE=\" " + "startTime=\"1245219839331\">" + "Y29sdW1uMQ==Y29sdW1uMjpmb28=" - + "" + + "privatepublic" + ""; AS_JSON = "{\"batch\":100,\"caching\":1000,\"cacheBlocks\":false,\"endRow\":\"enp5eng=\","