Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4DDF31101F for ; Wed, 14 May 2014 15:11:46 +0000 (UTC) Received: (qmail 84965 invoked by uid 500); 14 May 2014 15:11:45 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 84835 invoked by uid 500); 14 May 2014 15:11:45 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 84812 invoked by uid 99); 14 May 2014 15:11:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 15:11:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1C7C58C44E4; Wed, 14 May 2014 15:11:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.apache.org Date: Wed, 14 May 2014 15:11:45 -0000 Message-Id: <198de5a37df0404d9bf6199f6533c1ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] git commit: Upgrade to latest versions of dependencies/plugins (include ZK 3.4.6), fix longstanding problems where JUnit Asserts were accidentally used, removed some bogus deps, fixed up the poms, etc. Repository: curator Updated Branches: refs/heads/master 3c468b235 -> 6784f8074 Upgrade to latest versions of dependencies/plugins (include ZK 3.4.6), fix longstanding problems where JUnit Asserts were accidentally used, removed some bogus deps, fixed up the poms, etc. Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/426db3d3 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/426db3d3 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/426db3d3 Branch: refs/heads/master Commit: 426db3d355ef69d89a8c2b3d9f918c9f4be5989c Parents: bfdef2d Author: randgalt Authored: Sun Mar 30 12:54:08 2014 -0500 Committer: randgalt Committed: Sun Mar 30 12:54:08 2014 -0500 ---------------------------------------------------------------------- curator-client/pom.xml | 1 - .../curator/TestSessionFailRetryLoop.java | 2 +- curator-examples/pom.xml | 6 - curator-framework/pom.xml | 1 - curator-recipes/pom.xml | 1 - .../framework/client/TestBackgroundStates.java | 7 +- ...estResetConnectionWithBackgroundFailure.java | 14 +- .../locks/TestInterProcessSemaphoreCluster.java | 4 +- .../locks/TestLockCleanlinessWithFaults.java | 4 +- .../framework/recipes/locks/TestReaper.java | 11 +- .../TestPersistentEphemeralNodeListener.java | 7 +- .../queue/TestBoundedDistributedQueue.java | 6 +- .../recipes/queue/TestQueueSharder.java | 6 +- curator-test/pom.xml | 3 - curator-x-discovery-server/pom.xml | 24 -- .../contexts/GenericDiscoveryContext.java | 20 +- .../server/contexts/MapDiscoveryContext.java | 4 +- .../server/jetty_jersey/TestMapsWithJersey.java | 2 +- .../TestObjectPayloadWithJersey.java | 34 +-- .../jetty_jersey/TestStringsWithJersey.java | 18 +- .../jetty_resteasy/TestStringsWithRestEasy.java | 2 +- curator-x-discovery/pom.xml | 2 - .../apache/curator/x/discovery/TestUriSpec.java | 2 +- pom.xml | 273 +++++++++++++++---- 24 files changed, 289 insertions(+), 165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-client/pom.xml ---------------------------------------------------------------------- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index eabb135..5fd7d67 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -27,7 +27,6 @@ 2.4.2-SNAPSHOT - org.apache.curator curator-client 2.4.2-SNAPSHOT bundle http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java ---------------------------------------------------------------------- diff --git a/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java b/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java index e209e40..f3b2e4e 100644 --- a/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java +++ b/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java @@ -22,7 +22,7 @@ import org.apache.curator.utils.CloseableUtils; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.KillSession; import org.apache.curator.test.Timing; -import junit.framework.Assert; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-examples/pom.xml ---------------------------------------------------------------------- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index e29d98a..9fb4bb3 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -48,11 +48,5 @@ org.apache.curator curator-x-discovery - - - log4j - log4j - 1.2.16 - http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-framework/pom.xml ---------------------------------------------------------------------- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 1bac9cd..162e557 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -27,7 +27,6 @@ 2.4.2-SNAPSHOT - org.apache.curator curator-framework 2.4.2-SNAPSHOT bundle http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/pom.xml ---------------------------------------------------------------------- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 3c290f2..5fe9a31 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -27,7 +27,6 @@ 2.4.2-SNAPSHOT - org.apache.curator curator-recipes 2.4.2-SNAPSHOT bundle http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java index cb186fc..8cfa342 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java @@ -20,7 +20,6 @@ package org.apache.curator.framework.client; import com.google.common.collect.Queues; -import com.google.common.io.Closeables; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -30,7 +29,7 @@ import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.TestingServer; import org.apache.curator.test.Timing; -import org.apache.curator.utils.DebugUtils; +import org.apache.curator.utils.CloseableUtils; import org.testng.Assert; import org.testng.annotations.Test; import java.util.concurrent.BlockingQueue; @@ -90,7 +89,7 @@ public class TestBackgroundStates extends BaseClassForTests } finally { - Closeables.closeQuietly(client); + CloseableUtils.closeQuietly(client); } } @@ -133,7 +132,7 @@ public class TestBackgroundStates extends BaseClassForTests } finally { - Closeables.closeQuietly(client); + CloseableUtils.closeQuietly(client); } } http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java index e634a6d..5b6a5fa 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java @@ -19,7 +19,6 @@ package org.apache.curator.framework.client; -import com.google.common.io.Closeables; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -31,15 +30,24 @@ import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.TestingServer; import org.apache.curator.test.Timing; +import org.apache.curator.utils.CloseableUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; public class TestResetConnectionWithBackgroundFailure extends BaseClassForTests { private final Logger log = LoggerFactory.getLogger(getClass()); + @BeforeMethod + @Override + public void setup() throws Exception + { + super.setup(); + } + @Test public void testConnectionStateListener() throws Exception { @@ -96,8 +104,8 @@ public class TestResetConnectionWithBackgroundFailure extends BaseClassForTests } finally { - Closeables.closeQuietly(selector); - Closeables.closeQuietly(client); + CloseableUtils.closeQuietly(selector); + CloseableUtils.closeQuietly(client); } } http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java index b3f7a25..2aa8a72 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java @@ -19,7 +19,6 @@ package org.apache.curator.framework.recipes.locks; import com.google.common.collect.Lists; -import org.apache.curator.utils.CloseableUtils; import org.apache.curator.ensemble.EnsembleProvider; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -29,7 +28,8 @@ import org.apache.curator.retry.ExponentialBackoffRetry; import org.apache.curator.test.InstanceSpec; import org.apache.curator.test.TestingCluster; import org.apache.curator.test.Timing; -import junit.framework.Assert; +import org.apache.curator.utils.CloseableUtils; +import org.testng.Assert; import org.testng.annotations.Test; import java.io.IOException; import java.util.Iterator; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java index b1b9c78..9843848 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java @@ -18,13 +18,13 @@ */ package org.apache.curator.framework.recipes.locks; -import org.apache.curator.utils.CloseableUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; import org.apache.curator.retry.RetryNTimes; -import junit.framework.Assert; +import org.apache.curator.utils.CloseableUtils; import org.apache.zookeeper.KeeperException; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.List; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java index b11bc8b..0de78fc 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java @@ -18,8 +18,6 @@ */ package org.apache.curator.framework.recipes.locks; -import org.apache.curator.utils.CloseableUtils; -import junit.framework.Assert; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -28,8 +26,10 @@ import org.apache.curator.framework.recipes.leader.LeaderSelectorListener; import org.apache.curator.framework.state.ConnectionState; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.Timing; +import org.apache.curator.utils.CloseableUtils; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.data.Stat; +import org.testng.Assert; import org.testng.annotations.Test; import java.io.IOException; import java.util.Queue; @@ -103,7 +103,6 @@ public class TestReaper extends BaseClassForTests Timing timing = new Timing(); Reaper reaper = null; - Future watcher = null; CuratorFramework client = makeClient(timing, null); try { @@ -176,10 +175,6 @@ public class TestReaper extends BaseClassForTests } finally { - if ( watcher != null ) - { - watcher.cancel(true); - } CloseableUtils.closeQuietly(reaper); CloseableUtils.closeQuietly(client); } @@ -423,7 +418,7 @@ public class TestReaper extends BaseClassForTests timing.sleepABit(); Stat stat = client.checkExists().forPath("/a/b"); - Assert.assertNull("Child qty: " + ((stat != null) ? stat.getNumChildren() : 0), stat); + Assert.assertNull(stat, "Child qty: " + ((stat != null) ? stat.getNumChildren() : 0)); } finally { http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java index b97ba41..82d5876 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java @@ -19,8 +19,6 @@ package org.apache.curator.framework.recipes.nodes; -import com.google.common.collect.Lists; -import com.google.common.io.Closeables; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -29,10 +27,9 @@ import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.TestingServer; import org.apache.curator.test.Timing; +import org.apache.curator.utils.CloseableUtils; import org.testng.Assert; -import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import java.util.Collection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -88,7 +85,7 @@ public class TestPersistentEphemeralNodeListener extends BaseClassForTests } finally { - Closeables.closeQuietly(client); + CloseableUtils.closeQuietly(client); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java index 6662b7d..1acb051 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java @@ -18,16 +18,16 @@ */ package org.apache.curator.framework.recipes.queue; -import org.apache.curator.utils.CloseableUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; import org.apache.curator.framework.state.ConnectionState; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.Timing; -import junit.framework.Assert; +import org.apache.curator.utils.CloseableUtils; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.Arrays; import java.util.List; @@ -180,7 +180,7 @@ public class TestBoundedDistributedQueue extends BaseClassForTests for ( int count : counts ) { - Assert.assertTrue(counts.toString(), count <= (MAX_ITEMS * SLOP_FACTOR)); + Assert.assertTrue(count <= (MAX_ITEMS * SLOP_FACTOR), counts.toString()); } } finally http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java index 78c833e..b82ebbc 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java @@ -19,7 +19,7 @@ package org.apache.curator.framework.recipes.queue; import com.google.common.collect.Sets; -import org.apache.curator.utils.CloseableUtils; +import org.apache.commons.math.stat.descriptive.SummaryStatistics; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -27,8 +27,8 @@ import org.apache.curator.framework.state.ConnectionState; import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.Timing; -import junit.framework.Assert; -import org.apache.commons.math.stat.descriptive.SummaryStatistics; +import org.apache.curator.utils.CloseableUtils; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.Set; import java.util.concurrent.CountDownLatch; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-test/pom.xml ---------------------------------------------------------------------- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index a59f082..83d3329 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -27,7 +27,6 @@ 2.4.2-SNAPSHOT - org.apache.curator curator-test 2.4.2-SNAPSHOT @@ -39,13 +38,11 @@ org.javassist javassist - 3.15.0-GA org.apache.commons commons-math - 2.2 http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/pom.xml ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 6b95f99..6a3b96b 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -27,7 +27,6 @@ 2.4.2-SNAPSHOT - org.apache.curator curator-x-discovery-server 2.4.2-SNAPSHOT bundle @@ -37,7 +36,6 @@ 2011 - 1.11 * @@ -55,14 +53,6 @@ javax.ws.rs jsr311-api - 1.1.1 - - - - - com.google.inject - guice - 3.0 @@ -74,56 +64,43 @@ com.sun.jersey jersey-server - ${jersey.version} test com.sun.jersey jersey-servlet - ${jersey.version} test com.sun.jersey jersey-client - ${jersey.version} test com.sun.jersey jersey-core - ${jersey.version} test org.mortbay.jetty jetty - 6.1.22 test net.sf.scannotation scannotation - 1.0.2 test org.jboss.resteasy resteasy-jaxrs - 2.3.0.GA test - - - org.scannotation - scannotation - - @@ -132,7 +109,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.13 none http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java index 57ff81a..4929ccc 100644 --- a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java +++ b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java @@ -18,17 +18,15 @@ */ package org.apache.curator.x.discovery.server.contexts; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; - -import com.google.inject.TypeLiteral; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ObjectNode; - +import com.google.common.reflect.TypeToken; import org.apache.curator.x.discovery.ProviderStrategy; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.curator.x.discovery.server.rest.DiscoveryContext; +import org.codehaus.jackson.JsonNode; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.node.ObjectNode; +import javax.ws.rs.ext.ContextResolver; +import javax.ws.rs.ext.Provider; /** * For convenience, a version of {@link DiscoveryContext} that uses any generic type as the payload @@ -39,14 +37,14 @@ public class GenericDiscoveryContext implements DiscoveryContext, ContextR private final ServiceDiscovery serviceDiscovery; private final ProviderStrategy providerStrategy; private final int instanceRefreshMs; - private final TypeLiteral payloadType; // in the future - replace TypeLiteral with corresponding api from Guava 13 + private final TypeToken payloadType; public GenericDiscoveryContext(ServiceDiscovery serviceDiscovery, ProviderStrategy providerStrategy, int instanceRefreshMs, Class payloadType) { - this(serviceDiscovery, providerStrategy, instanceRefreshMs, TypeLiteral.get(payloadType)); + this(serviceDiscovery, providerStrategy, instanceRefreshMs, TypeToken.of(payloadType)); } - public GenericDiscoveryContext(ServiceDiscovery serviceDiscovery, ProviderStrategy providerStrategy, int instanceRefreshMs, TypeLiteral payloadType) + public GenericDiscoveryContext(ServiceDiscovery serviceDiscovery, ProviderStrategy providerStrategy, int instanceRefreshMs, TypeToken payloadType) { this.serviceDiscovery = serviceDiscovery; this.providerStrategy = providerStrategy; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java index 3db03fa..864a874 100644 --- a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java +++ b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java @@ -18,7 +18,7 @@ */ package org.apache.curator.x.discovery.server.contexts; -import com.google.inject.TypeLiteral; +import com.google.common.reflect.TypeToken; import org.apache.curator.x.discovery.ProviderStrategy; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.curator.x.discovery.server.rest.DiscoveryContext; @@ -35,6 +35,6 @@ public class MapDiscoveryContext extends GenericDiscoveryContext> serviceDiscovery, ProviderStrategy> providerStrategy, int instanceRefreshMs) { - super(serviceDiscovery, providerStrategy, instanceRefreshMs, new TypeLiteral>(){}); + super(serviceDiscovery, providerStrategy, instanceRefreshMs, new TypeToken>(){}); } } http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java index 1693b86..5dc16c8 100644 --- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java +++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java @@ -28,7 +28,6 @@ import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.api.client.config.DefaultClientConfig; import com.sun.jersey.api.core.DefaultResourceConfig; import com.sun.jersey.spi.container.servlet.ServletContainer; -import junit.framework.Assert; import org.apache.curator.test.InstanceSpec; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceType; @@ -43,6 +42,7 @@ import org.apache.curator.x.discovery.strategies.RandomStrategy; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.ServletHolder; +import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java index f6dc27f..80f2e4a 100644 --- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java +++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java @@ -18,20 +18,16 @@ */ package org.apache.curator.x.discovery.server.jetty_jersey; -import java.util.Set; - -import javax.ws.rs.core.Application; -import javax.ws.rs.core.MediaType; - -import junit.framework.Assert; - -import org.apache.curator.test.InstanceSpec; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; - import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.GenericType; +import com.sun.jersey.api.client.WebResource; +import com.sun.jersey.api.client.config.ClientConfig; +import com.sun.jersey.api.client.config.DefaultClientConfig; +import com.sun.jersey.api.core.DefaultResourceConfig; +import com.sun.jersey.spi.container.servlet.ServletContainer; +import org.apache.curator.test.InstanceSpec; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceType; import org.apache.curator.x.discovery.server.entity.JsonServiceInstanceMarshaller; @@ -41,16 +37,16 @@ import org.apache.curator.x.discovery.server.entity.ServiceInstances; import org.apache.curator.x.discovery.server.entity.ServiceNames; import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery; import org.apache.curator.x.discovery.strategies.RandomStrategy; -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.GenericType; -import com.sun.jersey.api.client.WebResource; -import com.sun.jersey.api.client.config.ClientConfig; -import com.sun.jersey.api.client.config.DefaultClientConfig; -import com.sun.jersey.api.core.DefaultResourceConfig; -import com.sun.jersey.spi.container.servlet.ServletContainer; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.ServletHolder; +import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import javax.ws.rs.core.Application; +import javax.ws.rs.core.MediaType; +import java.util.Set; public class TestObjectPayloadWithJersey { http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java index 012ac19..8cf43cc 100644 --- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java +++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java @@ -20,28 +20,28 @@ package org.apache.curator.x.discovery.server.jetty_jersey; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.GenericType; +import com.sun.jersey.api.client.WebResource; +import com.sun.jersey.api.client.config.ClientConfig; +import com.sun.jersey.api.client.config.DefaultClientConfig; +import com.sun.jersey.api.core.DefaultResourceConfig; +import com.sun.jersey.spi.container.servlet.ServletContainer; import org.apache.curator.test.InstanceSpec; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceType; +import org.apache.curator.x.discovery.server.contexts.StringDiscoveryContext; import org.apache.curator.x.discovery.server.entity.JsonServiceInstanceMarshaller; import org.apache.curator.x.discovery.server.entity.JsonServiceInstancesMarshaller; import org.apache.curator.x.discovery.server.entity.JsonServiceNamesMarshaller; import org.apache.curator.x.discovery.server.entity.ServiceInstances; import org.apache.curator.x.discovery.server.entity.ServiceNames; import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery; -import org.apache.curator.x.discovery.server.contexts.StringDiscoveryContext; import org.apache.curator.x.discovery.strategies.RandomStrategy; -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.GenericType; -import com.sun.jersey.api.client.WebResource; -import com.sun.jersey.api.client.config.ClientConfig; -import com.sun.jersey.api.client.config.DefaultClientConfig; -import com.sun.jersey.api.core.DefaultResourceConfig; -import com.sun.jersey.spi.container.servlet.ServletContainer; -import junit.framework.Assert; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.ServletHolder; +import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java index 4ab447f..cc9592c 100644 --- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java +++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java @@ -26,13 +26,13 @@ import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceType; import org.apache.curator.x.discovery.server.entity.ServiceInstances; import org.apache.curator.x.discovery.server.entity.ServiceNames; -import junit.framework.Assert; import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher; import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.ServletHolder; +import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery/pom.xml ---------------------------------------------------------------------- diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml index 36eaf60..fc54b49 100644 --- a/curator-x-discovery/pom.xml +++ b/curator-x-discovery/pom.xml @@ -27,7 +27,6 @@ 2.4.2-SNAPSHOT - org.apache.curator curator-x-discovery 2.4.2-SNAPSHOT bundle @@ -54,7 +53,6 @@ org.codehaus.jackson jackson-mapper-asl - 1.9.2 http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java b/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java index 52cbea8..974e81c 100644 --- a/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java +++ b/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java @@ -19,7 +19,7 @@ package org.apache.curator.x.discovery; import com.google.common.collect.Maps; -import junit.framework.Assert; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.Iterator; import java.util.Map; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 18e5907..0991e04 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,35 @@ UTF-8 UTF-8 + 1.6 + + + 2.7 + 2.9.1 + 2.8 + 2.5.1 + 3.1 + 2.3.7 + 2.17 + 2.9.1 + 3.3 + 1.5 + 1.0 + 1.9.0 + 2.5 + 0.10 + 3.18.1-GA + 2.2 + 1.9.13 + 1.18.1 + 1.1.1 + 6.1.26 + 1.0.2 + 2.3.0.GA + 3.4.6 + 16.0.1 + 6.8.8 + @@ -231,49 +260,157 @@ org.slf4j slf4j-api - 1.6.4 + 1.7.6 org.mockito mockito-core - 1.8.5 + 1.9.5 org.apache.curator curator-client - 2.4.2-SNAPSHOT + ${project.version} org.apache.curator curator-framework - 2.4.2-SNAPSHOT + ${project.version} org.apache.curator curator-recipes - 2.4.2-SNAPSHOT + ${project.version} org.apache.curator curator-test - 2.4.2-SNAPSHOT + ${project.version} org.apache.curator curator-x-discovery - 2.4.2-SNAPSHOT + ${project.version} org.apache.curator curator-x-discovery-server - 2.4.2-SNAPSHOT + ${project.version} + + + + org.javassist + javassist + ${javassist-version} + + + + org.apache.commons + commons-math + ${commons-math-version} + + + + org.codehaus.jackson + jackson-mapper-asl + ${jackson-mapper-asl-version} + + + + com.sun.jersey + jersey-server + ${jersey-version} + + + + com.sun.jersey + jersey-servlet + ${jersey-version} + + + + com.sun.jersey + jersey-client + ${jersey-version} + + + + com.sun.jersey + jersey-core + ${jersey-version} + + + + javax.ws.rs + jsr311-api + ${jsr311-api-version} + + + + org.mortbay.jetty + jetty + ${jetty-version} + + + + net.sf.scannotation + scannotation + ${scannotation-version} + + + + org.jboss.resteasy + resteasy-jaxrs + ${resteasy-jaxrs-version} + + + org.scannotation + scannotation + + + + + + org.apache.zookeeper + zookeeper + ${zookeeper-version} + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + junit + junit + + + + + + com.google.guava + guava + ${guava-version} + + + + org.testng + testng + ${testng-version} @@ -282,44 +419,16 @@ org.apache.zookeeper zookeeper - 3.4.5 - - - com.sun.jmx - jmxri - - - com.sun.jdmk - jmxtools - - - javax.jms - jms - - - junit - junit - - com.google.guava guava - 14.0.1 org.testng testng - 6.1.1 - test - - - - log4j - log4j - 1.2.16 test @@ -329,13 +438,13 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + ${maven-project-info-reports-plugin-version} org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${maven-javadoc-plugin-version} true @@ -344,6 +453,76 @@ + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin-version} + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin-version} + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin-version} + + + + org.apache.felix + maven-bundle-plugin + ${maven-bundle-plugin-version} + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin-version} + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin-version} + + + + org.apache.maven.plugins + maven-site-plugin + ${maven-site-plugin-version} + + + + org.apache.maven.plugins + maven-scm-publish-plugin + ${maven-scm-publish-plugin-version} + + + + com.mycila.maven-license-plugin + maven-license-plugin + ${maven-license-plugin-version} + + + + org.apache.maven.plugins + maven-release-plugin + ${maven-release-plugin-version} + + + + org.apache.rat + apache-rat-plugin + ${apache-rat-plugin-version} + + + + ${basedir} @@ -360,13 +539,11 @@ org.apache.maven.plugins maven-dependency-plugin - 2.8 org.apache.maven.plugins maven-install-plugin - 2.3.1 true @@ -375,16 +552,15 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 - 1.6 - 1.6 + ${jdk-version} + ${jdk-version} + org.apache.felix maven-bundle-plugin - 2.3.7 true true @@ -420,7 +596,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.16 1 false @@ -431,7 +606,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9 true @@ -440,7 +614,6 @@ org.apache.maven.plugins maven-site-plugin - 3.3 en true @@ -449,7 +622,7 @@ org.apache.maven.doxia doxia-module-confluence - 1.3 + ${doxia-module-confluence-version} @@ -465,7 +638,6 @@ org.apache.maven.plugins maven-scm-publish-plugin - 1.0-beta-2 false Curator website deployment @@ -486,7 +658,6 @@ com.mycila.maven-license-plugin maven-license-plugin - 1.9.0
src/etc/header.txt
@@ -518,7 +689,6 @@ org.apache.maven.plugins maven-release-plugin - 2.4.1 -Dmaven.test.skip=true forked-path @@ -528,7 +698,6 @@ org.apache.rat apache-rat-plugin - 0.8 0 false