From 6855b315bdfd5c3d445f6b143f0e846e33c76c58 Mon Sep 17 00:00:00 2001 From: Guangxu Cheng Date: Thu, 30 Aug 2018 21:33:56 +0800 Subject: [PATCH] HBASE-21133 '/version' in rest should return hbase rest client version --- .../main/java/org/apache/hadoop/hbase/rest/Constants.java | 4 +--- .../org/apache/hadoop/hbase/rest/model/VersionModel.java | 3 +-- .../org/apache/hadoop/hbase/rest/TestVersionResource.java | 5 +++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java index 4cf8a93ed5..79c42ce5f2 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java @@ -26,9 +26,7 @@ import org.apache.yetus.audience.InterfaceAudience; @InterfaceAudience.Public public interface Constants { // All constants in a public interface are 'public static final' - - String VERSION_STRING = "0.0.3"; - + int DEFAULT_MAX_AGE = 60 * 60 * 4; // 4 hours int DEFAULT_LISTEN_PORT = 8080; diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java index 378d149b5e..6998d48e10 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/VersionModel.java @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.rest.ProtobufMessageHandler; -import org.apache.hadoop.hbase.rest.RESTServlet; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.rest.protobuf.generated.VersionMessage.Version; import org.glassfish.jersey.servlet.ServletContainer; @@ -67,7 +66,7 @@ public class VersionModel implements Serializable, ProtobufMessageHandler { * @param context the servlet context */ public VersionModel(ServletContext context) { - restVersion = RESTServlet.VERSION_STRING; + restVersion = org.apache.hadoop.hbase.Version.version; jvmVersion = System.getProperty("java.vm.vendor") + ' ' + System.getProperty("java.version") + '-' + System.getProperty("java.vm.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 bbd5e082f4..a5c7dfe262 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 @@ -30,6 +30,7 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.Version; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; import org.apache.hadoop.hbase.rest.client.Response; @@ -81,7 +82,7 @@ public class TestVersionResource { private static void validate(VersionModel model) { assertNotNull(model); assertNotNull(model.getRESTVersion()); - assertEquals(RESTServlet.VERSION_STRING, model.getRESTVersion()); + assertEquals(Version.version, model.getRESTVersion()); String osVersion = model.getOSVersion(); assertNotNull(osVersion); assertTrue(osVersion.contains(System.getProperty("os.name"))); @@ -106,7 +107,7 @@ public class TestVersionResource { assertEquals(Constants.MIMETYPE_TEXT, response.getHeader("content-type")); String body = Bytes.toString(response.getBody()); assertTrue(body.length() > 0); - assertTrue(body.contains(RESTServlet.VERSION_STRING)); + assertTrue(body.contains(Version.version)); assertTrue(body.contains(System.getProperty("java.vm.vendor"))); assertTrue(body.contains(System.getProperty("java.version"))); assertTrue(body.contains(System.getProperty("java.vm.version"))); -- 2.17.1