Repository: brooklyn-server Updated Branches: refs/heads/master 8ad5578c1 -> 972a0d8e1
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java index 8d239da..ce060e3 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java @@ -56,6 +56,7 @@ public class ServiceRestarterTest extends BrooklynAppUnitTestSupport { private SensorEventListener<Object> eventListener; private List<SensorEvent<?>> events; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 cb93df0..bf5661e 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 @@ -122,6 +122,7 @@ public class MockContainerEntityImpl extends AbstractGroupImpl implements MockCo return (Set) Sets.newLinkedHashSet(getMembers()); } + @Override public String toString() { return "MockContainer["+getDisplayName()+"]"; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java index 419715b..05b9092 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java @@ -45,6 +45,7 @@ public class BrooklynRestApp extends Application { //Uncomment after removing jersey dependencies //@Override + @Override public Map<String, Object> getProperties() { return ImmutableMap.<String, Object>of( // Makes sure that all exceptions are handled by our custom DefaultExceptionMapper http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java index 6278b7c..cb55875 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java @@ -67,6 +67,7 @@ public class HaHotCheckResourceFilter implements ContainerRequestFilter { private ResourceInfo resourceInfo; private HaHotCheckHelperAbstract helper = new HaHotCheckHelperAbstract() { + @Override public ManagementContext mgmt() { return mgmt.getContext(ManagementContext.class); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java index 713dccb..e12b769 100644 --- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java +++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java @@ -40,142 +40,177 @@ public abstract class DelegatingPrintStream extends PrintStream { protected abstract PrintStream getDelegate(); + @Override public int hashCode() { return getDelegate().hashCode(); } + @Override public void write(byte[] b) throws IOException { getDelegate().write(b); } + @Override public boolean equals(Object obj) { return getDelegate().equals(obj); } + @Override public String toString() { return getDelegate().toString(); } + @Override public void flush() { getDelegate().flush(); } + @Override public void close() { getDelegate().close(); } + @Override public boolean checkError() { return getDelegate().checkError(); } + @Override public void write(int b) { getDelegate().write(b); } + @Override public void write(byte[] buf, int off, int len) { getDelegate().write(buf, off, len); } + @Override public void print(boolean b) { getDelegate().print(b); } + @Override public void print(char c) { getDelegate().print(c); } + @Override public void print(int i) { getDelegate().print(i); } + @Override public void print(long l) { getDelegate().print(l); } + @Override public void print(float f) { getDelegate().print(f); } + @Override public void print(double d) { getDelegate().print(d); } + @Override public void print(char[] s) { getDelegate().print(s); } + @Override public void print(String s) { getDelegate().print(s); } + @Override public void print(Object obj) { getDelegate().print(obj); } + @Override public void println() { getDelegate().println(); } + @Override public void println(boolean x) { getDelegate().println(x); } + @Override public void println(char x) { getDelegate().println(x); } + @Override public void println(int x) { getDelegate().println(x); } + @Override public void println(long x) { getDelegate().println(x); } + @Override public void println(float x) { getDelegate().println(x); } + @Override public void println(double x) { getDelegate().println(x); } + @Override public void println(char[] x) { getDelegate().println(x); } + @Override public void println(String x) { getDelegate().println(x); } + @Override public void println(Object x) { getDelegate().println(x); } + @Override public PrintStream printf(String format, Object... args) { return getDelegate().printf(format, args); } + @Override public PrintStream printf(Locale l, String format, Object... args) { return getDelegate().printf(l, format, args); } + @Override public PrintStream format(String format, Object... args) { return getDelegate().format(format, args); } + @Override public PrintStream format(Locale l, String format, Object... args) { return getDelegate().format(l, format, args); } + @Override public PrintStream append(CharSequence csq) { return getDelegate().append(csq); } + @Override public PrintStream append(CharSequence csq, int start, int end) { return getDelegate().append(csq, start, end); } + @Override public PrintStream append(char c) { return getDelegate().append(c); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 4a49e45..0664b9d 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 @@ -91,13 +91,21 @@ public class RestMockSimpleEntity extends SoftwareProcessImpl { super(entity, machine); } public boolean isRunning() { return true; } + @Override public void stop() {} + @Override public void kill() {} + @Override public void install() {} + @Override public void customize() {} + @Override public void launch() {} + @Override public void setup() { } + @Override public void copyInstallResources() { } + @Override public void copyRuntimeResources() { } } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java b/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java index 9683e33..27a2927 100644 --- a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java +++ b/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/HaMasterCheckFilter.java @@ -56,6 +56,7 @@ public class HaMasterCheckFilter implements Filter { protected ManagementContext mgmt; private HaHotCheckHelperAbstract helper = new HaHotCheckHelperAbstract() { + @Override public ManagementContext mgmt() { return mgmt; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java index 2bb3203..09ac6cc 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java @@ -59,6 +59,7 @@ public class BrooklynJacksonSerializerIntegrationTest extends BrooklynAppUnitTes URI entityUrl; URI configUri; + @Override @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java ---------------------------------------------------------------------- diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java index 73a56dd..fe54880 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java @@ -170,6 +170,7 @@ public abstract class AbstractMain { public Map<String,String> getDefinesAsMap() { return KeyValueParser.parseMap(Strings.join(getDefines(),",")); } public void applyDefinesAsSystemProperties() { System.getProperties().putAll(getDefinesAsMap()); } + @Override public ToStringHelper string() { return super.string() .add("defines", getDefines()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 c972bbf..27c11f4 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 @@ -547,6 +547,7 @@ public class CliTest { @Test public void testCanCustomiseInfoCommand() throws Exception { Main main = new Main() { + @Override protected Class<? extends BrooklynCommand> cliInfoCommand() { return CustomInfoCommand.class; } @@ -567,6 +568,7 @@ public class CliTest { @Test public void testCanCustomiseLaunchCommand() throws Exception { Main main = new Main() { + @Override protected Class<? extends BrooklynCommand> cliLaunchCommand() { return CustomLaunchCommand.class; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 14038b0..96d6c07 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 @@ -238,6 +238,7 @@ public class ChefAttributeFeed extends AbstractFeed { minPeriod); } + @Override @SuppressWarnings("unchecked") protected Poller<SshPollValue> getPoller() { return (Poller<SshPollValue>) super.getPoller(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefEntityImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefEntityImpl.java index 911b546..6bc3cfd 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefEntityImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefEntityImpl.java @@ -23,6 +23,7 @@ import org.apache.brooklyn.util.text.Strings; public class ChefEntityImpl extends EffectorStartableImpl implements ChefEntity { + @Override public void init() { String primaryName = getConfig(CHEF_COOKBOOK_PRIMARY_NAME); if (!Strings.isBlank(primaryName)) setDefaultDisplayName(primaryName+" (chef)"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java index 78eb094..3e294f7 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefLifecycleEffectorTasks.java @@ -236,6 +236,7 @@ public class ChefLifecycleEffectorTasks extends MachineLifecycleEffectorTasks im .knifeRunTwice(entity().getConfig(CHEF_RUN_CONVERGE_TWICE)) ); } + @Override protected void postStartCustom() { boolean result = false; result |= tryCheckStartPid(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java index c9d99b3..68a1d50 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java @@ -72,6 +72,7 @@ public class KnifeConvergeTaskFactory<RET> extends KnifeTaskFactory<RET> { /** construct the knife command, based on the settings on other methods * (called when instantiating the script, after all parameters sent) */ + @Override protected List<String> initialKnifeParameters() { // runs inside the task so can detect entity/machine at runtime MutableList<String> result = new MutableList<String>(); @@ -209,6 +210,7 @@ public class KnifeConvergeTaskFactory<RET> extends KnifeTaskFactory<RET> { return self(); } + @Override protected String buildKnifeCommand(int knifeCommandIndex) { String result = super.buildKnifeCommand(knifeCommandIndex); if (Boolean.TRUE.equals(runTwice)) @@ -236,6 +238,7 @@ public class KnifeConvergeTaskFactory<RET> extends KnifeTaskFactory<RET> { return (KnifeConvergeTaskFactory<String>) super.requiringZeroAndReturningStdout(); } + @Override public KnifeConvergeTaskFactory<RET> knifeAddParameters(String word1, String ...words) { super.knifeAddParameters(word1, words); return self(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 c325afc..39e1bbc 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 @@ -124,6 +124,7 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP } /** returns location (tighten type, since we know it is an ssh machine location here) */ + @Override public SshMachineLocation getLocation() { return (SshMachineLocation) super.getLocation(); } @@ -133,6 +134,7 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP entity.sensors().set(SoftwareProcess.INSTALL_DIR, installDir); } + @Override public String getInstallDir() { if (installDir != null) return installDir; @@ -178,6 +180,7 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP entity.sensors().set(SoftwareProcess.RUN_DIR, runDir); } + @Override public String getRunDir() { if (runDir != null) return runDir; @@ -361,6 +364,7 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP * @param createParentDir Whether to create the parent target directory, if it doesn't already exist * @return The exit code of the SSH command run */ + @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public int copyResource(Map<Object,Object> sshFlags, String source, String target, boolean createParentDir) { // TODO use SshTasks.put instead, better logging @@ -398,6 +402,7 @@ public abstract class AbstractSoftwareProcessSshDriver extends AbstractSoftwareP * * @see #copyResource(Map, String, String) for parameter descriptions. */ + @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public int copyResource(Map<Object,Object> sshFlags, InputStream source, String target, boolean createParentDir) { Map flags = Maps.newLinkedHashMap(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java index d9d83e8..0cba30e 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java @@ -49,6 +49,7 @@ public class SoftwareProcessDriverLifecycleEffectorTasks extends MachineLifecycl private static final Logger log = LoggerFactory.getLogger(SoftwareProcessDriverLifecycleEffectorTasks.class); + @Override public void restart(ConfigBag parameters) { RestartMachineMode isRestartMachine = parameters.get(RestartSoftwareParameters.RESTART_MACHINE_TYPED); if (isRestartMachine==null) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 b3b2994..6c9cb49 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 @@ -243,6 +243,7 @@ public class JmxFeed extends AbstractFeed { return getConfig(HELPER); } + @Override @SuppressWarnings("unchecked") protected Poller<Object> getPoller() { return (Poller<Object>) super.getPoller(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternTest.java b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternTest.java index 122cc56..baf212b 100644 --- a/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/core/location/dynamic/clocker/ClockerDynamicLocationPatternTest.java @@ -53,6 +53,7 @@ public class ClockerDynamicLocationPatternTest extends BrooklynAppUnitTestSuppor private LocalhostMachineProvisioningLocation loc; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeTest.java index d496f12..ebbcc55 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeTest.java @@ -180,6 +180,7 @@ public class BrooklynNodeTest { super(); } + @Override public Collection<Integer> getRequiredOpenPorts() { return super.getRequiredOpenPorts(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java index af7a3f1..c95e2fc 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java @@ -64,6 +64,7 @@ public class SelectMasterEffectorTest extends BrooklynAppUnitTestSupport { protected HttpCallback http; protected Poller<Void> poller; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { super.setUp(); @@ -94,6 +95,7 @@ public class SelectMasterEffectorTest extends BrooklynAppUnitTestSupport { .configure(MockBrooklynNode.HTTP_CLIENT_CALLBACK, http))); } + @Override @AfterMethod(alwaysRun=true) public void tearDown() throws Exception { poller.stop(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java index 83fb6bb..55fa4ff 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/chef/mysql/AbstractChefToyMySqlEntityLiveTest.java @@ -33,6 +33,7 @@ public abstract class AbstractChefToyMySqlEntityLiveTest extends AbstractToyMySq super.testMySqlOnProvisioningLocation(); } + @Override protected MachineProvisioningLocation<? extends SshMachineLocation> createLocation() { return ChefLiveTestSupport.createLocation(mgmt); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaOptsTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaOptsTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaOptsTest.java index 15243c5..58f72d6 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaOptsTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/java/JavaOptsTest.java @@ -244,6 +244,7 @@ public class JavaOptsTest extends BrooklynAppUnitTestSupport { } public static class TestingNoSensorsVanillaJavaAppImpl extends VanillaJavaAppImpl { + @Override protected void connectSensors() { /* nothing here */ sensors().set(SERVICE_UP, true); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerLiveTest.java index 0a7a9de..343814e 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerLiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerLiveTest.java @@ -57,6 +57,7 @@ public class SetHostnameCustomizerLiveTest extends BrooklynAppLiveTestSupport { protected MachineProvisioningLocation<SshMachineLocation> loc; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerTest.java index 2a36017..5f8e0f0 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/machine/SetHostnameCustomizerTest.java @@ -52,6 +52,7 @@ public class SetHostnameCustomizerTest extends BrooklynAppUnitTestSupport { private SetHostnameCustomizer customizer; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLiveTest.java index 287fdae..60b3b0f 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/machine/pool/ServerPoolLiveTest.java @@ -73,6 +73,7 @@ public class ServerPoolLiveTest extends AbstractServerPoolTest { return new LocalManagementContextForTests(brooklynProperties); } + @Override protected boolean shouldSkipOnBoxBaseDirResolution() { return false; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessStreamsTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessStreamsTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessStreamsTest.java index 75216f7..3ebffcb 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessStreamsTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessStreamsTest.java @@ -48,6 +48,7 @@ public abstract class AbstractSoftwareProcessStreamsTest extends BrooklynAppLive protected abstract Map<String, String> getCommands(); + @Override protected EntitySpec<? extends TestApplication> newAppSpec() { return EntitySpec.create(TestApplication.class) .configure(BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION, true); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/EntitySshToolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/EntitySshToolTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/EntitySshToolTest.java index ecb9be9..f21cf7f 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/EntitySshToolTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/EntitySshToolTest.java @@ -45,6 +45,7 @@ public class EntitySshToolTest extends BrooklynAppUnitTestSupport { private SshMachineLocation machine; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { super.setUp(); @@ -54,6 +55,7 @@ public class EntitySshToolTest extends BrooklynAppUnitTestSupport { .configure("address", "localhost")); } + @Override @AfterMethod(alwaysRun=true) public void tearDown() throws Exception { RecordingSshTool.clear(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareEffectorTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareEffectorTest.java index 69d1cfc..3bdc6f7 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareEffectorTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareEffectorTest.java @@ -68,6 +68,7 @@ public class SoftwareEffectorTest { public static final Effector<String> GET_REMOTE_DATE_1 = Effectors.effector(String.class, "getRemoteDate") .description("retrieves the date from the remote machine") .impl(new SshEffectorBody<String>() { + @Override public String call(ConfigBag parameters) { queue( ssh("date").requiringZeroAndReturningStdout() ); return last(String.class); @@ -103,6 +104,7 @@ public class SoftwareEffectorTest { public void testBadExitCodeCaught() { Task<Void> call = Entities.invokeEffector(app, app, Effectors.effector(Void.class, "badExitCode") .impl(new SshEffectorBody<Void>() { + @Override public Void call(ConfigBag parameters) { queue( ssh(COMMAND_THAT_DOES_NOT_EXIST).requiringZeroAndReturningStdout() ); return null; @@ -127,6 +129,7 @@ public class SoftwareEffectorTest { Task<Void> call = Entities.invokeEffector(app, app, Effectors.effector(Void.class, "badExitCode") .impl(new SshEffectorBody<Void>() { + @Override public Void call(ConfigBag parameters) { sshTasks[0] = queue( ssh(COMMAND_THAT_DOES_NOT_EXIST).requiringExitCodeZero() ); return null; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java index ca79ac0..990556f 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessOpenIptablesStreamsLiveTest.java @@ -53,6 +53,7 @@ public class SoftwareProcessOpenIptablesStreamsLiveTest extends BrooklynAppLiveT protected TestApplication app; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java index 91f8221..1df4ce5 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java @@ -46,6 +46,7 @@ public class SoftwareProcessPersisterInMemorySizeIntegrationTest extends Brookly } // to allow selection for running in IDE + @Override public void testPersistenceVolumeFast() throws Exception { super.testPersistenceVolumeFast(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 b8455b3..2bf65a9 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 @@ -62,10 +62,15 @@ public class StartStopSshDriverTest { super(entity, machine); } public boolean isRunning() { return true; } + @Override public void stop() {} + @Override public void kill() {} + @Override public void install() {} + @Override public void customize() {} + @Override public void launch() {} } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkEffectorsEc2LiveTests.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkEffectorsEc2LiveTests.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkEffectorsEc2LiveTests.java index bf7a67b..c8818a4 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkEffectorsEc2LiveTests.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/location/NetworkEffectorsEc2LiveTests.java @@ -28,6 +28,7 @@ public class NetworkEffectorsEc2LiveTests extends NetworkingEffectorsLiveTests { public static final String REGION_NAME = "us-east-1"; public static final String LOCATION_SPEC = PROVIDER + (REGION_NAME == null ? "" : ":" + REGION_NAME); + @Override @Test(groups = "Live") public void testPassSecurityGroupParameters() { super.testPassSecurityGroupParameters(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 299c40a..82d1347 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 @@ -63,6 +63,7 @@ public class AutoScalerPolicyNoMoreMachinesTest extends BrooklynAppUnitTestSuppo Set<Entity> entitiesAdded; Set<Entity> entitiesRemoved; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 0ab5539..e4907e0 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 @@ -124,6 +124,7 @@ public class DynamicToyMySqlEntityBuilder { ).summary("setup and run mysql").returning(SshTasks.returningStdoutLoggingInfo(log, true))); return "submitted start"; } + @Override protected void postStartCustom() { // if it's still up after 5s assume we are good Time.sleep(Duration.FIVE_SECONDS); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityTest.java index 46fd126..e626944 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/DynamicToyMySqlEntityTest.java @@ -32,6 +32,7 @@ public class DynamicToyMySqlEntityTest extends AbstractToyMySqlEntityTest { private static final Logger log = LoggerFactory.getLogger(DynamicToyMySqlEntityTest.class); + @Override protected Entity createMysql() { Entity mysql = app.createAndManageChild(DynamicToyMySqlEntityBuilder.spec()); log.debug("created "+mysql); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java ---------------------------------------------------------------------- diff --git a/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java b/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java index 329a652..cedd62f 100644 --- a/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java +++ b/software/winrm/src/main/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeed.java @@ -235,6 +235,7 @@ public class WindowsPerformanceCounterFeed extends AbstractFeed { } } + @Override @SuppressWarnings("unchecked") protected Poller<WinRmToolResponse> getPoller() { return (Poller<WinRmToolResponse>) super.getPoller(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java ---------------------------------------------------------------------- diff --git a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java b/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java index 6ea9763..03ee0ea 100644 --- a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java +++ b/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java @@ -52,6 +52,7 @@ public class AdvertiseWinrmLoginPolicy extends AbstractPolicy implements SensorE "vm.user.credentials", "The \"<user> : <password> @ <hostname>:<port>\""); + @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/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedLiveTest.java ---------------------------------------------------------------------- diff --git a/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedLiveTest.java b/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedLiveTest.java index 2795e89..9ddbb14 100644 --- a/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedLiveTest.java +++ b/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedLiveTest.java @@ -67,6 +67,7 @@ public class WindowsPerformanceCounterFeedLiveTest extends BrooklynAppLiveTestSu private Location loc; private Entity entity; + @Override @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.java ---------------------------------------------------------------------- diff --git a/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.java b/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.java index d2bf55e..01ca0f9 100644 --- a/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.java +++ b/test-support/src/main/java/org/apache/brooklyn/test/TestUtils.java @@ -49,6 +49,7 @@ public class TestUtils { public boolean asBoolean() { return value; } + @Override public String toString() { return message; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java b/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java index c2e3c1d..a92d764 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java +++ b/utils/common/src/main/java/org/apache/brooklyn/test/Asserts.java @@ -907,6 +907,7 @@ public class Asserts { public boolean asBoolean() { return value; } + @Override public String toString() { return message; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/common/src/main/java/org/apache/brooklyn/util/guava/Maybe.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/guava/Maybe.java b/utils/common/src/main/java/org/apache/brooklyn/util/guava/Maybe.java index 5270595..dbbe949 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/guava/Maybe.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/guava/Maybe.java @@ -269,6 +269,7 @@ public abstract class Maybe<T> implements Serializable, Supplier<T> { public <V> Maybe<V> transform(final Function<? super T, V> f) { if (isPresent()) return new AbstractPresent<V>() { private static final long serialVersionUID = 325089324325L; + @Override public V get() { return f.apply(Maybe.this.get()); } @@ -330,6 +331,7 @@ public abstract class Maybe<T> implements Serializable, Supplier<T> { public T get() { throw getException(); } + @Override public T orThrowUnwrapped() { throw getException(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/common/src/main/java/org/apache/brooklyn/util/internal/BasicDelegatingSystemProperty.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/internal/BasicDelegatingSystemProperty.java b/utils/common/src/main/java/org/apache/brooklyn/util/internal/BasicDelegatingSystemProperty.java index faa97ae..6ed402c 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/internal/BasicDelegatingSystemProperty.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/internal/BasicDelegatingSystemProperty.java @@ -30,6 +30,7 @@ public class BasicDelegatingSystemProperty { public boolean isAvailable() { return delegate.isAvailable(); } + @Override public String toString() { return delegate.toString(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/LoadedClassLoader.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/LoadedClassLoader.java b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/LoadedClassLoader.java index dba726f..d88a787 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/LoadedClassLoader.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/LoadedClassLoader.java @@ -28,6 +28,7 @@ public class LoadedClassLoader extends ClassLoader { Map<String, Class<?>> loadedClasses = new LinkedHashMap<String, Class<?>>(); + @Override protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { Class<?> result = loadedClasses.get(name); if (result==null) throw new ClassNotFoundException(""+name+" not known here"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/common/src/main/java/org/apache/brooklyn/util/logging/SimpleOneLineLogFormatter.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/logging/SimpleOneLineLogFormatter.java b/utils/common/src/main/java/org/apache/brooklyn/util/logging/SimpleOneLineLogFormatter.java index 43faf4b..d3faf52 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/logging/SimpleOneLineLogFormatter.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/logging/SimpleOneLineLogFormatter.java @@ -57,6 +57,7 @@ public class SimpleOneLineLogFormatter extends Formatter { } /** uses "YYYY-DD-MM hh:mm:ss.SSS message" format */ + @Override public String format(LogRecord record) { StringBuffer sb = new StringBuffer(); appendDate(record, sb); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/common/src/main/java/org/apache/brooklyn/util/stream/DelegatingPrintStream.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/stream/DelegatingPrintStream.java b/utils/common/src/main/java/org/apache/brooklyn/util/stream/DelegatingPrintStream.java index 11728c4..13f285c 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/stream/DelegatingPrintStream.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/stream/DelegatingPrintStream.java @@ -31,142 +31,177 @@ public abstract class DelegatingPrintStream extends PrintStream { protected abstract PrintStream getDelegate(); + @Override public int hashCode() { return getDelegate().hashCode(); } + @Override public void write(byte[] b) throws IOException { getDelegate().write(b); } + @Override public boolean equals(Object obj) { return getDelegate().equals(obj); } + @Override public String toString() { return getDelegate().toString(); } + @Override public void flush() { getDelegate().flush(); } + @Override public void close() { getDelegate().close(); } + @Override public boolean checkError() { return getDelegate().checkError(); } + @Override public void write(int b) { getDelegate().write(b); } + @Override public void write(byte[] buf, int off, int len) { getDelegate().write(buf, off, len); } + @Override public void print(boolean b) { getDelegate().print(b); } + @Override public void print(char c) { getDelegate().print(c); } + @Override public void print(int i) { getDelegate().print(i); } + @Override public void print(long l) { getDelegate().print(l); } + @Override public void print(float f) { getDelegate().print(f); } + @Override public void print(double d) { getDelegate().print(d); } + @Override public void print(char[] s) { getDelegate().print(s); } + @Override public void print(String s) { getDelegate().print(s); } + @Override public void print(Object obj) { getDelegate().print(obj); } + @Override public void println() { getDelegate().println(); } + @Override public void println(boolean x) { getDelegate().println(x); } + @Override public void println(char x) { getDelegate().println(x); } + @Override public void println(int x) { getDelegate().println(x); } + @Override public void println(long x) { getDelegate().println(x); } + @Override public void println(float x) { getDelegate().println(x); } + @Override public void println(double x) { getDelegate().println(x); } + @Override public void println(char[] x) { getDelegate().println(x); } + @Override public void println(String x) { getDelegate().println(x); } + @Override public void println(Object x) { getDelegate().println(x); } + @Override public PrintStream printf(String format, Object... args) { return getDelegate().printf(format, args); } + @Override public PrintStream printf(Locale l, String format, Object... args) { return getDelegate().printf(l, format, args); } + @Override public PrintStream format(String format, Object... args) { return getDelegate().format(format, args); } + @Override public PrintStream format(Locale l, String format, Object... args) { return getDelegate().format(l, format, args); } + @Override public PrintStream append(CharSequence csq) { return getDelegate().append(csq); } + @Override public PrintStream append(CharSequence csq, int start, int end) { return getDelegate().append(csq, start, end); } + @Override public PrintStream append(char c) { return getDelegate().append(c); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/common/src/main/java/org/apache/brooklyn/util/stream/ReaderInputStream.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/stream/ReaderInputStream.java b/utils/common/src/main/java/org/apache/brooklyn/util/stream/ReaderInputStream.java index a142052..f4abe11 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/stream/ReaderInputStream.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/stream/ReaderInputStream.java @@ -67,6 +67,7 @@ public class ReaderInputStream extends InputStream { * * @exception IOException if the original {@link Reader} fails to be read */ + @Override public synchronized int read() throws IOException { if (in == null) { throw new IOException("Stream Closed"); @@ -103,6 +104,7 @@ public class ReaderInputStream extends InputStream { * the end of the stream * @exception IOException if an error occurs */ + @Override public synchronized int read(byte[] b, int off, int len) throws IOException { if (in == null) { @@ -140,6 +142,7 @@ public class ReaderInputStream extends InputStream { * @param limit the maximum limit of bytes that can be read before the * mark position becomes invalid */ + @Override public synchronized void mark(final int limit) { try { in.mark(limit); @@ -153,6 +156,7 @@ public class ReaderInputStream extends InputStream { * @return the current number of bytes ready for reading * @exception IOException if an error occurs */ + @Override public synchronized int available() throws IOException { if (in == null) { throw new IOException("Stream Closed"); @@ -170,6 +174,7 @@ public class ReaderInputStream extends InputStream { /** * @return false - mark is not supported */ + @Override public boolean markSupported () { return false; // would be imprecise } @@ -179,6 +184,7 @@ public class ReaderInputStream extends InputStream { * * @exception IOException if the StringReader fails to be reset */ + @Override public synchronized void reset() throws IOException { if (in == null) { throw new IOException("Stream Closed"); @@ -192,6 +198,7 @@ public class ReaderInputStream extends InputStream { * * @exception IOException if the original StringReader fails to be closed */ + @Override public synchronized void close() throws IOException { if (in != null) { in.close(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/common/src/test/java/org/apache/brooklyn/util/collections/JsonyaTest.java ---------------------------------------------------------------------- diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/collections/JsonyaTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/collections/JsonyaTest.java index 4bf94a6..d066218 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/collections/JsonyaTest.java +++ b/utils/common/src/test/java/org/apache/brooklyn/util/collections/JsonyaTest.java @@ -143,6 +143,7 @@ public class JsonyaTest { @Test public void testPrimitivedAndLiteralledMap() { Object foo = new Object() { + @Override public String toString() { return "FOO"; } }; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java b/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java index 0ac40bc..5dcd37d 100644 --- a/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java +++ b/utils/jmx/jmxmp-ssl-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxmp/JmxmpAgent.java @@ -124,6 +124,7 @@ public class JmxmpAgent { // (e.g. if the app is compiled with java7 then run with java6, with a java6 agent here; // that causes the agent to launch, the main to fail, but the process to keep going) Thread t = new Thread() { + @Override public void run() { doMainForeground(agentArgs); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/utils/jmx/jmxrmi-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxrmi-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java b/utils/jmx/jmxrmi-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java index 6aa35d3..bedfb0a 100644 --- a/utils/jmx/jmxrmi-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java +++ b/utils/jmx/jmxrmi-agent/src/main/java/org/apache/brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java @@ -88,6 +88,7 @@ public class JmxRmiAgent { // (e.g. if the app is compiled with java7 then run with java6, with a java6 agent here; // that causes the agent to launch, the main to fail, but the process to keep going) Thread t = new Thread() { + @Override public void run() { doMainForeground(agentArgs); }
