Skip to content

Commit 139f085

Browse files
Apache9Apache9
authored
HBASE-26523 Upgrade hbase-thirdparty dependency to 4.0.0 (#3910)
Signed-off-by: Xiaolin Ha <haxiaolin@apache.org>
1 parent 006433b commit 139f085

38 files changed

+299
-285
lines changed

‎hbase-http/src/test/java/org/apache/hadoop/hbase/http/resource/JerseyResource.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
import java.io.IOException;
2121
import java.util.Map;
2222
import java.util.TreeMap;
23-
import javax.ws.rs.DefaultValue;
24-
import javax.ws.rs.GET;
25-
import javax.ws.rs.Path;
26-
import javax.ws.rs.PathParam;
27-
import javax.ws.rs.Produces;
28-
import javax.ws.rs.QueryParam;
29-
import javax.ws.rs.core.MediaType;
30-
import javax.ws.rs.core.Response;
3123
import org.slf4j.Logger;
3224
import org.slf4j.LoggerFactory;
3325

26+
import org.apache.hbase.thirdparty.javax.ws.rs.DefaultValue;
27+
import org.apache.hbase.thirdparty.javax.ws.rs.GET;
28+
import org.apache.hbase.thirdparty.javax.ws.rs.Path;
29+
import org.apache.hbase.thirdparty.javax.ws.rs.PathParam;
30+
import org.apache.hbase.thirdparty.javax.ws.rs.Produces;
31+
import org.apache.hbase.thirdparty.javax.ws.rs.QueryParam;
32+
import org.apache.hbase.thirdparty.javax.ws.rs.core.MediaType;
33+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
3434
import org.apache.hbase.thirdparty.org.eclipse.jetty.util.ajax.JSON;
3535

3636
/**

‎hbase-it/src/test/java/org/apache/hadoop/hbase/MockHttpApiRule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import java.util.regex.Pattern;
2929
import javax.servlet.http.HttpServletRequest;
3030
import javax.servlet.http.HttpServletResponse;
31-
import javax.ws.rs.core.MediaType;
3231
import org.junit.rules.ExternalResource;
3332
import org.slf4j.Logger;
3433
import org.slf4j.LoggerFactory;
3534

35+
import org.apache.hbase.thirdparty.javax.ws.rs.core.MediaType;
3636
import org.apache.hbase.thirdparty.org.eclipse.jetty.server.Request;
3737
import org.apache.hbase.thirdparty.org.eclipse.jetty.server.RequestLog;
3838
import org.apache.hbase.thirdparty.org.eclipse.jetty.server.Server;

‎hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@
3232
import java.util.Objects;
3333
import java.util.Optional;
3434
import java.util.concurrent.Callable;
35-
import javax.ws.rs.client.Client;
36-
import javax.ws.rs.client.ClientBuilder;
37-
import javax.ws.rs.client.Entity;
38-
import javax.ws.rs.client.Invocation;
39-
import javax.ws.rs.client.WebTarget;
40-
import javax.ws.rs.core.MediaType;
41-
import javax.ws.rs.core.Response;
42-
import javax.ws.rs.core.UriBuilder;
4335
import javax.xml.ws.http.HTTPException;
4436
import org.apache.commons.lang3.StringUtils;
4537
import org.apache.hadoop.conf.Configuration;
@@ -54,6 +46,14 @@
5446
import org.apache.hbase.thirdparty.com.google.gson.JsonElement;
5547
import org.apache.hbase.thirdparty.com.google.gson.JsonObject;
5648
import org.apache.hbase.thirdparty.com.google.gson.JsonParser;
49+
import org.apache.hbase.thirdparty.javax.ws.rs.client.Client;
50+
import org.apache.hbase.thirdparty.javax.ws.rs.client.ClientBuilder;
51+
import org.apache.hbase.thirdparty.javax.ws.rs.client.Entity;
52+
import org.apache.hbase.thirdparty.javax.ws.rs.client.Invocation;
53+
import org.apache.hbase.thirdparty.javax.ws.rs.client.WebTarget;
54+
import org.apache.hbase.thirdparty.javax.ws.rs.core.MediaType;
55+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
56+
import org.apache.hbase.thirdparty.javax.ws.rs.core.UriBuilder;
5757
import org.apache.hbase.thirdparty.org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
5858

5959
/**

‎hbase-rest/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,6 @@
264264
<groupId>com.sun.activation</groupId>
265265
<artifactId>javax.activation</artifactId>
266266
</dependency>
267-
<dependency>
268-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
269-
<artifactId>jackson-jaxrs-json-provider</artifactId>
270-
</dependency>
271267
<dependency>
272268
<groupId>com.fasterxml.jackson.core</groupId>
273269
<artifactId>jackson-annotations</artifactId>
@@ -280,6 +276,10 @@
280276
<groupId>com.fasterxml.jackson.core</groupId>
281277
<artifactId>jackson-databind</artifactId>
282278
</dependency>
279+
<dependency>
280+
<groupId>org.apache.hbase.thirdparty</groupId>
281+
<artifactId>hbase-shaded-jackson-jaxrs-json-provider</artifactId>
282+
</dependency>
283283
<dependency>
284284
<!-- We *might* need this for XMLStreamReader use in RemoteAdmin
285285
TODO figure out if we can remove it.

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ExistsResource.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@
2020
package org.apache.hadoop.hbase.rest;
2121

2222
import java.io.IOException;
23-
24-
import javax.ws.rs.GET;
25-
import javax.ws.rs.Produces;
26-
import javax.ws.rs.core.CacheControl;
27-
import javax.ws.rs.core.Context;
28-
import javax.ws.rs.core.Response;
29-
import javax.ws.rs.core.UriInfo;
30-
import javax.ws.rs.core.Response.ResponseBuilder;
31-
3223
import org.apache.yetus.audience.InterfaceAudience;
3324

25+
import org.apache.hbase.thirdparty.javax.ws.rs.GET;
26+
import org.apache.hbase.thirdparty.javax.ws.rs.Produces;
27+
import org.apache.hbase.thirdparty.javax.ws.rs.core.CacheControl;
28+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Context;
29+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
30+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response.ResponseBuilder;
31+
import org.apache.hbase.thirdparty.javax.ws.rs.core.UriInfo;
32+
3433
@InterfaceAudience.Private
3534
public class ExistsResource extends ResourceBase {
3635

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
package org.apache.hadoop.hbase.rest;
2020

2121
import java.io.IOException;
22-
23-
import javax.ws.rs.GET;
24-
import javax.ws.rs.Produces;
25-
import javax.ws.rs.core.Context;
26-
import javax.ws.rs.core.MultivaluedMap;
27-
import javax.ws.rs.core.Response;
28-
import javax.ws.rs.core.UriInfo;
29-
3022
import org.apache.hadoop.hbase.Cell;
3123
import org.apache.hadoop.hbase.CellUtil;
3224
import org.apache.hadoop.hbase.rest.model.CellModel;
@@ -37,6 +29,13 @@
3729
import org.slf4j.Logger;
3830
import org.slf4j.LoggerFactory;
3931

32+
import org.apache.hbase.thirdparty.javax.ws.rs.GET;
33+
import org.apache.hbase.thirdparty.javax.ws.rs.Produces;
34+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Context;
35+
import org.apache.hbase.thirdparty.javax.ws.rs.core.MultivaluedMap;
36+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
37+
import org.apache.hbase.thirdparty.javax.ws.rs.core.UriInfo;
38+
4039
@InterfaceAudience.Private
4140
public class MultiRowResource extends ResourceBase implements Constants {
4241
private static final Logger LOG = LoggerFactory.getLogger(MultiRowResource.class);

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/NamespacesInstanceResource.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@
2121
import java.io.IOException;
2222
import java.util.List;
2323
import javax.servlet.ServletContext;
24-
import javax.ws.rs.Consumes;
25-
import javax.ws.rs.DELETE;
26-
import javax.ws.rs.GET;
27-
import javax.ws.rs.POST;
28-
import javax.ws.rs.PUT;
29-
import javax.ws.rs.Path;
30-
import javax.ws.rs.PathParam;
31-
import javax.ws.rs.Produces;
32-
import javax.ws.rs.core.Context;
33-
import javax.ws.rs.core.HttpHeaders;
34-
import javax.ws.rs.core.Response;
35-
import javax.ws.rs.core.UriInfo;
3624
import org.apache.hadoop.hbase.NamespaceDescriptor;
3725
import org.apache.hadoop.hbase.client.Admin;
3826
import org.apache.hadoop.hbase.client.TableDescriptor;
@@ -44,6 +32,19 @@
4432
import org.slf4j.Logger;
4533
import org.slf4j.LoggerFactory;
4634

35+
import org.apache.hbase.thirdparty.javax.ws.rs.Consumes;
36+
import org.apache.hbase.thirdparty.javax.ws.rs.DELETE;
37+
import org.apache.hbase.thirdparty.javax.ws.rs.GET;
38+
import org.apache.hbase.thirdparty.javax.ws.rs.POST;
39+
import org.apache.hbase.thirdparty.javax.ws.rs.PUT;
40+
import org.apache.hbase.thirdparty.javax.ws.rs.Path;
41+
import org.apache.hbase.thirdparty.javax.ws.rs.PathParam;
42+
import org.apache.hbase.thirdparty.javax.ws.rs.Produces;
43+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Context;
44+
import org.apache.hbase.thirdparty.javax.ws.rs.core.HttpHeaders;
45+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
46+
import org.apache.hbase.thirdparty.javax.ws.rs.core.UriInfo;
47+
4748
/**
4849
* Implements the following REST end points:
4950
* <p>

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/NamespacesResource.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,19 @@
2020
package org.apache.hadoop.hbase.rest;
2121

2222
import java.io.IOException;
23-
2423
import javax.servlet.ServletContext;
25-
import javax.ws.rs.GET;
26-
import javax.ws.rs.Path;
27-
import javax.ws.rs.PathParam;
28-
import javax.ws.rs.Produces;
29-
import javax.ws.rs.core.Context;
30-
import javax.ws.rs.core.Response;
31-
import javax.ws.rs.core.UriInfo;
32-
24+
import org.apache.hadoop.hbase.rest.model.NamespacesModel;
3325
import org.apache.yetus.audience.InterfaceAudience;
3426
import org.slf4j.Logger;
3527
import org.slf4j.LoggerFactory;
36-
import org.apache.hadoop.hbase.rest.model.NamespacesModel;
28+
29+
import org.apache.hbase.thirdparty.javax.ws.rs.GET;
30+
import org.apache.hbase.thirdparty.javax.ws.rs.Path;
31+
import org.apache.hbase.thirdparty.javax.ws.rs.PathParam;
32+
import org.apache.hbase.thirdparty.javax.ws.rs.Produces;
33+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Context;
34+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
35+
import org.apache.hbase.thirdparty.javax.ws.rs.core.UriInfo;
3736

3837
/**
3938
* Implements REST GET list of all namespaces.

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ProtobufStreamingOutput.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.io.IOException;
2121
import java.io.OutputStream;
2222
import java.util.List;
23-
import javax.ws.rs.WebApplicationException;
24-
import javax.ws.rs.core.StreamingOutput;
2523
import org.apache.hadoop.hbase.Cell;
2624
import org.apache.hadoop.hbase.CellUtil;
2725
import org.apache.hadoop.hbase.client.Result;
@@ -34,6 +32,9 @@
3432
import org.slf4j.Logger;
3533
import org.slf4j.LoggerFactory;
3634

35+
import org.apache.hbase.thirdparty.javax.ws.rs.WebApplicationException;
36+
import org.apache.hbase.thirdparty.javax.ws.rs.core.StreamingOutput;
37+
3738
@InterfaceAudience.Private
3839
public class ProtobufStreamingOutput implements StreamingOutput {
3940
private static final Logger LOG = LoggerFactory.getLogger(ProtobufStreamingOutput.class);

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
package org.apache.hadoop.hbase.rest;
2020

21-
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
2221
import java.lang.management.ManagementFactory;
2322
import java.util.ArrayList;
2423
import java.util.EnumSet;
@@ -50,6 +49,7 @@
5049
import org.slf4j.Logger;
5150
import org.slf4j.LoggerFactory;
5251

52+
import org.apache.hbase.thirdparty.com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
5353
import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
5454
import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;
5555
import org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter;

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RegionsResource.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121

2222
import java.io.IOException;
2323
import java.util.List;
24-
import javax.ws.rs.GET;
25-
import javax.ws.rs.Produces;
26-
import javax.ws.rs.core.CacheControl;
27-
import javax.ws.rs.core.Context;
28-
import javax.ws.rs.core.Response;
29-
import javax.ws.rs.core.Response.ResponseBuilder;
30-
import javax.ws.rs.core.UriInfo;
3124
import org.apache.hadoop.hbase.HRegionLocation;
3225
import org.apache.hadoop.hbase.ServerName;
3326
import org.apache.hadoop.hbase.TableName;
@@ -42,6 +35,14 @@
4235
import org.slf4j.Logger;
4336
import org.slf4j.LoggerFactory;
4437

38+
import org.apache.hbase.thirdparty.javax.ws.rs.GET;
39+
import org.apache.hbase.thirdparty.javax.ws.rs.Produces;
40+
import org.apache.hbase.thirdparty.javax.ws.rs.core.CacheControl;
41+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Context;
42+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
43+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response.ResponseBuilder;
44+
import org.apache.hbase.thirdparty.javax.ws.rs.core.UriInfo;
45+
4546
@InterfaceAudience.Private
4647
public class RegionsResource extends ResourceBase {
4748
private static final Logger LOG = LoggerFactory.getLogger(RegionsResource.class);

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/ResourceBase.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
package org.apache.hadoop.hbase.rest;
2020

2121
import java.io.IOException;
22-
import javax.ws.rs.WebApplicationException;
23-
import javax.ws.rs.core.Response;
2422
import org.apache.hadoop.hbase.TableNotFoundException;
2523
import org.apache.hadoop.hbase.client.RetriesExhaustedException;
2624
import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;
2725
import org.apache.hadoop.util.StringUtils;
2826
import org.apache.yetus.audience.InterfaceAudience;
2927

28+
import org.apache.hbase.thirdparty.javax.ws.rs.WebApplicationException;
29+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
30+
3031
@InterfaceAudience.Private
3132
public class ResourceBase implements Constants {
3233

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RootResource.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,22 @@
2020
package org.apache.hadoop.hbase.rest;
2121

2222
import java.io.IOException;
23-
24-
import javax.ws.rs.GET;
25-
import javax.ws.rs.Path;
26-
import javax.ws.rs.PathParam;
27-
import javax.ws.rs.Produces;
28-
import javax.ws.rs.core.CacheControl;
29-
import javax.ws.rs.core.Context;
30-
import javax.ws.rs.core.Response;
31-
import javax.ws.rs.core.UriInfo;
32-
import javax.ws.rs.core.Response.ResponseBuilder;
33-
34-
import org.apache.yetus.audience.InterfaceAudience;
35-
import org.slf4j.Logger;
36-
import org.slf4j.LoggerFactory;
3723
import org.apache.hadoop.hbase.TableName;
3824
import org.apache.hadoop.hbase.rest.model.TableListModel;
3925
import org.apache.hadoop.hbase.rest.model.TableModel;
26+
import org.apache.yetus.audience.InterfaceAudience;
27+
import org.slf4j.Logger;
28+
import org.slf4j.LoggerFactory;
29+
30+
import org.apache.hbase.thirdparty.javax.ws.rs.GET;
31+
import org.apache.hbase.thirdparty.javax.ws.rs.Path;
32+
import org.apache.hbase.thirdparty.javax.ws.rs.PathParam;
33+
import org.apache.hbase.thirdparty.javax.ws.rs.Produces;
34+
import org.apache.hbase.thirdparty.javax.ws.rs.core.CacheControl;
35+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Context;
36+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
37+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response.ResponseBuilder;
38+
import org.apache.hbase.thirdparty.javax.ws.rs.core.UriInfo;
4039

4140
@Path("/")
4241
@InterfaceAudience.Private

‎hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,6 @@
2222
import java.io.IOException;
2323
import java.util.ArrayList;
2424
import java.util.List;
25-
26-
import javax.ws.rs.Consumes;
27-
import javax.ws.rs.DELETE;
28-
import javax.ws.rs.GET;
29-
import javax.ws.rs.POST;
30-
import javax.ws.rs.PUT;
31-
import javax.ws.rs.Produces;
32-
import javax.ws.rs.core.Context;
33-
import javax.ws.rs.core.HttpHeaders;
34-
import javax.ws.rs.core.MultivaluedMap;
35-
import javax.ws.rs.core.Response;
36-
import javax.ws.rs.core.Response.ResponseBuilder;
37-
import javax.ws.rs.core.UriInfo;
38-
3925
import org.apache.commons.lang3.StringUtils;
4026
import org.apache.hadoop.hbase.Cell;
4127
import org.apache.hadoop.hbase.Cell.Type;
@@ -57,6 +43,19 @@
5743
import org.slf4j.Logger;
5844
import org.slf4j.LoggerFactory;
5945

46+
import org.apache.hbase.thirdparty.javax.ws.rs.Consumes;
47+
import org.apache.hbase.thirdparty.javax.ws.rs.DELETE;
48+
import org.apache.hbase.thirdparty.javax.ws.rs.GET;
49+
import org.apache.hbase.thirdparty.javax.ws.rs.POST;
50+
import org.apache.hbase.thirdparty.javax.ws.rs.PUT;
51+
import org.apache.hbase.thirdparty.javax.ws.rs.Produces;
52+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Context;
53+
import org.apache.hbase.thirdparty.javax.ws.rs.core.HttpHeaders;
54+
import org.apache.hbase.thirdparty.javax.ws.rs.core.MultivaluedMap;
55+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response;
56+
import org.apache.hbase.thirdparty.javax.ws.rs.core.Response.ResponseBuilder;
57+
import org.apache.hbase.thirdparty.javax.ws.rs.core.UriInfo;
58+
6059
@InterfaceAudience.Private
6160
public class RowResource extends ResourceBase {
6261
private static final Logger LOG = LoggerFactory.getLogger(RowResource.class);

0 commit comments

Comments
 (0)