From ee6bbacfcddfc20f49e23d8571c087e5708d0c27 Mon Sep 17 00:00:00 2001 From: Artem Ervits Date: Thu, 18 Oct 2018 14:28:41 -0400 Subject: [PATCH] HBASE-21343 hbase-rest shouldn't import unshaded protobuf --- .../java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java | 8 ++++---- .../java/org/apache/hadoop/hbase/rest/model/ScannerModel.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java index 29b48e1443..c6bf0e4815 100644 --- hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java +++ hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java @@ -19,10 +19,10 @@ package org.apache.hadoop.hbase.rest.client; -import com.google.protobuf.Descriptors; -import com.google.protobuf.Message; -import com.google.protobuf.Service; -import com.google.protobuf.ServiceException; +import org.apache.hbase.thirdparty.com.google.protobuf.Descriptors; +import org.apache.hbase.thirdparty.com.google.protobuf.Message; +import org.apache.hbase.thirdparty.com.google.protobuf.Service; +import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; diff --git hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java index 7558e8fc12..b5bac0ad24 100644 --- hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java +++ hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/ScannerModel.java @@ -78,7 +78,7 @@ import org.apache.hadoop.hbase.util.Bytes; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; -import com.google.protobuf.ByteString; +import org.apache.hbase.thirdparty.com.google.protobuf.ByteString; /** * A representation of Scanner parameters. -- 2.16.2