http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java index 429c0a8..a4863ec 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java @@ -62,6 +62,7 @@ public class EntityLifecycleEnrichersTest extends BrooklynAppUnitTestSupport { List<ListenableFuture<?>> futures = Lists.newArrayList(); for (int i = 0; i < 100; i++) { ListenableFuture<Void> future = executor.submit(new Callable<Void>() { + @Override public Void call() throws Exception { TestEntity entity = app.addChild(EntitySpec.create(TestEntity.class)); entity.sensors().set(TestEntity.SERVICE_UP, true);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java b/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java index c54a0fb..30d40a2 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java @@ -112,6 +112,7 @@ public class RecordingSensorEventListener<T> implements SensorEventListener<T>, public void assertHasEventEventually(final Predicate<? super SensorEvent<T>> filter) { Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertHasEvent(filter); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java index 9729068..193e3e7 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java @@ -204,6 +204,7 @@ public class LocalEntitiesTest extends BrooklynAppUnitTestSupport { final Semaphore s1 = new Semaphore(0); final Object[] sonsConfig = new Object[1]; Thread t = new Thread(new Runnable() { + @Override public void run() { log.info("started"); s1.release(); @@ -245,6 +246,7 @@ public class LocalEntitiesTest extends BrooklynAppUnitTestSupport { HelloEntity dad = app.createAndManageChild(EntitySpec.create(HelloEntity.class)); HelloEntity son = dad.addChild(EntitySpec.create(HelloEntity.class) .configure(HelloEntity.MY_NAME, transform(attributeWhenReady(dad, HelloEntity.FAVOURITE_NAME), new Function<String,String>() { + @Override public String apply(String input) { return input+input.charAt(input.length()-1)+"y"; }}))); @@ -262,6 +264,7 @@ public class LocalEntitiesTest extends BrooklynAppUnitTestSupport { // the unnecessary (HelloEntity) cast is required as a work-around to an IntelliJ issue that prevents Brooklyn from launching from the IDE HelloEntity son = (HelloEntity) dad.addChild(EntitySpec.create(HelloEntity.class) .configure(HelloEntity.MY_NAME, transform(attributeWhenReady(dad, HelloEntity.FAVOURITE_NAME, (Closure)null), new Function<String,String>() { + @Override public String apply(String input) { return input+input.charAt(input.length()-1)+"y"; }}))); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java index 912c434..c00d33b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java @@ -209,6 +209,7 @@ public class ApplicationBuilderOverridingTest { } }; Future<StartableApplication> future = executor.submit(new Callable<StartableApplication>() { + @Override public StartableApplication call() { try { return builder.manage(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/proxying/EntityManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/proxying/EntityManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/proxying/EntityManagerTest.java index 7a667c3..3b0b239 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/proxying/EntityManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/proxying/EntityManagerTest.java @@ -132,6 +132,7 @@ public class EntityManagerTest extends BrooklynAppUnitTestSupport { try { for (int i = 0; i < NUM_GETTER_THREADS; i++) { ListenableFuture<?> future = executor.submit(new Callable<Void>() { + @Override public Void call() throws Exception { int numCycles = 0; try { @@ -151,6 +152,7 @@ public class EntityManagerTest extends BrooklynAppUnitTestSupport { for (int i = 0; i < NUM_ENTITY_LIFECYCLE_THREADS; i++) { ListenableFuture<?> future = executor.submit(new Callable<Void>() { + @Override public Void call() { List<TestEntity> entities = Lists.newLinkedList(); int numCycles = 0; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java b/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java index c449c53..bc7f483 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java @@ -90,7 +90,11 @@ public class FailingEntityImpl extends TestEntityImpl implements FailingEntity { private RuntimeException fail(final String msg) { if (getConfig(FAIL_IN_SUB_TASK)) { - Task<?> task = Tasks.builder().displayName(msg).body(new Runnable() { public void run() { throw newException(msg); } }).build(); + Task<?> task = Tasks.builder() + .displayName(msg) + .body(new Runnable() { + @Override public void run() { throw newException(msg); } + }).build(); Entities.submit(this, task).getUnchecked(); Assert.fail("Should have thrown exception on task.getUnchecked"); throw new IllegalStateException("unreachable code"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/feed/PollerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/feed/PollerTest.java b/core/src/test/java/org/apache/brooklyn/core/feed/PollerTest.java index 22175de..2251153 100644 --- a/core/src/test/java/org/apache/brooklyn/core/feed/PollerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/feed/PollerTest.java @@ -108,10 +108,12 @@ public class PollerTest extends BrooklynAppUnitTestSupport { .build(); } + @Override public void startThrowingPollExceptions() { this.poller.setShouldThrow(true); } + @Override public void stopThrowingPollExceptions() { this.poller.setShouldThrow(false); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java b/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java index b1c0204..e9062f2 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/SimulatedLocation.java @@ -73,17 +73,21 @@ public class SimulatedLocation extends AbstractLocation implements MachineProvis .configure(newFlags)); } + @Override public MachineLocation obtain(Map<?,?> flags) { return this; } + @Override public void release(MachineLocation machine) { } + @Override public Map<String,Object> getProvisioningFlags(Collection<String> tags) { return MutableMap.<String,Object>of(); } + @Override public InetAddress getAddress() { return address; } @@ -104,6 +108,7 @@ public class SimulatedLocation extends AbstractLocation implements MachineProvis return ImmutableSet.of(); } + @Override public synchronized boolean obtainSpecificPort(int portNumber) { if (!Iterables.contains(permittedPorts, portNumber)) return false; if (usedPorts.contains(portNumber)) return false; @@ -111,12 +116,14 @@ public class SimulatedLocation extends AbstractLocation implements MachineProvis return true; } + @Override public synchronized int obtainPort(PortRange range) { for (int p: range) if (obtainSpecificPort(p)) return p; return -1; } + @Override public synchronized void releasePort(int portNumber) { usedPorts.remove(portNumber); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java index 3e7d613..2332793 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java @@ -111,6 +111,7 @@ public class LocalManagementContextTest { properties.put("myname", "myval"); context = LocalManagementContextForTests.builder(true).useProperties(properties).build(); PropertiesReloadListener listener = new PropertiesReloadListener() { + @Override public void reloaded() { reloadedCallbackCount.incrementAndGet(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java index 7804db6..7945d77 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java @@ -850,10 +850,12 @@ public class RebindEntityTest extends RebindTestFixtureWithApp { public MyEntity2Impl() { } + @Override public List<String> getEvents() { return events; } + @Override public String getMyfield() { return myfield; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java index 6efafec..de3abc6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java @@ -350,6 +350,7 @@ public class RebindFeedTest extends RebindTestFixtureWithApp { this.size = size; sample = get(); } + @Override public String get() { return prefix + (size>=0 ? "-"+Identifiers.makeRandomId(size) : ""); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java index 7f9fd9c..a3ee3e4 100644 --- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java @@ -168,6 +168,7 @@ public class PolicyConfigTest extends BrooklynAppUnitTestSupport { final CountDownLatch latch = new CountDownLatch(1); MyPolicy policy = new MyPolicy(MutableMap.builder() .put(TestEntity.CONF_NAME, DependentConfiguration.whenDone(new Callable<String>() { + @Override public String call() { try { latch.await(); return "aval"; @@ -179,6 +180,7 @@ public class PolicyConfigTest extends BrooklynAppUnitTestSupport { app.policies().add(policy); Thread t = new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(10+EARLY_RETURN_GRACE); latch.countDown(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsTest.java b/core/src/test/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsTest.java index 73515ba..6717868 100644 --- a/core/src/test/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsTest.java @@ -70,6 +70,7 @@ public class BrooklynMetricsTest { app.start(ImmutableList.of(loc)); Asserts.succeedsEventually(MutableMap.of("timeout", Duration.FIVE_SECONDS), new Runnable() { + @Override public void run() { assertEquals(brooklynMetrics.getAttribute(BrooklynMetrics.TOTAL_EFFECTORS_INVOKED), (Long)1L); assertTrue(brooklynMetrics.getAttribute(BrooklynMetrics.TOTAL_TASKS_SUBMITTED) > 0); @@ -87,6 +88,7 @@ public class BrooklynMetricsTest { app.start(ImmutableList.of(loc)); Asserts.succeedsEventually(MutableMap.of("timeout", Duration.FIVE_SECONDS), new Runnable() { + @Override public void run() { assertEquals(brooklynMetrics.getAttribute(BrooklynMetrics.TOTAL_EFFECTORS_INVOKED), (Long)2L); // for app and testEntity's start }}); @@ -101,6 +103,7 @@ public class BrooklynMetricsTest { e.myEffector(); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEquals(brooklynMetrics.getAttribute(BrooklynMetrics.TOTAL_EFFECTORS_INVOKED), (Long)(effsInvoked+1)); assertTrue(brooklynMetrics.getAttribute(BrooklynMetrics.TOTAL_TASKS_SUBMITTED) > tasksSubmitted); @@ -112,6 +115,7 @@ public class BrooklynMetricsTest { e.sensors().set(TestEntity.SEQUENCE, 1); Asserts.succeedsEventually(MutableMap.of("timeout", Duration.FIVE_SECONDS), new Runnable() { + @Override public void run() { assertTrue(brooklynMetrics.getAttribute(BrooklynMetrics.TOTAL_EVENTS_PUBLISHED) > eventsPublished); assertTrue(brooklynMetrics.getAttribute(BrooklynMetrics.TOTAL_EVENTS_DELIVERED) > eventsDelivered); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/entity/NoopStartable.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/NoopStartable.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/NoopStartable.java index 91bd5c8..d1ea56b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/entity/NoopStartable.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/NoopStartable.java @@ -23,7 +23,7 @@ import java.util.Collection; import org.apache.brooklyn.core.entity.trait.Startable; public class NoopStartable implements Startable { - public void start(Collection loc) {} - public void stop() {} - public void restart() {} + @Override public void start(Collection loc) {} + @Override public void stop() {} + @Override public void restart() {} } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTest.java index 9258011..26a45fa 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTest.java @@ -51,6 +51,7 @@ public class EntityCleanupLongevityTest extends EntityCleanupLongevityTestFixtur @Test(groups={"Longevity","Acceptance"}) public void testLocationCreatedAndUnmanaged() throws Exception { doTestManyTimesAndAssertNoMemoryLeak(JavaClassNames.niceClassAndMethod(), new Runnable() { + @Override public void run() { loc = managementContext.getLocationManager().createLocation(LocationSpec.create(SimulatedLocation.class)); managementContext.getLocationManager().unmanage(loc); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTestFixture.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTestFixture.java index 69af3ce..8eeb29e 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTestFixture.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupLongevityTestFixture.java @@ -146,6 +146,7 @@ public abstract class EntityCleanupLongevityTestFixture { protected void doTestStartAppThenThrowAway(String testName, final boolean stop) { doTestManyTimesAndAssertNoMemoryLeak(testName, new Runnable() { + @Override public void run() { loc = managementContext.getLocationManager().createLocation(LocationSpec.create(SimulatedLocation.class)); app = newApp(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupTest.java index 11ef3d0..a0f96d1 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/longevity/EntityCleanupTest.java @@ -48,6 +48,7 @@ public class EntityCleanupTest extends EntityCleanupLongevityTestFixture { @Test public void testLocationCreatedAndUnmanaged() throws Exception { doTestManyTimesAndAssertNoMemoryLeak(JavaClassNames.niceClassAndMethod(), new Runnable() { + @Override public void run() { loc = managementContext.getLocationManager().createLocation(LocationSpec.create(SimulatedLocation.class)); managementContext.getLocationManager().unmanage(loc); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPerformanceTest.java index 6f77ab3..115d835 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPerformanceTest.java @@ -78,6 +78,7 @@ public class EntityPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { entity.sensors().set(TestEntity.SEQUENCE, i.getAndIncrement()); }})); @@ -100,11 +101,13 @@ public class EntityPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { entity.sensors().set(TestEntity.SEQUENCE, (i.getAndIncrement())); }})); Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() { + @Override public void run() { assertTrue(lastVal.get() >= numIterations, "lastVal="+lastVal+"; numIterations="+numIterations); }}); @@ -120,6 +123,7 @@ public class EntityPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { entity.myEffector(); }})); @@ -135,6 +139,7 @@ public class EntityPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { Task<?> task = entity.invoke(TestEntity.MY_EFFECTOR, MutableMap.<String,Object>of()); try { @@ -155,6 +160,7 @@ public class EntityPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { Task<?> task = Entities.invokeEffector(app, entities, TestEntity.MY_EFFECTOR); try { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPersistencePerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPersistencePerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPersistencePerformanceTest.java index d96a121..a821107 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPersistencePerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/EntityPersistencePerformanceTest.java @@ -83,6 +83,7 @@ public class EntityPersistencePerformanceTest extends RebindTestFixtureWithApp { .every(repeatEvery) .repeat(new Runnable() { int i = 0; + @Override public void run() { for (TestEntity entity : entities) { entity.sensors().set(TestEntity.SEQUENCE, i++); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/FilePersistencePerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/FilePersistencePerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/FilePersistencePerformanceTest.java index 364a673..9304f45 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/FilePersistencePerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/FilePersistencePerformanceTest.java @@ -78,7 +78,7 @@ public class FilePersistencePerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { - public void run() { + @Override public void run() { fileAccessor.put(""+i.incrementAndGet()); }})); } @@ -94,7 +94,7 @@ public class FilePersistencePerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { - public void run() { + @Override public void run() { fileAccessor.get(); }})); } @@ -120,7 +120,7 @@ public class FilePersistencePerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { - public void run() { + @Override public void run() { File file = files.get(i.getAndIncrement()); FileBasedStoreObjectAccessor fileAccessor = new FileBasedStoreObjectAccessor(file, "mytmpextension"); fileAccessor.delete(); @@ -146,7 +146,7 @@ public class FilePersistencePerformanceTest extends AbstractPerformanceTest { .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { int i = 0; - public void run() { + @Override public void run() { try { if (i % 2 == 0) { FileUtil.setFilePermissionsTo600(file); @@ -173,7 +173,7 @@ public class FilePersistencePerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { - public void run() { + @Override public void run() { String cmd = "true"; new ProcessTool().execCommands(MutableMap.<String,String>of(), MutableList.of(cmd), null); }})); @@ -192,7 +192,7 @@ public class FilePersistencePerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { - public void run() { + @Override public void run() { File newFile = new File(parentDir, "fileRename-"+i.incrementAndGet()+".txt"); file.renameTo(newFile); file = newFile; @@ -211,7 +211,7 @@ public class FilePersistencePerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { - public void run() { + @Override public void run() { try { Files.write(""+i.incrementAndGet(), file, Charsets.UTF_8); } catch (IOException e) { @@ -233,7 +233,7 @@ public class FilePersistencePerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { - public void run() { + @Override public void run() { File newFile = new File(parentDir, "fileRename-"+i.incrementAndGet()+".txt"); try { Files.move(file, newFile); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/JavaYardStickPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/JavaYardStickPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/JavaYardStickPerformanceTest.java index 52722d4..b3e8ea6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/JavaYardStickPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/JavaYardStickPerformanceTest.java @@ -79,7 +79,8 @@ public class JavaYardStickPerformanceTest extends AbstractPerformanceTest { .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { @Override public void run() { - Future<?> future = executor.submit(new Runnable() { public void run() { i[0] = i[0] + 1; }}); + Future<?> future = executor.submit(new Runnable() { @Override + public void run() { i[0] = i[0] + 1; }}); try { future.get(); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java index 4d1030c..cfda668 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java @@ -72,6 +72,7 @@ public class SubscriptionPerformanceTest extends AbstractPerformanceTest { for (int i = 0; i < numSubscribers; i++) { subscriptionManager.subscribe(MutableMap.<String, Object>of("subscriber", i), entity, TestEntity.SEQUENCE, new SensorEventListener<Integer>() { + @Override public void onEvent(SensorEvent<Integer> event) { int count = listenerCount.incrementAndGet(); if (count >= expectedCount) completionLatch.countDown(); @@ -83,6 +84,7 @@ public class SubscriptionPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { entity.sensors().set(TestEntity.SEQUENCE, (iter.getAndIncrement())); }}) @@ -102,6 +104,7 @@ public class SubscriptionPerformanceTest extends AbstractPerformanceTest { for (int i = 0; i < numSubscribers; i++) { subscriptionManager.subscribe(MutableMap.<String, Object>of("subscriber", i), entity, TestEntity.SEQUENCE, new SensorEventListener<Integer>() { + @Override public void onEvent(SensorEvent<Integer> event) { int count = listenerCount.incrementAndGet(); if (count >= expectedCount) completionLatch.countDown(); @@ -129,11 +132,13 @@ public class SubscriptionPerformanceTest extends AbstractPerformanceTest { for (int i = 0; i < (numUnrelatedSubscribers/2); i++) { subscriptionManager.subscribe(MutableMap.<String, Object>of("subscriber", i), entities.get(1), TestEntity.SEQUENCE, new SensorEventListener<Integer>() { + @Override public void onEvent(SensorEvent<Integer> event) { exception.set(new RuntimeException("Unrelated subscriber called with "+event)); throw exception.get(); }}); subscriptionManager.subscribe(MutableMap.<String, Object>of("subscriber", i), entity, TestEntity.MY_NOTIF, new SensorEventListener<Integer>() { + @Override public void onEvent(SensorEvent<Integer> event) { exception.set(new RuntimeException("Unrelated subscriber called with "+event)); throw exception.get(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/TaskPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/TaskPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/TaskPerformanceTest.java index b35cbdc..a7a531b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/TaskPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/TaskPerformanceTest.java @@ -64,6 +64,7 @@ public class TaskPerformanceTest extends AbstractPerformanceTest { final CountDownLatch completionLatch = new CountDownLatch(1); final Runnable work = new Runnable() { + @Override public void run() { int val = counter.incrementAndGet(); if (val >= numIterations) completionLatch.countDown(); @@ -74,6 +75,7 @@ public class TaskPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { executionManager.submit(work); }}) @@ -87,7 +89,8 @@ public class TaskPerformanceTest extends AbstractPerformanceTest { final AtomicInteger counter = new AtomicInteger(); final CountDownLatch completionLatch = new CountDownLatch(1); - final Runnable work = new Runnable() { public void run() { + final Runnable work = new Runnable() { + @Override public void run() { int val = counter.incrementAndGet(); if (val >= numIterations) completionLatch.countDown(); } @@ -100,7 +103,7 @@ public class TaskPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { - public void run() { + @Override public void run() { executionManager.submit(flags, work); }}) .completionLatch(completionLatch)); @@ -118,7 +121,9 @@ public class TaskPerformanceTest extends AbstractPerformanceTest { final CountDownLatch completionLatch = new CountDownLatch(1); final List<Exception> exceptions = Lists.newCopyOnWriteArrayList(); - final Runnable work = new Runnable() { public void run() { + final Runnable work = new Runnable() { + @Override + public void run() { int numConcurrentCalls = concurrentCallCount.incrementAndGet(); try { if (numConcurrentCalls > 1) throw new IllegalStateException("numConcurrentCalls="+numConcurrentCalls); @@ -139,6 +144,7 @@ public class TaskPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { while (submitCount.get() > counter.get() + 5000) { LOG.info("delaying because "+submitCount.get()+" submitted and only "+counter.get()+" run"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/XmlPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/XmlPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/XmlPerformanceTest.java index 8658a7c..469af0e 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/XmlPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/XmlPerformanceTest.java @@ -45,6 +45,7 @@ public class XmlPerformanceTest extends AbstractPerformanceTest { .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { String xml = "<a><b>myb</b></a>"; XmlUtil.xpath(xml, "/a/b[text()]"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/enricher/stock/CustomAggregatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/enricher/stock/CustomAggregatingEnricherTest.java b/core/src/test/java/org/apache/brooklyn/enricher/stock/CustomAggregatingEnricherTest.java index 678bfe1..acb0957 100644 --- a/core/src/test/java/org/apache/brooklyn/enricher/stock/CustomAggregatingEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/enricher/stock/CustomAggregatingEnricherTest.java @@ -527,6 +527,7 @@ public class CustomAggregatingEnricherTest extends BrooklynAppUnitTestSupport { public void testCustomAggregatingFunction() { TestEntity producer1 = app.createAndManageChild(EntitySpec.create(TestEntity.class)); Function<Collection<Integer>,Integer> aggregator = new Function<Collection<Integer>, Integer>() { + @Override public Integer apply(Collection<Integer> input) { int result = 1; for (Integer in : input) result += in*in; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/enricher/stock/EnricherWithDeferredSupplierTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/enricher/stock/EnricherWithDeferredSupplierTest.java b/core/src/test/java/org/apache/brooklyn/enricher/stock/EnricherWithDeferredSupplierTest.java index 31a29fd..23f52fa 100644 --- a/core/src/test/java/org/apache/brooklyn/enricher/stock/EnricherWithDeferredSupplierTest.java +++ b/core/src/test/java/org/apache/brooklyn/enricher/stock/EnricherWithDeferredSupplierTest.java @@ -115,6 +115,7 @@ public class EnricherWithDeferredSupplierTest extends BrooklynAppUnitTestSupport .displayName(toString()) .tag(BrooklynTaskTags.TRANSIENT_TASK_TAG) .body(new Callable<Entity>() { + @Override public Entity call() { EntityInternal entity = entity(); Collection<Entity> entitiesToSearch = entity.getManagementContext().getEntityManager().getEntities(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/entity/group/DynamicClusterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicClusterTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicClusterTest.java index c3e7d7f..b443f29 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicClusterTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicClusterTest.java @@ -438,6 +438,7 @@ public class DynamicClusterTest extends BrooklynAppUnitTestSupport { try { for (int i = 0; i < 10; i++) { executor.submit(new Runnable() { + @Override public void run() { try { cluster.resize(2); @@ -1290,6 +1291,7 @@ public class DynamicClusterTest extends BrooklynAppUnitTestSupport { // app.start blocks so in the failure case this test would block forever. Asserts.assertReturnsEventually(new Runnable() { + @Override public void run() { app.start(ImmutableList.of(app.newSimulatedLocation())); EntityAsserts.assertAttributeEqualsEventually(cluster, Attributes.SERVICE_STATE_ACTUAL, Lifecycle.RUNNING); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/entity/group/DynamicFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicFabricTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicFabricTest.java index 015c168..13541c8 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicFabricTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicFabricTest.java @@ -195,6 +195,7 @@ public class DynamicFabricTest extends BrooklynAppUnitTestSupport { } Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() { + @Override public void run() { assertEquals(fabric.getAttribute(DynamicFabric.FABRIC_SIZE), (Integer) total.get()); assertEquals(fabric.getFabricSize(), (Integer) total.get()); @@ -298,11 +299,13 @@ public class DynamicFabricTest extends BrooklynAppUnitTestSupport { } Asserts.succeedsEventually(MutableMap.of("timeout", 10*1000), new Runnable() { + @Override public void run() { assertTrue(task.isDone()); }}); Asserts.succeedsEventually(MutableMap.of("timeout", 10*1000), new Runnable() { + @Override public void run() { for (Entity it : fabric.getChildren()) { int count = ((TestEntity)it).getCounter().get(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java index 321335e..1e45833 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java @@ -124,6 +124,7 @@ public class DynamicGroupTest { final Entity e3 = app.addChild(EntitySpec.create(TestEntity.class).displayName("myname")); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEqualsIgnoringOrder(group.getMembers(), ImmutableSet.of(e3)); }}); @@ -151,6 +152,7 @@ public class DynamicGroupTest { e1.sensors().set(MY_ATTRIBUTE, "yes"); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEqualsIgnoringOrder(group.getMembers(), ImmutableSet.of(e1)); }}); @@ -159,6 +161,7 @@ public class DynamicGroupTest { e1.sensors().set(MY_ATTRIBUTE, "no"); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEqualsIgnoringOrder(group.getMembers(), ImmutableSet.of()); }}); @@ -191,6 +194,7 @@ public class DynamicGroupTest { e2.sensors().set(MY_ATTRIBUTE, "yes"); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEqualsIgnoringOrder(group.getMembers(), ImmutableSet.of(e2)); }}); @@ -204,6 +208,7 @@ public class DynamicGroupTest { Entities.unmanage(e1); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEqualsIgnoringOrder(group.getMembers(), ImmutableSet.of()); }}); @@ -223,12 +228,14 @@ public class DynamicGroupTest { e3.setParent(app); Entities.manage(e3); Asserts.succeedsContinually(MutableMap.of("timeout", VERY_SHORT_WAIT_MS), new Runnable() { + @Override public void run() { assertEquals(ImmutableSet.copyOf(group.getMembers()), ImmutableSet.of(e1, e2)); }}); Entities.unmanage(e3); Asserts.succeedsContinually(MutableMap.of("timeout", VERY_SHORT_WAIT_MS), new Runnable() { + @Override public void run() { assertEqualsIgnoringOrder(ImmutableSet.copyOf(group.getMembers()), ImmutableSet.of(e1, e2)); }}); @@ -244,6 +251,7 @@ public class DynamicGroupTest { e3.setParent(app); Entities.manage(e3); Asserts.succeedsContinually(MutableMap.of("timeout", VERY_SHORT_WAIT_MS), new Runnable() { + @Override public void run() { assertEqualsIgnoringOrder(ImmutableSet.copyOf(group.getMembers()), ImmutableSet.of(e1, e2)); }}); @@ -265,6 +273,7 @@ public class DynamicGroupTest { final List<Exception> exceptions = new CopyOnWriteArrayList<Exception>(); app.subscriptions().subscribe(group, DynamicGroup.MEMBER_ADDED, new SensorEventListener<Entity>() { + @Override public void onEvent(SensorEvent<Entity> event) { try { TestEntity val = (TestEntity) event.getValue(); @@ -279,6 +288,7 @@ public class DynamicGroupTest { }}); app.subscriptions().subscribe(group, DynamicGroup.MEMBER_REMOVED, new SensorEventListener<Entity>() { + @Override public void onEvent(SensorEvent<Entity> event) { try { TestEntity val = (TestEntity) event.getValue(); @@ -297,6 +307,7 @@ public class DynamicGroupTest { final TestEntity entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)); LOG.debug("Created: entity {}", i); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertTrue(entitiesNotified.contains(entity)); } @@ -307,6 +318,7 @@ public class DynamicGroupTest { } Asserts.succeedsEventually(ImmutableMap.of("timeout", Duration.of(10, TimeUnit.SECONDS)), new Runnable() { + @Override public void run() { int added = addedNotifications.get(), removed = removedNotifications.get(), @@ -378,6 +390,7 @@ public class DynamicGroupTest { } Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertTrue(notificationCount.get() == (NUM_CYCLES*2) || exceptions.size() > 0); }}); @@ -455,6 +468,7 @@ public class DynamicGroupTest { } Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEqualsIgnoringOrder(group2.getMembers(), ImmutableSet.of(e3)); }}); @@ -552,6 +566,7 @@ public class DynamicGroupTest { private <T> void assertContainsEventually(final Collection<? extends T> vals, final T val) { Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertTrue(vals.contains(val)); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java index 9f2a302..4a95270 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupRebindTest.java @@ -86,6 +86,7 @@ public class DynamicMultiGroupRebindTest extends RebindTestFixtureWithApp { final DynamicMultiGroup dmg = dmgs.get(i); final TestEntity child = childs.get(i); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Group bucketA = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketA"), null); assertNotNull(bucketA); @@ -107,6 +108,7 @@ public class DynamicMultiGroupRebindTest extends RebindTestFixtureWithApp { final TestEntity child = (TestEntity) newManagementContext.getEntityManager().getEntity(childs.get(i).getId()); // FIXME Remove timeout; use default Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Group bucketA = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketA"), null); Group bucketB = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketB"), null); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java index efa3981..9925556 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java @@ -55,6 +55,7 @@ public class DynamicMultiGroupTest extends BrooklynAppUnitTestSupport { .configure(BUCKET_FUNCTION, bucketFromAttribute(SENSOR)) ); app.subscriptions().subscribeToChildren(group, SENSOR, new SensorEventListener<String>() { + @Override public void onEvent(SensorEvent<String> event) { dmg.rescanEntities(); } }); @@ -91,6 +92,7 @@ public class DynamicMultiGroupTest extends BrooklynAppUnitTestSupport { .configure(BUCKET_FUNCTION, bucketFromAttribute(SENSOR)) ); app.subscriptions().subscribeToChildren(group, SENSOR, new SensorEventListener<String>() { + @Override public void onEvent(SensorEvent<String> event) { dmg.rescanEntities(); } }); @@ -122,6 +124,7 @@ public class DynamicMultiGroupTest extends BrooklynAppUnitTestSupport { child1.sensors().set(SENSOR, "bucketA"); child2.sensors().set(SENSOR, "bucketA"); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Group bucketA = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketA"), null); Group bucketB = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketB"), null); @@ -134,6 +137,7 @@ public class DynamicMultiGroupTest extends BrooklynAppUnitTestSupport { // Move child 1 into bucket B child1.sensors().set(SENSOR, "bucketB"); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Group bucketA = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketA"), null); Group bucketB = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketB"), null); @@ -147,6 +151,7 @@ public class DynamicMultiGroupTest extends BrooklynAppUnitTestSupport { // Move child 2 into bucket B; there is now no bucket A child2.sensors().set(SENSOR, "bucketB"); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Group bucketA = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketA"), null); Group bucketB = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketB"), null); @@ -160,6 +165,7 @@ public class DynamicMultiGroupTest extends BrooklynAppUnitTestSupport { final TestEntity child3 = group.addChild(EntitySpec.create(childSpec).displayName("child3")); child3.sensors().set(SENSOR, "bucketC"); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Group bucketC = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketC"), null); assertNotNull(bucketC); @@ -171,6 +177,7 @@ public class DynamicMultiGroupTest extends BrooklynAppUnitTestSupport { // disappears as it is empty. child3.sensors().set(SENSOR, null); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Group bucketB = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketB"), null); Group bucketC = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketC"), null); @@ -183,6 +190,7 @@ public class DynamicMultiGroupTest extends BrooklynAppUnitTestSupport { // Add child 3 back to bucket C -- this should result in a new group entity child3.sensors().set(SENSOR, "bucketC"); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Group bucketC = (Group) find(dmg.getChildren(), displayNameEqualTo("bucketC"), null); assertNotNull(bucketC); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java index 81ca90d..fa729b6 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java @@ -86,6 +86,7 @@ public class GroupPickUpEntitiesTest extends BrooklynAppUnitTestSupport { e2.sensors().set(TestEntity.NAME, "BOB"); EntityAsserts.assertAttributeEqualsEventually(group, BasicGroup.GROUP_SIZE, 2); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { // must use "succeedsEventually" because size + members attributes are set sequentially in another thread; // just waiting for the first does not mean the second will have been set by the time we check in this thread. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java index efecee5..5bb6617 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/GroupTest.java @@ -117,6 +117,7 @@ public class GroupTest extends BrooklynAppUnitTestSupport { group.addMember(entity1); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String msg = "events="+groupAddedListener.getEvents(); assertEquals(groupAddedListener.getEvents().size(), 1, msg); @@ -127,6 +128,7 @@ public class GroupTest extends BrooklynAppUnitTestSupport { group.removeMember(entity1); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String msg = "events="+groupRemovedListener.getEvents(); assertEquals(groupRemovedListener.getEvents().size(), 1, msg); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/entity/group/MembershipTrackingPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/MembershipTrackingPolicyTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/MembershipTrackingPolicyTest.java index 5325a1d..67a171a 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/MembershipTrackingPolicyTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/MembershipTrackingPolicyTest.java @@ -231,6 +231,7 @@ public class MembershipTrackingPolicyTest extends BrooklynAppUnitTestSupport { private void assertRecordsEventually(final RecordingMembershipTrackingPolicy policy, final List<Record>... validExpecteds) { Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() { + @Override public void run() { for (List<Record> validExpected : validExpecteds) { if (policy.records.equals(validExpected)) return; @@ -245,6 +246,7 @@ public class MembershipTrackingPolicyTest extends BrooklynAppUnitTestSupport { private void assertRecordsContinually(final RecordingMembershipTrackingPolicy policy, final Record... expected) { Asserts.succeedsContinually(ImmutableMap.of("timeout", 100), new Runnable() { + @Override public void run() { assertEquals(policy.records, ImmutableList.copyOf(expected), "actual="+policy.records); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedIntegrationTest.java index ca5dd07..305fc75 100644 --- a/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedIntegrationTest.java @@ -90,6 +90,7 @@ public class HttpFeedIntegrationTest extends BrooklynAppUnitTestSupport { EntityAsserts.assertAttributeEqualsEventually(entity, SENSOR_INT, 200); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String val = entity.getAttribute(SENSOR_STRING); assertTrue(val != null && val.contains("Hello, World"), "val="+val); @@ -120,6 +121,7 @@ public class HttpFeedIntegrationTest extends BrooklynAppUnitTestSupport { EntityAsserts.assertAttributeEqualsEventually(entity, SENSOR_INT, 200); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String val = entity.getAttribute(SENSOR_STRING); assertTrue(val != null && val.contains("Hello, World"), "val="+val); @@ -148,6 +150,7 @@ public class HttpFeedIntegrationTest extends BrooklynAppUnitTestSupport { EntityAsserts.assertAttributeEqualsEventually(entity, SENSOR_INT, 401); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String val = entity.getAttribute(SENSOR_STRING); assertTrue(val != null && val.equals("Failed!"), "val=" + val); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java b/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java index 1ecef40..c2de313 100644 --- a/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java +++ b/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java @@ -272,6 +272,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport { feed.resume(); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertTrue(server.getRequestCount() > countWhenSuspended + 1, "Request count failed to increment when feed was resumed, from " + countWhenSuspended + ", still at " + server.getRequestCount()); @@ -367,6 +368,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport { .poll(HttpPollConfig.forMultiple() .onSuccess(new Function<HttpToolResponse,Void>() { + @Override public Void apply(HttpToolResponse response) { entity.sensors().set(SENSOR_INT, response.getResponseCode()); if (response.getResponseCode()==200) @@ -384,6 +386,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport { private <T> void assertSensorEventually(final AttributeSensor<T> sensor, final T expectedVal, long timeout) { Asserts.succeedsEventually(ImmutableMap.of("timeout", timeout), new Callable<Void>() { + @Override public Void call() { assertEquals(entity.getAttribute(sensor), expectedVal); return null; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/feed/shell/ShellFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/feed/shell/ShellFeedIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/feed/shell/ShellFeedIntegrationTest.java index 7b6f0fe..9431b3b 100644 --- a/core/src/test/java/org/apache/brooklyn/feed/shell/ShellFeedIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/feed/shell/ShellFeedIntegrationTest.java @@ -117,6 +117,7 @@ public class ShellFeedIntegrationTest extends BrooklynAppUnitTestSupport { .build(); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String val = entity.getAttribute(SENSOR_STRING); assertTrue(val != null && val.contains("timed out after 1ms"), "val=" + val); @@ -134,6 +135,7 @@ public class ShellFeedIntegrationTest extends BrooklynAppUnitTestSupport { .build(); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String val = entity.getAttribute(SENSOR_STRING); assertTrue(val != null && val.contains("hello MYVAL"), "val="+val); @@ -150,6 +152,7 @@ public class ShellFeedIntegrationTest extends BrooklynAppUnitTestSupport { .build(); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String val = entity.getAttribute(SENSOR_STRING); assertTrue(val != null && val.contains("hello"), "val="+val); @@ -168,6 +171,7 @@ public class ShellFeedIntegrationTest extends BrooklynAppUnitTestSupport { .build(); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String val = entity.getAttribute(SENSOR_STRING); assertTrue(val != null && val.contains(cmd), "val="+val); @@ -193,6 +197,7 @@ public class ShellFeedIntegrationTest extends BrooklynAppUnitTestSupport { .build(); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String val = entity.getAttribute(SENSOR_STRING); assertTrue(val != null && val.contains("Exit status (on failure) 123"), "val="+val); @@ -207,6 +212,7 @@ public class ShellFeedIntegrationTest extends BrooklynAppUnitTestSupport { .poll(new ShellPollConfig<Long>(SENSOR_LONG) .command("df -P | tail -1") .onSuccess(new Function<SshPollValue, Long>() { + @Override public Long apply(SshPollValue input) { String[] parts = input.getStdout().split("[ \\t]+"); System.out.println("input="+input+"; parts="+Arrays.toString(parts)); @@ -215,6 +221,7 @@ public class ShellFeedIntegrationTest extends BrooklynAppUnitTestSupport { .build(); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { Long val = entity.getAttribute(SENSOR_LONG); assertTrue(val != null && val >= 0, "val="+val); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java b/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java index a3f22dd..95d7d06 100644 --- a/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java +++ b/core/src/test/java/org/apache/brooklyn/feed/ssh/SshFeedTest.java @@ -99,10 +99,12 @@ public class SshFeedTest extends BrooklynAppUnitTestSupport { // Expect it to only execute once (i.e. share exec result for both sensors). // Wait several seconds, in case it takes a while to do the second exec. Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEquals(RecordingSshMachineLocation.execScriptCalls, ImmutableList.of(ImmutableList.of(cmd))); }}); Asserts.succeedsContinually(ImmutableMap.of("timeout", Duration.FIVE_SECONDS), new Runnable() { + @Override public void run() { assertEquals(RecordingSshMachineLocation.execScriptCalls, ImmutableList.of(ImmutableList.of(cmd))); }}); @@ -129,6 +131,7 @@ public class SshFeedTest extends BrooklynAppUnitTestSupport { // Expect it to execute the different commands (i.e. not share) Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEquals(ImmutableSet.copyOf(RecordingSshMachineLocation.execScriptCalls), ImmutableSet.of(ImmutableList.of(cmd), ImmutableList.of(cmd2))); }}); @@ -156,6 +159,7 @@ public class SshFeedTest extends BrooklynAppUnitTestSupport { // Expect it to execute the command twice, with different envs (i.e. not share) Asserts.succeedsEventually(new Runnable() { + @Override public void run() { assertEquals(RecordingSshMachineLocation.execScriptCalls, ImmutableList.of(ImmutableList.of(cmd), ImmutableList.of(cmd))); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java index 0e8a3d3..844df4a 100644 --- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java @@ -116,6 +116,7 @@ public class SshMachineLocationIntegrationTest extends SshMachineLocationTest { BasicExecutionContext execContext = new BasicExecutionContext(execManager); try { MachineDetails details = execContext.submit(new Callable<MachineDetails>() { + @Override public MachineDetails call() { return host.getMachineDetails(); }}).get(); @@ -196,6 +197,7 @@ public class SshMachineLocationIntegrationTest extends SshMachineLocationTest { final SshMachineLocation unreachableHost = new SshMachineLocation(MutableMap.of("address", InetAddress.getByName(unreachableIp))); System.out.println(unreachableHost.getAddress()); Asserts.assertReturnsEventually(new Runnable() { + @Override public void run() { assertFalse(unreachableHost.isSshable()); }}, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationPerformanceTest.java index 27ca938..95f2025 100644 --- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationPerformanceTest.java @@ -147,6 +147,7 @@ public class SshMachineLocationPerformanceTest { List<ListenableFuture<?>> futures = Lists.newArrayList(); for (int j = 0; j < concurrentRuns; j++) { futures.add(executor.submit(new Runnable() { + @Override public void run() { try { task.run(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java index fe491af..bac6018 100644 --- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java @@ -132,6 +132,7 @@ public class SshMachineLocationTest extends BrooklynAppUnitTestSupport { BasicExecutionContext execContext = new BasicExecutionContext(execManager); try { MachineDetails details = execContext.submit(new Callable<MachineDetails>() { + @Override public MachineDetails call() { return host.getMachineDetails(); }}).get(); @@ -195,6 +196,7 @@ public class SshMachineLocationTest extends BrooklynAppUnitTestSupport { EntitySpec<TestApplication> appSpec = EntitySpec.create(TestApplication.class) .configure(BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION, true) .addInitializer(new EntityInitializer() { + @Override public void apply(EntityLocal entity) { ((EntityInternal)entity).getMutableEntityType().addEffector(EffectorTaskTest.DOUBLE_1); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java index 9180183..7ec01cf 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java @@ -369,6 +369,7 @@ public class FlagUtilsTest { return config().get(key); } + @Override public <T> T setConfig(ConfigKey<T> key, T val) { return config().set(key, val); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/ShellToolAbstractTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/ShellToolAbstractTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/ShellToolAbstractTest.java index a9d34a5..16987f1 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/ShellToolAbstractTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/ShellToolAbstractTest.java @@ -200,6 +200,7 @@ public abstract class ShellToolAbstractTest { connect(localtool); futures.add(executor.submit(new Runnable() { + @Override public void run() { String bigstring = Strings.repeat("abcdefghij", 1000); // 10KB String out = execScript(localtool, ImmutableList.of("export MYPROP="+bigstring, "echo val is $MYPROP")); @@ -223,6 +224,7 @@ public abstract class ShellToolAbstractTest { connect(localtool); futures.add(executor.submit(new Runnable() { + @Override public void run() { String bigstring = Strings.repeat("abcdefghij", 1000); // 10KB String out = execScript(localtool, ImmutableList.of("sleep 2", "export MYPROP="+bigstring, "echo val is $MYPROP")); @@ -297,6 +299,7 @@ public abstract class ShellToolAbstractTest { if (i > 0) Time.sleep(delay); futures.add(executor.submit(new Runnable() { + @Override public void run() { String bigstring = Strings.repeat("abcdefghij", 1000); // 10KB String out = execCommands("echo "+bigstring); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractPerformanceTest.java index 481553e..c2eed08 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractPerformanceTest.java @@ -65,6 +65,7 @@ public abstract class SshToolAbstractPerformanceTest { @Test(groups = {"Integration"}) public void testConsecutiveConnectAndDisconnect() throws Exception { Runnable task = new Runnable() { + @Override public void run() { tool = newSshTool(MutableMap.of("host", "localhost")); tool.connect(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionPerformanceTest.java index e8e7890..d018847 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionPerformanceTest.java @@ -173,6 +173,7 @@ public class BasicTaskExecutionPerformanceTest { Long toobig = Iterables.find( times, new Predicate<Long>() { + @Override public boolean apply(Long input) { return input > MAX_ACCEPTABLE_TIME; }}, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionTest.java b/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionTest.java index c4edfca..3f90867 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTaskExecutionTest.java @@ -108,6 +108,7 @@ public class BasicTaskExecutionTest { final CountDownLatch signalStarted = new CountDownLatch(1); final CountDownLatch allowCompletion = new CountDownLatch(1); final BasicTask<Object> t = new BasicTask<Object>(new Callable<Object>() { + @Override public Object call() throws Exception { Object result = data.put(1, "b"); signalStarted.countDown(); @@ -127,6 +128,7 @@ public class BasicTaskExecutionTest { log.debug("runBasicTaskWithWaits, BasicTask status: {}", t.getStatusDetail(false)); Asserts.succeedsEventually(new Runnable() { + @Override public void run() { String status = t.getStatusDetail(false); assertTrue(status != null && status.toLowerCase().contains("waiting"), "status="+status); @@ -246,6 +248,7 @@ public class BasicTaskExecutionTest { final CountDownLatch runningLatch = new CountDownLatch(1); final CountDownLatch finishLatch = new CountDownLatch(1); Task<Void> t = new BasicTask<Void>(new Callable<Void>() { + @Override public Void call() throws Exception { runningLatch.countDown(); finishLatch.await(); @@ -267,6 +270,7 @@ public class BasicTaskExecutionTest { final CountDownLatch blockForever = new CountDownLatch(1); BasicTask<Integer> t = new BasicTask<Integer>(new Callable<Integer>() { + @Override public Integer call() throws Exception { blockForever.await(); return 42; }}); @@ -295,6 +299,7 @@ public class BasicTaskExecutionTest { final CountDownLatch blockForever = new CountDownLatch(1); BasicTask<Integer> t = new BasicTask<Integer>(new Callable<Integer>() { + @Override public Integer call() throws Exception { synchronized (data) { signalStarted.countDown(); @@ -338,6 +343,7 @@ public class BasicTaskExecutionTest { @Test public void errorDuringRun() throws Exception { BasicTask<Void> t = new BasicTask<Void>(new Callable<Void>() { + @Override public Void call() throws Exception { throw new IllegalStateException("Simulating failure in errorDuringRun"); }}); @@ -366,6 +372,7 @@ public class BasicTaskExecutionTest { final CountDownLatch allowCompletion = new CountDownLatch(1); BasicTask<Integer> t = new BasicTask<Integer>(new Callable<Integer>() { + @Override public Integer call() throws Exception { signalStarted.countDown(); allowCompletion.await(); @@ -395,8 +402,10 @@ public class BasicTaskExecutionTest { public void fieldsSetForBasicTaskSubmittedBasicTask() throws Exception { //submitted BasicTask B is started by A, and waits for A to complete BasicTask<Integer> t = new BasicTask<Integer>(MutableMap.of("displayName", "sample", "description", "some descr"), new Callable<Integer>() { + @Override public Integer call() throws Exception { em.submit(MutableMap.of("tag", "B"), new Callable<Integer>() { + @Override public Integer call() throws Exception { assertEquals(45, em.getTasksWithTag("A").iterator().next().get()); return 46; @@ -428,6 +437,7 @@ public class BasicTaskExecutionTest { private Callable<Object> newPutCallable(final Object key, final Object val) { return new Callable<Object>() { + @Override public Object call() { return data.put(key, val); } @@ -436,6 +446,7 @@ public class BasicTaskExecutionTest { private Callable<Integer> newIncrementCallable(final Object key) { return new Callable<Integer>() { + @Override public Integer call() { synchronized (data) { return (Integer) data.put(key, (Integer)data.get(key) + 1); @@ -446,6 +457,7 @@ public class BasicTaskExecutionTest { private Runnable newPutRunnable(final Object key, final Object val) { return new Runnable() { + @Override public void run() { data.put(key, val); } @@ -454,6 +466,7 @@ public class BasicTaskExecutionTest { private Runnable newNoop() { return new Runnable() { + @Override public void run() { } }; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTasksFutureTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTasksFutureTest.java b/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTasksFutureTest.java index bff72df..442813c 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTasksFutureTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/task/BasicTasksFutureTest.java @@ -129,7 +129,7 @@ public class BasicTasksFutureTest { } private void addFutureListener(Task<String> t, final String key) { - t.addListener(new Runnable() { public void run() { + t.addListener(new Runnable() { @Override public void run() { synchronized (data) { log.info("notifying for "+key); data.notifyAll(); @@ -151,6 +151,7 @@ public class BasicTasksFutureTest { private <T> Task<T> waitForSemaphore(final Duration time, final boolean requireSemaphore, final T result) { return Tasks.<T>builder().body(new Callable<T>() { + @Override public T call() { try { started.release(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/util/core/task/DynamicSequentialTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/task/DynamicSequentialTaskTest.java b/core/src/test/java/org/apache/brooklyn/util/core/task/DynamicSequentialTaskTest.java index ac5c11c..e218cc7 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/task/DynamicSequentialTaskTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/task/DynamicSequentialTaskTest.java @@ -96,6 +96,7 @@ public class DynamicSequentialTaskTest { @Test public void testSimple() throws Exception { Callable<String> mainJob = new Callable<String>() { + @Override public String call() { log.info("main job - "+Tasks.current()); messages.add("main"); @@ -125,6 +126,7 @@ public class DynamicSequentialTaskTest { public Callable<String> sayCallable(final String message, final Duration duration, final String message2) { return new Callable<String>() { + @Override public String call() { try { if (message != null) {
