brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjcorb...@apache.org
Subject [02/17] brooklyn-server git commit: Add missing @Override annotations
Date Mon, 23 Jan 2017 15:14:30 GMT
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java b/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
index 6d58be0a..ae61d0a 100644
--- a/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
@@ -48,6 +48,7 @@ public class BasicEnricherTest extends BrooklynAppUnitTestSupport {
     // TODO These tests are a copy of BasicPolicyTest, which is a code smell.
     // However, the src/main/java code does not contain as much duplication.
 
+    @Override
     protected void setUpApp() {
         EntitySpec<TestApplication> appSpec = EntitySpec.create(TestApplication.class, TestApplicationNoEnrichersImpl.class)
                 .configure(BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION, shouldSkipOnBoxBaseDirResolution());

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
index c4b288c..f333b43 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
@@ -27,46 +27,57 @@ public class ApplicationLifecycleStateStressTest extends ApplicationLifecycleSta
     // invocationCount defined on this class, rather than the simple `@Test` annotation on 
     // the super-class (without redefining all the public methods here!)?
     
+    @Override
     public void testHappyPathEmptyApp() throws Exception {
         super.testHappyPathEmptyApp();
     }
     
+    @Override
     public void testHappyPathWithChild() throws Exception {
         super.testHappyPathWithChild();
     }
     
+    @Override
     public void testOnlyChildFailsToStartCausesAppToFail() throws Exception {
         super.testOnlyChildFailsToStartCausesAppToFail();
     }
     
+    @Override
     public void testSomeChildFailsOnStartCausesAppToFail() throws Exception {
         super.testSomeChildFailsOnStartCausesAppToFail();
     }
     
+    @Override
     public void testOnlyChildFailsToStartThenRecoversCausesAppToRecover() throws Exception {
         super.testOnlyChildFailsToStartThenRecoversCausesAppToRecover();
     }
     
+    @Override
     public void testSomeChildFailsToStartThenRecoversCausesAppToRecover() throws Exception {
         super.testSomeChildFailsToStartThenRecoversCausesAppToRecover();
     }
     
+    @Override
     public void testStartsThenOnlyChildFailsCausesAppToFail() throws Exception {
         super.testStartsThenOnlyChildFailsCausesAppToFail();
     }
 
+    @Override
     public void testStartsThenSomeChildFailsCausesAppToFail() throws Exception {
         super.testStartsThenSomeChildFailsCausesAppToFail();
     }
 
+    @Override
     public void testChildFailuresOnStartButWithQuorumCausesAppToSucceed() throws Exception {
         super.testChildFailuresOnStartButWithQuorumCausesAppToSucceed();
     }
     
+    @Override
     public void testStartsThenChildFailsButWithQuorumCausesAppToSucceed() throws Exception {
         super.testStartsThenChildFailsButWithQuorumCausesAppToSucceed();
     }
 
+    @Override
     public void testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy() throws Exception {
         super.testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy();
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
index 84c7eef..3d67337 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
@@ -59,6 +59,7 @@ public class EntityAutomanagedTest extends BrooklynAppUnitTestSupport {
     
     protected RecordingCollectionChangeListener listener;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 9dde21a..22175de 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
@@ -118,6 +118,7 @@ public class PollerTest extends BrooklynAppUnitTestSupport {
     }
 
     private static class TaskFailer extends ThrowingPoller {
+        @Override
         public Boolean execute(final boolean shouldThrow) {
             Task<Boolean> t = Tasks.<Boolean>builder()
                     .body(new Callable<Boolean>() {
@@ -135,6 +136,7 @@ public class PollerTest extends BrooklynAppUnitTestSupport {
     }
 
     private static class PollFailer extends ThrowingPoller {
+        @Override
         public Boolean execute(final boolean shouldThrow) {
             if (shouldThrow) {
                 throw new IllegalArgumentException("exception in poller");

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java b/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
index cf893e4..bc578bd 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
@@ -47,6 +47,7 @@ public class MachinesTest extends BrooklynAppUnitTestSupport {
     protected LocationSpec<LocalhostMachineProvisioningLocation> otherLocSpec;
     protected LocationSpec<LocalhostMachine> localMachineSpec;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/AcmeEntitlementManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/AcmeEntitlementManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/AcmeEntitlementManagerTest.java
index 798a812..ca38191 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/AcmeEntitlementManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/AcmeEntitlementManagerTest.java
@@ -29,6 +29,7 @@ import org.testng.annotations.Test;
 
 public class AcmeEntitlementManagerTest extends AcmeEntitlementManagerTestFixture {
 
+    @Override
     protected void addGlobalConfig() {
         configBag.put(Entitlements.GLOBAL_ENTITLEMENT_MANAGER, AcmeEntitlementManager.class.getName());
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/PerUserEntitlementManagerPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/PerUserEntitlementManagerPropertiesTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/PerUserEntitlementManagerPropertiesTest.java
index 353157d..2d2d6c9 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/PerUserEntitlementManagerPropertiesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/entitlement/PerUserEntitlementManagerPropertiesTest.java
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
 
 public class PerUserEntitlementManagerPropertiesTest extends AcmeEntitlementManagerTestFixture {
 
+    @Override
     protected void addGlobalConfig() throws IOException {
         Properties moreProps = new Properties();
         moreProps.load(new StringReader(

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerFileBasedTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerFileBasedTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerFileBasedTest.java
index 85e0e29..0f62a9b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerFileBasedTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerFileBasedTest.java
@@ -30,6 +30,7 @@ public class HighAvailabilityManagerFileBasedTest extends HighAvailabilityManage
 
     private File dir;
 
+    @Override
     protected FileBasedObjectStore newPersistenceObjectStore() {
         if (dir!=null)
             throw new IllegalStateException("Test does not support multiple object stores");

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerInMemoryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerInMemoryTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerInMemoryTest.java
index 21f61d3..7308810 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerInMemoryTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerInMemoryTest.java
@@ -48,10 +48,12 @@ public class HighAvailabilityManagerInMemoryTest extends HighAvailabilityManager
 
     private static final Logger log = LoggerFactory.getLogger(HighAvailabilityManagerInMemoryTest.class);
     
+    @Override
     protected PersistenceObjectStore newPersistenceObjectStore() {
         return new InMemoryObjectStore();
     }
     
+    @Override
     public void testGetManagementPlaneStatus() throws Exception {
         super.testGetManagementPlaneStatus();
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerSplitBrainTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerSplitBrainTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerSplitBrainTest.java
index 8b34f68..ef3e0a4 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerSplitBrainTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerSplitBrainTest.java
@@ -418,7 +418,7 @@ public class HighAvailabilityManagerSplitBrainTest {
         List<Thread> spawned = MutableList.of();
         for (int i=0; i<size; i++) {
             final HaMgmtNode n = newNode();
-            Thread t = new Thread() { public void run() {
+            Thread t = new Thread() { @Override public void run() {
                 if (staggerStart!=null) Time.sleep(staggerStart.multiply(Math.random()));
                 n.ha.start(HighAvailabilityMode.AUTO);
                 n.ha.setPollPeriod(Duration.millis(20));

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java
index a077f31..478e8b7 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java
@@ -142,6 +142,7 @@ public class LocalSubscriptionManagerTest extends BrooklynAppUnitTestSupport {
         // Repeatedly subscribe and unsubscribe, so listener-set constantly changing while publishing to it.
         // First create a stable listener so it is always the same listener-set object.
         Thread thread = new Thread() {
+            @Override
             public void run() {
                 try {
                     SensorEventListener<Object> noopListener = new SensorEventListener<Object>() {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemorySizeIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemorySizeIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemorySizeIntegrationTest.java
index 873370e..5a3a4b5 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemorySizeIntegrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemorySizeIntegrationTest.java
@@ -53,6 +53,7 @@ public class BrooklynMementoPersisterInMemorySizeIntegrationTest extends Brookly
 
     protected RecordingTransactionListener recorder;
 
+    @Override
     protected ManagementContext newPersistingManagementContext() {
         recorder = new RecordingTransactionListener("in-mem-test-"+Identifiers.makeRandomId(4));
         return RebindTestUtils.managementContextBuilder(classLoader, 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemoryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemoryTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemoryTest.java
index 461ec99..af6aac4 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemoryTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterInMemoryTest.java
@@ -26,6 +26,7 @@ import org.testng.annotations.Test;
 @Test
 public class BrooklynMementoPersisterInMemoryTest extends BrooklynMementoPersisterTestFixture {
 
+    @Override
     protected ManagementContext newPersistingManagementContext() {
         return RebindTestUtils.managementContextBuilder(classLoader, new InMemoryObjectStore())
             .persistPeriod(Duration.millis(10)).buildStarted();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessorWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessorWriterTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessorWriterTest.java
index eb480e8..8c8355c 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessorWriterTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessorWriterTest.java
@@ -52,6 +52,7 @@ public class FileBasedStoreObjectAccessorWriterTest extends PersistenceStoreObje
         return new String(charArray);
     }
 
+    @Override
     protected StoreObjectAccessorWithLock newPersistenceStoreObjectAccessor() throws IOException {
         file = Os.newTempFile(getClass(), "txt");
         return new StoreObjectAccessorLocking(new FileBasedStoreObjectAccessor(file, ".tmp"));
@@ -63,6 +64,7 @@ public class FileBasedStoreObjectAccessorWriterTest extends PersistenceStoreObje
         return Duration.seconds(2);
     }
     
+    @Override
     @Test(groups="Integration")
     public void testLastModifiedTime() throws Exception {
         super.testLastModifiedTime();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/InMemoryStoreObjectAccessorWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/InMemoryStoreObjectAccessorWriterTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/InMemoryStoreObjectAccessorWriterTest.java
index 47d401d..6893a03 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/InMemoryStoreObjectAccessorWriterTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/InMemoryStoreObjectAccessorWriterTest.java
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
 @Test
 public class InMemoryStoreObjectAccessorWriterTest extends PersistenceStoreObjectAccessorWriterTestFixture {
 
+    @Override
     protected StoreObjectAccessorWithLock newPersistenceStoreObjectAccessor() throws IOException {
         InMemoryObjectStore store = new InMemoryObjectStore();
         store.prepareForSharedUse(null, null);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/ActivePartialRebindVersionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/ActivePartialRebindVersionTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/ActivePartialRebindVersionTest.java
index 7781b9b..6b1e43f 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/ActivePartialRebindVersionTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/ActivePartialRebindVersionTest.java
@@ -36,6 +36,7 @@ public class ActivePartialRebindVersionTest extends RebindTestFixtureWithApp {
     @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(ActivePartialRebindVersionTest.class);
     
+    @Override
     protected LocalManagementContext createOrigManagementContext() {
         return RebindTestUtils.managementContextBuilder(mementoDir, classLoader)
                 .persistPeriodMillis(getPersistPeriodMillis())

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/CheckpointEntityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/CheckpointEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/CheckpointEntityTest.java
index d2aa5d6..0e23143 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/CheckpointEntityTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/CheckpointEntityTest.java
@@ -47,6 +47,7 @@ public class CheckpointEntityTest extends RebindTestFixtureWithApp {
 
     private MyEntity origE;
     
+    @Override
     @BeforeMethod
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 a918e64..7804db6 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
@@ -374,6 +374,7 @@ public class RebindEntityTest extends RebindTestFixtureWithApp {
         RebindTestUtils.checkCurrentMementoSerializable(origApp);
         newManagementContext = RebindTestUtils.newPersistingManagementContextUnstarted(mementoDir, classLoader);
         Thread thread = new Thread() {
+            @Override
             public void run() {
                 try {
                     newManagementContext.getRebindManager().rebind(classLoader, null, ManagementNodeState.MASTER);
@@ -425,6 +426,7 @@ public class RebindEntityTest extends RebindTestFixtureWithApp {
         RebindTestUtils.checkCurrentMementoSerializable(origApp);
         newManagementContext = new LocalManagementContext();
         Thread thread = new Thread() {
+            @Override
             public void run() {
                 try {
                     RebindTestUtils.rebind(RebindOptions.create()

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
index 91b6064..90a776b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocalhostLocationTest.java
@@ -43,6 +43,7 @@ public class RebindLocalhostLocationTest extends RebindTestFixtureWithApp {
     private LocalhostMachineProvisioningLocation origLoc;
     private SshMachineLocation origChildLoc;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
 
     public void setUp() throws Exception {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
index 53e9a5c..42b1ec2 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java
@@ -57,6 +57,7 @@ public class RebindLocationTest extends RebindTestFixtureWithApp {
     @SuppressWarnings("unused")
     private MyEntity origE;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindSshMachineLocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindSshMachineLocationTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindSshMachineLocationTest.java
index ec8cacb..068dff4 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindSshMachineLocationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindSshMachineLocationTest.java
@@ -41,6 +41,7 @@ public class RebindSshMachineLocationTest extends RebindTestFixtureWithApp {
     private FixedListMachineProvisioningLocation<SshMachineLocation> origLoc;
     private SshMachineLocation origChildLoc;
     
+    @Override
     @SuppressWarnings("unchecked")
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixtureWithApp.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixtureWithApp.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixtureWithApp.java
index 8c4bae7..f69871b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixtureWithApp.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixtureWithApp.java
@@ -38,6 +38,7 @@ public class RebindTestFixtureWithApp extends RebindTestFixture<TestApplication>
         return null;
     }
 
+    @Override
     protected TestApplication createApp() {
         EntitySpec<TestApplication> spec = EntitySpec.create(TestApplication.class, TestApplicationNoEnrichersImpl.class);
         if (shouldSkipOnBoxBaseDirResolution()!=null) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppLiveTestSupport.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppLiveTestSupport.java b/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppLiveTestSupport.java
index 977b7a5..d48f1bf 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppLiveTestSupport.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppLiveTestSupport.java
@@ -34,6 +34,7 @@ public class BrooklynAppLiveTestSupport extends BrooklynMgmtUnitTestSupport {
 
     protected TestApplication app;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         if (mgmt!=null) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppUnitTestSupport.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppUnitTestSupport.java b/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppUnitTestSupport.java
index 6a79a0f..3d02fe7 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppUnitTestSupport.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/BrooklynAppUnitTestSupport.java
@@ -32,6 +32,7 @@ public class BrooklynAppUnitTestSupport extends BrooklynMgmtUnitTestSupport {
 
     protected TestApplication app;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationNoEnrichersImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationNoEnrichersImpl.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationNoEnrichersImpl.java
index 14d10c6..2321e9e 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationNoEnrichersImpl.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationNoEnrichersImpl.java
@@ -24,6 +24,7 @@ package org.apache.brooklyn.core.test.entity;
  */
 public class TestApplicationNoEnrichersImpl extends TestApplicationImpl {
     
+    @Override
     protected void initEnrichers() { /* none */ }
     
 }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java
index b6a0aa4..7a2c813 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntityImpl.java
@@ -74,6 +74,7 @@ public class TestEntityImpl extends AbstractEntity implements TestEntity {
         this.constructorProperties = properties;
     }
     
+    @Override
     public AbstractEntity configure(Map flags) {
         this.configureProperties = flags;
         return super.configure(flags);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 bbd10c9..d96a121 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
@@ -44,6 +44,7 @@ public class EntityPersistencePerformanceTest extends RebindTestFixtureWithApp {
 
     // TODO Not measuring performance per cycle; just looking at CPU usage during test
     
+    @Override
     protected int getPersistPeriodMillis() {
         return 1000;
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 84c60ca..52722d4 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
@@ -37,12 +37,14 @@ public class JavaYardStickPerformanceTest extends AbstractPerformanceTest {
 
     private ExecutorService executor;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
         executor = Executors.newCachedThreadPool();
     }
     
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 6f66f20..4d1030c 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
@@ -44,6 +44,7 @@ public class SubscriptionPerformanceTest extends AbstractPerformanceTest {
     List<TestEntity> entities;
     SubscriptionManager subscriptionManager;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 ca05734..b35cbdc 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
@@ -44,6 +44,7 @@ public class TaskPerformanceTest extends AbstractPerformanceTest {
     
     BasicExecutionManager executionManager;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/entity/stock/BasicStartableTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/entity/stock/BasicStartableTest.java b/core/src/test/java/org/apache/brooklyn/entity/stock/BasicStartableTest.java
index 9977956..51b130c 100644
--- a/core/src/test/java/org/apache/brooklyn/entity/stock/BasicStartableTest.java
+++ b/core/src/test/java/org/apache/brooklyn/entity/stock/BasicStartableTest.java
@@ -54,6 +54,7 @@ public class BasicStartableTest extends BrooklynAppUnitTestSupport {
     private SimulatedLocation loc1;
     private SimulatedLocation loc2;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java
index 6e36067..20b3f29 100644
--- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java
+++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java
@@ -51,12 +51,14 @@ public class SshMachineLocationSshToolTest extends BrooklynAppUnitTestSupport {
     // See EntitySshToolTest in software-base for an equivalent that configures the SshTool on the 
     // management context and on the entity.
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
         RecordingSshTool.clear();
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         RecordingSshTool.clear();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 447e1eb..fe491af 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
@@ -93,6 +93,7 @@ public class SshMachineLocationTest extends BrooklynAppUnitTestSupport {
 
     protected SshMachineLocation host;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -100,6 +101,7 @@ public class SshMachineLocationTest extends BrooklynAppUnitTestSupport {
         RecordingSshTool.clear();
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         try {
@@ -178,6 +180,7 @@ public class SshMachineLocationTest extends BrooklynAppUnitTestSupport {
 
         final Effector<MachineDetails> GET_MACHINE_DETAILS = Effectors.effector(MachineDetails.class, "getMachineDetails")
                 .impl(new EffectorBody<MachineDetails>() {
+                    @Override
                     public MachineDetails call(ConfigBag parameters) {
                         Maybe<MachineLocation> machine = Machines.findUniqueMachineLocation(entity().getLocations());
                         try {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/http/BetterMockWebServer.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/http/BetterMockWebServer.java b/core/src/test/java/org/apache/brooklyn/util/core/http/BetterMockWebServer.java
index 306fbc4..b1bcaaa 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/http/BetterMockWebServer.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/http/BetterMockWebServer.java
@@ -61,6 +61,7 @@ public class BetterMockWebServer {
         delegate.enqueue(response);
     }
 
+    @Override
     public boolean equals(Object obj) {
         return delegate.equals(obj);
     }
@@ -92,6 +93,7 @@ public class BetterMockWebServer {
         }
     }
 
+    @Override
     public int hashCode() {
         return delegate.hashCode();
     }
@@ -124,6 +126,7 @@ public class BetterMockWebServer {
         return delegate.toProxyAddress();
     }
 
+    @Override
     public String toString() {
         return delegate.toString();
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractIntegrationTest.java
index 131caa3..54e7531 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractIntegrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/SshToolAbstractIntegrationTest.java
@@ -86,8 +86,10 @@ public abstract class SshToolAbstractIntegrationTest extends ShellToolAbstractTe
 
     protected String remoteFilePath;
 
+    @Override
     protected SshTool tool() { return (SshTool)tool; }
     
+    @Override
     protected abstract SshTool newUnregisteredTool(Map<String,?> flags);
 
     @Override
@@ -101,6 +103,7 @@ public abstract class SshToolAbstractIntegrationTest extends ShellToolAbstractTe
     }
     
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliToolIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliToolIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliToolIntegrationTest.java
index deabbba..31df773 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliToolIntegrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliToolIntegrationTest.java
@@ -48,6 +48,7 @@ public class SshCliToolIntegrationTest extends SshToolAbstractIntegrationTest {
 
     private static final Logger log = LoggerFactory.getLogger(SshCliToolIntegrationTest.class);
     
+    @Override
     protected SshTool newUnregisteredTool(Map<String,?> flags) {
         return new SshCliTool(flags);
     }
@@ -83,6 +84,7 @@ public class SshCliToolIntegrationTest extends SshToolAbstractIntegrationTest {
     
     // TODO When running mvn on the command line (for Aled), this test hangs when prompting for a password (but works in the IDE!)
     // Doing .connect() isn't enough; need to cause ssh or scp to be invoked
+    @Override
     @Test(enabled=false, groups = {"Integration"})
     public void testConnectWithInvalidUserThrowsException() throws Exception {
         final SshTool localtool = newTool(ImmutableMap.of("user", "wronguser", "host", "localhost", "privateKeyFile", "~/.ssh/id_rsa"));
@@ -97,6 +99,7 @@ public class SshCliToolIntegrationTest extends SshToolAbstractIntegrationTest {
     }
     
     // TODO ssh-cli doesn't support pass-phrases yet
+    @Override
     @Test(enabled=false, groups = {"Integration"})
     public void testSshKeyWithPassphrase() throws Exception {
         super.testSshKeyWithPassphrase();
@@ -109,6 +112,7 @@ public class SshCliToolIntegrationTest extends SshToolAbstractIntegrationTest {
         super.testCopyToServerWithLastModifiedDate();
     }
     
+    @Override
     @Test(groups = {"Integration"})
     public void testExecReturningNonZeroExitCode() throws Exception {
         int exitcode = tool.execCommands(MutableMap.<String,Object>of(), ImmutableList.of("exit 123"));

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java
index 43c2e0e..5f2e55e 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java
@@ -69,6 +69,7 @@ public class SshjToolAsyncStubIntegrationTest {
         counter = 0;
         
         tool = new SshjTool(ImmutableMap.<String,Object>of("host", "localhost")) {
+            @Override
             @SuppressWarnings("unchecked")
             protected <T, C extends SshAction<T>> T acquire(C action, int sshTries, Duration sshTriesTimeout) {
                 if (action instanceof SshjTool.ShellAction) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolIntegrationTest.java
index 093835e..76f45b9 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolIntegrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjToolIntegrationTest.java
@@ -76,6 +76,7 @@ public class SshjToolIntegrationTest extends SshToolAbstractIntegrationTest {
         final AtomicInteger callCount = new AtomicInteger();
         
         final SshTool localtool = new SshjTool(ImmutableMap.of("sshTries", 3, "host", "localhost", "privateKeyFile", "~/.ssh/id_rsa")) {
+            @Override
             protected SshAction<Session> newSessionAction() {
                 callCount.incrementAndGet();
                 throw new RuntimeException("Simulating ssh execution failure");
@@ -97,6 +98,7 @@ public class SshjToolIntegrationTest extends SshToolAbstractIntegrationTest {
         final AtomicInteger callCount = new AtomicInteger();
         final int successOnAttempt = 2;
         final SshTool localtool = new SshjTool(ImmutableMap.of("sshTries", 3, "host", "localhost", "privateKeyFile", "~/.ssh/id_rsa")) {
+            @Override
             protected SshAction<Session> newSessionAction() {
                 callCount.incrementAndGet();
                 if (callCount.incrementAndGet() >= successOnAttempt) {
@@ -116,6 +118,7 @@ public class SshjToolIntegrationTest extends SshToolAbstractIntegrationTest {
     public void testGivesUpAfterMaxTime() throws Exception {
         final AtomicInteger callCount = new AtomicInteger();
         final SshTool localtool = new SshjTool(ImmutableMap.of("sshTriesTimeout", 1000, "host", "localhost", "privateKeyFile", "~/.ssh/id_rsa")) {
+            @Override
             protected SshAction<Session> newSessionAction() {
                 callCount.incrementAndGet();
                 try {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/mutex/WithMutexesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/mutex/WithMutexesTest.java b/core/src/test/java/org/apache/brooklyn/util/core/mutex/WithMutexesTest.java
index 268a6f1..d99975c 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/mutex/WithMutexesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/mutex/WithMutexesTest.java
@@ -66,6 +66,7 @@ public class WithMutexesTest {
         Assert.assertFalse(m.tryAcquireMutex("foo", "something else"));
 
         Thread t = new Thread() {
+            @Override
             public void run() {
                 try {
                     m.acquireMutex("foo", "thread 2 foo");

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/text/TemplateProcessorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/text/TemplateProcessorTest.java b/core/src/test/java/org/apache/brooklyn/util/core/text/TemplateProcessorTest.java
index 547279f..d9f235b 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/text/TemplateProcessorTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/text/TemplateProcessorTest.java
@@ -46,12 +46,14 @@ import com.google.common.collect.ImmutableMap;
 public class TemplateProcessorTest extends BrooklynAppUnitTestSupport {
     private FixedLocaleTest localeFix = new FixedLocaleTest();
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
         localeFix.setUp();
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         super.tearDown();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverterTest.java b/core/src/test/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverterTest.java
index a34f037..9d39076 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverterTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverterTest.java
@@ -30,6 +30,7 @@ import com.thoughtworks.xstream.XStream;
 @Test
 public class ImmutableListConverterTest extends ConverterTestFixture {
 
+    @Override
     protected void registerConverters(XStream xstream) {
         super.registerConverters(xstream);
         xstream.aliasType("ImmutableList", ImmutableList.class);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/xstream/InetAddressConverterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/xstream/InetAddressConverterTest.java b/core/src/test/java/org/apache/brooklyn/util/core/xstream/InetAddressConverterTest.java
index 346bbf1..5a63e7a 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/xstream/InetAddressConverterTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/xstream/InetAddressConverterTest.java
@@ -29,6 +29,7 @@ import com.thoughtworks.xstream.XStream;
 @Test
 public class InetAddressConverterTest extends ConverterTestFixture {
 
+    @Override
     protected void registerConverters(XStream xstream) {
         super.registerConverters(xstream);
         xstream.registerConverter(new Inet4AddressConverter());

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverterTest.java b/core/src/test/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverterTest.java
index e4be7a3..4ec236e 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverterTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverterTest.java
@@ -33,6 +33,7 @@ import com.thoughtworks.xstream.XStream;
 @Test
 public class StringKeyMapConverterTest extends ConverterTestFixture {
 
+    @Override
     protected void registerConverters(XStream xstream) {
         super.registerConverters(xstream);
         xstream.alias("map", Map.class, LinkedHashMap.class);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/ClassRenameOsgiConfigLoader.java
----------------------------------------------------------------------
diff --git a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/ClassRenameOsgiConfigLoader.java b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/ClassRenameOsgiConfigLoader.java
index 6a03c9c..0cabee8 100644
--- a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/ClassRenameOsgiConfigLoader.java
+++ b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/ClassRenameOsgiConfigLoader.java
@@ -48,6 +48,7 @@ public class ClassRenameOsgiConfigLoader extends OsgiConfigLoader {
     }
 
     // Called by OSGi
+    @Override
     public void init() {
         LOG.trace("DeserializingClassRenamesProvider.OsgiConfigLoader.init: registering loader");
         DeserializingClassRenamesProvider.INSTANCE.getLoaders().add(this);
@@ -55,6 +56,7 @@ public class ClassRenameOsgiConfigLoader extends OsgiConfigLoader {
     }
 
     // Called by OSGi
+    @Override
     public void destroy() {
         LOG.trace("DeserializingClassRenamesProvider.OsgiConfigLoader.destroy: unregistering loader");
         boolean removed = DeserializingClassRenamesProvider.INSTANCE.getLoaders().remove(this);
@@ -64,6 +66,7 @@ public class ClassRenameOsgiConfigLoader extends OsgiConfigLoader {
     }
 
     // Called by OSGi when configuration changes
+    @Override
     public void updateProperties(Map properties) {
         LOG.debug("DeserializingClassRenamesProvider.OsgiConfigLoader.updateProperties: clearing cache, so class-renames will be reloaded");
         DeserializingClassRenamesProvider.INSTANCE.reset();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/JcloudsProviderRenameOsgiConfigLoader.java
----------------------------------------------------------------------
diff --git a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/JcloudsProviderRenameOsgiConfigLoader.java b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/JcloudsProviderRenameOsgiConfigLoader.java
index 7bc9152..59cf076 100644
--- a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/JcloudsProviderRenameOsgiConfigLoader.java
+++ b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/JcloudsProviderRenameOsgiConfigLoader.java
@@ -34,6 +34,7 @@ public class JcloudsProviderRenameOsgiConfigLoader extends OsgiConfigLoader {
     }
 
     // Called by OSGi
+    @Override
     public void init() {
         LOG.trace("DeserializingJcloudsRenamesProvider.OsgiConfigLoader.init: registering loader");
         DeserializingJcloudsRenamesProvider.INSTANCE.getLoaders().add(this);
@@ -41,6 +42,7 @@ public class JcloudsProviderRenameOsgiConfigLoader extends OsgiConfigLoader {
     }
 
     // Called by OSGi
+    @Override
     public void destroy() {
         LOG.trace("DeserializingJcloudsRenamesProvider.OsgiConfigLoader.destroy: unregistering loader");
         boolean removed = DeserializingJcloudsRenamesProvider.INSTANCE.getLoaders().remove(this);
@@ -50,6 +52,7 @@ public class JcloudsProviderRenameOsgiConfigLoader extends OsgiConfigLoader {
     }
 
     // Called by OSGi when configuration changes
+    @Override
     public void updateProperties(Map properties) {
         LOG.debug("DeserializingJcloudsRenamesProvider.OsgiConfigLoader.updateProperties: clearing cache, so jclouds renames will be reloaded");
         DeserializingJcloudsRenamesProvider.INSTANCE.reset();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
----------------------------------------------------------------------
diff --git a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
index fe17b89..1f1dc1d 100644
--- a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
+++ b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynLauncher.java
@@ -342,6 +342,7 @@ public class BrooklynLauncher extends BasicLauncher<BrooklynLauncher> {
         super.startBrooklynNode();
     }
 
+    @Override
     protected EntitySpec<LocalBrooklynNode> customizeBrooklynNodeSpec(EntitySpec<LocalBrooklynNode> brooklynNodeSpec) {
         return brooklynNodeSpec
                 .configure(SoftwareProcess.RUN_DIR, System.getenv("ROOT"))
@@ -353,6 +354,7 @@ public class BrooklynLauncher extends BasicLauncher<BrooklynLauncher> {
                 .configure(BrooklynNode.NO_WEB_CONSOLE_AUTHENTICATION, Boolean.TRUE.equals(skipSecurityFilter));
     }
 
+    @Override
     protected void startApps() {
         if ((stopWhichAppsOnShutdown==StopWhichAppsOnShutdown.ALL) ||
             (stopWhichAppsOnShutdown==StopWhichAppsOnShutdown.ALL_IF_NOT_PERSISTED && getPersistMode()==PersistMode.DISABLED)) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java
index 9f072b2..18272a5 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindTestToFiles.java
@@ -45,16 +45,19 @@ import com.google.common.io.Files;
 
 public class BrooklynLauncherRebindTestToFiles extends BrooklynLauncherRebindTestFixture {
 
+    @Override
     protected String newTempPersistenceContainerName() {
         File persistenceDirF = Files.createTempDir();
         Os.deleteOnExitRecursively(persistenceDirF);
         return persistenceDirF.getAbsolutePath();
     }
     
+    @Override
     protected String badContainerName() {
         return "/path/does/not/exist/"+Identifiers.makeRandomId(4);
     }
     
+    @Override
     protected void checkPersistenceContainerNameIs(String expected) {
         String expectedFqp = new File(Os.tidyPath(expected)).getAbsolutePath();
         assertEquals(getPersistenceDir(lastMgmt()).getAbsolutePath(), expectedFqp);
@@ -66,6 +69,7 @@ public class BrooklynLauncherRebindTestToFiles extends BrooklynLauncherRebindTes
         return store.getBaseDir();
     }
 
+    @Override
     protected void checkPersistenceContainerNameIsDefault() {
         String expected = BrooklynServerPaths.newMainPersistencePathResolver(BrooklynProperties.Factory.newEmpty()).location(null).dir(null).resolve();
         checkPersistenceContainerNameIs(expected);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java
index 24db1c7..486e805 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/BrooklynLauncherRebindToCloudObjectStoreTest.java
@@ -53,6 +53,7 @@ public class BrooklynLauncherRebindToCloudObjectStoreTest extends BrooklynLaunch
     
     { persistenceLocationSpec = BlobStoreTest.PERSIST_TO_OBJECT_STORE_FOR_TEST_SPEC; }
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         persistenceDir = newTempPersistenceContainerName();
@@ -63,6 +64,7 @@ public class BrooklynLauncherRebindToCloudObjectStoreTest extends BrooklynLaunch
         return super.newLauncherBase().persistenceLocation(persistenceLocationSpec);
     }
     
+    @Override
     protected LocalManagementContextForTests newManagementContextForTests(BrooklynProperties props) {
         BrooklynProperties p2 = BrooklynProperties.Factory.newDefault();
         if (props!=null) p2.putAll(props);
@@ -74,10 +76,12 @@ public class BrooklynLauncherRebindToCloudObjectStoreTest extends BrooklynLaunch
         return "test-"+JavaClassNames.callerStackElement(0).getClassName()+"-"+Identifiers.makeRandomId(4);
     }
     
+    @Override
     protected String badContainerName() {
         return "container-does-not-exist-"+Identifiers.makeRandomId(4);
     }
     
+    @Override
     protected void checkPersistenceContainerNameIs(String expected) {
         assertEquals(getPersistenceContainerName(lastMgmt()), expected);
     }
@@ -88,6 +92,7 @@ public class BrooklynLauncherRebindToCloudObjectStoreTest extends BrooklynLaunch
         return store.getContainerName();
     }
 
+    @Override
     protected void checkPersistenceContainerNameIsDefault() {
         checkPersistenceContainerNameIs(BrooklynServerPaths.DEFAULT_PERSISTENCE_CONTAINER_NAME);
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
index ab0b708..565ad5d 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/AbstractBlueprintTest.java
@@ -76,6 +76,7 @@ public abstract class AbstractBlueprintTest {
             @Override
             protected BrooklynCampPlatformLauncherAbstract newPlatformLauncher() {
                 return new BrooklynCampPlatformLauncher() {
+                    @Override
                     protected ManagementContext newManagementContext() {
                         return AbstractBlueprintTest.this.mgmt;
                     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
index b03c29d..f3f4c7d 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/blueprints/Windows7zipBlueprintLiveTest.java
@@ -50,6 +50,7 @@ public class Windows7zipBlueprintLiveTest extends AbstractBlueprintTest {
     protected MachineProvisioningLocation<WinRmMachineLocation> location;
     protected WinRmMachineLocation machine;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -57,6 +58,7 @@ public class Windows7zipBlueprintLiveTest extends AbstractBlueprintTest {
         machine = location.obtain(ImmutableMap.of());
     }
     
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         try {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
index 0c70845..f8d47ea 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
@@ -199,6 +199,7 @@ public class BrooklynImageChooser implements Cloneable {
         return 0;
     }
 
+    @Override
     public BrooklynImageChooser clone() {
         return new BrooklynImageChooser();
     }
@@ -236,6 +237,7 @@ public class BrooklynImageChooser implements Cloneable {
         public OrderingScoredWithoutDefaults(BrooklynImageChooser chooser) {
             this.chooser = chooser;
         }
+        @Override
         public int compare(Image left, Image right) {
             return BrooklynImageChooser.compare(chooser.score(left), chooser.score(right));
         }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/PortableTemplateBuilder.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/PortableTemplateBuilder.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/PortableTemplateBuilder.java
index 8d33921..86dfe4b 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/PortableTemplateBuilder.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/PortableTemplateBuilder.java
@@ -127,6 +127,7 @@ public class PortableTemplateBuilder<T extends PortableTemplateBuilder<?>> exten
         return result;
     }
 
+    @Override
     protected String makeNonTrivialArgumentsString() {
         String s = super.makeNonTrivialArgumentsString();
         TemplateOptions aggr = computeAggregatedOptions(false);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java b/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java
index cebdcba..100cf97 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java
@@ -94,6 +94,7 @@ public class CreateUserPolicy extends AbstractPolicy implements SensorEventListe
             "Whether to reset the password used for user login",
             false);
 
+    @Override
     public void setEntity(EntityLocal entity) {
         super.setEntity(entity);
         subscriptions().subscribe(entity, AbstractEntity.LOCATION_ADDED, this);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
index a94424e..ecea29a 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BrooklynMementoPersisterJcloudsObjectStoreTest.java
@@ -38,6 +38,7 @@ public class BrooklynMementoPersisterJcloudsObjectStoreTest extends BrooklynMeme
     @Override @BeforeMethod
     public void setUp() throws Exception { super.setUp(); }
     
+    @Override
     protected LocalManagementContext newPersistingManagementContext() {
         objectStore = new JcloudsBlobStoreBasedObjectStore(
             BlobStoreTest.PERSIST_TO_OBJECT_STORE_FOR_TEST_SPEC, BlobStoreTest.CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(4));

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
index c89064b..316a3b3 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/HighAvailabilityManagerJcloudsObjectStoreTest.java
@@ -31,6 +31,7 @@ import org.testng.annotations.Test;
 @Test(groups={"Live", "Live-sanity"})
 public class HighAvailabilityManagerJcloudsObjectStoreTest extends HighAvailabilityManagerTestFixture {
 
+    @Override
     protected ManagementContextInternal newLocalManagementContext() {
         return new LocalManagementContextForTests(BrooklynProperties.Factory.newDefault());
     }
@@ -38,11 +39,13 @@ public class HighAvailabilityManagerJcloudsObjectStoreTest extends HighAvailabil
     @Override @BeforeMethod
     public void setUp() throws Exception { super.setUp(); }
     
+    @Override
     protected PersistenceObjectStore newPersistenceObjectStore() {
         return new JcloudsBlobStoreBasedObjectStore(
             BlobStoreTest.PERSIST_TO_OBJECT_STORE_FOR_TEST_SPEC, BlobStoreTest.CONTAINER_PREFIX+"-"+Identifiers.makeRandomId(4));
     }
 
+    @Override
     @Test(groups="Live", invocationCount=5) //run fewer times w softlayer... 
     public void testGetManagementPlaneStatusManyTimes() throws Exception {
         testGetManagementPlaneStatus();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsObjectStoreAccessorWriterTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsObjectStoreAccessorWriterTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsObjectStoreAccessorWriterTest.java
index 4160880..d49cad2 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsObjectStoreAccessorWriterTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsObjectStoreAccessorWriterTest.java
@@ -63,6 +63,7 @@ public class JcloudsObjectStoreAccessorWriterTest extends PersistenceStoreObject
         if (store!=null) store.deleteCompletely();
     }
     
+    @Override
     protected StoreObjectAccessorWithLock newPersistenceStoreObjectAccessor() throws IOException {
         return newPersistenceStoreObjectAccessor(store, "");
     }
@@ -77,6 +78,7 @@ public class JcloudsObjectStoreAccessorWriterTest extends PersistenceStoreObject
         return Duration.seconds(2);
     }
     
+    @Override
     protected int biggishSize() {
         // bit smaller since it's actually uploading here!
         return 10000;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
index 56e8ccc..83684eb 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedRebindTest.java
@@ -81,6 +81,7 @@ public class JcloudsByonLocationResolverStubbedRebindTest extends AbstractJcloud
     protected Application newApp;
     protected ManagementContext newManagementContext;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         mementoDir = Os.newTempDir(getClass());
@@ -96,6 +97,7 @@ public class JcloudsByonLocationResolverStubbedRebindTest extends AbstractJcloud
         initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of());
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         super.tearDown();
@@ -112,6 +114,7 @@ public class JcloudsByonLocationResolverStubbedRebindTest extends AbstractJcloud
         origManagementContext = null;
     }
 
+    @Override
     protected NodeCreator newNodeCreator() {
         return new NodeCreatorForRebinding();
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java
index 8432905..bf1aa0c 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverStubbedTest.java
@@ -65,6 +65,7 @@ public class JcloudsByonLocationResolverStubbedTest extends AbstractJcloudsStubb
         initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of());
     }
     
+    @Override
     protected LocalManagementContext newManagementContext() {
         // This really is stubbed; no live access to the cloud
         LocalManagementContext result = LocalManagementContextForTests.builder(true).build();
@@ -75,6 +76,7 @@ public class JcloudsByonLocationResolverStubbedTest extends AbstractJcloudsStubb
 
     }
 
+    @Override
     protected NodeCreator newNodeCreator() {
         return new AbstractNodeCreator() {
             @Override

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
index 23963e0..53bc32d 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
@@ -63,6 +63,7 @@ public class JcloudsByonRebindLiveTest extends RebindTestFixtureWithApp {
     private LocalManagementContext provisioningManagementContext;
     private JcloudsSshMachineLocation provisionedMachine;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -75,6 +76,7 @@ public class JcloudsByonRebindLiveTest extends RebindTestFixtureWithApp {
         AbstractJcloudsLiveTest.stripBrooklynProperties(origManagementContext.getBrooklynProperties());
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         List<Exception> exceptions = Lists.newArrayList();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
index 49a2a4a..3ce9dbd 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
@@ -50,6 +50,7 @@ public class JcloudsImageChoiceStubbedLiveTest extends AbstractJcloudsStubbedLiv
         };
     }
 
+    @Override
     protected Map<Object, Object> jcloudsLocationConfig(Map<Object, Object> defaults) {
         return ImmutableMap.<Object, Object>builder()
                 .putAll(defaults)

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingDefaultTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingDefaultTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingDefaultTest.java
index 5409790..d11a903 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingDefaultTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingDefaultTest.java
@@ -182,6 +182,7 @@ public class JcloudsLocationReleasePortForwardingDefaultTest extends BrooklynApp
     // inside an effector.
     private void execRelease(final JcloudsLocation loc, final JcloudsSshMachineLocation machine) throws Exception {
         EffectorBody<Void> effectorBody = new EffectorBody<Void>() {
+            @Override
             public Void call(ConfigBag parameters) {
                 loc.releasePortForwarding(machine);
                 return null;

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsProviderAndApiLoaderTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsProviderAndApiLoaderTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsProviderAndApiLoaderTest.java
index 9540357..730aa69 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsProviderAndApiLoaderTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsProviderAndApiLoaderTest.java
@@ -160,6 +160,7 @@ public class JcloudsProviderAndApiLoaderTest {
         }
         
         static class Builder extends BaseApiMetadata.Builder<Builder> {
+            @Override
             protected Builder self() {
                 return this;
             }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
index ec014c2..1390608 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
@@ -72,6 +72,7 @@ public class JcloudsRebindLiveTest extends RebindTestFixtureWithApp {
     
     protected List<JcloudsMachineLocation> machines;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -81,6 +82,7 @@ public class JcloudsRebindLiveTest extends RebindTestFixtureWithApp {
         AbstractJcloudsLiveTest.stripBrooklynProperties(origManagementContext.getBrooklynProperties());
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         List<Exception> exceptions = Lists.newArrayList();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
index 6f09007..f20a271 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
@@ -84,6 +84,7 @@ public class JcloudsRebindStubTest extends RebindTestFixtureWithApp {
     protected Multimap<ManagementContext, JcloudsSshMachineLocation> machines;
     protected BrooklynProperties brooklynProperties;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -91,6 +92,7 @@ public class JcloudsRebindStubTest extends RebindTestFixtureWithApp {
         machines = Multimaps.synchronizedMultimap(ArrayListMultimap.<ManagementContext, JcloudsSshMachineLocation>create());
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         List<Exception> exceptions = Lists.newArrayList();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
index e7bf4d8..8a316d3 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
@@ -82,6 +82,7 @@ public class JcloudsRebindStubUnitTest extends RebindTestFixtureWithApp {
     protected NodeCreator nodeCreator;
     protected ComputeServiceRegistry computeServiceRegistry;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -91,6 +92,7 @@ public class JcloudsRebindStubUnitTest extends RebindTestFixtureWithApp {
         machines = Multimaps.synchronizedMultimap(ArrayListMultimap.<ManagementContext, JcloudsSshMachineLocation>create());
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         try {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRenamesRebindTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRenamesRebindTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRenamesRebindTest.java
index faf3ff9..cfc5221 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRenamesRebindTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRenamesRebindTest.java
@@ -36,6 +36,7 @@ import com.google.common.collect.ImmutableMap;
  */
 public class JcloudsRenamesRebindTest extends RebindTestFixtureWithApp {
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationAddressOverwriteTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationAddressOverwriteTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationAddressOverwriteTest.java
index 1ad91bd..f43983b 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationAddressOverwriteTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationAddressOverwriteTest.java
@@ -48,6 +48,7 @@ public class JcloudsSshMachineLocationAddressOverwriteTest extends AbstractJclou
     private List<String> privateAddresses;
     private List<String> publicAddresses;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -56,6 +57,7 @@ public class JcloudsSshMachineLocationAddressOverwriteTest extends AbstractJclou
         initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of(JcloudsLocationConfig.USE_MACHINE_PUBLIC_ADDRESS_AS_PRIVATE_ADDRESS.getName(), true));
     }
     
+    @Override
     protected NodeCreator newNodeCreator() {
         return new AbstractNodeCreator() {
             @Override protected NodeMetadata newNode(String group, Template template) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationStubbedTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationStubbedTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationStubbedTest.java
index 30fd0d3..b61a53f 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationStubbedTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocationStubbedTest.java
@@ -52,6 +52,7 @@ public class JcloudsSshMachineLocationStubbedTest extends AbstractJcloudsStubbed
     private List<String> privateAddresses;
     private List<String> publicAddresses;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -60,6 +61,7 @@ public class JcloudsSshMachineLocationStubbedTest extends AbstractJcloudsStubbed
         initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of());
     }
     
+    @Override
     protected NodeCreator newNodeCreator() {
         return new AbstractNodeCreator() {
             @Override protected NodeMetadata newNode(String group, Template template) {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
index 4e25dbd..b6e7932 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
@@ -77,6 +77,7 @@ public class StubbedComputeServiceRegistry implements ComputeServiceRegistry {
         public SingleNodeCreator(NodeMetadata node) {
             this.node = node;
         }
+        @Override
         protected NodeMetadata newNode(String group, Template template) {
             return node;
         }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/policy/src/main/java/org/apache/brooklyn/policy/action/StopAfterDurationPolicy.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/action/StopAfterDurationPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/action/StopAfterDurationPolicy.java
index ae73c61..1d8d53a 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/action/StopAfterDurationPolicy.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/action/StopAfterDurationPolicy.java
@@ -79,6 +79,7 @@ public class StopAfterDurationPolicy extends AbstractPolicy {
 
     private final Object eventLock = new Object[0];
 
+    @Override
     public void setEntity(final EntityLocal entity) {
         super.setEntity(entity);
         entity.subscriptions().subscribe(entity, Attributes.SERVICE_STATE_ACTUAL, new LifecycleListener());

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunParameters.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunParameters.java b/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunParameters.java
index c8742e4..cc85042 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunParameters.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunParameters.java
@@ -86,6 +86,7 @@ public class FollowTheSunParameters {
         return true;
     }
     
+    @Override
     public String toString() {
         return "Inter-geography policy params: percentTotal="+triggerPercentTotal+"; deltaAbovePercentTotal="+triggerDeltaAbovePercentTotal+
                 "; absoluteTotal="+triggerAbsoluteTotal+"; percentMajority="+triggerPercentMajority+

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupImpl.java b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupImpl.java
index 35f0c8d..cdd0ec2 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupImpl.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupImpl.java
@@ -117,6 +117,7 @@ public class ItemsInContainersGroupImpl extends DynamicGroupImpl implements Item
         rescanEntities();
     }
     
+    @Override
     protected void onEntityAdded(Entity item) {
         if (acceptsEntity(item)) {
             if (LOG.isDebugEnabled()) LOG.debug("{} adding new item {}", this, item);
@@ -124,6 +125,7 @@ public class ItemsInContainersGroupImpl extends DynamicGroupImpl implements Item
         }
     }
     
+    @Override
     protected void onEntityRemoved(Entity item) {
         if (removeMember(item)) {
             if (LOG.isDebugEnabled()) LOG.debug("{} removing deleted item {}", this, item);


Mime
View raw message