Repository: jclouds Updated Branches: refs/heads/master b5218e0ce -> 7af18d484
JCLOUDS-534: Address Guava 17 compatibility issues Corrected with: find -name \*.java | xargs sed -i 's/new Stopwatch();/Stopwatch.createUnstarted();/' find -name \*.java | xargs sed -i 's/new Stopwatch().start();/Stopwatch.createStarted();/' Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/7af18d48 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/7af18d48 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/7af18d48 Branch: refs/heads/master Commit: 7af18d4843a0e2a6dfbc4e401542fcd034625a37 Parents: b5218e0 Author: Andrew Gaul <[email protected]> Authored: Fri Apr 11 14:04:46 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Apr 11 14:24:12 2014 -0700 ---------------------------------------------------------------------- .../java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java | 4 ++-- .../main/java/org/jclouds/compute/functions/PollNodeRunning.java | 2 +- .../org/jclouds/compute/internal/BaseComputeServiceLiveTest.java | 4 ++-- .../org/jclouds/compute/util/ConcurrentOpenSocketFinderTest.java | 2 +- ...nApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java | 4 ++-- core/src/test/java/org/jclouds/util/Predicates2Test.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/7af18d48/apis/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java index 53fbc3b..c37abb8 100644 --- a/apis/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/handlers/SQSErrorRetryHandlerTest.java @@ -59,7 +59,7 @@ public class SQSErrorRetryHandlerTest { HttpCommand command = createHttpCommandForFailureCount(59); - Stopwatch watch = new Stopwatch().start(); + Stopwatch watch = Stopwatch.createStarted(); assertTrue(retry.shouldRetryRequestOnError(command, response, error)); assertEquals(command.getFailureCount(), 60); // allow for slightly inaccurate system timers @@ -75,7 +75,7 @@ public class SQSErrorRetryHandlerTest { HttpCommand command = createHttpCommandForFailureCount(60); - Stopwatch watch = new Stopwatch().start(); + Stopwatch watch = Stopwatch.createStarted(); assertFalse(retry.shouldRetryRequestOnError(command, response, error)); assertEquals(command.getFailureCount(), 61); assertTrue(watch.stop().elapsed(TimeUnit.MILLISECONDS) < 100); http://git-wip-us.apache.org/repos/asf/jclouds/blob/7af18d48/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java b/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java index b360b9f..9fb800d 100644 --- a/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java +++ b/compute/src/main/java/org/jclouds/compute/functions/PollNodeRunning.java @@ -62,7 +62,7 @@ public class PollNodeRunning implements Function<AtomicReference<NodeMetadata>, String originalId = node.get().getId(); NodeMetadata originalNode = node.get(); try { - Stopwatch stopwatch = new Stopwatch().start(); + Stopwatch stopwatch = Stopwatch.createStarted(); if (!nodeRunning.apply(node)) { long timeWaited = stopwatch.elapsed(TimeUnit.MILLISECONDS); if (node.get() == null) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/7af18d48/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java index dbdba20..45b7f51 100644 --- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java @@ -656,7 +656,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte protected ServiceStats trackAvailabilityOfProcessOnNode(Statement process, String processName, NodeMetadata node) { ServiceStats stats = new ServiceStats(); - Stopwatch watch = new Stopwatch().start(); + Stopwatch watch = Stopwatch.createStarted(); ExecResponse exec = client.runScriptOnNode(node.getId(), process, runAsRoot(false).wrapInInitScript(false)); stats.backgroundProcessMilliseconds = watch.elapsed(TimeUnit.MILLISECONDS); watch.reset().start(); @@ -697,7 +697,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte ImmutableMap<String, String> userMetadata = ImmutableMap.<String, String> of("test", group); ImmutableSet<String> tags = ImmutableSet. of(group); - Stopwatch watch = new Stopwatch().start(); + Stopwatch watch = Stopwatch.createStarted(); NodeMetadata node = getOnlyElement(client.createNodesInGroup(group, 1, inboundPorts(22, 8080).blockOnPort(22, 300).userMetadata(userMetadata).tags(tags))); long createSeconds = watch.elapsed(TimeUnit.SECONDS); http://git-wip-us.apache.org/repos/asf/jclouds/blob/7af18d48/compute/src/test/java/org/jclouds/compute/util/ConcurrentOpenSocketFinderTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/compute/util/ConcurrentOpenSocketFinderTest.java b/compute/src/test/java/org/jclouds/compute/util/ConcurrentOpenSocketFinderTest.java index 1b6fc59..903841e 100644 --- a/compute/src/test/java/org/jclouds/compute/util/ConcurrentOpenSocketFinderTest.java +++ b/compute/src/test/java/org/jclouds/compute/util/ConcurrentOpenSocketFinderTest.java @@ -102,7 +102,7 @@ public class ConcurrentOpenSocketFinderTest { OpenSocketFinder finder = new ConcurrentOpenSocketFinder(socketAlwaysClosed, nodeRunning, userExecutor); - Stopwatch stopwatch = new Stopwatch(); + Stopwatch stopwatch = Stopwatch.createUnstarted(); stopwatch.start(); try { finder.findOpenSocketOnNode(node, 22, timeoutMs, MILLISECONDS); http://git-wip-us.apache.org/repos/asf/jclouds/blob/7af18d48/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java b/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java index 50e2214..f46a678 100644 --- a/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java +++ b/core/src/test/java/org/jclouds/rest/functions/PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest.java @@ -123,7 +123,7 @@ public class PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest public void testCacheIsFasterWhenNoAnnotationPresent() { InvocationSuccess keyPairApi = getKeyPairApi(); ImplicitOptionalConverter fn = forApiVersion("2011-07-15"); - Stopwatch watch = new Stopwatch().start(); + Stopwatch watch = Stopwatch.createStarted(); fn.apply(keyPairApi); long first = watch.stop().elapsed(TimeUnit.MICROSECONDS); watch.reset().start(); @@ -137,7 +137,7 @@ public class PresentWhenApiVersionLexicographicallyAtOrAfterSinceApiVersionTest public void testCacheIsFasterWhenAnnotationPresent() { InvocationSuccess floatingIpApi = getKeyPairApi(); ImplicitOptionalConverter fn = forApiVersion("2011-07-15"); - Stopwatch watch = new Stopwatch().start(); + Stopwatch watch = Stopwatch.createStarted(); fn.apply(floatingIpApi); long first = watch.stop().elapsed(TimeUnit.MICROSECONDS); watch.reset().start(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/7af18d48/core/src/test/java/org/jclouds/util/Predicates2Test.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/util/Predicates2Test.java b/core/src/test/java/org/jclouds/util/Predicates2Test.java index 4bf500a..242363f 100644 --- a/core/src/test/java/org/jclouds/util/Predicates2Test.java +++ b/core/src/test/java/org/jclouds/util/Predicates2Test.java @@ -52,7 +52,7 @@ public class Predicates2Test { @BeforeMethod public void setUp() { - stopwatch = new Stopwatch(); + stopwatch = Stopwatch.createUnstarted(); } @Test @@ -161,7 +161,7 @@ public class Predicates2Test { RepeatedAttemptsPredicate(int succeedOnAttempt) { this.succeedOnAttempt = succeedOnAttempt; - this.stopwatch = new Stopwatch(); + this.stopwatch = Stopwatch.createUnstarted(); stopwatch.start(); } @Override
