You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2017/01/23 15:14:31 UTC
[03/17] brooklyn-server git commit: Add missing @Override annotations
Add missing @Override annotations
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0d2d5d6a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0d2d5d6a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0d2d5d6a
Branch: refs/heads/master
Commit: 0d2d5d6a7a3568c4ed4c4aee4d07dd5982802d9e
Parents: 4d2f7cc
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Jan 20 12:45:34 2017 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Jan 20 12:45:34 2017 +0200
----------------------------------------------------------------------
.../brooklyn/api/location/LocationSpec.java | 3 ++
.../apache/brooklyn/api/policy/PolicySpec.java | 1 +
.../brooklyn/api/sensor/EnricherSpec.java | 2 ++
.../brooklyn/camp/AggregatingCampPlatform.java | 4 +++
.../apache/brooklyn/camp/BasicCampPlatform.java | 4 +++
.../brooklyn/camp/spi/PlatformRootSummary.java | 1 +
.../camp/brooklyn/AbstractYamlRebindTest.java | 1 +
.../brooklyn/catalog/CatalogYamlRebindTest.java | 1 +
.../catalog/CatalogYamlVersioningTest.java | 1 +
.../brooklyn/core/config/MapConfigKey.java | 5 +++
.../vault/VaultAppIdExternalConfigSupplier.java | 1 +
.../core/effector/ExplicitEffector.java | 2 ++
.../brooklyn/core/effector/MethodEffector.java | 1 +
.../core/effector/ssh/SshEffectorTasks.java | 2 ++
.../core/enricher/EnricherDynamicType.java | 1 +
.../core/entity/AbstractApplication.java | 1 +
.../brooklyn/core/entity/AbstractEntity.java | 4 +++
.../factory/BasicConfigurableEntityFactory.java | 1 +
.../entity/factory/ClosureEntityFactory.java | 1 +
.../org/apache/brooklyn/core/feed/Poller.java | 1 +
.../core/internal/BrooklynPropertiesImpl.java | 1 +
.../core/location/AbstractLocation.java | 4 +++
.../brooklyn/core/location/PortRanges.java | 2 ++
.../location/access/PortForwardManager.java | 1 +
.../access/PortForwardManagerAuthority.java | 1 +
.../location/geo/LocalhostExternalIpLoader.java | 1 +
.../core/location/geo/UtraceHostGeoLookup.java | 1 +
.../location/internal/LocationDynamicType.java | 1 +
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 1 +
.../BrooklynClassLoadingContextSequential.java | 1 +
.../JavaBrooklynClassLoadingContext.java | 1 +
...PropertyChangeToCollectionChangeAdapter.java | 2 ++
.../mgmt/internal/LocalSubscriptionManager.java | 2 ++
.../core/mgmt/internal/LocalUsageManager.java | 2 ++
.../brooklyn/core/policy/PolicyDynamicType.java | 1 +
.../stock/AbstractTypeTransformingEnricher.java | 1 +
.../brooklyn/enricher/stock/AddingEnricher.java | 1 +
.../brooklyn/enricher/stock/Aggregator.java | 2 ++
.../brooklyn/enricher/stock/Enrichers.java | 7 ++++
.../stock/SensorPropagatingEnricher.java | 1 +
.../brooklyn/enricher/stock/Transformer.java | 1 +
.../org/apache/brooklyn/feed/http/HttpFeed.java | 1 +
.../apache/brooklyn/feed/shell/ShellFeed.java | 1 +
.../org/apache/brooklyn/feed/ssh/SshFeed.java | 1 +
.../LocalhostMachineProvisioningLocation.java | 4 +++
.../location/ssh/SshMachineLocation.java | 1 +
.../util/core/config/ResolvingConfigBag.java | 2 ++
.../util/core/internal/ssh/cli/SshCliTool.java | 2 ++
.../core/internal/ssh/process/ProcessTool.java | 1 +
.../util/core/internal/ssh/sshj/SshjTool.java | 2 ++
.../util/core/task/BasicExecutionManager.java | 1 +
.../util/core/task/DynamicSequentialTask.java | 1 +
.../core/task/ListenableForwardingFuture.java | 1 +
.../brooklyn/util/core/task/ScheduledTask.java | 3 ++
.../brooklyn/util/core/task/SequentialTask.java | 1 +
.../brooklyn/util/core/task/ValueResolver.java | 1 +
.../internal/AbstractSshExecTaskFactory.java | 2 ++
.../xstream/EnumCaseForgivingConverter.java | 1 +
.../EnumCaseForgivingSingleValueConverter.java | 1 +
.../core/xstream/ImmutableListConverter.java | 1 +
.../core/xstream/ImmutableMapConverter.java | 1 +
.../core/xstream/ImmutableSetConverter.java | 1 +
.../util/core/xstream/MapConverter.java | 2 ++
.../core/xstream/StringKeyMapConverter.java | 1 +
.../MapListAndOtherStructuredConfigKeyTest.java | 2 ++
.../effector/EffectorExceptionLoggedTest.java | 1 +
.../core/effector/EffectorTaskTest.java | 2 ++
.../core/enricher/BasicEnricherTest.java | 1 +
.../ApplicationLifecycleStateStressTest.java | 11 ++++++
.../core/entity/EntityAutomanagedTest.java | 1 +
.../apache/brooklyn/core/feed/PollerTest.java | 2 ++
.../brooklyn/core/location/MachinesTest.java | 1 +
.../entitlement/AcmeEntitlementManagerTest.java | 1 +
...PerUserEntitlementManagerPropertiesTest.java | 1 +
.../HighAvailabilityManagerFileBasedTest.java | 1 +
.../ha/HighAvailabilityManagerInMemoryTest.java | 2 ++
.../HighAvailabilityManagerSplitBrainTest.java | 2 +-
.../internal/LocalSubscriptionManagerTest.java | 1 +
...ntoPersisterInMemorySizeIntegrationTest.java | 1 +
.../BrooklynMementoPersisterInMemoryTest.java | 1 +
.../FileBasedStoreObjectAccessorWriterTest.java | 2 ++
.../InMemoryStoreObjectAccessorWriterTest.java | 1 +
.../rebind/ActivePartialRebindVersionTest.java | 1 +
.../core/mgmt/rebind/CheckpointEntityTest.java | 1 +
.../core/mgmt/rebind/RebindEntityTest.java | 2 ++
.../rebind/RebindLocalhostLocationTest.java | 1 +
.../core/mgmt/rebind/RebindLocationTest.java | 1 +
.../rebind/RebindSshMachineLocationTest.java | 1 +
.../mgmt/rebind/RebindTestFixtureWithApp.java | 1 +
.../core/test/BrooklynAppLiveTestSupport.java | 1 +
.../core/test/BrooklynAppUnitTestSupport.java | 1 +
.../entity/TestApplicationNoEnrichersImpl.java | 1 +
.../core/test/entity/TestEntityImpl.java | 1 +
.../EntityPersistencePerformanceTest.java | 1 +
.../JavaYardStickPerformanceTest.java | 2 ++
.../SubscriptionPerformanceTest.java | 1 +
.../qa/performance/TaskPerformanceTest.java | 1 +
.../entity/stock/BasicStartableTest.java | 1 +
.../ssh/SshMachineLocationSshToolTest.java | 2 ++
.../location/ssh/SshMachineLocationTest.java | 3 ++
.../util/core/http/BetterMockWebServer.java | 3 ++
.../ssh/SshToolAbstractIntegrationTest.java | 3 ++
.../ssh/cli/SshCliToolIntegrationTest.java | 4 +++
.../sshj/SshjToolAsyncStubIntegrationTest.java | 1 +
.../ssh/sshj/SshjToolIntegrationTest.java | 3 ++
.../util/core/mutex/WithMutexesTest.java | 1 +
.../util/core/text/TemplateProcessorTest.java | 2 ++
.../xstream/ImmutableListConverterTest.java | 1 +
.../core/xstream/InetAddressConverterTest.java | 1 +
.../core/xstream/StringKeyMapConverterTest.java | 1 +
.../osgi/ClassRenameOsgiConfigLoader.java | 3 ++
.../JcloudsProviderRenameOsgiConfigLoader.java | 3 ++
.../brooklyn/launcher/BrooklynLauncher.java | 2 ++
.../BrooklynLauncherRebindTestToFiles.java | 4 +++
...lynLauncherRebindToCloudObjectStoreTest.java | 5 +++
.../blueprints/AbstractBlueprintTest.java | 1 +
.../Windows7zipBlueprintLiveTest.java | 2 ++
.../location/jclouds/BrooklynImageChooser.java | 2 ++
.../templates/PortableTemplateBuilder.java | 1 +
.../policy/jclouds/os/CreateUserPolicy.java | 1 +
...nMementoPersisterJcloudsObjectStoreTest.java | 1 +
...ailabilityManagerJcloudsObjectStoreTest.java | 3 ++
.../JcloudsObjectStoreAccessorWriterTest.java | 2 ++
...dsByonLocationResolverStubbedRebindTest.java | 3 ++
.../JcloudsByonLocationResolverStubbedTest.java | 2 ++
.../jclouds/JcloudsByonRebindLiveTest.java | 2 ++
.../JcloudsImageChoiceStubbedLiveTest.java | 1 +
...ocationReleasePortForwardingDefaultTest.java | 1 +
.../JcloudsProviderAndApiLoaderTest.java | 1 +
.../location/jclouds/JcloudsRebindLiveTest.java | 2 ++
.../location/jclouds/JcloudsRebindStubTest.java | 2 ++
.../jclouds/JcloudsRebindStubUnitTest.java | 2 ++
.../jclouds/JcloudsRenamesRebindTest.java | 1 +
...sSshMachineLocationAddressOverwriteTest.java | 2 ++
.../JcloudsSshMachineLocationStubbedTest.java | 2 ++
.../jclouds/StubbedComputeServiceRegistry.java | 1 +
.../policy/action/StopAfterDurationPolicy.java | 1 +
.../followthesun/FollowTheSunParameters.java | 1 +
.../ItemsInContainersGroupImpl.java | 2 ++
.../policy/ha/ServiceRestarterTest.java | 1 +
.../loadbalancing/MockContainerEntityImpl.java | 1 +
.../apache/brooklyn/rest/BrooklynRestApp.java | 1 +
.../rest/filter/HaHotCheckResourceFilter.java | 1 +
.../rest/resources/DelegatingPrintStream.java | 35 ++++++++++++++++++++
.../testing/mocks/RestMockSimpleEntity.java | 8 +++++
.../rest/filter/HaMasterCheckFilter.java | 1 +
...rooklynJacksonSerializerIntegrationTest.java | 1 +
.../org/apache/brooklyn/cli/AbstractMain.java | 1 +
.../java/org/apache/brooklyn/cli/CliTest.java | 2 ++
.../brooklyn/entity/chef/ChefAttributeFeed.java | 1 +
.../brooklyn/entity/chef/ChefEntityImpl.java | 1 +
.../entity/chef/ChefLifecycleEffectorTasks.java | 1 +
.../entity/chef/KnifeConvergeTaskFactory.java | 3 ++
.../base/AbstractSoftwareProcessSshDriver.java | 5 +++
...wareProcessDriverLifecycleEffectorTasks.java | 1 +
.../org/apache/brooklyn/feed/jmx/JmxFeed.java | 1 +
.../ClockerDynamicLocationPatternTest.java | 1 +
.../entity/brooklynnode/BrooklynNodeTest.java | 1 +
.../brooklynnode/SelectMasterEffectorTest.java | 2 ++
.../AbstractChefToyMySqlEntityLiveTest.java | 1 +
.../brooklyn/entity/java/JavaOptsTest.java | 1 +
.../machine/SetHostnameCustomizerLiveTest.java | 1 +
.../machine/SetHostnameCustomizerTest.java | 1 +
.../entity/machine/pool/ServerPoolLiveTest.java | 1 +
.../AbstractSoftwareProcessStreamsTest.java | 1 +
.../entity/software/base/EntitySshToolTest.java | 2 ++
.../software/base/SoftwareEffectorTest.java | 3 ++
...twareProcessOpenIptablesStreamsLiveTest.java | 1 +
...essPersisterInMemorySizeIntegrationTest.java | 1 +
.../base/lifecycle/StartStopSshDriverTest.java | 5 +++
.../location/NetworkEffectorsEc2LiveTests.java | 1 +
.../AutoScalerPolicyNoMoreMachinesTest.java | 1 +
.../mysql/DynamicToyMySqlEntityBuilder.java | 1 +
.../test/mysql/DynamicToyMySqlEntityTest.java | 1 +
.../windows/WindowsPerformanceCounterFeed.java | 1 +
.../winrm/AdvertiseWinrmLoginPolicy.java | 1 +
.../WindowsPerformanceCounterFeedLiveTest.java | 1 +
.../org/apache/brooklyn/test/TestUtils.java | 1 +
.../java/org/apache/brooklyn/test/Asserts.java | 1 +
.../org/apache/brooklyn/util/guava/Maybe.java | 2 ++
.../internal/BasicDelegatingSystemProperty.java | 1 +
.../util/javalang/LoadedClassLoader.java | 1 +
.../util/logging/SimpleOneLineLogFormatter.java | 1 +
.../util/stream/DelegatingPrintStream.java | 35 ++++++++++++++++++++
.../brooklyn/util/stream/ReaderInputStream.java | 7 ++++
.../brooklyn/util/collections/JsonyaTest.java | 1 +
.../brooklyn/util/jmx/jmxmp/JmxmpAgent.java | 1 +
.../brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java | 1 +
188 files changed, 384 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java b/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java
index b66ebea..6f84403 100644
--- a/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/location/LocationSpec.java
@@ -94,6 +94,7 @@ public class LocationSpec<T extends Location> extends AbstractBrooklynObjectSpec
return result;
}
+ @Override
protected void checkValidType(Class<? extends T> type) {
checkIsImplementation(type, Location.class);
checkIsNewStyleImplementation(type);
@@ -147,6 +148,7 @@ public class LocationSpec<T extends Location> extends AbstractBrooklynObjectSpec
* @return Read-only construction flags
* @see SetFromFlag declarations on the location type
*/
+ @Override
public Map<String, ?> getFlags() {
return Collections.unmodifiableMap(flags);
}
@@ -154,6 +156,7 @@ public class LocationSpec<T extends Location> extends AbstractBrooklynObjectSpec
/**
* @return Read-only configuration values
*/
+ @Override
public Map<ConfigKey<?>, Object> getConfig() {
return Collections.unmodifiableMap(config);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java b/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java
index a139d5d..6182629 100644
--- a/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/policy/PolicySpec.java
@@ -63,6 +63,7 @@ public class PolicySpec<T extends Policy> extends AbstractBrooklynObjectSpec<T,P
super(type);
}
+ @Override
protected void checkValidType(Class<? extends T> type) {
checkIsImplementation(type, Policy.class);
checkIsNewStyleImplementation(type);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java b/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java
index ae50e2d..2cd99a6 100644
--- a/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/sensor/EnricherSpec.java
@@ -65,6 +65,7 @@ public class EnricherSpec<T extends Enricher> extends AbstractBrooklynObjectSpec
super(type);
}
+ @Override
protected void checkValidType(Class<? extends T> type) {
checkIsImplementation(type, Enricher.class);
checkIsNewStyleImplementation(type);
@@ -82,6 +83,7 @@ public class EnricherSpec<T extends Enricher> extends AbstractBrooklynObjectSpec
super(type);
}
+ @Override
@SuppressWarnings("unchecked")
protected K self() {
// we override the AbstractBrooklynObjectSpec method -- it's a different K here because
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/AggregatingCampPlatform.java
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/AggregatingCampPlatform.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/AggregatingCampPlatform.java
index 137e927..cc2aef7 100644
--- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/AggregatingCampPlatform.java
+++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/AggregatingCampPlatform.java
@@ -72,6 +72,7 @@ public class AggregatingCampPlatform extends CampPlatform {
return AggregatingResourceLookup.of(lookups);
}
+ @Override
public ResourceLookup<PlatformComponentTemplate> platformComponentTemplates() {
return aggregatingLookup(new Function<CampPlatform, ResourceLookup<PlatformComponentTemplate>>() {
public ResourceLookup<PlatformComponentTemplate> apply(@Nullable CampPlatform input) {
@@ -89,6 +90,7 @@ public class AggregatingCampPlatform extends CampPlatform {
});
}
+ @Override
public ResourceLookup<AssemblyTemplate> assemblyTemplates() {
return aggregatingLookup(new Function<CampPlatform, ResourceLookup<AssemblyTemplate>>() {
public ResourceLookup<AssemblyTemplate> apply(@Nullable CampPlatform input) {
@@ -97,6 +99,7 @@ public class AggregatingCampPlatform extends CampPlatform {
});
}
+ @Override
public ResourceLookup<PlatformComponent> platformComponents() {
return aggregatingLookup(new Function<CampPlatform, ResourceLookup<PlatformComponent>>() {
public ResourceLookup<PlatformComponent> apply(@Nullable CampPlatform input) {
@@ -114,6 +117,7 @@ public class AggregatingCampPlatform extends CampPlatform {
});
}
+ @Override
public ResourceLookup<Assembly> assemblies() {
return aggregatingLookup(new Function<CampPlatform, ResourceLookup<Assembly>>() {
public ResourceLookup<Assembly> apply(@Nullable CampPlatform input) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/BasicCampPlatform.java
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/BasicCampPlatform.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/BasicCampPlatform.java
index 34fc6a2..e0cbf6d 100644
--- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/BasicCampPlatform.java
+++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/BasicCampPlatform.java
@@ -53,6 +53,7 @@ public class BasicCampPlatform extends CampPlatform {
BasicResourceLookup<ApplicationComponent> applicationComponents = new BasicResourceLookup<ApplicationComponent>();
BasicResourceLookup<Assembly> assemblies = new BasicResourceLookup<Assembly>();
+ @Override
public BasicResourceLookup<PlatformComponentTemplate> platformComponentTemplates() {
return platformComponentTemplates;
}
@@ -62,10 +63,12 @@ public class BasicCampPlatform extends CampPlatform {
return applicationComponentTemplates;
}
+ @Override
public BasicResourceLookup<AssemblyTemplate> assemblyTemplates() {
return assemblyTemplates;
}
+ @Override
public BasicResourceLookup<PlatformComponent> platformComponents() {
return platformComponents;
}
@@ -75,6 +78,7 @@ public class BasicCampPlatform extends CampPlatform {
return applicationComponents;
}
+ @Override
public BasicResourceLookup<Assembly> assemblies() {
return assemblies;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/PlatformRootSummary.java
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/PlatformRootSummary.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/PlatformRootSummary.java
index d8713df..a861738 100644
--- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/PlatformRootSummary.java
+++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/PlatformRootSummary.java
@@ -60,6 +60,7 @@ public class PlatformRootSummary extends AbstractResource {
protected Builder(String type) { super(type); }
+ @Override
protected void initialize() {
super.initialize();
// TODO a better way not to have an ID here (new subclass BasicIdentifiableResource for other BasicResource instances)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java
index 2ba96e2..c9a57ce 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlRebindTest.java
@@ -104,6 +104,7 @@ public class AbstractYamlRebindTest extends RebindTestFixture<StartableApplicati
return null;
}
+ @Override
protected ManagementContext mgmt() {
return (newManagementContext != null) ? newManagementContext : origManagementContext;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
index 4cac9af..e6aff50 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java
@@ -122,6 +122,7 @@ public class CatalogYamlRebindTest extends AbstractYamlRebindTest {
super.tearDown();
}
+ @Override
protected boolean useOsgi() {
return true;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java
index 7fb4b68..bebda6f 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlVersioningTest.java
@@ -44,6 +44,7 @@ public class CatalogYamlVersioningTest extends AbstractYamlTest {
private BrooklynTypeRegistry types;
+ @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/main/java/org/apache/brooklyn/core/config/MapConfigKey.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/MapConfigKey.java b/core/src/main/java/org/apache/brooklyn/core/config/MapConfigKey.java
index 367259d..dea76b1 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/MapConfigKey.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/MapConfigKey.java
@@ -85,6 +85,7 @@ public class MapConfigKey<V> extends AbstractStructuredConfigKey<Map<String,V>,M
typeInheritance(key.getTypeInheritance());
constraint(key.getConstraint());
}
+ @Override
public Builder<V> self() {
return this;
}
@@ -108,9 +109,11 @@ public class MapConfigKey<V> extends AbstractStructuredConfigKey<Map<String,V>,M
return new MapConfigKey<V>(this);
}
+ @Override
public String getName() {
return name;
}
+ @Override
public String getDescription() {
return description;
}
@@ -152,9 +155,11 @@ public class MapConfigKey<V> extends AbstractStructuredConfigKey<Map<String,V>,M
return String.format("%s[MapConfigKey:%s]", name, getTypeName());
}
+ @Override
public ConfigKey<V> subKey(String subName) {
return super.subKey(subName);
}
+ @Override
public ConfigKey<V> subKey(String subName, String description) {
return super.subKey(subName, description);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java
index c71d57a..1cfc88f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java
@@ -42,6 +42,7 @@ public class VaultAppIdExternalConfigSupplier extends VaultExternalConfigSupplie
super(managementContext, name, config);
}
+ @Override
protected String initAndLogIn(Map<String, String> config) {
List<String> errors = Lists.newArrayListWithCapacity(1);
String appId = config.get("appId");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/effector/ExplicitEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/ExplicitEffector.java b/core/src/main/java/org/apache/brooklyn/core/effector/ExplicitEffector.java
index 65c1f0c..c9ae61b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/effector/ExplicitEffector.java
+++ b/core/src/main/java/org/apache/brooklyn/core/effector/ExplicitEffector.java
@@ -37,6 +37,7 @@ public abstract class ExplicitEffector<I,T> extends AbstractEffector<T> {
super(name, type, parameters, description);
}
+ @Override
public T call(Entity entity, Map parameters) {
return invokeEffector((I) entity, (Map<String,?>)parameters );
}
@@ -58,6 +59,7 @@ public abstract class ExplicitEffector<I,T> extends AbstractEffector<T> {
super(name, type, parameters, description);
this.body = body;
}
+ @Override
public T invokeEffector(I trait, Map<String,?> parameters) { return body.call(trait, parameters); }
@Override
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/effector/MethodEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/MethodEffector.java b/core/src/main/java/org/apache/brooklyn/core/effector/MethodEffector.java
index 351e86c..7350902 100644
--- a/core/src/main/java/org/apache/brooklyn/core/effector/MethodEffector.java
+++ b/core/src/main/java/org/apache/brooklyn/core/effector/MethodEffector.java
@@ -142,6 +142,7 @@ public class MethodEffector<T> extends AbstractEffector<T> {
super(anns.name, (Class<T>)anns.returnType, anns.parameters, JavaGroovyEquivalents.elvis(description, anns.description));
}
+ @Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public T call(Entity entity, Map parameters) {
if (entity instanceof AbstractEntity) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java b/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java
index 1f46314..6b74781 100644
--- a/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java
+++ b/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java
@@ -138,10 +138,12 @@ public class SshEffectorTasks {
return (SshEffectorTaskFactory<Boolean>) super.returningIsExitCodeZero();
}
+ @Override
public SshEffectorTaskFactory<String> requiringZeroAndReturningStdout() {
return (SshEffectorTaskFactory<String>) super.requiringZeroAndReturningStdout();
}
+ @Override
public <RET2> SshEffectorTaskFactory<RET2> returning(Function<ProcessTaskWrapper<?>, RET2> resultTransformation) {
return (SshEffectorTaskFactory<RET2>) super.returning(resultTransformation);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/enricher/EnricherDynamicType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/enricher/EnricherDynamicType.java b/core/src/main/java/org/apache/brooklyn/core/enricher/EnricherDynamicType.java
index b6a0b23..4331ee0 100644
--- a/core/src/main/java/org/apache/brooklyn/core/enricher/EnricherDynamicType.java
+++ b/core/src/main/java/org/apache/brooklyn/core/enricher/EnricherDynamicType.java
@@ -32,6 +32,7 @@ public class EnricherDynamicType extends BrooklynDynamicType<Enricher, AbstractE
super(enricher);
}
+ @Override
public EnricherType getSnapshot() {
return (EnricherType) super.getSnapshot();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java
index 400999e..857635d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractApplication.java
@@ -60,6 +60,7 @@ public abstract class AbstractApplication extends AbstractEntity implements Star
public AbstractApplication() {
}
+ @Override
public void init() {
super.init();
initApp();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
index 26da5d6..83c29a3 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java
@@ -499,6 +499,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return this;
}
+ @Override
public void setManagementContext(ManagementContextInternal managementContext) {
super.setManagementContext(managementContext);
getManagementSupport().setManagementContext(managementContext);
@@ -1229,6 +1230,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
ConfigConstraints.assertValid(AbstractEntity.this, key, val);
}
+ @Override
protected AbstractConfigMapImpl<?> getConfigsInternal() {
return configsInternal;
}
@@ -1259,6 +1261,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
}
}
+ @Override
protected <T> void onConfigChanged(ConfigKey<T> key, Object val) {
getManagementSupport().getEntityChangeListener().onConfigChanged(key);
}
@@ -1525,6 +1528,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
/**
* Default entity initialization sets ID sensors and calls {@link #initEnrichers()}.
*/
+ @Override
public void init() {
super.init();
initEnrichers();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/entity/factory/BasicConfigurableEntityFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/factory/BasicConfigurableEntityFactory.java b/core/src/main/java/org/apache/brooklyn/core/entity/factory/BasicConfigurableEntityFactory.java
index fa3bc92..32d730b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/factory/BasicConfigurableEntityFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/factory/BasicConfigurableEntityFactory.java
@@ -49,6 +49,7 @@ public class BasicConfigurableEntityFactory<T extends Entity> extends AbstractCo
this.clazzName = DeserializingClassRenamesProvider.INSTANCE.findMappedName(clazz.getName());
}
+ @Override
public T newEntity2(Map flags, Entity parent) {
try {
Constructor<? extends T> constructor = clazz.getConstructor(Map.class, Entity.class);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/entity/factory/ClosureEntityFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/factory/ClosureEntityFactory.java b/core/src/main/java/org/apache/brooklyn/core/entity/factory/ClosureEntityFactory.java
index df0cf26..5a5e003 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/factory/ClosureEntityFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/factory/ClosureEntityFactory.java
@@ -37,6 +37,7 @@ public class ClosureEntityFactory<T extends Entity> extends AbstractConfigurable
this.closure = closure;
}
+ @Override
public T newEntity2(Map flags, Entity parent) {
if (closure.getMaximumNumberOfParameters()>1)
return closure.call(flags, parent);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
index 9d8e0f8..13cd805 100644
--- a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
+++ b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java
@@ -207,6 +207,7 @@ public class Poller<V> {
return pollJobs.isEmpty();
}
+ @Override
public String toString() {
return Objects.toStringHelper(this).add("entity", entity).toString();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
index 89cb7d2..c03f858 100644
--- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java
@@ -384,6 +384,7 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro
}
/** like normal map.put, except config keys are dereferenced on the way in */
+ @Override
@SuppressWarnings("unchecked")
public Object put(Object key, Object value) {
if (key instanceof HasConfigKey) key = ((HasConfigKey)key).getConfigKey().getName();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java b/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
index d9eefe0..d980b34 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/AbstractLocation.java
@@ -189,6 +189,7 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
//throw new IllegalStateException("Cannot set configuration "+key+" on active location "+this)
}
+ @Override
public void setManagementContext(ManagementContextInternal managementContext) {
super.setManagementContext(managementContext);
if (displayNameAutoGenerated && getId() != null) name.set(getClass().getSimpleName()+":"+getId().substring(0, Math.min(getId().length(),4)));
@@ -547,6 +548,7 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
setDisplayName(newName);
}
+ @Override
public void setDisplayName(String newName) {
name.set(newName);
displayNameAutoGenerated = false;
@@ -642,11 +644,13 @@ public abstract class AbstractLocation extends AbstractBrooklynObject implements
return removed;
}
+ @Override
public void init() {
super.init();
loadExtension();
}
+ @Override
public void rebind() {
super.rebind();
loadExtension();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/location/PortRanges.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/PortRanges.java b/core/src/main/java/org/apache/brooklyn/core/location/PortRanges.java
index ca4c2e4..aa0b337 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/PortRanges.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/PortRanges.java
@@ -66,6 +66,7 @@ public class PortRanges {
return //getClass().getName()+"["+
""+port; //+"]";
}
+ @Override
public int hashCode() {
return Objects.hashCode(port);
}
@@ -176,6 +177,7 @@ public class PortRanges {
return //getClass().getName()+"["+
s; //+"]";
}
+ @Override
public int hashCode() {
return Objects.hashCode(ranges);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java
index 21e579c..b3497f1 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java
@@ -83,6 +83,7 @@ public interface PortForwardManager extends Location {
return privatePort;
}
+ @Override
public String toString() {
return Objects.toStringHelper(this)
.add("publicIpId", publicIpId)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerAuthority.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerAuthority.java b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerAuthority.java
index 89c57f3..8c8eee0 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerAuthority.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerAuthority.java
@@ -36,6 +36,7 @@ public class PortForwardManagerAuthority extends PortForwardManagerImpl {
this.owningEntity = owningEntity;
}
+ @Override
protected void onChanged() {
if (owningEntity != null) {
((EntityInternal) owningEntity).requestPersist();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/location/geo/LocalhostExternalIpLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/geo/LocalhostExternalIpLoader.java b/core/src/main/java/org/apache/brooklyn/core/location/geo/LocalhostExternalIpLoader.java
index f6623fc..0fd4107 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/geo/LocalhostExternalIpLoader.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/geo/LocalhostExternalIpLoader.java
@@ -170,6 +170,7 @@ public class LocalhostExternalIpLoader {
}
new Thread() {
+ @Override
public void run() {
for (String url : candidateUrls) {
try {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java b/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java
index 1ff8a3e..12f1b15 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java
@@ -127,6 +127,7 @@ Beyond this you get blacklisted and requests may time out, or return none.
public HostGeoInfo getHostGeoInfo(final InetAddress address, Duration timeout) throws MalformedURLException, IOException {
final AtomicReference<HostGeoInfo> result = new AtomicReference<HostGeoInfo>();
Thread lt = new Thread() {
+ @Override
public void run() {
try {
result.set(retrieveHostGeoInfo(address));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationDynamicType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationDynamicType.java b/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationDynamicType.java
index 59f0d34..43c126c 100644
--- a/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationDynamicType.java
+++ b/core/src/main/java/org/apache/brooklyn/core/location/internal/LocationDynamicType.java
@@ -29,6 +29,7 @@ public class LocationDynamicType extends BrooklynDynamicType<Location, AbstractL
super(location);
}
+ @Override
public LocationType getSnapshot() {
return (LocationType) super.getSnapshot();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
index 68e62d7..d917624 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
@@ -336,6 +336,7 @@ public class BrooklynTaskTags extends TaskTags {
this.effectorName = checkNotNull(effectorName, "effectorName");
this.parameters = parameters;
}
+ @Override
public String toString() {
return EFFECTOR_TAG+"@"+entityId+":"+effectorName;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/BrooklynClassLoadingContextSequential.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/BrooklynClassLoadingContextSequential.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/BrooklynClassLoadingContextSequential.java
index 19aa743..989cacc 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/BrooklynClassLoadingContextSequential.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/BrooklynClassLoadingContextSequential.java
@@ -68,6 +68,7 @@ public final class BrooklynClassLoadingContextSequential extends AbstractBrookly
this.secondaries.add( target );
}
+ @Override
public Maybe<Class<?>> tryLoadClass(String className) {
List<Throwable> errors = MutableList.of();
for (BrooklynClassLoadingContext target: primaries) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
index 70519cc..2a53e5b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
@@ -79,6 +79,7 @@ public class JavaBrooklynClassLoadingContext extends AbstractBrooklynClassLoadin
return JavaBrooklynClassLoadingContext.class.getClassLoader();
}
+ @Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public Maybe<Class<?>> tryLoadClass(String className) {
Maybe<Class<?>> cls = tryLoadClass0(className);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java
index cd13e1c..4930e01 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java
@@ -51,10 +51,12 @@ public class GroovyObservablesPropertyChangeToCollectionChangeAdapter implements
}
}
+ @Override
public int hashCode() {
return delegate.hashCode();
}
+ @Override
public boolean equals(Object other) {
if (other instanceof GroovyObservablesPropertyChangeToCollectionChangeAdapter)
return delegate.equals(((GroovyObservablesPropertyChangeToCollectionChangeAdapter) other).delegate);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java
index fd15cf3..9a01c48 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java
@@ -94,6 +94,7 @@ public class LocalSubscriptionManager extends AbstractSubscriptionManager {
return totalEventsDeliveredCount.get();
}
+ @Override
@SuppressWarnings("unchecked")
protected synchronized <T> SubscriptionHandle subscribe(Map<String, Object> flags, final Subscription<T> s) {
Entity producer = s.producer;
@@ -210,6 +211,7 @@ public class LocalSubscriptionManager extends AbstractSubscriptionManager {
return result;
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public <T> void publish(final SensorEvent<T> event) {
// REVIEW 1459 - execution
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
index ba8c665..d4c2c0d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java
@@ -280,6 +280,7 @@ public class LocalUsageManager implements UsageManager {
listener.onApplicationEvent(new ApplicationMetadataImpl(Entities.proxy(app)), event);
return null;
}
+ @Override
public String toString() {
return "applicationEvent("+app+", "+state+")";
}});
@@ -364,6 +365,7 @@ public class LocalUsageManager implements UsageManager {
listener.onLocationEvent(new LocationMetadataImpl(loc), event);
return null;
}
+ @Override
public String toString() {
return "locationEvent("+loc+", "+state+")";
}});
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java b/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java
index b103dbc..d4a9a68 100644
--- a/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java
+++ b/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java
@@ -32,6 +32,7 @@ public class PolicyDynamicType extends BrooklynDynamicType<Policy, AbstractPolic
super(policy);
}
+ @Override
public PolicyType getSnapshot() {
return (PolicyType) super.getSnapshot();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractTypeTransformingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractTypeTransformingEnricher.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractTypeTransformingEnricher.java
index e15322f..67769ec 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractTypeTransformingEnricher.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/AbstractTypeTransformingEnricher.java
@@ -52,6 +52,7 @@ public abstract class AbstractTypeTransformingEnricher<T,U> extends AbstractEnri
this.target = target;
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public void setEntity(EntityLocal entity) {
super.setEntity(entity);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/enricher/stock/AddingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/AddingEnricher.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/AddingEnricher.java
index 860cec2..8a192c2 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/AddingEnricher.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/AddingEnricher.java
@@ -54,6 +54,7 @@ public class AddingEnricher extends AbstractEnricher implements SensorEventListe
this.target = target;
}
+ @Override
public void setEntity(EntityLocal entity) {
super.setEntity(entity);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
index 23a9e81..2dd8a3c 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Aggregator.java
@@ -79,6 +79,7 @@ public class Aggregator<T,U> extends AbstractAggregator<T,U> implements SensorEv
public Aggregator() {}
+ @Override
@SuppressWarnings("unchecked")
protected void setEntityLoadingConfig() {
super.setEntityLoadingConfig();
@@ -189,6 +190,7 @@ public class Aggregator<T,U> extends AbstractAggregator<T,U> implements SensorEv
onUpdated();
}
+ @Override
protected void onUpdated() {
try {
emit(targetSensor, compute());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java
index 973933c..7e500a0 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java
@@ -306,6 +306,7 @@ public class Enrichers {
if (publishing==null) return null;
return "aggregator:"+publishing.getName();
}
+ @Override
public EnricherSpec<?> build() {
return super.build().configure(MutableMap.builder()
.putIfNotNull(Aggregator.PRODUCER, fromEntity)
@@ -415,6 +416,7 @@ public class Enrichers {
if (publishing==null) return null;
return "combiner:"+publishing.getName();
}
+ @Override
public EnricherSpec<?> build() {
return super.build().configure(MutableMap.builder()
.putIfNotNull(Combiner.PRODUCER, fromEntity)
@@ -473,6 +475,7 @@ public class Enrichers {
if (publishing==null) return null;
return "transformer:"+publishing.getName();
}
+ @Override
public EnricherSpec<?> build() {
return super.build().configure(MutableMap.builder()
.putIfNotNull(Transformer.PRODUCER, fromEntity)
@@ -556,6 +559,7 @@ public class Enrichers {
return "propagating["+fromId+":"+com.google.common.base.Joiner.on(",").join(summary)+"]";
}
+ @Override
public EnricherSpec<? extends Enricher> build() {
return super.build().configure(MutableMap.builder()
.putIfNotNull(Propagator.PRODUCER, fromEntity)
@@ -615,6 +619,7 @@ public class Enrichers {
if (targetSensor==null || fromSensor==null) return null;
return "updating:"+targetSensor.getName()+"<-"+fromSensor.getName();
}
+ @Override
public EnricherSpec<?> build() {
return super.build().configure(MutableMap.builder()
.put(UpdatingMap.TARGET_SENSOR, targetSensor)
@@ -686,6 +691,7 @@ public class Enrichers {
if (transforming==null || publishing==null) return null;
return "joiner:"+transforming.getName()+"->"+publishing.getName();
}
+ @Override
public EnricherSpec<?> build() {
return super.build().configure(MutableMap.builder()
.putIfNotNull(Joiner.PRODUCER, fromEntity)
@@ -749,6 +755,7 @@ public class Enrichers {
return self();
}
+ @Override
public EnricherSpec<?> build() {
return super.build().configure(MutableMap.builder()
.put(Reducer.SOURCE_SENSORS, reducing)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricher.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricher.java
index 5f1b9ed..304756e 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricher.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricher.java
@@ -128,6 +128,7 @@ public class SensorPropagatingEnricher extends AbstractEnricher implements Senso
this.sensorMappings = ImmutableMap.copyOf(sensors);
}
+ @Override
public void setEntity(EntityLocal entity) {
super.setEntity(entity);
for (Sensor<?> s: sensors) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
index 2cc4d75..356e16f 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
@@ -92,6 +92,7 @@ public class Transformer<T,U> extends AbstractTransformer<T,U> {
.immediately(true)
.getMaybe().orNull();
}
+ @Override
public String toString() {
return ""+targetValueRaw;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java b/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
index b8cc8e7..6c9439b 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java
@@ -398,6 +398,7 @@ public class HttpFeed extends AbstractFeed {
}
}
+ @Override
@SuppressWarnings("unchecked")
protected Poller<HttpToolResponse> getPoller() {
return (Poller<HttpToolResponse>) super.getPoller();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java b/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
index afbdcf7..eaa3caf 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/shell/ShellFeed.java
@@ -244,6 +244,7 @@ public class ShellFeed extends AbstractFeed {
}
}
+ @Override
@SuppressWarnings("unchecked")
protected Poller<SshPollValue> getPoller() {
return (Poller<SshPollValue>) super.getPoller();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java b/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java
index f887e96..5ac144a 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java
@@ -254,6 +254,7 @@ public class SshFeed extends AbstractFeed {
}
}
+ @Override
@SuppressWarnings("unchecked")
protected Poller<SshPollValue> getPoller() {
return (Poller<SshPollValue>) super.getPoller();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
index 3fb207f..59b5fe9 100644
--- a/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocation.java
@@ -128,6 +128,7 @@ public class LocalhostMachineProvisioningLocation extends FixedListMachineProvis
return LocationSpec.create(LocalhostMachineProvisioningLocation.class);
}
+ @Override
public LocalhostMachineProvisioningLocation configure(Map<?,?> flags) {
super.configure(flags);
@@ -230,6 +231,7 @@ public class LocalhostMachineProvisioningLocation extends FixedListMachineProvis
portsInUse.remove((Object) portNumber);
}
+ @Override
public void release(SshMachineLocation machine) {
LocalhostMachine localMachine = (LocalhostMachine) machine;
Set<Integer> portsObtained = Sets.newLinkedHashSet();
@@ -272,12 +274,14 @@ public class LocalhostMachineProvisioningLocation extends FixedListMachineProvis
return mutexSupport;
}
+ @Override
public boolean obtainSpecificPort(int portNumber) {
if (!isSudoAllowed() && portNumber <= 1024)
return false;
return LocalhostMachineProvisioningLocation.obtainSpecificPort(getAddress(), portNumber);
}
+ @Override
public int obtainPort(PortRange range) {
int r = LocalhostMachineProvisioningLocation.obtainPort(getAddress(), range);
synchronized (portsObtained) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
index 7df55aa..295d1fb 100644
--- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
@@ -362,6 +362,7 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
}
})
.build(new CacheLoader<Map<String, ?>, Pool<SshTool>>() {
+ @Override
public Pool<SshTool> load(Map<String, ?> properties) {
if (LOG.isDebugEnabled()) {
LOG.debug("{} building ssh pool for {} with properties: {}",
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/config/ResolvingConfigBag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/config/ResolvingConfigBag.java b/core/src/main/java/org/apache/brooklyn/util/core/config/ResolvingConfigBag.java
index 7cff1a3..53af175 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/config/ResolvingConfigBag.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/config/ResolvingConfigBag.java
@@ -128,6 +128,7 @@ public class ResolvingConfigBag extends ConfigBag {
return super.getUnusedConfig();
}
+ @Override
@SuppressWarnings("unchecked")
protected <T> T get(ConfigKey<T> key, boolean markUsed) {
return (T) getTransformer().apply(super.get(key, markUsed));
@@ -156,6 +157,7 @@ public class ResolvingConfigBag extends ConfigBag {
throw new UnsupportedOperationException();
}
+ @Override
protected synchronized Maybe<Object> getStringKeyMaybe(String key, boolean markUsed) {
Maybe<Object> result = super.getStringKeyMaybe(key, markUsed);
return (result.isPresent()) ? Maybe.of(getTransformer().apply(result.get())) : result;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
index e854f18..e0bb94d 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
@@ -81,6 +81,7 @@ public class SshCliTool extends SshAbstractTool implements SshTool {
public B scpExecutable(String val) {
this.scpExecutable = val; return self();
}
+ @Override
@SuppressWarnings("unchecked")
public T build() {
return (T) new SshCliTool(this);
@@ -186,6 +187,7 @@ public class SshCliTool extends SshAbstractTool implements SshTool {
@Override
public int execScript(final Map<String,?> props, final List<String> commands, final Map<String,?> env) {
return new ToolAbstractExecScript(props) {
+ @Override
public int run() {
String scriptContents = toScript(props, commands, env);
if (LOG.isTraceEnabled()) LOG.trace("Running shell command at {} as script: {}", host, scriptContents);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
index 2838fea..944114c 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
@@ -78,6 +78,7 @@ public class ProcessTool extends ShellAbstractTool implements ShellTool {
@Override
public int execScript(final Map<String,?> props, final List<String> commands, final Map<String,?> env) {
return new ToolAbstractExecScript(props) {
+ @Override
public int run() {
try {
String directory = getOptionalVal(props, PROP_DIRECTORY);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
index 328f66d..e652905 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
@@ -319,6 +319,7 @@ public class SshjTool extends SshAbstractTool implements SshTool {
if (LOG.isDebugEnabled()) LOG.debug("Ignoring ssh exec-async configuration, because feature is disabled");
}
return new ToolAbstractExecScript(props) {
+ @Override
public int run() {
String scriptContents = toScript(props, commands, env);
if (LOG.isTraceEnabled()) LOG.trace("Running shell command at {} as script: {}", host, scriptContents);
@@ -358,6 +359,7 @@ public class SshjTool extends SshAbstractTool implements SshTool {
private int stderrCount = 0;
private Stopwatch timer;
+ @Override
public int run() {
timer = Stopwatch.createStarted();
final String scriptContents = toScript(props, commands, env);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
index 3c0e321..36a316f 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java
@@ -132,6 +132,7 @@ public class BasicExecutionManager implements ExecutionManager {
private final List<ExecutionListener> listeners = new CopyOnWriteArrayList<ExecutionListener>();
private final static ThreadLocal<String> threadOriginalName = new ThreadLocal<String>() {
+ @Override
protected String initialValue() {
// should not happen, as only access is in _afterEnd with a check that _beforeStart was invoked
log.warn("No original name recorded for thread "+Thread.currentThread().getName()+"; task "+Tasks.current());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java
index 51a4e34..1b421b0 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java
@@ -168,6 +168,7 @@ public class DynamicSequentialTask<T> extends BasicTask<T> implements HasTaskChi
// returns true if anything is successfully cancelled
}
+ @Override
public boolean cancel(TaskCancellationMode mode) {
return cancel(mode, null);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/task/ListenableForwardingFuture.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ListenableForwardingFuture.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ListenableForwardingFuture.java
index cbc474c..ac42d2f 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/ListenableForwardingFuture.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ListenableForwardingFuture.java
@@ -67,6 +67,7 @@ public abstract class ListenableForwardingFuture<T> extends SimpleForwardingFutu
public abstract boolean cancel(TaskCancellationMode mode);
+ @Override
public final boolean cancel(boolean mayInterrupt) {
return cancel(TaskCancellationMode.INTERRUPT_TASK_AND_DEPENDENT_SUBMITTED_TASKS);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java
index 25f268c..c16ce3b 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java
@@ -143,6 +143,7 @@ public class ScheduledTask extends BasicTask<Object> {
}
}
+ @Override
protected String getActiveTaskStatusString(int verbosity) {
StringBuilder rv = new StringBuilder("Scheduler");
if (runCount > 0) {
@@ -182,11 +183,13 @@ public class ScheduledTask extends BasicTask<Object> {
}
}
+ @Override
public void blockUntilEnded() {
while (!isDone()) super.blockUntilEnded();
}
/** @return The value of the most recently run task */
+ @Override
public Object get() throws InterruptedException, ExecutionException {
blockUntilStarted();
blockUntilFirstScheduleStarted();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java
index 1a9fbac..46a7578 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/SequentialTask.java
@@ -53,6 +53,7 @@ public class SequentialTask<T> extends CompoundTask<T> {
super(ImmutableList.copyOf(tasks));
}
+ @Override
protected List<T> runJobs() throws InterruptedException, ExecutionException {
setBlockingDetails("Executing "+
(children.size()==1 ? "1 child task" :
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
index 3b00252..c0af7cf 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
@@ -164,6 +164,7 @@ public class ValueResolver<T> implements DeferredSupplier<T> {
}
/** returns a copy of this resolver which can be queried, even if the original (single-use instance) has already been copied */
+ @Override
public ValueResolver<T> clone() {
ValueResolver<T> result = new ValueResolver<T>(value, type)
.context(exec).description(description)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java
index 444f9f4..04272e8 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java
@@ -44,6 +44,7 @@ public abstract class AbstractSshExecTaskFactory<T extends AbstractProcessTaskFa
public ProcessTaskWrapper<RET> newTask() {
dirty = false;
return new ProcessTaskWrapper<RET>(this) {
+ @Override
protected void run(ConfigBag config) {
Preconditions.checkNotNull(getMachine(), "machine");
if (Boolean.FALSE.equals(this.runAsScript)) {
@@ -52,6 +53,7 @@ public abstract class AbstractSshExecTaskFactory<T extends AbstractProcessTaskFa
this.exitCode = getMachine().execScript(config.getAllConfig(), getSummary(), commands, shellEnvironment);
}
}
+ @Override
protected String taskTypeShortName() { return "SSH"; }
};
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingConverter.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingConverter.java
index 9ed1156..082244d 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingConverter.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingConverter.java
@@ -28,6 +28,7 @@ import com.thoughtworks.xstream.io.HierarchicalStreamReader;
* (normal xstream.resgisterConverter doesn't apply to enums) */
public class EnumCaseForgivingConverter extends EnumConverter {
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
Class type = context.getRequiredType();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingSingleValueConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingSingleValueConverter.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingSingleValueConverter.java
index 2f697ea..873b741 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingSingleValueConverter.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/EnumCaseForgivingSingleValueConverter.java
@@ -29,6 +29,7 @@ public class EnumCaseForgivingSingleValueConverter extends EnumSingleValueConver
enumType = type;
}
+ @Override
public Object fromString(String str) {
return EnumCaseForgivingConverter.resolve(enumType, str);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverter.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverter.java
index 59265bb..ca73311 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverter.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableListConverter.java
@@ -46,6 +46,7 @@ public class ImmutableListConverter extends CollectionConverter {
// only differences are creating the overarching collection, which we do after the fact
// (optimizing format on disk as opposed to in-memory), and we discard null values
// to avoid failing entirely.
+ @Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
Collection<?> collection = Lists.newArrayList();
populateCollection(reader, context, collection);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableMapConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableMapConverter.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableMapConverter.java
index 18a57ad..4aa3bb5 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableMapConverter.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableMapConverter.java
@@ -45,6 +45,7 @@ public class ImmutableMapConverter extends MapConverter {
// only differences are creating the overarching collection, which we do after the fact
// (optimizing format on disk as opposed to in-memory), and we discard null key/values
// to avoid failing entirely.
+ @Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
Map<?, ?> map = Maps.newLinkedHashMap();
populateMap(reader, context, map);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableSetConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableSetConverter.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableSetConverter.java
index 59c52a4..b6dd5fd 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableSetConverter.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/ImmutableSetConverter.java
@@ -46,6 +46,7 @@ public class ImmutableSetConverter extends CollectionConverter {
// only differences are creating the overarching collection, which we do after the fact
// (optimizing format on disk as opposed to in-memory), and we discard null values
// to avoid failing entirely.
+ @Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
Collection<?> collection = Lists.newArrayList();
populateCollection(reader, context, collection);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/xstream/MapConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/MapConverter.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/MapConverter.java
index 3c50dd9..c7cbd0a 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/MapConverter.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/MapConverter.java
@@ -42,6 +42,7 @@ public class MapConverter extends com.thoughtworks.xstream.converters.collection
super(mapper);
}
+ @Override
@SuppressWarnings({ "rawtypes" })
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
Map map = (Map) source;
@@ -81,6 +82,7 @@ public class MapConverter extends com.thoughtworks.xstream.converters.collection
writer.endNode();
}
+ @Override
protected void populateMap(HierarchicalStreamReader reader, UnmarshallingContext context, Map map) {
while (reader.hasMoreChildren()) {
reader.moveDown();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/main/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverter.java b/core/src/main/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverter.java
index 47ad150..dbc0a05 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverter.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/xstream/StringKeyMapConverter.java
@@ -59,6 +59,7 @@ public class StringKeyMapConverter extends MapConverter {
return Identifiers.isValidToken(key, VALID_XML_NODE_NAME_START_CHARS, VALID_XML_NODE_NAME_CHARS);
}
+ @Override
public boolean canConvert(Class type) {
return super.canConvert(type) || type.getName().equals(MutableMap.class.getName());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
index bfe1126..fd6b15a 100644
--- a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
@@ -58,6 +58,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends BrooklynAppUnitTestS
private TestApplication app;
private TestEntity entity;
+ @Override
@BeforeMethod(alwaysRun=true)
public void setUp() {
locs = ImmutableList.of(new SimulatedLocation());
@@ -65,6 +66,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends BrooklynAppUnitTestS
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
}
+ @Override
@AfterMethod(alwaysRun=true)
public void tearDown() throws Exception {
if (app != null) Entities.destroyAll(app.getManagementContext());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorExceptionLoggedTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorExceptionLoggedTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorExceptionLoggedTest.java
index f3854f1..875c398 100644
--- a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorExceptionLoggedTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorExceptionLoggedTest.java
@@ -78,6 +78,7 @@ public class EffectorExceptionLoggedTest extends BrooklynAppUnitTestSupport {
}
}
+ @Override
protected BrooklynProperties getBrooklynProperties() {
BrooklynProperties result = BrooklynProperties.Factory.newEmpty();
result.put(Entitlements.GLOBAL_ENTITLEMENT_MANAGER, ThrowingEntitlementManager.class.getName());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java
index 427f22b..f094697 100644
--- a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java
@@ -226,6 +226,7 @@ public class EffectorTaskTest extends BrooklynAppUnitTestSupport {
.description("doubles the given number and adds one")
.parameter(Integer.class, "numberToStartWith")
.impl(new EffectorBody<Integer>() {
+ @Override
public Integer call(ConfigBag parameters) {
int input = (Integer)parameters.getStringKey("numberToStartWith");
queue( add(times(input, 2), 1) );
@@ -238,6 +239,7 @@ public class EffectorTaskTest extends BrooklynAppUnitTestSupport {
.description("doubles the given number and adds one, as a basic task")
.parameter(Integer.class, "numberToStartWith")
.impl(new EffectorBody<Integer>() {
+ @Override
public Integer call(ConfigBag parameters) {
int input = (Integer)parameters.getStringKey("numberToStartWith");
// note the subtasks must be queued explicitly with a basic task