You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/07/19 21:34:44 UTC
[1/2] git commit: Changes required by Guava deprecation of Stopwatch
ctor
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master cfb7a0cd8 -> e315de33e
Changes required by Guava deprecation of Stopwatch ctor
- Preparation for jclouds 1.8.0 and Guava 17
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d293383d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d293383d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d293383d
Branch: refs/heads/master
Commit: d293383dc4f9e3edf2984b6c79a63a1393611e97
Parents: f0b8f29
Author: Andrew Kennedy <gr...@apache.org>
Authored: Tue Jul 8 18:02:19 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Jul 19 20:20:54 2014 +0100
----------------------------------------------------------------------
.../src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java | 2 +-
.../management/internal/EntityExecutionManagerTest.java | 2 +-
.../java/brooklyn/qa/performance/AbstractPerformanceTest.java | 3 +--
.../util/internal/ssh/SshToolAbstractPerformanceTest.java | 2 +-
.../src/test/java/brooklyn/util/task/BasicTasksFutureTest.java | 2 +-
.../src/test/java/brooklyn/util/task/TaskFinalizationTest.java | 2 +-
.../java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java | 6 ++----
.../entity/webapp/AbstractWebAppFixtureIntegrationTest.java | 2 +-
8 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d293383d/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java
index 5664884..3a35595 100644
--- a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java
+++ b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java
@@ -158,7 +158,7 @@ public class LocalEntitiesTest extends BrooklynAppUnitTestSupport {
latch.countDown();
}});
- Stopwatch stopwatch = new Stopwatch().start();
+ Stopwatch stopwatch = Stopwatch.createStarted();
for (int i = 1; i <= 5; i++) {
h.setAge(i);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d293383d/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java b/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java
index 332b54a..cd58c82 100644
--- a/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java
+++ b/core/src/test/java/brooklyn/management/internal/EntityExecutionManagerTest.java
@@ -223,7 +223,7 @@ public class EntityExecutionManagerTest {
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.<String,Object>of());
oldTask.get();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d293383d/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java
index 2885530..f287ebd 100644
--- a/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java
+++ b/core/src/test/java/brooklyn/qa/performance/AbstractPerformanceTest.java
@@ -130,8 +130,7 @@ public class AbstractPerformanceTest {
}
protected long measure(Runnable r) {
- Stopwatch stopwatch = new Stopwatch();
- stopwatch.start();
+ Stopwatch stopwatch = Stopwatch.createStarted();
r.run();
return stopwatch.elapsed(TimeUnit.MILLISECONDS);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d293383d/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractPerformanceTest.java
----------------------------------------------------------------------
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 90973e4..be1441a 100644
--- a/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractPerformanceTest.java
+++ b/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractPerformanceTest.java
@@ -107,7 +107,7 @@ public abstract class SshToolAbstractPerformanceTest {
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();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d293383d/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java b/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java
index 029747c..08c7f7a 100644
--- a/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java
+++ b/core/src/test/java/brooklyn/util/task/BasicTasksFutureTest.java
@@ -185,7 +185,7 @@ public class BasicTasksFutureTest {
Task<String> 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");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d293383d/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java b/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java
index 30b02eb..b906fec 100644
--- a/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java
+++ b/core/src/test/java/brooklyn/util/task/TaskFinalizationTest.java
@@ -48,7 +48,7 @@ public class TaskFinalizationTest {
}
});
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)) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d293383d/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java
index 7bac889..1bc8a3b 100644
--- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java
+++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java
@@ -341,8 +341,7 @@ public class AutoScalerPolicyTest {
// 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
@@ -462,8 +461,7 @@ public class AutoScalerPolicyTest {
// 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
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d293383d/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
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 fe64855..2b358d0 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
@@ -306,7 +306,7 @@ public abstract class AbstractWebAppFixtureIntegrationTest {
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);
[2/2] git commit: This closes #${PR}
Posted by gr...@apache.org.
This closes #${PR}
* github/pr/79:
Changes required by Guava deprecation of Stopwatch ctor
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e315de33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e315de33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e315de33
Branch: refs/heads/master
Commit: e315de33ed6ae4fb4f47d98f4d2140aab9948242
Parents: cfb7a0c d293383
Author: Andrew Kennedy <gr...@apache.org>
Authored: Sat Jul 19 20:34:36 2014 +0100
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Jul 19 20:34:36 2014 +0100
----------------------------------------------------------------------
.../src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java | 2 +-
.../management/internal/EntityExecutionManagerTest.java | 2 +-
.../java/brooklyn/qa/performance/AbstractPerformanceTest.java | 3 +--
.../util/internal/ssh/SshToolAbstractPerformanceTest.java | 2 +-
.../src/test/java/brooklyn/util/task/BasicTasksFutureTest.java | 2 +-
.../src/test/java/brooklyn/util/task/TaskFinalizationTest.java | 2 +-
.../java/brooklyn/policy/autoscaling/AutoScalerPolicyTest.java | 6 ++----
.../entity/webapp/AbstractWebAppFixtureIntegrationTest.java | 2 +-
8 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------