From 3f1b59aec45c43caf416338d2bf02d3cc4a1dc14 Mon Sep 17 00:00:00 2001 From: Andrew Kennedy Date: Tue, 8 Jul 2014 18:02:19 +0100 Subject: [PATCH] Update jclouds to 1.8.0-SNAPSHOT --- .../test/java/brooklyn/entity/hello/LocalEntitiesTest.java | 2 +- .../management/internal/EntityExecutionManagerTest.java | 2 +- .../brooklyn/qa/performance/AbstractPerformanceTest.java | 3 +-- .../util/internal/ssh/SshToolAbstractPerformanceTest.java | 2 +- .../test/java/brooklyn/util/task/BasicTasksFutureTest.java | 2 +- .../test/java/brooklyn/util/task/TaskFinalizationTest.java | 2 +- .../brooklyn/policy/autoscaling/AutoScalerPolicyTest.java | 6 ++---- pom.xml | 6 +++--- .../entity/webapp/AbstractWebAppFixtureIntegrationTest.java | 2 +- 9 files changed, 12 insertions(+), 15 deletions(-) diff --git a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java index 53dd87865c..4f0f812df1 100644 --- a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java @@ -140,7 +140,7 @@ public void testSendMultipleInOrderThenUnsubscribe() throws Exception { latch.countDown(); }}); - Stopwatch stopwatch = new Stopwatch().start(); + Stopwatch stopwatch = Stopwatch.createStarted(); for (int i = 1; i <= 5; i++) { h.setAge(i); } diff --git a/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java b/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java index 0d86decbf9..2e914f37d5 100644 --- a/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java +++ b/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java @@ -205,7 +205,7 @@ public void testEffectorTasksGcedForAge() throws Exception { app = ApplicationBuilder.newManagedApp(TestApplication.class, new LocalManagementContext(brooklynProperties)); final TestEntity entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)); - Stopwatch stopwatch = new Stopwatch().start(); + Stopwatch stopwatch = Stopwatch.createStarted(); Task oldTask = entity.invoke(TestEntity.MY_EFFECTOR, ImmutableMap.of()); oldTask.get(); diff --git a/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java index 9e780849ed..2a9ec7dc63 100644 --- a/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java @@ -112,8 +112,7 @@ protected long measure(String prefix, int numIterations, Runnable r) { } protected long measure(Runnable r) { - Stopwatch stopwatch = new Stopwatch(); - stopwatch.start(); + Stopwatch stopwatch = Stopwatch.createStarted(); r.run(); return stopwatch.elapsed(TimeUnit.MILLISECONDS); } diff --git a/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractPerformanceTest.java b/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractPerformanceTest.java index 1cf571b321..cb3d3a36ab 100644 --- a/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractPerformanceTest.java +++ b/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractPerformanceTest.java @@ -89,7 +89,7 @@ private void runMany(Runnable task, String context, int iterations) throws Excep MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); ObjectName osMBeanName = ObjectName.getInstance(ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME); long preCpuTime = (Long) mbeanServer.getAttribute(osMBeanName, "ProcessCpuTime"); - Stopwatch stopwatch = new Stopwatch().start(); + Stopwatch stopwatch = Stopwatch.createStarted(); for (int i = 0; i < iterations; i++) { task.run(); diff --git a/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java b/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java index 63e2d310b9..974c8656e1 100644 --- a/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java +++ b/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java @@ -167,7 +167,7 @@ public void doTestCancelTriggersListenableFuture(Duration delay) throws Exceptio Task t = waitForSemaphore(Duration.TEN_SECONDS, true, "x"); addFutureListener(t, "before"); - Stopwatch watch = new Stopwatch().start(); + Stopwatch watch = Stopwatch.createStarted(); ec.submit(t); addFutureListener(t, "during"); diff --git a/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java b/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java index 36256ff48b..da54d06822 100644 --- a/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java +++ b/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java @@ -30,7 +30,7 @@ public void onTaskFinalization(Task t) { } }); t = null; - Stopwatch watch = new Stopwatch().start(); + Stopwatch watch = Stopwatch.createStarted(); for (int i=0; i<30; i++) { System.gc(); System.gc(); if (x.tryAcquire(1, TimeUnit.SECONDS)) { diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java index 229a4d8d76..aaf4a56629 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java @@ -323,8 +323,7 @@ public void testResizeUpStabilizationDelayTakesMaxSustainedDesired() throws Exce // Will grow to only the max sustained in this time window // (i.e. to 2 within the first $resizeUpStabilizationDelay milliseconds) - Stopwatch stopwatch = new Stopwatch(); - stopwatch.start(); + Stopwatch stopwatch = Stopwatch.createStarted(); resizable.emit(AutoScalerPolicy.DEFAULT_POOL_HOT_SENSOR, message(1, 61L, 1*10L, 1*20L)); // would grow to 4 resizable.emit(AutoScalerPolicy.DEFAULT_POOL_HOT_SENSOR, message(1, 21L, 1*10L, 1*20L)); // would grow to 2 @@ -444,8 +443,7 @@ public void testResizeDownStabilizationDelayTakesMinSustainedDesired() throws Ex // Will shrink to only the min sustained in this time window // (i.e. to 2 within the first $resizeUpStabilizationDelay milliseconds) - Stopwatch stopwatch = new Stopwatch(); - stopwatch.start(); + Stopwatch stopwatch = Stopwatch.createStarted(); resizable.emit(AutoScalerPolicy.DEFAULT_POOL_COLD_SENSOR, message(3, 1L, 3*10L, 3*20L)); // would shrink to 1 resizable.emit(AutoScalerPolicy.DEFAULT_POOL_COLD_SENSOR, message(3, 20L, 3*10L, 3*20L)); // would shrink to 2 diff --git a/pom.xml b/pom.xml index 27c2228d7c..8b73ab3c61 100644 --- a/pom.xml +++ b/pom.xml @@ -91,9 +91,9 @@ 6121 1.8.4 - io.cloudsoft.jclouds - 1.7.4-ea-brooklyn.1 - 15.0 + org.apache.jclouds + 1.8.0-SNAPSHOT + 17.0 1.8.6 1.0.7 6.8 diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java index 3acc864ca7..cd5f8f3438 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java @@ -288,7 +288,7 @@ public Void call() throws Exception { String url = entity.getAttribute(WebAppService.ROOT_URL) + "does_not_exist"; final int desiredMsgsPerSec = 10; - Stopwatch stopwatch = new Stopwatch().start(); + Stopwatch stopwatch = Stopwatch.createStarted(); final AtomicInteger reqsSent = new AtomicInteger(); final Integer preRequestCount = entity.getAttribute(WebAppService.REQUEST_COUNT);