From c51ada8bc5bd25b0d3e1a2a8b270ffd42bdbec6e Mon Sep 17 00:00:00 2001 From: Guangxu Cheng Date: Tue, 5 Sep 2017 21:11:10 +0800 Subject: [PATCH] HBASE-17713 the interface '/version/cluster' with header 'Accept: application/json' return is not JSON but plain text --- .../rest/model/StorageClusterVersionModel.java | 4 ++-- .../hadoop/hbase/rest/TestVersionResource.java | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java index e332d49..548ca20 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java @@ -23,6 +23,7 @@ import org.codehaus.jackson.annotate.JsonValue; import java.io.Serializable; +import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; @@ -47,7 +48,7 @@ public class StorageClusterVersionModel implements Serializable { /** * @return the storage cluster version */ - @XmlValue + @XmlAttribute(name="Version") public String getVersion() { return version; } @@ -62,7 +63,6 @@ public class StorageClusterVersionModel implements Serializable { /* (non-Javadoc) * @see java.lang.Object#toString() */ - @JsonValue @Override public String toString() { return version; diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java index b96a5d5..27cef97 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.rest; import java.io.ByteArrayInputStream; import java.io.IOException; +import javax.ws.rs.core.MediaType; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -30,11 +31,16 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; import org.apache.hadoop.hbase.rest.client.Response; +import org.apache.hadoop.hbase.rest.model.CellModel; +import org.apache.hadoop.hbase.rest.model.CellSetModel; +import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.rest.model.StorageClusterVersionModel; import org.apache.hadoop.hbase.rest.model.VersionModel; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; +import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; +import org.codehaus.jackson.map.ObjectMapper; import org.glassfish.jersey.servlet.ServletContainer; import static org.junit.Assert.*; @@ -128,6 +134,12 @@ public class TestVersionResource { Response response = client.get("/version", Constants.MIMETYPE_JSON); assertTrue(response.getCode() == 200); assertEquals(Constants.MIMETYPE_JSON, response.getHeader("content-type")); + ObjectMapper mapper = new JacksonJaxbJsonProvider() + .locateMapper(VersionModel.class, MediaType.APPLICATION_JSON_TYPE); + VersionModel model + = mapper.readValue(response.getBody(), VersionModel.class); + validate(model); + LOG.info("success retrieving Stargate version as JSON"); } @Test @@ -169,11 +181,17 @@ public class TestVersionResource { } @Test - public void doTestGetStorageClusterVersionJSON() throws IOException { + public void testGetStorageClusterVersionJSON() throws IOException { Response response = client.get("/version/cluster", Constants.MIMETYPE_JSON); assertTrue(response.getCode() == 200); assertEquals(Constants.MIMETYPE_JSON, response.getHeader("content-type")); + ObjectMapper mapper = new JacksonJaxbJsonProvider() + .locateMapper(StorageClusterVersionModel.class, MediaType.APPLICATION_JSON_TYPE); + StorageClusterVersionModel clusterVersionModel + = mapper.readValue(response.getBody(), StorageClusterVersionModel.class); + assertNotNull(clusterVersionModel); + assertNotNull(clusterVersionModel.getVersion()); + LOG.info("success retrieving storage cluster version as JSON"); } - } -- 1.9.5.msysgit.0