Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C9268200D1B for ; Wed, 6 Sep 2017 16:32:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C7EF316171A; Wed, 6 Sep 2017 14:32:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 006AE161C20 for ; Wed, 6 Sep 2017 16:32:08 +0200 (CEST) Received: (qmail 10288 invoked by uid 500); 6 Sep 2017 14:32:06 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 10279 invoked by uid 99); 6 Sep 2017 14:32:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Sep 2017 14:32:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8345E7DFA; Wed, 6 Sep 2017 14:32:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: <856911882efc4929ada89e1589341ec5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-17713 the interface '/version/cluster' with header 'Accept: application/json' return is not JSON but plain text Date: Wed, 6 Sep 2017 14:32:06 +0000 (UTC) archived-at: Wed, 06 Sep 2017 14:32:10 -0000 Repository: hbase Updated Branches: refs/heads/branch-2 f0c1cd50c -> d7a74a75a HBASE-17713 the interface '/version/cluster' with header 'Accept: application/json' return is not JSON but plain text Signed-off-by: tedyu Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d7a74a75 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d7a74a75 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d7a74a75 Branch: refs/heads/branch-2 Commit: d7a74a75a133810ec5159ede1e451b2e0f281310 Parents: f0c1cd5 Author: Guangxu Cheng Authored: Wed Sep 6 11:58:24 2017 +0800 Committer: tedyu Committed: Wed Sep 6 07:31:56 2017 -0700 ---------------------------------------------------------------------- .../rest/model/StorageClusterVersionModel.java | 4 ++-- .../hadoop/hbase/rest/TestVersionResource.java | 19 +++++++++++++++++-- .../hadoop/hbase/rest/client/TestXmlParsing.java | 2 +- .../model/TestStorageClusterVersionModel.java | 4 ++-- 4 files changed, 22 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d7a74a75/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/StorageClusterVersionModel.java ---------------------------------------------------------------------- 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; http://git-wip-us.apache.org/repos/asf/hbase/blob/d7a74a75/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java ---------------------------------------------------------------------- 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..99fce2c 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; @@ -35,6 +36,8 @@ 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 +131,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 +178,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"); } - } http://git-wip-us.apache.org/repos/asf/hbase/blob/d7a74a75/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestXmlParsing.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestXmlParsing.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestXmlParsing.java index 56dc05e..5e259f2 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestXmlParsing.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestXmlParsing.java @@ -41,7 +41,7 @@ public class TestXmlParsing { @Test public void testParsingClusterVersion() throws Exception { final String xml = "" - + "2.0.0"; + + ""; Client client = mock(Client.class); RemoteAdmin admin = new RemoteAdmin(client, HBaseConfiguration.create(), null); Response resp = new Response(200, null, xml.getBytes()); http://git-wip-us.apache.org/repos/asf/hbase/blob/d7a74a75/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java index 602312d..8c7e22b 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java @@ -31,9 +31,9 @@ public class TestStorageClusterVersionModel extends TestModelBase"+ - "" + VERSION + ""; + ""; - AS_JSON = "\"0.0.1-testing\""; + AS_JSON = "{\"Version\": \"0.0.1-testing\"}"; } protected StorageClusterVersionModel buildTestModel() {