fixing imports that mistakenly use jersey.packaged.* (apache#1057)

ccf19881030 · Jan 12, 2018 · d4572b6 · d4572b6
1 parent d0c70b1
commit d4572b6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/zookeeper/aspectj/ClientCnxnAspect.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/zookeeper/aspectj/ClientCnxnAspect.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
+import com.google.common.collect.Lists;
 import org.apache.bookkeeper.util.MathUtils;
 import org.apache.jute.Record;
 import org.apache.zookeeper.proto.ConnectRequest;
@@ -47,8 +48,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jersey.repackaged.com.google.common.collect.Lists;
-
 @Aspect
 public class ClientCnxnAspect {
 

diff --git a/...-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java b/...-broker/src/test/java/org/apache/pulsar/broker/loadbalance/SimpleLoadManagerImplTest.java
@@ -43,6 +43,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.google.common.collect.Maps;
 import org.apache.bookkeeper.test.PortManager;
 import org.apache.bookkeeper.util.ZkUtils;
 import org.apache.commons.lang3.SystemUtils;
@@ -97,8 +98,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
 
-import jersey.repackaged.com.google.common.collect.Maps;
-
 /**
  */
 public class SimpleLoadManagerImplTest {

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
@@ -40,6 +40,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import com.google.common.collect.Sets;
 import org.apache.pulsar.broker.namespace.NamespaceService;
 import org.apache.pulsar.broker.service.BrokerService;
 import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers;
@@ -69,8 +70,6 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 
-import jersey.repackaged.com.google.common.collect.Sets;
-
 public class DispatcherBlockConsumerTest extends ProducerConsumerBase {
     private static final Logger log = LoggerFactory.getLogger(DispatcherBlockConsumerTest.class);
 

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
@@ -47,6 +47,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.google.common.collect.Lists;
 import org.apache.pulsar.broker.namespace.OwnershipCache;
 import org.apache.pulsar.broker.service.Topic;
 import org.apache.pulsar.client.admin.PulsarAdminException;
@@ -82,9 +83,6 @@
 
 import com.google.common.collect.Sets;
 
-import jersey.repackaged.com.google.common.collect.Lists;
-import static org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest.retryStrategically;
-
 public class BrokerClientIntegrationTest extends ProducerConsumerBase {
     private static final Logger log = LoggerFactory.getLogger(BrokerClientIntegrationTest.class);
 

diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketProxyStats.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/WebSocketProxyStats.java
@@ -31,6 +31,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response.Status;
 
+import com.google.common.collect.Maps;
 import org.apache.pulsar.common.naming.DestinationName;
 import org.apache.pulsar.common.stats.Metrics;
 import org.apache.pulsar.websocket.stats.ProxyTopicStat;
@@ -43,7 +44,6 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import jersey.repackaged.com.google.common.collect.Maps;
 
 @Path("/proxy-stats")
 @Api(value = "/proxy", description = "Stats for web-socket proxy", tags = "proxy-stats")