You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/08/22 00:24:15 UTC
hbase git commit: Revert "HBASE-18615 hbase-rest tests fail in
hbase-2.0.0-alpha2" Pushed prematurely. Revert.
Repository: hbase
Updated Branches:
refs/heads/branch-2 b059d8602 -> 62d2cd0d0
Revert "HBASE-18615 hbase-rest tests fail in hbase-2.0.0-alpha2"
Pushed prematurely. Revert.
This reverts commit 0be04ab4a102430dd9a2259c9d98a1ae18a8693d.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/62d2cd0d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/62d2cd0d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/62d2cd0d
Branch: refs/heads/branch-2
Commit: 62d2cd0d07794de01f1d7e7757fd8736da32faa1
Parents: b059d86
Author: Michael Stack <st...@apache.org>
Authored: Mon Aug 21 17:23:57 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Mon Aug 21 17:23:57 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java | 4 +---
.../org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/62d2cd0d/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
index 9b38b98..eb3fc26 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
@@ -235,9 +235,7 @@ public class RESTServer implements Constants {
parseCommandLine(args, servlet);
- // Set up the Jersey servlet container for Jetty
- // The Jackson1Feature is a signal to Jersey that it should use jackson doing json.
- // See here: https://stackoverflow.com/questions/39458230/how-register-jacksonfeature-on-clientconfig
+ // set up the Jersey servlet container for Jetty
ResourceConfig application = new ResourceConfig().
packages("org.apache.hadoop.hbase.rest").register(Jackson1Feature.class);
ServletHolder sh = new ServletHolder(new ServletContainer(application));
http://git-wip-us.apache.org/repos/asf/hbase/blob/62d2cd0d/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java
index c5cc121..298b954 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java
@@ -34,7 +34,6 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.glassfish.jersey.jackson1.Jackson1Feature;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;
@@ -62,8 +61,7 @@ public class HBaseRESTTestingUtility {
RESTServlet.getInstance(conf, UserProvider.instantiate(conf));
// set up the Jersey servlet container for Jetty
- ResourceConfig app = new ResourceConfig().
- packages("org.apache.hadoop.hbase.rest").register(Jackson1Feature.class);
+ ResourceConfig app = new ResourceConfig();
ServletHolder sh = new ServletHolder(new ServletContainer(app));
// set up Jetty and run the embedded server