diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java index 43a7667..c3abf05 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ScannerResource.java @@ -84,9 +84,9 @@ public class ScannerResource extends ResourceBase { } byte[] endRow = model.hasEndRow() ? model.getEndRow() : null; RowSpec spec = null; - if (model.getLabels() != null) { + if (model.getLabel() != null) { spec = new RowSpec(model.getStartRow(), endRow, model.getColumns(), model.getStartTime(), - model.getEndTime(), model.getMaxVersions(), model.getLabels()); + model.getEndTime(), model.getMaxVersions(), model.getLabel()); } else { spec = new RowSpec(model.getStartRow(), endRow, model.getColumns(), model.getStartTime(), model.getEndTime(), model.getMaxVersions()); 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 2fa53f4..56c97f1 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 @@ -647,7 +647,7 @@ public class ScannerModel implements ProtobufMessageHandler, Serializable { } @XmlElement(name="label") - public List getLabels() { + public List getLabel() { return labels; } 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..18eede4 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 @@ -50,7 +50,7 @@ public class TestScannerModel extends TestModelBase { AS_JSON = "{\"batch\":100,\"caching\":1000,\"cacheBlocks\":false,\"endRow\":\"enp5eng=\"," + "\"endTime\":1245393318192,\"maxVersions\":2147483647,\"startRow\":\"YWJyYWNhZGFicmE=\"," + "\"startTime\":1245219839331,\"column\":[\"Y29sdW1uMQ==\",\"Y29sdW1uMjpmb28=\"]," - +"\"labels\":[\"private\",\"public\"]" + +"\"label\":[\"private\",\"public\"]" +"}"; AS_PB = "CgthYnJhY2FkYWJyYRIFenp5engaB2NvbHVtbjEaC2NvbHVtbjI6Zm9vIGQo47qL554kMLDi57mf" @@ -93,8 +93,8 @@ public class TestScannerModel extends TestModelBase { assertEquals(model.getCacheBlocks(), CACHE_BLOCKS); boolean foundLabel1 = false; boolean foundLabel2 = false; - if (model.getLabels() != null && model.getLabels().size() > 0) { - for (String label : model.getLabels()) { + if (model.getLabel() != null && model.getLabel().size() > 0) { + for (String label : model.getLabel()) { if (label.equals(PRIVATE)) { foundLabel1 = true; } else if (label.equals(PUBLIC)) {