brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjcorb...@apache.org
Subject [05/17] brooklyn-server git commit: Add missing @Override annotation to method signatures overriding interface methods
Date Mon, 23 Jan 2017 15:14:33 GMT
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
index bee3eae..5d06b12 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
@@ -316,6 +316,7 @@ public class LoadBalancingPolicyTest extends AbstractLoadBalancingPolicyTest {
         pool.policies().add(policy);
         
         Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() {
+            @Override
             public void run() {
                 assertEquals(model.getContainerWorkrates(), ImmutableMap.of(containerA, 10d));
             }
@@ -375,6 +376,7 @@ public class LoadBalancingPolicyTest extends AbstractLoadBalancingPolicyTest {
         final MockItemEntity item2 = newItem(app, containerB, "2", 13);
         
         Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() {
+            @Override
             public void run() {
                 assertEquals(model.getPoolSize(), 2);
                 assertEquals(model.getPoolContents(), ImmutableSet.of(containerA, containerB));

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
index bf5661e..ba2c519 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
@@ -165,9 +165,11 @@ public class MockContainerEntityImpl extends AbstractGroupImpl implements MockCo
         sensors().set(SERVICE_UP, false);
     }
 
+    @Override
     public void offloadAndStop(final MockContainerEntity otherContainer) {
         if (LOG.isDebugEnabled()) LOG.debug("Mocks: offloading container {} to {} (items {})", new Object[] {this, otherContainer, getBalanceableItems()});
         runWithLock(ImmutableList.of(this, otherContainer), new Runnable() {
+            @Override
             public void run() {
                 offloading = false;
                 for (Movable item : getBalanceableItems()) {
@@ -188,6 +190,7 @@ public class MockContainerEntityImpl extends AbstractGroupImpl implements MockCo
         List<MockContainerEntity> entitiesToLockCopy = MutableList.copyOf(Iterables.filter(entitiesToLock, Predicates.notNull()));
         List<MockContainerEntity> entitiesLocked = Lists.newArrayList();
         Collections.sort(entitiesToLockCopy, new Comparator<MockContainerEntity>() {
+            @Override
             public int compare(MockContainerEntity o1, MockContainerEntity o2) {
                 return o1.getId().compareTo(o2.getId());
             }});

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
index 70980bc..2947df1 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
@@ -66,6 +66,7 @@ public class LocationSpec implements HasName, HasConfig, Serializable {
         return spec;
     }
 
+    @Override
     public Map<String, ?> getConfig() {
         return config;
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
index 188df40..98f1e6d 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
@@ -62,6 +62,7 @@ public class SecurityProviderHttpSession implements HttpSession {
         return 0;
     }
 
+    @Override
     @Deprecated //in interface
     public javax.servlet.http.HttpSessionContext getSessionContext() {
         return null;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java
index e1a6de5..3cb8845 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceIntegrationTest.java
@@ -109,6 +109,7 @@ public class ApplicationResourceIntegrationTest extends BrooklynRestResourceTest
         final URI stateSensor = URI.create("/applications/simple-app/entities/simple-ent/sensors/service.state");
         final String expectedStatus = Lifecycle.STOPPED.toString();
         Asserts.succeedsEventually(MutableMap.of("timeout", 60 * 1000), new Runnable() {
+            @Override
             public void run() {
                 // Accept with and without quotes; if don't specify "Accepts" header, then
                 // might get back json or plain text (depending on compiler / java runtime 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
index bcf8d25..967d72d 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java
@@ -128,6 +128,7 @@ public class ApplicationResourceTest extends BrooklynRestResourceTest {
     // Convenience for finding an EntitySummary within a collection, based on its name
     private static Predicate<EntitySummary> withName(final String name) {
         return new Predicate<EntitySummary>() {
+            @Override
             public boolean apply(EntitySummary input) {
                 return name.equals(input.getName());
             }
@@ -137,6 +138,7 @@ public class ApplicationResourceTest extends BrooklynRestResourceTest {
     // Convenience for finding a Map within a collection, based on the value of one of its keys
     private static Predicate<? super Map<?,?>> withValueForKey(final Object key, final Object value) {
         return new Predicate<Object>() {
+            @Override
             public boolean apply(Object input) {
                 if (!(input instanceof Map)) return false;
                 return value.equals(((Map<?, ?>) input).get(key));

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourcePerformanceTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourcePerformanceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourcePerformanceTest.java
index e97666f..6bea38d 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourcePerformanceTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourcePerformanceTest.java
@@ -145,6 +145,7 @@ public class CatalogResourcePerformanceTest extends BrooklynRestResourcePerforma
         runPerformanceTest(
                 "CatalogResourcePerformanceTest."+methodName, 
                 new Function<WebClient, Void>() {
+                    @Override
                     public Void apply(WebClient client) {
                         List<?> result = client.path(urlPath).get(returnType);
                         assertTrue(result.size() > 0, "size="+result.size());
@@ -156,6 +157,7 @@ public class CatalogResourcePerformanceTest extends BrooklynRestResourcePerforma
         runPerformanceTest(
                 "CatalogResourcePerformanceTest."+methodName, 
                 new Function<WebClient, Void>() {
+                    @Override
                     public Void apply(WebClient client) {
                         Object result = client.path(urlPath).get(returnType);
                         assertNotNull(result);
@@ -174,10 +176,12 @@ public class CatalogResourcePerformanceTest extends BrooklynRestResourcePerforma
                 .iterations(numIterations)
                 .minAcceptablePerSecond(minRatePerSec)
                 .preJob(new Runnable() {
+                    @Override
                     public void run() {
                         client.set(client());
                     }})
                 .job(new Runnable() {
+                    @Override
                     public void run() {
                         job.apply(client.get());
                     }}));

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java
index f8bc636..391f2bb 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java
@@ -369,6 +369,7 @@ public class SensorResourceTest extends BrooklynRestResourceTest {
         SleepingCallable(Duration duration) {
             this.duration = duration;
         }
+        @Override
         public Void call() throws Exception {
             Time.sleep(duration);
             return null;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
index 21fd246..6b9d056 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/UsageResourceTest.java
@@ -58,6 +58,8 @@ import org.apache.brooklyn.util.time.Time;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.util.concurrent.Runnables;
+
 import javax.ws.rs.core.GenericType;
 
 @Test( // by using a different suite name we disallow interleaving other tests between the methods of this test class, which wrecks the test fixtures
@@ -335,7 +337,7 @@ public class UsageResourceTest extends BrooklynRestResourceTest {
     
     private void waitForTask(final String taskId) {
         boolean success = Repeater.create()
-                .repeat(new Runnable() { public void run() {}})
+                .repeat(Runnables.doNothing())
                 .until(new Callable<Boolean>() {
                     @Override public Boolean call() {
                         Response response = client().path("/activities/"+taskId).get();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java
index 0664b9d..36d3bf6 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java
@@ -90,6 +90,7 @@ public class RestMockSimpleEntity extends SoftwareProcessImpl {
         public MockSshDriver(org.apache.brooklyn.api.entity.EntityLocal entity, SshMachineLocation machine) {
             super(entity, machine);
         }
+        @Override
         public boolean isRunning() { return true; }
         @Override
         public void stop() {}

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
index 31d8d7c..a40c167 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/ServerStoppingShutdownHandler.java
@@ -48,6 +48,7 @@ public class ServerStoppingShutdownHandler implements ShutdownHandler {
         // essentially same as BrooklynLauncher.terminate() but cut down ...
         // NB: this is only used in dev mode use of BrooklynJavascriptGuiLauncher
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 Time.sleep(Duration.millis(250));
                 log.debug("Shutting down server in background thread, closing "+server+" and "+mgmt);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/server-cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java
----------------------------------------------------------------------
diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java b/server-cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java
index 06c868b..3172bfa 100644
--- a/server-cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java
+++ b/server-cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java
@@ -70,6 +70,7 @@ public class ClassFinder {
 
     public static Predicate<Class<?>> notBoring() {
         return new Predicate<Class<?>>() {
+            @Override
             public boolean apply(Class<?> input) {
                 return (input != null && !BORING.contains(input));
             }
@@ -78,6 +79,7 @@ public class ClassFinder {
     
     public static Predicate<Class<?>> withAnnotation(final Class<? extends Annotation> annotation) {
         return new Predicate<Class<?>>() {
+            @Override
             public boolean apply(Class<?> input) {
                 return (input != null && input.getAnnotation(annotation) != null);
             }
@@ -86,6 +88,7 @@ public class ClassFinder {
     
     public static Predicate<? super Class<? extends BrooklynObject>> withClassNameMatching(final String typeRegex) {
         return new Predicate<Class<?>>() {
+            @Override
             public boolean apply(Class<?> input) {
                 return (input != null && input.getName() != null && input.getName().matches(typeRegex));
             }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java
----------------------------------------------------------------------
diff --git a/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java b/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java
index 27c11f4..d3dbe28 100644
--- a/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java
+++ b/server-cli/src/test/java/org/apache/brooklyn/cli/CliTest.java
@@ -364,6 +364,7 @@ public class CliTest {
         Cli<BrooklynCommand> cli = buildCli();
         BrooklynCommand command = cli.parse("launch", "--noConsole", "--app", ExampleApp.class.getName(), "--location", "localhost");
         submitCommandAndAssertRunnableSucceeds(command, new Runnable() {
+                @Override
                 public void run() {
                     assertTrue(exampleAppConstructed);
                     assertTrue(exampleAppRunning);
@@ -376,6 +377,7 @@ public class CliTest {
         Cli<BrooklynCommand> cli = buildCli();
         BrooklynCommand command = cli.parse("launch", "--noConsole", "--app", "example-app-no-location.yaml", "--location", "localhost");
         submitCommandAndAssertRunnableSucceeds(command, new Runnable() {
+                @Override
                 public void run() {
                     assertTrue(exampleEntityRunning);
                 }
@@ -387,6 +389,7 @@ public class CliTest {
         Cli<BrooklynCommand> cli = buildCli();
         BrooklynCommand command = cli.parse("launch", "--noConsole", "--app", "example-app-no-location.yaml", "--location", "localhost:(name=testLocalhost)");
         submitCommandAndAssertRunnableSucceeds(command, new Runnable() {
+                @Override
                 public void run() {
                     assertTrue(exampleEntityRunning);
                     assertTrue(Iterables.getOnlyElement(exampleEntity.getApplication().getLocations()).getDisplayName().equals("testLocalhost"));
@@ -399,6 +402,7 @@ public class CliTest {
         Cli<BrooklynCommand> cli = buildCli();
         BrooklynCommand command = cli.parse("launch", "--noConsole", "--app", "example-app-app-location.yaml");
         submitCommandAndAssertRunnableSucceeds(command, new Runnable() {
+                @Override
                 public void run() {
                     assertTrue(exampleEntityRunning);
                     assertTrue(Iterables.getOnlyElement(exampleEntity.getApplication().getLocations()).getDisplayName().equals("appLocalhost"));
@@ -411,6 +415,7 @@ public class CliTest {
         Cli<BrooklynCommand> cli = buildCli();
         BrooklynCommand command = cli.parse("launch", "--noConsole", "--app", "example-app-app-location.yaml", "--location", "localhost");
         submitCommandAndAssertRunnableSucceeds(command, new Runnable() {
+                @Override
                 public void run() {
                     assertTrue(exampleEntityRunning);
                     assertTrue(Iterables.getFirst(exampleEntity.getApplication().getLocations(), null).getDisplayName().equals("appLocalhost"));
@@ -443,6 +448,7 @@ public class CliTest {
         Cli<BrooklynCommand> cli = buildCli();
         BrooklynCommand command = cli.parse("launch", "--noConsole", "--catalogAdd", Joiner.on(",").join(bomFiles));
         submitCommandAndAssertFunctionSucceeds(command, new Function<ManagementContext, Void>() {
+                @Override
                 public Void apply(ManagementContext mgmt) {
                     assertMgmtStartedEventually(mgmt);
                     for (String itemName : itemSymbolicNames) {
@@ -453,6 +459,7 @@ public class CliTest {
                 }
                 private void assertMgmtStartedEventually(final ManagementContext mgmt) {
                     Asserts.succeedsEventually(new Runnable() {
+                        @Override
                         public void run() {
                             assertTrue(mgmt.isStartupComplete());
                         }});
@@ -606,6 +613,7 @@ public class CliTest {
         
         final AtomicReference<Exception> exception = new AtomicReference<Exception>();
         Thread t= new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     command.call();
@@ -644,6 +652,7 @@ public class CliTest {
 
     void submitCommandAndAssertRunnableSucceeds(final BrooklynCommand command, final Runnable runnable) {
         submitCommandAndAssertFunctionSucceeds(command, new Function<ManagementContext, Void>() {
+            @Override
             public Void apply(ManagementContext mgmt) {
                 runnable.run();
                 return null;
@@ -660,6 +669,7 @@ public class CliTest {
         }
         try {
             executor.submit(new Callable<Void>() {
+                @Override
                 public Void call() throws Exception {
                     try {
                         LOG.info("Calling command: "+command);
@@ -672,6 +682,7 @@ public class CliTest {
                 }});
     
             Runnable functionWrapper = new Runnable() {
+                @Override
                 public void run() {
                     function.apply(mgmt.get());
                 }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
index e9a116f..128f909 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
@@ -103,6 +103,7 @@ public class BrooklynNodeImpl extends SoftwareProcessImpl implements BrooklynNod
             this.unmanageEntity = unmanageEntity;
         }
 
+        @Override
         public void run() {
             if (latchTask != null) {
                 latchTask.blockUntilEnded();
@@ -180,7 +181,7 @@ public class BrooklynNodeImpl extends SoftwareProcessImpl implements BrooklynNod
         super.preRestart();
         //restart will kill the process, try to shut down before that
         shutdownGracefully();
-        DynamicTasks.queue("pre-restart", new Runnable() { public void run() {
+        DynamicTasks.queue("pre-restart", new Runnable() { @Override public void run() {
             //set by shutdown - clear it so the entity starts cleanly. Does the indicator bring any value at all?
             ServiceNotUpLogic.clearNotUpIndicator(BrooklynNodeImpl.this, SHUTDOWN.getName());
         }});

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java
index 96d6c07..7d73891 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefAttributeFeed.java
@@ -221,6 +221,7 @@ public class ChefAttributeFeed extends AbstractFeed {
         knifeTaskFactory = new KnifeNodeAttributeQueryTaskFactory(nodeName);
         
         final Callable<SshPollValue> getAttributesFromKnife = new Callable<SshPollValue>() {
+            @Override
             public SshPollValue call() throws Exception {
                 ProcessTaskWrapper<String> taskWrapper = knifeTaskFactory.newTask();
                 final ExecutionContext executionContext = ((EntityInternal) entity).getExecutionContext();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java
index ac12f00..e2edcb2 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java
@@ -58,6 +58,7 @@ public class ChefTasks {
     public static TaskFactory<?> installCookbooks(final String chefDirectory, final Map<String,String> cookbooksAndUrls, final boolean force) {
         return Tasks.<Void>builder().displayName("install "+(cookbooksAndUrls==null ? "0" : cookbooksAndUrls.size())+" cookbook"+Strings.s(cookbooksAndUrls)).body(
                 new Runnable() {
+                    @Override
                     public void run() {
                         Entity e = EffectorTasks.findEntity();
                         if (cookbooksAndUrls==null)

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeTaskFactory.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeTaskFactory.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeTaskFactory.java
index 5d1af9d..2623a19 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeTaskFactory.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeTaskFactory.java
@@ -83,6 +83,7 @@ public class KnifeTaskFactory<RET> extends SystemProcessTaskFactory<KnifeTaskFac
     protected void insertKnifeCompletionListenerIntoCompletionListenersList(List<Function<ProcessTaskWrapper<?>, Void>> listeners) {
         // give a nice warning if chef/knife not set up correctly
         Function<ProcessTaskWrapper<?>, Void> propagateIfKnifeConfigFileMissing = new Function<ProcessTaskWrapper<?>, Void>() {
+            @Override
             public Void apply(@Nullable ProcessTaskWrapper<?> input) {
                 if (input.getExitCode()!=0 && input.getStderr().indexOf("WARNING: No knife configuration file found")>=0) {
                     String myConfig = knifeConfigFileOption();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index 276db80..6a64c6c 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -83,6 +83,7 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
 
     protected abstract String getLogFileLocation();
 
+    @Override
     public boolean isJmxEnabled() {
         return (entity instanceof UsesJmx) && (entity.getConfig(UsesJmx.USE_JMX));
     }
@@ -124,6 +125,7 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
     public List<String> getJavaOpts() {
         Iterable<String> sysprops = Iterables.transform(getJavaSystemProperties().entrySet(),
                 new Function<Map.Entry<String, ?>, String>() {
+                    @Override
                     public String apply(Map.Entry<String, ?> entry) {
                         String k = entry.getKey();
                         Object v = entry.getValue();
@@ -435,15 +437,16 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
 
     @Override
     public void setup() {
-        DynamicTasks.queue("install java", new Runnable() { public void run() {
-            installJava();
-        }});
+        DynamicTasks.queue("install java", new Runnable() {
+            @Override public void run() { installJava(); }
+        });
 
         // TODO check java version
 
         if (getEntity().getConfig(UsesJava.CHECK_JAVA_HOSTNAME_BUG)) {
-            DynamicTasks.queue("check java hostname bug", new Runnable() { public void run() {
-                checkJavaHostnameBug(); }});
+            DynamicTasks.queue("check java hostname bug", new Runnable() {
+                @Override public void run() { checkJavaHostnameBug(); }
+            });
         }
     }
 
@@ -452,8 +455,9 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
         super.copyRuntimeResources();
 
         if (isJmxEnabled()) {
-            DynamicTasks.queue("install jmx", new Runnable() { public void run() {
-                installJmxSupport(); }});
+            DynamicTasks.queue("install jmx", new Runnable() {
+                @Override public void run() { installJmxSupport(); }
+            });
         }
     }
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppImpl.java
index 21865f3..6f73a4c 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppImpl.java
@@ -52,10 +52,15 @@ public class VanillaJavaAppImpl extends SoftwareProcessImpl implements VanillaJa
         super(properties, parent);
     }
 
+    @Override
     public String getMainClass() { return getConfig(MAIN_CLASS); }
+    @Override
     public List<String> getClasspath() { return getConfig(CLASSPATH); }
+    @Override
     public List<String> getClasspathFiles() { return getAttribute(CLASSPATH_FILES); }
+    @Override
     public Map getJvmDefines() { return getConfig(JVM_DEFINES); }
+    @Override
     public List getJvmXArgs() { return getConfig(JVM_XARGS); }
 
     public void addToClasspath(String url) {
@@ -98,6 +103,7 @@ public class VanillaJavaAppImpl extends SoftwareProcessImpl implements VanillaJa
         return VanillaJavaAppDriver.class;
     }
 
+    @Override
     public String getRunDir() {
         // FIXME Make this an attribute; don't assume it hsa to be ssh? What uses this?
         VanillaJavaAppSshDriver driver = (VanillaJavaAppSshDriver) getDriver();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineInitTasks.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineInitTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineInitTasks.java
index ff540f2..1ded420 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineInitTasks.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineInitTasks.java
@@ -62,6 +62,7 @@ public class MachineInitTasks {
      */
     public Task<Void> stopIptablesAsync(final SshMachineLocation machine) {
         return DynamicTasks.queue("stop iptables", new Runnable() {
+            @Override
             public void run() {
                 stopIptablesImpl(machine);
             }
@@ -99,6 +100,7 @@ public class MachineInitTasks {
      */
     public Task<Void> openIptablesAsync(final Iterable<Integer> inboundPorts, final SshMachineLocation machine) {
         return DynamicTasks.queue("open iptables "+toTruncatedString(inboundPorts, 6), new Runnable() {
+            @Override
             public void run() {
                 openIptablesImpl(inboundPorts, machine);
             }
@@ -142,6 +144,7 @@ public class MachineInitTasks {
      */
     private Task<Void> insertIptablesRules(final List<String> iptablesRules, final String installCommands, final SshMachineLocation machine) {
         return DynamicTasks.queue("insert rules", new Runnable() {
+            @Override
             public void run() {
                 insertIptablesRulesImpl(iptablesRules, installCommands, machine);
             }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java
index 15a482a..67b0eea 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java
@@ -120,88 +120,88 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
             skipStart = entityStarted.or(false);
         }
 
-        DynamicTasks.queue("prepare", new Runnable() { public void run() {
+        DynamicTasks.queue("prepare", new Runnable() { @Override public void run() {
             prepare();
         }});
 
         if (!skipStart) {
-            DynamicTasks.queue("install", new Runnable() { public void run() {
+            DynamicTasks.queue("install", new Runnable() { @Override public void run() {
                 Optional<Boolean> locationInstalled = Optional.fromNullable(getLocation().getConfig(BrooklynConfigKeys.SKIP_ENTITY_INSTALLATION));
                 Optional<Boolean> entityInstalled = Optional.fromNullable(entity.getConfig(BrooklynConfigKeys.SKIP_ENTITY_INSTALLATION));
 
                 boolean skipInstall = locationInstalled.or(entityInstalled).or(false);
                 if (!skipInstall) {
-                    DynamicTasks.queue("copy-pre-install-resources", new Runnable() { public void run() {
+                    DynamicTasks.queue("copy-pre-install-resources", new Runnable() { @Override public void run() {
                         waitForConfigKey(BrooklynConfigKeys.PRE_INSTALL_RESOURCES_LATCH);
                         copyPreInstallResources();
                     }});
 
-                    DynamicTasks.queue("pre-install", new Runnable() { public void run() {
+                    DynamicTasks.queue("pre-install", new Runnable() { @Override public void run() {
                         preInstall();
                     }});
 
-                    DynamicTasks.queue("pre-install-command", new Runnable() { public void run() {
+                    DynamicTasks.queue("pre-install-command", new Runnable() { @Override public void run() {
                         runPreInstallCommand();
                     }});
 
-                    DynamicTasks.queue("setup", new Runnable() { public void run() {
+                    DynamicTasks.queue("setup", new Runnable() { @Override public void run() {
                         waitForConfigKey(BrooklynConfigKeys.SETUP_LATCH);
                         setup();
                     }});
 
-                    DynamicTasks.queue("copy-install-resources", new Runnable() { public void run() {
+                    DynamicTasks.queue("copy-install-resources", new Runnable() { @Override public void run() {
                         waitForConfigKey(BrooklynConfigKeys.INSTALL_RESOURCES_LATCH);
                         copyInstallResources();
                     }});
 
-                    DynamicTasks.queue("install (main)", new Runnable() { public void run() {
+                    DynamicTasks.queue("install (main)", new Runnable() { @Override public void run() {
                         waitForConfigKey(BrooklynConfigKeys.INSTALL_LATCH);
                         install();
                     }});
 
-                    DynamicTasks.queue("post-install-command", new Runnable() { public void run() {
+                    DynamicTasks.queue("post-install-command", new Runnable() { @Override public void run() {
                         runPostInstallCommand();
                     }});
                 }
             }});
 
-            DynamicTasks.queue("customize", new Runnable() { public void run() {
-                DynamicTasks.queue("pre-customize-command", new Runnable() { public void run() {
+            DynamicTasks.queue("customize", new Runnable() { @Override public void run() {
+                DynamicTasks.queue("pre-customize-command", new Runnable() { @Override public void run() {
                     runPreCustomizeCommand();
                 }});
 
-                DynamicTasks.queue("customize (main)", new Runnable() { public void run() {
+                DynamicTasks.queue("customize (main)", new Runnable() { @Override public void run() {
                     waitForConfigKey(BrooklynConfigKeys.CUSTOMIZE_LATCH);
                     customize();
                 }});
 
-                DynamicTasks.queue("post-customize-command", new Runnable() { public void run() {
+                DynamicTasks.queue("post-customize-command", new Runnable() { @Override public void run() {
                     runPostCustomizeCommand();
                 }});
             }});
 
-            DynamicTasks.queue("launch", new Runnable() { public void run() {
-                DynamicTasks.queue("copy-runtime-resources", new Runnable() { public void run() {
+            DynamicTasks.queue("launch", new Runnable() { @Override public void run() {
+                DynamicTasks.queue("copy-runtime-resources", new Runnable() { @Override public void run() {
                     waitForConfigKey(BrooklynConfigKeys.RUNTIME_RESOURCES_LATCH);
                     copyRuntimeResources();
                 }});
 
-                DynamicTasks.queue("pre-launch-command", new Runnable() { public void run() {
+                DynamicTasks.queue("pre-launch-command", new Runnable() { @Override public void run() {
                     runPreLaunchCommand();
                 }});
 
-                DynamicTasks.queue("launch (main)", new Runnable() { public void run() {
+                DynamicTasks.queue("launch (main)", new Runnable() { @Override public void run() {
                     waitForConfigKey(BrooklynConfigKeys.LAUNCH_LATCH);
                     launch();
                 }});
 
-                DynamicTasks.queue("post-launch-command", new Runnable() { public void run() {
+                DynamicTasks.queue("post-launch-command", new Runnable() { @Override public void run() {
                     runPostLaunchCommand();
                 }});
             }});
         }
 
-        DynamicTasks.queue("post-launch", new Runnable() { public void run() {
+        DynamicTasks.queue("post-launch", new Runnable() { @Override public void run() {
             postLaunch();
         }});
     }
@@ -284,6 +284,7 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
     @Override
     public void restart() {
         DynamicTasks.queue("stop (best effort)", new Runnable() {
+            @Override
             public void run() {
                 DynamicTasks.markInessential();
                 boolean previouslyRunning = isRunning();
@@ -306,6 +307,7 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
         });
 
         DynamicTasks.queue("restart", new Runnable() {
+            @Override
             public void run() {
                 try {
                     if (doFullStartOnRestart()) {
@@ -313,17 +315,17 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr
                         ServiceStateLogic.setExpectedState(getEntity(), Lifecycle.STARTING);
                         start();
                     } else {
-                        DynamicTasks.queue("pre-launch-command", new Runnable() { public void run() {
+                        DynamicTasks.queue("pre-launch-command", new Runnable() { @Override public void run() {
                             ServiceStateLogic.setExpectedState(getEntity(), Lifecycle.STARTING);
                             runPreLaunchCommand();
                         }});
-                        DynamicTasks.queue("launch (main)", new Runnable() { public void run() {
+                        DynamicTasks.queue("launch (main)", new Runnable() { @Override public void run() {
                             launch();
                         }});
-                        DynamicTasks.queue("post-launch-command", new Runnable() { public void run() {
+                        DynamicTasks.queue("post-launch-command", new Runnable() { @Override public void run() {
                             runPostLaunchCommand();
                         }});
-                        DynamicTasks.queue("post-launch", new Runnable() { public void run() {
+                        DynamicTasks.queue("post-launch", new Runnable() { @Override public void run() {
                             postLaunch();
                         }});
                     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessSshDriver.java
index 39e1bbc..642326f 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessSshDriver.java
@@ -243,6 +243,7 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP
     /**
      * @deprecated since 0.10.0 This method will become private in a future release.
      */
+    @Override
     @Deprecated
     public int execute(List<String> script, String summaryForLogging) {
         return execute(Maps.newLinkedHashMap(), script, summaryForLogging);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
index 2fa424f..688b1eb 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
@@ -60,7 +60,9 @@ public class SameServerEntityImpl extends AbstractEntity implements SameServerEn
         if (DynamicTasks.getTaskQueuingContext() != null) {
             doRestart(ConfigBag.EMPTY);
         } else {
-            Task<?> task = Tasks.builder().displayName("restart").body(new Runnable() { public void run() { doRestart(ConfigBag.EMPTY); } }).build();
+            Task<?> task = Tasks.builder().displayName("restart").body(new Runnable() {
+                @Override public void run() { doRestart(ConfigBag.EMPTY); }
+            }).build(); 
             Entities.submit(this, task).getUnchecked();
         }
     }
@@ -79,7 +81,9 @@ public class SameServerEntityImpl extends AbstractEntity implements SameServerEn
         if (DynamicTasks.getTaskQueuingContext() != null) {
             doStart(locations);
         } else {
-            Task<?> task = Tasks.builder().displayName("start").body(new Runnable() { public void run() { doStart(locations); } }).build();
+            Task<?> task = Tasks.builder().displayName("start").body(new Runnable() {
+                @Override public void run() { doStart(locations); }
+            }).build();
             Entities.submit(this, task).getUnchecked();
         }
     }
@@ -94,7 +98,9 @@ public class SameServerEntityImpl extends AbstractEntity implements SameServerEn
         if (DynamicTasks.getTaskQueuingContext() != null) {
             doStop();
         } else {
-            Task<?> task = Tasks.builder().displayName("stop").body(new Runnable() { public void run() { doStop(); } }).build();
+            Task<?> task = Tasks.builder().displayName("stop").body(new Runnable() {
+                @Override public void run() { doStop(); }
+            }).build();
             Entities.submit(this, task).getUnchecked();
         }
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriver.java
index e02c7e2..c965de8 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriver.java
@@ -37,6 +37,7 @@ public interface SoftwareProcessDriver extends EntityDriver {
     /**
      * The entity whose components we are controlling.
      */
+    @Override
     EntityLocal getEntity();
 
     /**

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
index 6f88f6c..78081e7 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
@@ -306,6 +306,7 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements Soft
                         .suppressDuplicates(true)
                         .onException(Functions.constant(Boolean.FALSE))
                         .callable(new Callable<Boolean>() {
+                            @Override
                             public Boolean call() {
                                 return getDriver().isRunning();
                             }
@@ -613,7 +614,9 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements Soft
         if (DynamicTasks.getTaskQueuingContext() != null) {
             getLifecycleEffectorTasks().start(locations);
         } else {
-            Task<?> task = Tasks.builder().displayName("start (sequential)").body(new Runnable() { public void run() { getLifecycleEffectorTasks().start(locations); } }).build();
+            Task<?> task = Tasks.builder().displayName("start (sequential)").body(new Runnable() {
+                @Override public void run() { getLifecycleEffectorTasks().start(locations); }
+            }).build();
             Entities.submit(this, task).getUnchecked();
         }
     }
@@ -635,7 +638,9 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements Soft
         if (DynamicTasks.getTaskQueuingContext() != null) {
             getLifecycleEffectorTasks().stop(ConfigBag.EMPTY);
         } else {
-            Task<?> task = Tasks.builder().displayName("stop").body(new Runnable() { public void run() { getLifecycleEffectorTasks().stop(ConfigBag.EMPTY); } }).build();
+            Task<?> task = Tasks.builder().displayName("stop").body(new Runnable() {
+                @Override public void run() { getLifecycleEffectorTasks().stop(ConfigBag.EMPTY); }
+            }).build();
             Entities.submit(this, task).getUnchecked();
         }
     }
@@ -649,7 +654,9 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements Soft
         if (DynamicTasks.getTaskQueuingContext() != null) {
             getLifecycleEffectorTasks().restart(ConfigBag.EMPTY);
         } else {
-            Task<?> task = Tasks.builder().displayName("restart").body(new Runnable() { public void run() { getLifecycleEffectorTasks().restart(ConfigBag.EMPTY); } }).build();
+            Task<?> task = Tasks.builder().displayName("restart").body(new Runnable() {
+                @Override public void run() { getLifecycleEffectorTasks().restart(ConfigBag.EMPTY); }
+            }).build();
             Entities.submit(this, task).getUnchecked();
         }
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java
index dcd1dde..da69a2a 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java
@@ -394,6 +394,7 @@ public abstract class MachineLifecycleEffectorTasks {
             this.location = location;
         }
 
+        @Override
         public MachineLocation call() throws Exception {
             // Blocks if a latch was configured.
             entity().getConfig(BrooklynConfigKeys.PROVISION_LATCH);
@@ -439,6 +440,7 @@ public abstract class MachineLifecycleEffectorTasks {
             this.location = location;
         }
 
+        @Override
         public MachineLocation call() throws NoMachinesAvailableException {
             return location.obtain(flags);
         }
@@ -454,6 +456,7 @@ public abstract class MachineLifecycleEffectorTasks {
         private PreStartTask(MachineLocation machine) {
             this.machine = machine;
         }
+        @Override
         public void run() {
             log.info("Starting {} on machine {}", entity(), machine);
             Collection<Location> oldLocs = entity().getLocations();
@@ -608,6 +611,7 @@ public abstract class MachineLifecycleEffectorTasks {
     }
 
     private class PostStartTask implements Runnable {
+        @Override
         public void run() {
             postStartCustom();
         }
@@ -858,18 +862,21 @@ public abstract class MachineLifecycleEffectorTasks {
     }
 
     private class StopAnyProvisionedMachinesTask implements Callable<StopMachineDetails<Integer>> {
+        @Override
         public StopMachineDetails<Integer> call() {
             return stopAnyProvisionedMachines();
         }
     }
 
     private class SuspendAnyProvisionedMachinesTask implements Callable<StopMachineDetails<Integer>> {
+        @Override
         public StopMachineDetails<Integer> call() {
             return suspendAnyProvisionedMachines();
         }
     }
 
     private class StopProcessesAtMachineTask implements Callable<String> {
+        @Override
         public String call() {
             DynamicTasks.markInessential();
             stopProcessesAtMachine();
@@ -879,6 +886,7 @@ public abstract class MachineLifecycleEffectorTasks {
     }
 
     private class StopFeedsAtMachineTask implements Callable<String> {
+        @Override
         public String call() {
             DynamicTasks.markInessential();
             for (Feed feed : entity().feeds().getFeeds()) {
@@ -890,6 +898,7 @@ public abstract class MachineLifecycleEffectorTasks {
     }
 
     private class StopMachineTask implements Callable<String> {
+        @Override
         public String call() {
             DynamicTasks.markInessential();
             stop(ConfigBag.newInstance().configure(StopSoftwareParameters.STOP_MACHINE_MODE, StopMode.IF_NOT_STOPPED));
@@ -899,6 +908,7 @@ public abstract class MachineLifecycleEffectorTasks {
     }
 
     private class PreStopCustomTask implements Callable<String> {
+        @Override
         public String call() {
             if (entity().getAttribute(SoftwareProcess.SERVICE_STATE_ACTUAL) == Lifecycle.STOPPED) {
                 log.debug("Skipping stop of entity " + entity() + " when already stopped");
@@ -912,6 +922,7 @@ public abstract class MachineLifecycleEffectorTasks {
     }
 
     private class PostStopCustomTask implements Callable<Void> {
+        @Override
         public Void call() {
             postStopCustom();
             return null;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
index 3dee3a3..e7aa1f0 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java
@@ -189,11 +189,13 @@ public class ScriptHelper {
     }
 
     protected Runnable mutexAcquire = new Runnable() {
+        @Override
         public void run() {
         }
     };
 
     protected Runnable mutexRelease = new Runnable() {
+        @Override
         public void run() {
         }
     };
@@ -206,6 +208,7 @@ public class ScriptHelper {
      */
     public ScriptHelper useMutex(final WithMutexes mutexSupport, final String mutexId, final String description) {
         mutexAcquire = new Runnable() {
+            @Override
             public void run() {
                 try {
                     mutexSupport.acquireMutex(mutexId, description);
@@ -216,6 +219,7 @@ public class ScriptHelper {
         };
 
         mutexRelease = new Runnable() {
+            @Override
             public void run() {
                 mutexSupport.releaseMutex(mutexId);
             }
@@ -283,6 +287,7 @@ public class ScriptHelper {
         if (task!=null) throw new IllegalStateException("task can only be generated once");
         TaskBuilder<Integer> tb = Tasks.<Integer>builder().displayName("ssh: "+summary).body(
                 new Callable<Integer>() {
+                    @Override
                     public Integer call() throws Exception {
                         return executeInternal();
                     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java
index 1bdd097..be23ca7 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/WinRmExecuteHelper.java
@@ -97,6 +97,7 @@ public class WinRmExecuteHelper {
         if (task!=null) throw new IllegalStateException("task can only be generated once");
         TaskBuilder<Integer> tb = Tasks.<Integer>builder().displayName("winrm: "+summary).body(
                 new Callable<Integer>() {
+                    @Override
                     public Integer call() throws Exception {
                         return executeInternal();
                     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
index 6c9cb49..166036e 100644
--- a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
+++ b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
@@ -266,7 +266,7 @@ public class JmxFeed extends AbstractFeed {
         final SetMultimap<String, JmxAttributePollConfig<?>> attributePolls = getConfig(ATTRIBUTE_POLLS);
         
         getPoller().submit(new Callable<Void>() {
-               public Void call() {
+               @Override public Void call() {
                    getHelper().connect(getConfig(JMX_CONNECTION_TIMEOUT));
                    return null;
                }
@@ -275,7 +275,7 @@ public class JmxFeed extends AbstractFeed {
         
         for (final NotificationFilter filter : notificationSubscriptions.keySet()) {
             getPoller().submit(new Callable<Void>() {
-                public Void call() {
+                @Override public Void call() {
                     // TODO Could config.getObjectName have wildcards? Is this code safe?
                     Set<JmxNotificationSubscriptionConfig<?>> configs = notificationSubscriptions.get(filter);
                     NotificationListener listener = registerNotificationListener(configs);
@@ -335,6 +335,7 @@ public class JmxFeed extends AbstractFeed {
         
         getPoller().scheduleAtFixedRate(
                 new Callable<Object>() {
+                    @Override
                     public Object call() throws Exception {
                         if (log.isDebugEnabled()) log.debug("jmx operation polling for {} sensors at {} -> {}", new Object[] {getEntity(), getJmxUri(), operationName});
                         if (signature.size() == params.size()) {
@@ -365,6 +366,7 @@ public class JmxFeed extends AbstractFeed {
         // TODO Not good calling this holding the synchronization lock
         getPoller().scheduleAtFixedRate(
                 new Callable<Object>() {
+                    @Override
                     public Object call() throws Exception {
                         if (log.isTraceEnabled()) log.trace("jmx attribute polling for {} sensors at {} -> {}", new Object[] {getEntity(), getJmxUri(), jmxAttributeName});
                         return getHelper().getAttribute(objectName, jmxAttributeName);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxHelper.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxHelper.java b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxHelper.java
index d29dee0..5a6372b 100644
--- a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxHelper.java
+++ b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxHelper.java
@@ -520,6 +520,7 @@ public class JmxHelper {
     
     public Set<ObjectInstance> findMBeans(final ObjectName objectName) {
         return invokeWithReconnect(new Callable<Set<ObjectInstance>>() {
+                @Override
                 public Set<ObjectInstance> call() throws Exception {
                     return getConnectionOrFail().queryMBeans(objectName, null);
                 }});
@@ -583,6 +584,7 @@ public class JmxHelper {
                     .limitTimeTo(timeout, timeUnit)
                     .every(500, TimeUnit.MILLISECONDS)
                     .until(new Callable<Boolean>() {
+                            @Override
                             public Boolean call() {
                                 connect(timeoutMillis);
                                 beans.set(findMBeans(objectName));
@@ -623,6 +625,7 @@ public class JmxHelper {
         
         if (realObjectName != null) {
             Object result = invokeWithReconnect(new Callable<Object>() {
+                    @Override
                     public Object call() throws Exception {
                         return getConnectionOrFail().getAttribute(realObjectName, attribute);
                     }});
@@ -643,6 +646,7 @@ public class JmxHelper {
         
         if (realObjectName != null) {
             invokeWithReconnect(new Callable<Void>() {
+                    @Override
                     public Void call() throws Exception {
                         getConnectionOrFail().setAttribute(realObjectName, new javax.management.Attribute(attribute, val));
                         return null;
@@ -670,6 +674,7 @@ public class JmxHelper {
         }
         
         Object result = invokeWithReconnect(new Callable<Object>() {
+                @Override
                 public Object call() throws Exception {
                     return getConnectionOrFail().invoke(realObjectName, method, arguments, signature);
                 }});
@@ -693,6 +698,7 @@ public class JmxHelper {
     
     public void addNotificationListener(final ObjectName objectName, final NotificationListener listener, final NotificationFilter filter) {
         invokeWithReconnect(new Callable<Void>() {
+                @Override
                 public Void call() throws Exception {
                     getConnectionOrFail().addNotificationListener(objectName, listener, filter, null);
                     return null;
@@ -709,6 +715,7 @@ public class JmxHelper {
     
     public void removeNotificationListener(final ObjectName objectName, final NotificationListener listener, final NotificationFilter filter) {
         if (isConnected()) invokeWithReconnect(new Callable<Void>() {
+                @Override
                 public Void call() throws Exception {
                     getConnectionOrFail().removeNotificationListener(objectName, listener, filter, null);
                     return null;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java
index 7e67ee0..70d3166 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java
@@ -177,6 +177,7 @@ public abstract class AbstractEc2LiveTest extends BrooklynAppLiveTestSupport {
     
     protected void assertViaSshLocalPortListeningEventually(final SoftwareProcess server, final int port) {
         Asserts.succeedsEventually(ImmutableMap.of("timeout", Duration.FIVE_MINUTES), new Runnable() {
+            @Override
             public void run() {
                 assertExecSsh(server, ImmutableList.of("netstat -antp", "netstat -antp | grep LISTEN | grep "+port));
             }});
@@ -184,6 +185,7 @@ public abstract class AbstractEc2LiveTest extends BrooklynAppLiveTestSupport {
     
     protected void assertViaSshLocalUrlListeningEventually(final SoftwareProcess server, final String url) {
         Asserts.succeedsEventually(ImmutableMap.of("timeout", Duration.FIVE_MINUTES), new Runnable() {
+            @Override
             public void run() {
                 assertExecSsh(server, ImmutableList.of(BashCommands.installPackage("curl"), "netstat -antp", "curl -k --retry 3 "+url));
             }});

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/java/EntityPollingTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/java/EntityPollingTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/java/EntityPollingTest.java
index c897c26..2330bd9 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/java/EntityPollingTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/java/EntityPollingTest.java
@@ -156,6 +156,7 @@ public class EntityPollingTest {
     public void testEntityWithDelayedJmxStartupWillKeepRetrying() {
         // In 2 seconds time, we'll start the JMX server
         Thread t = new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     Thread.sleep(2000);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java
index d39ed94..047e569 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java
@@ -78,6 +78,7 @@ public class JavaSoftwareProcessSshDriverIntegrationTest extends BrooklynAppLive
         final MyEntity entity = app.createAndManageChild(EntitySpec.create(MyEntity.class));
         app.start(ImmutableList.of(localhost));
         Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() {
+            @Override
             public void run() {
                 assertTrue(entity.getAttribute(SoftwareProcess.SERVICE_UP));
             }});
@@ -135,6 +136,7 @@ public class JavaSoftwareProcessSshDriverIntegrationTest extends BrooklynAppLive
         final MyEntity entity = app.createAndManageChild(EntitySpec.create(MyEntity.class));
         app.start(ImmutableList.of(localhost));
         Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() {
+            @Override
             public void run() {
                 assertTrue(entity.getAttribute(SoftwareProcess.SERVICE_UP));
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java
index 5533d19..58e13a2 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/java/VanillaJavaAppTest.java
@@ -146,6 +146,7 @@ public class VanillaJavaAppTest {
         
         // Memory MXBean
         Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() {
+            @Override
             public void run() {
                 assertNotNull(javaProcess.getAttribute(VanillaJavaApp.NON_HEAP_MEMORY_USAGE));
                 long init = javaProcess.getAttribute(VanillaJavaApp.INIT_HEAP_MEMORY);
@@ -164,6 +165,7 @@ public class VanillaJavaAppTest {
         
         // Threads MX Bean
         Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new Runnable() {
+            @Override
             public void run() {
                 long current = javaProcess.getAttribute(VanillaJavaApp.CURRENT_THREAD_COUNT);
                 long peak = javaProcess.getAttribute(VanillaJavaApp.PEAK_THREAD_COUNT);
@@ -175,6 +177,7 @@ public class VanillaJavaAppTest {
 
         // Runtime MX Bean
         Asserts.succeedsEventually(MutableMap.of("timeout", LONG_TIMEOUT_MS), new Runnable() {
+            @Override
             public void run() {
                 assertNotNull(javaProcess.getAttribute(VanillaJavaApp.START_TIME));
                 assertNotNull(javaProcess.getAttribute(VanillaJavaApp.UP_TIME));
@@ -182,6 +185,7 @@ public class VanillaJavaAppTest {
         
         // Operating System MX Bean
         Asserts.succeedsEventually(MutableMap.of("timeout", LONG_TIMEOUT_MS), new Runnable() {
+            @Override
             public void run() {
                 assertNotNull(javaProcess.getAttribute(VanillaJavaApp.PROCESS_CPU_TIME));
                 assertNotNull(javaProcess.getAttribute(VanillaJavaApp.SYSTEM_LOAD_AVERAGE));
@@ -205,6 +209,7 @@ public class VanillaJavaAppTest {
         
         final List<Double> fractions = new CopyOnWriteArrayList<Double>();
         app.getManagementContext().getSubscriptionManager().subscribe(javaProcess, VanillaJavaApp.PROCESS_CPU_TIME_FRACTION_LAST, new SensorEventListener<Double>() {
+                @Override
                 public void onEvent(SensorEvent<Double> event) {
                     fractions.add(event.getValue());
                 }});
@@ -213,8 +218,10 @@ public class VanillaJavaAppTest {
         // Expect load to be in the right order of magnitude (to ensure we haven't got a decimal point in the wrong place etc);
         // But with multi-core could get big number; and on jenkins@releng3 we once saw [11.9, 0.6, 0.5]!
         Asserts.succeedsEventually(new Runnable() {
+            @Override
             public void run() {
                 Iterable<Double> nonTrivialFractions = Iterables.filter(fractions, new Predicate<Double>() {
+                        @Override
                         public boolean apply(Double input) {
                             return input > 0.01;
                         }});
@@ -222,12 +229,14 @@ public class VanillaJavaAppTest {
             }});
 
         Iterable<Double> tooBigFractions = Iterables.filter(fractions, new Predicate<Double>() {
+                @Override
                 public boolean apply(Double input) {
                     return input > 50;
                 }});
         assertTrue(Iterables.isEmpty(tooBigFractions), "fractions="+fractions); 
         
         Iterable<Double> ballparkRightFractions = Iterables.filter(fractions, new Predicate<Double>() {
+                @Override
                 public boolean apply(Double input) {
                     return input > 0.01 && input < 4;
                 }});
@@ -272,6 +281,7 @@ public class VanillaJavaAppTest {
         
         // bad cert fails
         Asserts.assertFails(new Callable<Void>() {
+            @Override
             public Void call() throws Exception {
                 new AsserterForJmxConnection(javaProcess)
                         .customizeSocketFactory(null, new FluentKeySigner("cheater").newCertificateFor("jmx-access-key", SecureKeys.newKeyPair()))
@@ -281,6 +291,7 @@ public class VanillaJavaAppTest {
 
         // bad key fails
         Asserts.assertFails(new Callable<Void>() {
+            @Override
             public Void call() throws Exception {
                 new AsserterForJmxConnection(javaProcess)
                         .customizeSocketFactory(SecureKeys.newKeyPair().getPrivate(), null)
@@ -290,6 +301,7 @@ public class VanillaJavaAppTest {
         
         // bad profile fails
         Asserts.assertFails(new Callable<Void>() {
+            @Override
             public Void call() throws Exception {
                 AsserterForJmxConnection asserter = new AsserterForJmxConnection(javaProcess);
                 asserter.putEnv("jmx.remote.profiles", JmxmpAgent.TLS_JMX_REMOTE_PROFILES);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityFeedRebindTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityFeedRebindTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityFeedRebindTest.java
index 960c244..b3253d6 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityFeedRebindTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityFeedRebindTest.java
@@ -201,6 +201,7 @@ public class SoftwareProcessEntityFeedRebindTest extends RebindTestFixtureWithAp
                             .suppressDuplicates(true)
                             .onException(Functions.constant(-1))
                             .callable(new Callable<Integer>() {
+                                @Override
                                 public Integer call() {
                                     if (!Entities.isManaged(MyServiceWithFeedsImpl.this)) {
                                         feedCalledWhenNotManaged = true;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartJcloudsLiveTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartJcloudsLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartJcloudsLiveTest.java
index 9515feb..4cfc06c 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartJcloudsLiveTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartJcloudsLiveTest.java
@@ -136,6 +136,7 @@ public class SoftwareProcessStopsDuringStartJcloudsLiveTest extends BrooklynAppL
                 .configure(BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION, true));
         
         executeInLimitedTime(new Callable<Void>() {
+            @Override
             public Void call() {
                 app.start(ImmutableList.of(loc));
                 return null;
@@ -146,6 +147,7 @@ public class SoftwareProcessStopsDuringStartJcloudsLiveTest extends BrooklynAppL
         assertEquals(entity.getAttribute(MachineLifecycleEffectorTasks.INTERNAL_PROVISIONED_MACHINE), Machines.findUniqueMachineLocation(entity.getLocations(), SshMachineLocation.class).get());
 
         executeInLimitedTime(new Callable<Void>() {
+            @Override
             public Void call() {
                 Entities.destroy(app);
                 return null;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java
index 095da91..46253c0 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java
@@ -142,6 +142,7 @@ public class SoftwareProcessStopsDuringStartTest extends BrooklynAppUnitTestSupp
     @Test
     public void testStopDuringProvisionWaitsForCompletion() throws Exception {
         Future<?> startFuture = executor.submit(new Runnable() {
+            @Override
             public void run() {
                 entity.start(ImmutableList.<Location>of(loc));
             }});
@@ -157,6 +158,7 @@ public class SoftwareProcessStopsDuringStartTest extends BrooklynAppUnitTestSupp
         watcher.start();
         try {
             stopFuture = executor.submit(new Runnable() {
+                @Override
                 public void run() {
                     entity.stop();
                 }});
@@ -189,6 +191,7 @@ public class SoftwareProcessStopsDuringStartTest extends BrooklynAppUnitTestSupp
                 .configure(MachineLifecycleEffectorTasks.STOP_WAIT_PROVISIONING_TIMEOUT, Duration.millis(100)));
 
         executor.submit(new Runnable() {
+            @Override
             public void run() {
                 entity.start(ImmutableList.<Location>of(loc));
             }});
@@ -218,6 +221,7 @@ public class SoftwareProcessStopsDuringStartTest extends BrooklynAppUnitTestSupp
         loc.setObtainToFail(0);
         
         executor.submit(new Runnable() {
+            @Override
             public void run() {
                 entity.start(ImmutableList.<Location>of(loc));
             }});
@@ -233,6 +237,7 @@ public class SoftwareProcessStopsDuringStartTest extends BrooklynAppUnitTestSupp
         watcher.start();
         try {
             stopFuture = executor.submit(new Runnable() {
+                @Override
                 public void run() {
                     entity.stop();
                 }});

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/NaiveScriptRunnerTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/NaiveScriptRunnerTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/NaiveScriptRunnerTest.java
index e1f801b..ce91735 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/NaiveScriptRunnerTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/NaiveScriptRunnerTest.java
@@ -197,6 +197,7 @@ public class NaiveScriptRunnerTest {
                 body.append("echo `echo foo``echo bar`", "grep absent-text badfile_which_does_not_exist_blaahblahasdewq").
                 gatherOutput();
         Task<Integer> submitter = Tasks.<Integer>builder().body(new Callable<Integer>() {
+            @Override
             public Integer call() {
                 int result = script.execute();
                 return result;
@@ -209,6 +210,7 @@ public class NaiveScriptRunnerTest {
             ec.submit(submitter);
             // soon there should be a task which is submitted
             Assert.assertTrue(Repeater.create("get script").every(Duration.millis(10)).limitTimeTo(Duration.FIVE_SECONDS).until(new Callable<Boolean>() {
+                @Override
                 public Boolean call() { 
                     return (script.peekTask() != null) && Tasks.isQueuedOrSubmitted(script.peekTask());
                 }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperTest.java
index 7a0ddf0..3ce1e30 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelperTest.java
@@ -110,6 +110,7 @@ public class ScriptHelperTest extends BrooklynAppUnitTestSupport {
                 .poll(new FunctionPollConfig<Boolean, Boolean>(SERVICE_PROCESS_IS_RUNNING)
                     .onException(Functions.constant(Boolean.FALSE))
                     .callable(new Callable<Boolean>() {
+                        @Override
                         public Boolean call() {
                             return getDriver().isRunning();
                         }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
index 2bf65a9..f18ccd6 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/lifecycle/StartStopSshDriverTest.java
@@ -61,6 +61,7 @@ public class StartStopSshDriverTest {
         public BasicStartStopSshDriver(EntityLocal entity, SshMachineLocation machine) {
             super(entity, machine);
         }
+        @Override
         public boolean isRunning() { return true; }
         @Override
         public void stop() {}

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkingEffectorsLiveTests.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkingEffectorsLiveTests.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkingEffectorsLiveTests.java
index de0c324..704f9ed 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkingEffectorsLiveTests.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkingEffectorsLiveTests.java
@@ -106,6 +106,7 @@ public abstract class NetworkingEffectorsLiveTests extends BrooklynAppLiveTestSu
 
     protected Predicate<SecurityGroup> ruleExistsPredicate(final int fromPort, final int toPort, final IpProtocol ipProtocol) {
         return new Predicate<SecurityGroup>() {
+            @Override
             public boolean apply(SecurityGroup scipPermission) {
                 for (IpPermission ipPermission : scipPermission.getIpPermissions()) {
                     if (ipPermission.getFromPort() == fromPort && ipPermission.getToPort() == toPort && ipPermission.getIpProtocol() == ipProtocol) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/autoscaling/AutoScalerPolicyNoMoreMachinesTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/autoscaling/AutoScalerPolicyNoMoreMachinesTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/autoscaling/AutoScalerPolicyNoMoreMachinesTest.java
index 82d1347..b7186e7 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/autoscaling/AutoScalerPolicyNoMoreMachinesTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/autoscaling/AutoScalerPolicyNoMoreMachinesTest.java
@@ -199,6 +199,7 @@ public class AutoScalerPolicyNoMoreMachinesTest extends BrooklynAppUnitTestSuppo
     
     protected void assertSizeEventually(final int targetSize, final int quarantineSize, final int deletedSize) {
         Asserts.succeedsEventually(new Runnable() {
+            @Override
             public void run() {
                 assertSize(targetSize, quarantineSize);
                 assertEquals(entitiesRemoved.size(), deletedSize, "removed="+entitiesRemoved);
@@ -207,6 +208,7 @@ public class AutoScalerPolicyNoMoreMachinesTest extends BrooklynAppUnitTestSuppo
     
     protected void assertSizeContinually(final int targetSize, final int quarantineSize, final int deletedSize) {
         Asserts.succeedsContinually(ImmutableMap.of("timeout", SHORT_WAIT_MS), new Runnable() {
+            @Override
             public void run() {
                 assertSize(targetSize, quarantineSize);
                 assertEquals(entitiesRemoved.size(), deletedSize, "removed="+entitiesRemoved);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/jmx/GeneralisedDynamicMBean.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/jmx/GeneralisedDynamicMBean.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/jmx/GeneralisedDynamicMBean.java
index 9c6c551..7d4510e 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/jmx/GeneralisedDynamicMBean.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/jmx/GeneralisedDynamicMBean.java
@@ -72,6 +72,7 @@ public class GeneralisedDynamicMBean implements DynamicMBean {
         });
         
         Iterable<MBeanOperationInfo> opInfo = Iterables.transform(initialOperations.keySet(), new Function<Object, MBeanOperationInfo>() {
+            @Override
             public MBeanOperationInfo apply(Object it) {
                 if (it instanceof MBeanOperationInfo) {
                     return (MBeanOperationInfo) it;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java
index bf22419..58fe006 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/location/WinRmMachineLocationLiveTest.java
@@ -526,6 +526,7 @@ public class WinRmMachineLocationLiveTest {
         for (int i = 0; i < NUM_RUNS; i++) {
             for (final Method method : methodsToRun) {
                 results.add(executor.submit(new Callable<Void>() {
+                    @Override
                     public Void call() throws Exception {
                         LOG.info("Executing "+method.getName()+" in thread "+Thread.currentThread());
                         Stopwatch stopwatch = Stopwatch.createStarted();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java
index e4907e0..8a7ce53 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityBuilder.java
@@ -101,6 +101,7 @@ public class DynamicToyMySqlEntityBuilder {
     }
 
     public static class MySqlEntityInitializer implements EntityInitializer {
+        @Override
         public void apply(final EntityLocal entity) {
           new MachineLifecycleEffectorTasks() {
             @Override


Mime
View raw message