Add missing @Override annotation to method signatures overriding interface methods
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e61caea4 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e61caea4 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e61caea4 Branch: refs/heads/master Commit: e61caea44a535ea1aeda0ea8633b3a0d7c38c8ec Parents: 0d2d5d6 Author: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Authored: Fri Jan 20 16:00:40 2017 +0200 Committer: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Committed: Fri Jan 20 16:17:09 2017 +0200 ---------------------------------------------------------------------- .../org/apache/brooklyn/api/entity/Entity.java | 2 + .../apache/brooklyn/api/entity/EntityLocal.java | 1 + .../brooklyn/api/location/MachineLocation.java | 1 + .../java/org/apache/brooklyn/api/mgmt/Task.java | 1 + .../mementos/BrooklynMementoManifest.java | 1 + .../org/apache/brooklyn/api/policy/Policy.java | 1 + .../brooklyn/camp/AggregatingCampPlatform.java | 6 +++ .../collection/AggregatingResourceLookup.java | 2 + .../spi/collection/BasicResourceLookup.java | 2 + .../camp/spi/collection/ResourceLookup.java | 3 ++ .../BasicAssemblyTemplateInstantiator.java | 1 + .../brooklyn/camp/spi/resolve/PdpMatcher.java | 2 + .../web/MockAssemblyTemplateInstantiator.java | 1 + .../camp/test/mock/web/MockWebPlatform.java | 2 + .../camp/brooklyn/BrooklynCampPlatform.java | 2 + .../brooklyn/ConfigInheritanceYamlTest.java | 2 + .../camp/brooklyn/ConfigParametersYamlTest.java | 1 + .../brooklyn/camp/brooklyn/ConfigYamlTest.java | 3 ++ .../DependentConfigPollingYamlTest.java | 2 + .../camp/brooklyn/EnrichersYamlTest.java | 3 ++ .../camp/brooklyn/EntitiesYamlTest.java | 1 + .../brooklyn/TestEntityWithInitConfigImpl.java | 1 + .../TestSensorAndEffectorInitializer.java | 1 + .../qa/performance/CatalogPerformanceTest.java | 6 +++ .../brooklyn/camp/brooklyn/spi/dsl/DslTest.java | 3 ++ .../camp/server/rest/util/CampRestGuavas.java | 1 + .../camp/server/rest/util/DtoFactory.java | 2 + .../AbstractExternalConfigSupplier.java | 1 + .../external/InPlaceExternalConfigSupplier.java | 1 + .../PropertiesFileExternalConfigSupplier.java | 1 + .../external/UrlsExternalConfigSupplier.java | 1 + .../config/internal/AbstractConfigMapImpl.java | 2 + .../internal/AbstractStructuredConfigKey.java | 2 + .../core/config/render/RendererHints.java | 1 + .../core/effector/ssh/SshEffectorTasks.java | 3 ++ .../brooklyn/core/entity/AbstractEntity.java | 1 + .../apache/brooklyn/core/entity/Entities.java | 2 + .../drivers/BasicEntityDriverManager.java | 1 + .../drivers/RegistryEntityDriverFactory.java | 1 + .../DownloadProducerFromCloudsoftRepo.java | 1 + .../DownloadProducerFromLocalRepo.java | 1 + .../DownloadProducerFromProperties.java | 1 + .../AbstractConfigurableEntityFactory.java | 6 +++ .../org/apache/brooklyn/core/feed/Poller.java | 4 +- .../core/internal/BrooklynProperties.java | 1 + .../core/internal/BrooklynPropertiesImpl.java | 17 ++++++- .../storage/impl/BrooklynStorageImpl.java | 1 + .../core/location/BasicLocationDefinition.java | 3 ++ .../core/location/BasicMachineMetadata.java | 5 ++ .../brooklyn/core/location/PortRanges.java | 6 +-- .../location/access/PortForwardManager.java | 1 + .../cloud/names/AbstractCloudMachineNamer.java | 3 ++ .../location/geo/GeoBytesHostGeoLookup.java | 1 + .../location/geo/MaxMind2HostGeoLookup.java | 1 + .../core/location/geo/UtraceHostGeoLookup.java | 1 + .../core/mgmt/ha/BasicMasterChooser.java | 1 + .../mgmt/ha/HighAvailabilityManagerImpl.java | 2 + .../internal/AbstractManagementContext.java | 3 ++ .../internal/AbstractSubscriptionManager.java | 9 ++++ .../internal/AsyncCollectionChangeAdapter.java | 2 + ...PropertyChangeToCollectionChangeAdapter.java | 1 + .../core/mgmt/internal/LocalEntityManager.java | 5 +- .../mgmt/internal/LocalLocationManager.java | 5 +- .../mgmt/internal/LocalSubscriptionManager.java | 5 ++ .../core/mgmt/internal/LocalUsageManager.java | 4 ++ .../BrooklynMementoPersisterToObjectStore.java | 5 ++ .../rebind/PeriodicDeltaChangeListener.java | 1 + .../core/mgmt/rebind/PersisterDeltaImpl.java | 2 + .../core/mgmt/rebind/RebindContextImpl.java | 3 ++ .../mgmt/rebind/RebindExceptionHandlerImpl.java | 1 + .../core/mgmt/rebind/RebindManagerImpl.java | 2 + .../mgmt/rebind/dto/BasicEntityMemento.java | 1 + .../transformer/impl/XsltTransformer.java | 1 + .../AbstractConfigurationSupportInternal.java | 2 + .../core/objs/BasicConfigurableObject.java | 2 + .../core/objs/BrooklynObjectInternal.java | 2 + .../core/objs/proxy/EntityProxyImpl.java | 1 + .../relations/ByObjectBasicRelationSupport.java | 2 + .../sensor/AttributeSensorAndConfigKey.java | 1 + .../brooklyn/core/sensor/BasicSensor.java | 7 +++ .../brooklyn/core/sensor/BasicSensorEvent.java | 4 ++ .../core/sensor/DependentConfiguration.java | 1 + .../core/server/entity/BrooklynMetricsImpl.java | 1 + .../core/typereg/BasicBrooklynTypeRegistry.java | 1 + .../org/apache/brooklyn/feed/http/HttpFeed.java | 1 + .../brooklyn/feed/http/HttpValueFunctions.java | 2 + .../org/apache/brooklyn/feed/ssh/SshFeed.java | 1 + .../FixedListMachineProvisioningLocation.java | 1 + .../location/ssh/SshMachineLocation.java | 3 ++ .../core/task/AbstractExecutionContext.java | 1 + .../util/core/task/BasicExecutionContext.java | 5 ++ .../util/core/task/BasicExecutionManager.java | 18 +++++--- .../brooklyn/util/core/task/CompoundTask.java | 1 + .../brooklyn/util/core/task/TaskBuilder.java | 1 + .../brooklyn/util/core/task/TaskTags.java | 2 + .../apache/brooklyn/util/core/task/Tasks.java | 2 +- .../brooklyn/util/core/task/ValueResolver.java | 3 ++ .../util/core/task/ssh/SshPutTaskFactory.java | 1 + .../brooklyn/util/core/task/ssh/SshTasks.java | 3 +- .../internal/AbstractProcessTaskFactory.java | 1 + .../system/internal/ExecWithLoggingHelpers.java | 1 + ...rooklynFeatureEnablementPerformanceTest.java | 1 + .../MapListAndOtherStructuredConfigKeyTest.java | 2 + .../core/effector/EffectorConcatenateTest.java | 5 ++ .../core/effector/EffectorSayHiTest.java | 2 +- .../core/effector/EffectorTaskTest.java | 45 +++++++++++++----- .../core/entity/DependentConfigurationTest.java | 3 ++ .../brooklyn/core/entity/DynamicEntityTest.java | 1 + .../brooklyn/core/entity/EntityConfigTest.java | 4 ++ .../core/entity/EntityConfigUsageTest.java | 4 ++ .../entity/EntityLifecycleEnrichersTest.java | 1 + .../entity/RecordingSensorEventListener.java | 1 + .../core/entity/hello/LocalEntitiesTest.java | 3 ++ .../ApplicationBuilderOverridingTest.java | 1 + .../core/entity/proxying/EntityManagerTest.java | 2 + .../core/entity/trait/FailingEntityImpl.java | 6 ++- .../apache/brooklyn/core/feed/PollerTest.java | 2 + .../core/location/SimulatedLocation.java | 7 +++ .../internal/LocalManagementContextTest.java | 1 + .../core/mgmt/rebind/RebindEntityTest.java | 2 + .../core/mgmt/rebind/RebindFeedTest.java | 1 + .../core/policy/basic/PolicyConfigTest.java | 2 + .../core/server/entity/BrooklynMetricsTest.java | 4 ++ .../core/test/entity/NoopStartable.java | 6 +-- .../longevity/EntityCleanupLongevityTest.java | 1 + .../EntityCleanupLongevityTestFixture.java | 1 + .../test/qa/longevity/EntityCleanupTest.java | 1 + .../qa/performance/EntityPerformanceTest.java | 6 +++ .../EntityPersistencePerformanceTest.java | 1 + .../FilePersistencePerformanceTest.java | 16 +++---- .../JavaYardStickPerformanceTest.java | 3 +- .../SubscriptionPerformanceTest.java | 5 ++ .../qa/performance/TaskPerformanceTest.java | 12 +++-- .../test/qa/performance/XmlPerformanceTest.java | 1 + .../stock/CustomAggregatingEnricherTest.java | 1 + .../stock/EnricherWithDeferredSupplierTest.java | 1 + .../entity/group/DynamicClusterTest.java | 2 + .../entity/group/DynamicFabricTest.java | 3 ++ .../brooklyn/entity/group/DynamicGroupTest.java | 15 ++++++ .../group/DynamicMultiGroupRebindTest.java | 2 + .../entity/group/DynamicMultiGroupTest.java | 8 ++++ .../entity/group/GroupPickUpEntitiesTest.java | 1 + .../apache/brooklyn/entity/group/GroupTest.java | 2 + .../group/MembershipTrackingPolicyTest.java | 2 + .../feed/http/HttpFeedIntegrationTest.java | 3 ++ .../apache/brooklyn/feed/http/HttpFeedTest.java | 3 ++ .../feed/shell/ShellFeedIntegrationTest.java | 7 +++ .../apache/brooklyn/feed/ssh/SshFeedTest.java | 4 ++ .../ssh/SshMachineLocationIntegrationTest.java | 2 + .../ssh/SshMachineLocationPerformanceTest.java | 1 + .../location/ssh/SshMachineLocationTest.java | 2 + .../util/core/internal/FlagUtilsTest.java | 1 + .../internal/ssh/ShellToolAbstractTest.java | 3 ++ .../ssh/SshToolAbstractPerformanceTest.java | 1 + .../task/BasicTaskExecutionPerformanceTest.java | 1 + .../util/core/task/BasicTaskExecutionTest.java | 13 ++++++ .../util/core/task/BasicTasksFutureTest.java | 3 +- .../core/task/DynamicSequentialTaskTest.java | 2 + .../util/core/task/ScheduledExecutionTest.java | 17 +++++++ .../core/task/SingleThreadedSchedulerTest.java | 5 ++ .../util/core/task/TaskFinalizationTest.java | 3 +- .../util/core/task/ValueResolverTest.java | 5 ++ .../entity/basic/VanillaSoftwareYamlTest.java | 2 + .../blueprints/AbstractBlueprintTest.java | 1 + .../JcloudsBlobStoreBasedObjectStore.java | 1 + .../location/jclouds/JcloudsLocation.java | 4 ++ .../networking/SecurityGroupDefinition.java | 8 +++- .../AbstractPortableTemplateBuilder.java | 28 ++++++++++++ .../customize/AutoAssignFloatingIpOption.java | 1 + .../customize/AutoCreateFloatingIpsOption.java | 1 + .../customize/AutoGenerateKeypairsOption.java | 1 + .../templates/customize/DomainNameOption.java | 1 + .../ExtraPublicKeyDataToAuthOption.java | 1 + .../templates/customize/InboundPortsOption.java | 1 + .../templates/customize/KeyPairOption.java | 1 + .../templates/customize/LoginUserOption.java | 1 + .../customize/LoginUserPasswordOption.java | 1 + .../LoginUserPrivateKeyDataOption.java | 1 + .../LoginUserPrivateKeyFileOption.java | 1 + .../templates/customize/NetworkNameOption.java | 1 + .../templates/customize/RunAsRootOption.java | 1 + .../customize/SecurityGroupOption.java | 1 + .../templates/customize/StringTagsOption.java | 1 + .../customize/TemplateBuilderCustomizers.java | 11 +++++ .../customize/UserDataUuencodedOption.java | 1 + .../customize/UserMetadataMapOption.java | 1 + .../customize/UserMetadataStringOption.java | 1 + .../policy/jclouds/os/CreateUserPolicy.java | 1 + .../BlobStorePersistencePerformanceTest.java | 6 +-- ...ocationReleasePortForwardingDefaultTest.java | 2 + .../location/jclouds/JcloudsLocationTest.java | 2 + .../JcloudsRateLimitedRetryLiveTest.java | 2 + .../location/jclouds/LiveTestEntity.java | 2 + .../policy/autoscaling/AutoScalerPolicy.java | 4 ++ .../followthesun/DefaultFollowTheSunModel.java | 1 + .../policy/followthesun/FollowTheSunPolicy.java | 2 + .../policy/followthesun/WeightedObject.java | 1 + .../loadbalancing/LoadBalancingPolicy.java | 2 + .../autoscaling/AutoScalerPolicyMetricTest.java | 1 + .../autoscaling/AutoScalerPolicyTest.java | 7 +++ .../policy/enricher/RebindEnricherTest.java | 2 + .../AbstractFollowTheSunPolicyTest.java | 2 + .../FollowTheSunPolicySoakTest.java | 3 ++ .../AbstractLoadBalancingPolicyTest.java | 3 ++ .../ItemsInContainersGroupTest.java | 3 ++ .../loadbalancing/LoadBalancingPolicyTest.java | 2 + .../loadbalancing/MockContainerEntityImpl.java | 3 ++ .../brooklyn/rest/domain/LocationSpec.java | 1 + .../jaas/SecurityProviderHttpSession.java | 1 + .../ApplicationResourceIntegrationTest.java | 1 + .../rest/resources/ApplicationResourceTest.java | 2 + .../CatalogResourcePerformanceTest.java | 4 ++ .../rest/resources/SensorResourceTest.java | 1 + .../rest/resources/UsageResourceTest.java | 4 +- .../testing/mocks/RestMockSimpleEntity.java | 1 + .../util/ServerStoppingShutdownHandler.java | 1 + .../apache/brooklyn/cli/lister/ClassFinder.java | 3 ++ .../java/org/apache/brooklyn/cli/CliTest.java | 11 +++++ .../entity/brooklynnode/BrooklynNodeImpl.java | 3 +- .../brooklyn/entity/chef/ChefAttributeFeed.java | 1 + .../apache/brooklyn/entity/chef/ChefTasks.java | 1 + .../brooklyn/entity/chef/KnifeTaskFactory.java | 1 + .../java/JavaSoftwareProcessSshDriver.java | 18 +++++--- .../entity/java/VanillaJavaAppImpl.java | 6 +++ .../entity/machine/MachineInitTasks.java | 3 ++ .../base/AbstractSoftwareProcessDriver.java | 48 ++++++++++---------- .../base/AbstractSoftwareProcessSshDriver.java | 1 + .../software/base/SameServerEntityImpl.java | 12 +++-- .../software/base/SoftwareProcessDriver.java | 1 + .../software/base/SoftwareProcessImpl.java | 13 ++++-- .../MachineLifecycleEffectorTasks.java | 11 +++++ .../software/base/lifecycle/ScriptHelper.java | 5 ++ .../base/lifecycle/WinRmExecuteHelper.java | 1 + .../org/apache/brooklyn/feed/jmx/JmxFeed.java | 6 ++- .../org/apache/brooklyn/feed/jmx/JmxHelper.java | 7 +++ .../brooklyn/entity/AbstractEc2LiveTest.java | 2 + .../brooklyn/entity/java/EntityPollingTest.java | 1 + ...SoftwareProcessSshDriverIntegrationTest.java | 2 + .../entity/java/VanillaJavaAppTest.java | 12 +++++ .../SoftwareProcessEntityFeedRebindTest.java | 1 + ...eProcessStopsDuringStartJcloudsLiveTest.java | 2 + .../SoftwareProcessStopsDuringStartTest.java | 5 ++ .../base/lifecycle/NaiveScriptRunnerTest.java | 2 + .../base/lifecycle/ScriptHelperTest.java | 1 + .../base/lifecycle/StartStopSshDriverTest.java | 1 + .../location/NetworkingEffectorsLiveTests.java | 1 + .../AutoScalerPolicyNoMoreMachinesTest.java | 2 + .../base/test/jmx/GeneralisedDynamicMBean.java | 1 + .../location/WinRmMachineLocationLiveTest.java | 1 + .../mysql/DynamicToyMySqlEntityBuilder.java | 1 + .../apache/brooklyn/feed/jmx/JmxFeedTest.java | 12 +++++ .../apache/brooklyn/feed/jmx/JmxHelperTest.java | 4 ++ .../test/framework/ParallelTestCaseImpl.java | 3 ++ .../brooklyn/test/framework/TestCaseImpl.java | 3 ++ .../test/framework/TestEffectorImpl.java | 3 ++ .../framework/TestEndpointReachableImpl.java | 2 + .../test/framework/TestFrameworkAssertions.java | 1 + .../test/framework/TestHttpCallImpl.java | 3 ++ .../brooklyn/test/framework/TestSensorImpl.java | 4 ++ .../test/framework/TestWinrmCommandImpl.java | 2 + .../test/framework/TestEffectorTest.java | 1 + .../brooklyn/test/framework/TestSensorTest.java | 3 ++ .../org/apache/brooklyn/test/HttpTestUtils.java | 4 ++ .../org/apache/brooklyn/test/LogWatcher.java | 2 + .../brooklyn/test/NetworkingTestUtils.java | 1 + .../org/apache/brooklyn/test/WebAppMonitor.java | 1 + .../brooklyn/config/ConfigInheritances.java | 1 + .../brooklyn/config/ConfigValueAtContainer.java | 1 + .../apache/brooklyn/config/StringConfigMap.java | 2 + .../java/org/apache/brooklyn/test/Asserts.java | 3 ++ .../org/apache/brooklyn/util/ShellUtils.java | 1 + .../brooklyn/util/collections/Jsonya.java | 2 + .../util/concurrent/CallableFromRunnable.java | 1 + .../brooklyn/util/crypto/SslTrustUtils.java | 3 ++ .../util/exceptions/ReferenceWithError.java | 1 + .../org/apache/brooklyn/util/guava/Maybe.java | 1 + .../apache/brooklyn/util/http/HttpAsserts.java | 3 ++ .../org/apache/brooklyn/util/http/HttpTool.java | 1 + .../util/http/TrustingSslSocketFactory.java | 1 + .../util/http/executor/UsernamePassword.java | 2 + .../brooklyn/util/math/MathFunctions.java | 19 ++++++++ .../brooklyn/util/math/MathPredicates.java | 9 ++++ .../brooklyn/util/maven/MavenRetriever.java | 4 ++ .../util/net/ReachableSocketFinder.java | 1 + .../brooklyn/util/osgi/OsgiActivator.java | 4 +- .../org/apache/brooklyn/util/pool/Lease.java | 1 + .../brooklyn/util/text/ComparableVersion.java | 1 + .../util/text/NaturalOrderComparator.java | 1 + .../brooklyn/util/text/StringFunctions.java | 9 ++++ .../brooklyn/util/text/StringShortener.java | 2 + .../org/apache/brooklyn/test/AssertsTest.java | 2 + .../util/javalang/MemoryUsageTrackerTest.java | 1 + .../brooklyn/util/pool/BasicPoolTest.java | 1 + .../brooklyn/util/repeat/RepeaterTest.java | 4 +- .../brooklyn/util/stream/StreamGobblerTest.java | 1 + .../brooklyn/util/jmx/jmxmp/JmxmpAgent.java | 1 + .../brooklyn/test/support/StatusListener.java | 7 +++ 297 files changed, 887 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java index 5faf19c..d67d06c 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java @@ -72,6 +72,7 @@ public interface Entity extends BrooklynObject { /** * A display name; recommended to be a concise single-line description. */ + @Override String getDisplayName(); /** @@ -343,6 +344,7 @@ public interface Entity extends BrooklynObject { /** * @return A read-only thread-safe iterator over all the instances. */ + @Override Iterator<T> iterator(); int size(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java b/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java index 6fa181b..2236608 100644 --- a/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java +++ b/api/src/main/java/org/apache/brooklyn/api/entity/EntityLocal.java @@ -54,6 +54,7 @@ public interface EntityLocal extends Entity { /** * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().set(key, val)} */ + @Override @Deprecated <T> T setConfig(ConfigKey<T> key, T val); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java b/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java index 7483ec5..aa8ef9c 100644 --- a/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java +++ b/api/src/main/java/org/apache/brooklyn/api/location/MachineLocation.java @@ -32,6 +32,7 @@ public interface MachineLocation extends AddressableLocation, HasNetworkAddresse /** * @return the machine's network address. */ + @Override InetAddress getAddress(); /** @deprecated since 0.7.0. Use getMachineDetails().getOsDetails() instead. */ http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/api/src/main/java/org/apache/brooklyn/api/mgmt/Task.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/Task.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/Task.java index 42147c5..ce7a96d 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mgmt/Task.java +++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/Task.java @@ -141,6 +141,7 @@ public interface Task<T> extends ListenableFuture<T>, TaskAdaptable<T> { * TODO Fine-grained control over underlying jobs, e.g. to ensure anything represented by this task is actually completed, * is not (yet) publicly exposed. See the convenience method blockUntilInternalTasksEnded in the Tasks set of helpers * for more discussion. */ + @Override public boolean cancel(boolean mayInterruptIfRunning); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java index 2efc6f6..0b192ae 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java +++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java @@ -31,6 +31,7 @@ import org.apache.brooklyn.api.objs.Identifiable; */ public interface BrooklynMementoManifest extends Serializable { public interface EntityMementoManifest extends Identifiable{ + @Override public String getId(); public String getType(); public String getParent(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java b/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java index 5b1e2fa..c1a9899 100644 --- a/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java +++ b/api/src/main/java/org/apache/brooklyn/api/policy/Policy.java @@ -62,6 +62,7 @@ public interface Policy extends EntityAdjunct, Rebindable, Configurable { /** * @deprecated since 0.7.0; use {@link #config()}, such as {@code policy.config().set(key, val)} */ + @Override @Deprecated <T> T setConfig(ConfigKey<T> key, T val); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 cc2aef7..7a46771 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 @@ -75,6 +75,7 @@ public class AggregatingCampPlatform extends CampPlatform { @Override public ResourceLookup<PlatformComponentTemplate> platformComponentTemplates() { return aggregatingLookup(new Function<CampPlatform, ResourceLookup<PlatformComponentTemplate>>() { + @Override public ResourceLookup<PlatformComponentTemplate> apply(@Nullable CampPlatform input) { return input.platformComponentTemplates(); } @@ -84,6 +85,7 @@ public class AggregatingCampPlatform extends CampPlatform { @Override public ResourceLookup<ApplicationComponentTemplate> applicationComponentTemplates() { return aggregatingLookup(new Function<CampPlatform, ResourceLookup<ApplicationComponentTemplate>>() { + @Override public ResourceLookup<ApplicationComponentTemplate> apply(@Nullable CampPlatform input) { return input.applicationComponentTemplates(); } @@ -93,6 +95,7 @@ public class AggregatingCampPlatform extends CampPlatform { @Override public ResourceLookup<AssemblyTemplate> assemblyTemplates() { return aggregatingLookup(new Function<CampPlatform, ResourceLookup<AssemblyTemplate>>() { + @Override public ResourceLookup<AssemblyTemplate> apply(@Nullable CampPlatform input) { return input.assemblyTemplates(); } @@ -102,6 +105,7 @@ public class AggregatingCampPlatform extends CampPlatform { @Override public ResourceLookup<PlatformComponent> platformComponents() { return aggregatingLookup(new Function<CampPlatform, ResourceLookup<PlatformComponent>>() { + @Override public ResourceLookup<PlatformComponent> apply(@Nullable CampPlatform input) { return input.platformComponents(); } @@ -111,6 +115,7 @@ public class AggregatingCampPlatform extends CampPlatform { @Override public ResourceLookup<ApplicationComponent> applicationComponents() { return aggregatingLookup(new Function<CampPlatform, ResourceLookup<ApplicationComponent>>() { + @Override public ResourceLookup<ApplicationComponent> apply(@Nullable CampPlatform input) { return input.applicationComponents(); } @@ -120,6 +125,7 @@ public class AggregatingCampPlatform extends CampPlatform { @Override public ResourceLookup<Assembly> assemblies() { return aggregatingLookup(new Function<CampPlatform, ResourceLookup<Assembly>>() { + @Override public ResourceLookup<Assembly> apply(@Nullable CampPlatform input) { return input.assemblies(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java index fe05a0c..b019883 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java @@ -40,6 +40,7 @@ public class AggregatingResourceLookup<T extends AbstractResource> extends Abstr return result; } + @Override public T get(String id) { for (ResourceLookup<T> item: targets) { T result = item.get(id); @@ -48,6 +49,7 @@ public class AggregatingResourceLookup<T extends AbstractResource> extends Abstr return null; } + @Override public List<ResolvableLink<T>> links() { List<ResolvableLink<T>> result = new ArrayList<ResolvableLink<T>>(); for (ResourceLookup<T> item: targets) result.addAll(item.links()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java index 1941aa3..adcdaa1 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java @@ -34,10 +34,12 @@ public class BasicResourceLookup<T extends AbstractResource> extends AbstractRes Map<String,T> items = new MutableMap<String,T>(); Map<String,ResolvableLink<T>> links = new MutableMap<String,ResolvableLink<T>>(); + @Override public T get(String id) { return items.get(id); } + @Override public synchronized List<ResolvableLink<T>> links() { return new ArrayList<ResolvableLink<T>>(links.values()); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/ResourceLookup.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/ResourceLookup.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/ResourceLookup.java index 7fc5a71..d7af60d 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/ResourceLookup.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/ResourceLookup.java @@ -33,12 +33,15 @@ public interface ResourceLookup<T extends AbstractResource> { public abstract boolean isEmpty(); public static class EmptyResourceLookup<T extends AbstractResource> implements ResourceLookup<T> { + @Override public T get(String id) { throw new NoSuchElementException("no resource: "+id); } + @Override public List<ResolvableLink<T>> links() { return Collections.emptyList(); } + @Override public boolean isEmpty() { return links().isEmpty(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/instantiate/BasicAssemblyTemplateInstantiator.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/instantiate/BasicAssemblyTemplateInstantiator.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/instantiate/BasicAssemblyTemplateInstantiator.java index 82751c3..c8a7f51 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/instantiate/BasicAssemblyTemplateInstantiator.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/instantiate/BasicAssemblyTemplateInstantiator.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.camp.spi.AssemblyTemplate; /** A simple instantiator which simply invokes the component's instantiators in parallel */ public class BasicAssemblyTemplateInstantiator implements AssemblyTemplateInstantiator { + @Override public Assembly instantiate(AssemblyTemplate template, CampPlatform platform) { // TODO this should build it based on the components // template.getPlatformComponentTemplates().links().iterator().next().resolve(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpMatcher.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpMatcher.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpMatcher.java index a574b71..3364403 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpMatcher.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/resolve/PdpMatcher.java @@ -33,6 +33,7 @@ public interface PdpMatcher { public ArtifactMatcher(String artifactType) { this.artifactType = artifactType; } + @Override public boolean accepts(Object art) { return (art instanceof Artifact) && this.artifactType.equals( ((Artifact)art).getArtifactType() ); } @@ -43,6 +44,7 @@ public interface PdpMatcher { public ServiceMatcher(String serviceType) { this.serviceType = serviceType; } + @Override public boolean accepts(Object svc) { return (svc instanceof Service) && this.serviceType.equals( ((Service)svc).getServiceType() ); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockAssemblyTemplateInstantiator.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockAssemblyTemplateInstantiator.java b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockAssemblyTemplateInstantiator.java index a358eed..e4e5162 100644 --- a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockAssemblyTemplateInstantiator.java +++ b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockAssemblyTemplateInstantiator.java @@ -29,6 +29,7 @@ public class MockAssemblyTemplateInstantiator implements AssemblyTemplateInstant private static final Logger log = LoggerFactory.getLogger(MockAssemblyTemplateInstantiator.class); + @Override public Assembly instantiate(AssemblyTemplate template, CampPlatform platform) { log.debug("Ignoring request to instantiate "+template); return null; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java index 4a60d1c..cfbad47 100644 --- a/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java +++ b/camp/camp-base/src/test/java/org/apache/brooklyn/camp/test/mock/web/MockWebPlatform.java @@ -62,6 +62,7 @@ public class MockWebPlatform { .build(); public static final PdpMatcher WAR_GETS_WAR_MATCHER = new PdpMatcher.ArtifactMatcher("com.java:WAR") { + @Override public boolean apply(Object art, AssemblyTemplateConstructor atc) { ApplicationComponentTemplate act = ApplicationComponentTemplate.builder() .name( ((Artifact)art).getName() ) @@ -80,6 +81,7 @@ public class MockWebPlatform { public static final PdpMatcher newLiteralServiceTypeToPlatformComponentTemplateMatcher(final BasicCampPlatform platform, @Nullable final Class<? extends AssemblyTemplateInstantiator> instantiator) { return new PdpMatcher() { + @Override public boolean apply(Object item, AssemblyTemplateConstructor atc) { if (!(item instanceof Service)) return false; Service svc = (Service)item; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java index a6d65b4..947ecc2 100644 --- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java +++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampPlatform.java @@ -97,10 +97,12 @@ public class BrooklynCampPlatform extends AggregatingCampPlatform implements Has this.platform = platform; } + @Override public Map<String, Object> parse(Map<String, Object> map) { return platform.pdp().applyInterpreters(map); } + @Override public Object parse(String val) { Map<String, Object> result = platform.pdp().applyInterpreters(ImmutableMap.of("dummyKey", val)); checkState(result.keySet().equals(ImmutableSet.of("dummyKey")), "expected single result, but got %s", result); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java index bccf750..540cf81 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java @@ -248,6 +248,7 @@ public class ConfigInheritanceYamlTest extends AbstractYamlTest { // Task that resolves slowly executor.submit(new Callable<Object>() { + @Override public Object call() { return app.sensors().set(Sensors.newStringSensor("myOtherSensor"), "myObject"); }}); @@ -275,6 +276,7 @@ public class ConfigInheritanceYamlTest extends AbstractYamlTest { // Task that resolves slowly executor.submit(new Callable<Object>() { + @Override public Object call() { return app.sensors().set(Sensors.newStringSensor("myOtherSensor"), "myObject"); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java index 2336030..d7040e5 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java @@ -579,6 +579,7 @@ public class ConfigParametersYamlTest extends AbstractYamlRebindTest { Entity app = createStartWaitAndLogApplication(yaml); final TestEntity entity = (TestEntity) Iterables.getOnlyElement(app.getChildren()); Asserts.assertReturnsEventually(new Runnable() { + @Override public void run() { assertEquals(entity.config().get(ConfigKeys.newStringConfigKey("my.other.key")), "myDefaultValInOuter"); }}, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java index eeb9fba..07fc36a 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java @@ -272,6 +272,7 @@ public class ConfigYamlTest extends AbstractYamlTest { // Now set the attribute: get will return once that has happened executor.submit(new Callable<Object>() { + @Override public Object call() { return entity.sensors().set(Sensors.newStringSensor("myOtherSensor"), "myOther"); }}); @@ -318,6 +319,7 @@ public class ConfigYamlTest extends AbstractYamlTest { // Now set the attribute: get will return once that has happened executor.submit(new Callable<Object>() { + @Override public Object call() { return entity.sensors().set(Sensors.newStringSensor("myOtherSensor"), "myOther"); }}); @@ -368,6 +370,7 @@ public class ConfigYamlTest extends AbstractYamlTest { // Now set the attribute: get will return once that has happened executor.submit(new Callable<Object>() { + @Override public Object call() { return entity.sensors().set(Sensors.newStringSensor("myOtherSensor"), "myOther"); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DependentConfigPollingYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DependentConfigPollingYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DependentConfigPollingYamlTest.java index a379a93..3432643 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DependentConfigPollingYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/DependentConfigPollingYamlTest.java @@ -80,6 +80,7 @@ public class DependentConfigPollingYamlTest extends AbstractYamlTest { // the synchronized block if BrooklynDslDeferredSupplier.get(). // The sleep is to ensure we really did get into the locking code. executor.submit(new Callable<Object>() { + @Override public Object call() { return entity.config().get(TestEntity.CONF_NAME); }}); @@ -102,6 +103,7 @@ public class DependentConfigPollingYamlTest extends AbstractYamlTest { // Confirm we haven't left threads behind. Asserts.succeedsEventually(new Runnable() { + @Override public void run() { int postNumThreads = Thread.activeCount(); String msg = "pre="+preNumThreads+"; post="+postNumThreads+"; iterations="+numIterations; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java index ea61068..e1915f2 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EnrichersYamlTest.java @@ -64,6 +64,7 @@ public class EnrichersYamlTest extends AbstractYamlTest { Assert.assertEquals(enricher.getConfig(TestEnricher.CONF_FROM_FUNCTION), "$brooklyn: is a fun place"); Entity target = ((EntityInternal)app).getExecutionContext().submit(MutableMap.of(), new Callable<Entity>() { + @Override public Entity call() { return enricher.getConfig(TestEnricher.TARGET_ENTITY); }}).get(); @@ -71,6 +72,7 @@ public class EnrichersYamlTest extends AbstractYamlTest { Assert.assertEquals(target.getDisplayName(), "testentity"); Assert.assertEquals(target, app.getChildren().iterator().next()); Entity targetFromFlag = ((EntityInternal)app).getExecutionContext().submit(MutableMap.of(), new Callable<Entity>() { + @Override public Entity call() { return enricher.getConfig(TestEnricher.TARGET_ENTITY_FROM_FLAG); }}).get(); @@ -187,6 +189,7 @@ public class EnrichersYamlTest extends AbstractYamlTest { Asserts.assertTrue(enricher instanceof Propagator, "Expected enricher to be Propagator, found:" + enricher); final Propagator propagator = (Propagator)enricher; Entity producer = ((EntityInternal)parentEntity).getExecutionContext().submit(MutableMap.of(), new Callable<Entity>() { + @Override public Entity call() { return propagator.getConfig(Propagator.PRODUCER); }}).get(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java index cf31dd7..ef3c1e9 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java @@ -347,6 +347,7 @@ public class EntitiesYamlTest extends AbstractYamlTest { Assert.assertNotNull(entities[0], "Expected app to contain child named 'testentity'"); Assert.assertNotNull(entities[1], "Expected app to contain child named 'second entity'"); Object object = ((EntityInternal)app).getExecutionContext().submit(MutableMap.of(), new Callable<Object>() { + @Override public Object call() { return entities[1].getConfig(TestEntity.CONF_OBJECT); }}).get(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java index ad0431a..983bb50 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestEntityWithInitConfigImpl.java @@ -52,6 +52,7 @@ public class TestEntityWithInitConfigImpl extends AbstractEntity implements Test LOG.trace("Restarting {}", this); } + @Override public Entity getEntityCachedOnInit() { return entityCachedOnInit; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java index 36422c9..3fada09 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/TestSensorAndEffectorInitializer.java @@ -43,6 +43,7 @@ public class TestSensorAndEffectorInitializer implements EntityInitializer { protected String helloWord() { return "Hello"; } + @Override public void apply(@SuppressWarnings("deprecation") org.apache.brooklyn.api.entity.EntityLocal entity) { Effector<String> eff = Effectors.effector(String.class, EFFECTOR_SAY_HELLO).parameter(String.class, "name").impl( new EffectorBody<String>() { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/qa/performance/CatalogPerformanceTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/qa/performance/CatalogPerformanceTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/qa/performance/CatalogPerformanceTest.java index dac44d8..5238164 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/qa/performance/CatalogPerformanceTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/qa/performance/CatalogPerformanceTest.java @@ -96,12 +96,14 @@ public class CatalogPerformanceTest extends AbstractYamlTest { Runnable preJob = null; Runnable job = new Runnable() { + @Override public void run() { int i = counter.getAndIncrement(); items.set(addItems(i)); } }; Runnable postJob = new Runnable() { + @Override public void run() { if (items.get() != null) { for (CatalogItem<?, ?> item : items.get()) { @@ -119,12 +121,14 @@ public class CatalogPerformanceTest extends AbstractYamlTest { final AtomicReference<List<CatalogItem<?,?>>> items = new AtomicReference<>(); Runnable preJob = new Runnable() { + @Override public void run() { int i = counter.getAndIncrement(); items.set(addItems(i)); } }; Runnable job = new Runnable() { + @Override public void run() { for (CatalogItem<?, ?> item : items.get()) { mgmt().getCatalog().peekSpec(item); @@ -132,6 +136,7 @@ public class CatalogPerformanceTest extends AbstractYamlTest { } }; Runnable postJob = new Runnable() { + @Override public void run() { if (items.get() != null) { for (CatalogItem<?, ?> item : items.get()) { @@ -148,6 +153,7 @@ public class CatalogPerformanceTest extends AbstractYamlTest { final List<CatalogItem<?, ?>> items = addItems(0); Runnable job = new Runnable() { + @Override public void run() { for (CatalogItem<?, ?> item : items) { mgmt().getCatalog().peekSpec(item); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslTest.java index 4292dbe..750b083 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslTest.java @@ -170,6 +170,7 @@ public class DslTest extends BrooklynAppUnitTestSupport { final String expectedValue = Identifiers.makeRandomId(10); Runnable job = new Runnable() { + @Override public void run() { entity.sensors().set(TestApplication.MY_ATTRIBUTE, expectedValue); } @@ -378,6 +379,7 @@ public class DslTest extends BrooklynAppUnitTestSupport { protected void preResolve(final TestEntity entity) { expectedValue = Identifiers.makeRandomId(10); Runnable job = new Runnable() { + @Override public void run() { entity.sensors().set(sensor, expectedValue); } @@ -500,6 +502,7 @@ public class DslTest extends BrooklynAppUnitTestSupport { // and does this using BrooklynTaskTags.getTargetOrContextEntity(Tasks.current()). // If we are not in a task executed by the context entity, then this lookup will fail. Callable<Maybe<?>> job = new Callable<Maybe<?>>() { + @Override public Maybe<?> call() throws Exception { return Tasks.resolving(dsl).as(type) .context(context) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampRestGuavas.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampRestGuavas.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampRestGuavas.java index 22758a4..4ba50b3 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampRestGuavas.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/CampRestGuavas.java @@ -26,6 +26,7 @@ public class CampRestGuavas { public static final Function<AbstractResource,String> IDENTITY_OF_REST_RESOURCE = new Function<AbstractResource,String>() { + @Override public String apply(AbstractResource input) { return input.getId(); } }; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java ---------------------------------------------------------------------- diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java index c745053..b430765 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/rest/util/DtoFactory.java @@ -129,12 +129,14 @@ public class DtoFactory { * result of the given function to generate an ID against an object of the given type */ public synchronized <T> void registerIdentityFunction(Class<T> type, final String resourceTypeUriBase, final Function<T,String> fnIdentity) { final Function<String,String> fnUriFromId = new Function<String,String>() { + @Override public String apply(String id) { return Urls.mergePaths(resourceTypeUriBase, id); } }; registryId.put(type, (Function<String, String>) fnUriFromId); registerResourceUriFunction(type, new Function<T,String>() { + @Override public String apply(T input) { return fnUriFromId.apply(fnIdentity.apply(input)); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/config/external/AbstractExternalConfigSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/AbstractExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/AbstractExternalConfigSupplier.java index 2288414..2a868d2 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/external/AbstractExternalConfigSupplier.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/external/AbstractExternalConfigSupplier.java @@ -39,6 +39,7 @@ abstract public class AbstractExternalConfigSupplier implements ExternalConfigSu return managementContext; } + @Override public String getName() { return name; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/config/external/InPlaceExternalConfigSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/InPlaceExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/InPlaceExternalConfigSupplier.java index a5445e9..4650345 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/external/InPlaceExternalConfigSupplier.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/external/InPlaceExternalConfigSupplier.java @@ -44,6 +44,7 @@ public class InPlaceExternalConfigSupplier extends AbstractExternalConfigSupplie this.config = config; } + @Override public String get(String key) { return config.get(key); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/config/external/PropertiesFileExternalConfigSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/PropertiesFileExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/PropertiesFileExternalConfigSupplier.java index f76cdf6..233fa80 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/external/PropertiesFileExternalConfigSupplier.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/external/PropertiesFileExternalConfigSupplier.java @@ -48,6 +48,7 @@ public class PropertiesFileExternalConfigSupplier extends AbstractExternalConfig this.properties = loadProperties(config.get(PROPERTIES_URL)); } + @Override public String get(String key) { return properties.getProperty(key); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java index 0cd677f..8b8d5b3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java @@ -73,6 +73,7 @@ public class UrlsExternalConfigSupplier extends AbstractExternalConfigSupplier { return Objects.toStringHelper(this).add("name", getName()).toString(); } + @Override public String get(String key) { String target = config.get(key); if (target == null) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java b/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java index b81d836..48a9eb1 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java @@ -103,10 +103,12 @@ public abstract class AbstractConfigMapImpl<TContainer extends BrooklynObject> i return (BrooklynObjectInternal)bo; } + @Override public <T> T getConfig(ConfigKey<T> key) { return getConfigImpl(key, false).getWithoutError().get(); } + @Override public <T> T getConfig(HasConfigKey<T> key) { return getConfigImpl(key.getConfigKey(), false).getWithoutError().get(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractStructuredConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractStructuredConfigKey.java b/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractStructuredConfigKey.java index f29c0ac..39f4bb1 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractStructuredConfigKey.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractStructuredConfigKey.java @@ -55,10 +55,12 @@ public abstract class AbstractStructuredConfigKey<T,RawT,V> extends BasicConfigK return contender.toString(); } + @Override public boolean acceptsKeyMatch(Object contender) { return (getName().equalsIgnoreCase(getKeyName(contender))); } + @Override public boolean acceptsSubkey(Object contender) { return contender!=null && getKeyName(contender).startsWith(getName()+"."); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java b/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java index 4ff47d1..2cef27e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/render/RendererHints.java @@ -175,6 +175,7 @@ public class RendererHints { return getUrlFromValue(e.getAttribute(s)); } + @Override public String getActionName() { return actionName; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 6b74781..e7666fd 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 @@ -241,6 +241,7 @@ public class SshEffectorTasks { /** as {@link #codePidRunning(Integer)} but returning boolean */ public static SshEffectorTaskFactory<Boolean> isPidRunning(Integer pid) { return codePidRunning(pid).summary("PID "+pid+" is-running check (boolean)").returning(new Function<ProcessTaskWrapper<?>, Boolean>() { + @Override public Boolean apply(@Nullable ProcessTaskWrapper<?> input) { return Integer.valueOf(0).equals(input.getExitCode()); } }); } @@ -264,6 +265,7 @@ public class SshEffectorTasks { "ps -p `cat "+pidFile+"`")).summary("PID file "+pidFile+" is-running check (exit code)") .allowingNonZeroExitCode() .addCompletionListener(new Function<ProcessTaskWrapper<?>,Void>() { + @Override public Void apply(ProcessTaskWrapper<?> input) { if (input.getStderr().contains("ERROR:")) throw new IllegalStateException("Invalid or inaccessible PID filespec: "+pidFile); @@ -284,6 +286,7 @@ public class SshEffectorTasks { public static SshEffectorTaskFactory<Boolean> isPidFromFileRunning(String pidFile) { return codePidFromFileRunning(pidFile).summary("PID file "+pidFile+" is-running check (boolean)"). returning(new Function<ProcessTaskWrapper<?>, Boolean>() { + @Override public Boolean apply(@Nullable ProcessTaskWrapper<?> input) { return ((Integer)0).equals(input.getExitCode()); } }); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 83c29a3..d6a372f 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 @@ -1998,6 +1998,7 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E // -------- EFFECTORS -------------- /** Convenience for finding named effector in {@link EntityType#getEffectors()} {@link Map}. */ + @Override public Effector<?> getEffector(String effectorName) { return entityType.getEffector(effectorName); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java b/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java index 69670ec..bdc00df 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/Entities.java @@ -878,6 +878,7 @@ public class Entities { log.debug("destroying all apps in "+mgmt+": "+mgmt.getApplications()); for (final Application app: mgmt.getApplications()) { futures.add(executor.submit(new Runnable() { + @Override public void run() { log.debug("destroying app "+app+" (managed? "+isManaged(app)+"; mgmt is "+mgmt+")"); try { @@ -1240,6 +1241,7 @@ public class Entities { if (!Repeater.create(description).limitTimeTo(timeout) .rethrowException().backoffTo(Duration.ONE_SECOND) .until(new Callable<Boolean>() { + @Override public Boolean call() { return Boolean.TRUE.equals(entity.getAttribute(Startable.SERVICE_UP)); }}) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/entity/drivers/BasicEntityDriverManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/BasicEntityDriverManager.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/BasicEntityDriverManager.java index b7c3bd5..48064dd 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/BasicEntityDriverManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/BasicEntityDriverManager.java @@ -41,6 +41,7 @@ public class BasicEntityDriverManager implements EntityDriverManager { return reflective; } + @Override public <D extends EntityDriver> void registerDriver(Class<D> driverInterface, Class<? extends Location> locationClazz, Class<? extends D> driverClazz) { registry.registerDriver(driverInterface, locationClazz, driverClazz); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/entity/drivers/RegistryEntityDriverFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/RegistryEntityDriverFactory.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/RegistryEntityDriverFactory.java index d2dd125..5413207 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/RegistryEntityDriverFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/RegistryEntityDriverFactory.java @@ -53,6 +53,7 @@ public class RegistryEntityDriverFactory implements EntityDriverManager { return lookupDriver(entity.getDriverInterface(), location) != null; } + @Override public <D extends EntityDriver> void registerDriver(Class<D> driverInterface, Class<? extends Location> locationClazz, Class<? extends D> driverClazz) { synchronized (registry) { registry.put(new DriverLocationTuple(driverInterface, locationClazz), driverClazz); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java index 715fe96..2e7e4a2 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromCloudsoftRepo.java @@ -66,6 +66,7 @@ public class DownloadProducerFromCloudsoftRepo implements Function<DownloadRequi this.config = config; } + @Override public DownloadTargets apply(DownloadRequirement req) { Boolean enabled = config.getConfig(CLOUDSOFT_REPO_ENABLED); String baseUrl = config.getConfig(CLOUDSOFT_REPO_URL); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromLocalRepo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromLocalRepo.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromLocalRepo.java index 8de8ae8..8962459 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromLocalRepo.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromLocalRepo.java @@ -67,6 +67,7 @@ public class DownloadProducerFromLocalRepo implements Function<DownloadRequireme this.config = config; } + @Override public DownloadTargets apply(DownloadRequirement req) { Boolean enabled = config.getConfig(LOCAL_REPO_ENABLED); String path = config.getConfig(LOCAL_REPO_PATH); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromProperties.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromProperties.java index a5b3204..425498c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromProperties.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadProducerFromProperties.java @@ -126,6 +126,7 @@ public class DownloadProducerFromProperties implements Function<DownloadRequirem this.config = config; } + @Override public DownloadTargets apply(DownloadRequirement downloadRequirement) { List<Rule> rules = generateRules(); BasicDownloadTargets.Builder result = BasicDownloadTargets.builder(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/entity/factory/AbstractConfigurableEntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/factory/AbstractConfigurableEntityFactory.java b/core/src/main/java/org/apache/brooklyn/core/entity/factory/AbstractConfigurableEntityFactory.java index 6b41e4b..24a02c7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/factory/AbstractConfigurableEntityFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/factory/AbstractConfigurableEntityFactory.java @@ -41,24 +41,29 @@ public abstract class AbstractConfigurableEntityFactory<T extends Entity> implem this.config.putAll(flags); } + @Override public AbstractConfigurableEntityFactory<T> configure(Map flags) { config.putAll(flags); return this; } + @Override public AbstractConfigurableEntityFactory<T> configure(ConfigKey key, Object value) { config.put(key, value); return this; } + @Override public AbstractConfigurableEntityFactory<T> configure(ConfigKey.HasConfigKey key, Object value) { return setConfig(key.getConfigKey(), value); } + @Override public AbstractConfigurableEntityFactory<T> setConfig(ConfigKey key, Object value) { return configure(key, value); } + @Override public AbstractConfigurableEntityFactory<T> setConfig(ConfigKey.HasConfigKey key, Object value) { return configure(key.getConfigKey(), value); } @@ -67,6 +72,7 @@ public abstract class AbstractConfigurableEntityFactory<T extends Entity> implem return newEntity(new HashMap(),parent); } + @Override public T newEntity(Map flags, Entity parent) { Map flags2 = new HashMap(); flags2.putAll(config); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 13cd805..6eb1481 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 @@ -70,6 +70,7 @@ public class Poller<V> { this.pollPeriod = period; wrappedJob = new Runnable() { + @Override public void run() { try { V val = job.call(); @@ -144,9 +145,10 @@ public class Poller<V> { final String scheduleName = pollJob.handler.getDescription(); if (pollJob.pollPeriod.compareTo(Duration.ZERO) > 0) { Callable<Task<?>> pollingTaskFactory = new Callable<Task<?>>() { + @Override public Task<?> call() { DynamicSequentialTask<Void> task = new DynamicSequentialTask<Void>(MutableMap.of("displayName", scheduleName, "entity", entity), - new Callable<Void>() { public Void call() { + new Callable<Void>() { @Override public Void call() { if (!Entities.isManaged(entity)) { return null; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java index 1cfbcbc..ad72e4a 100644 --- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java +++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java @@ -280,6 +280,7 @@ public interface BrooklynProperties extends Map, StringConfigMap { public String getFirst(Map flags, String ...keys); /** like normal map.put, except config keys are dereferenced on the way in */ + @Override public Object put(Object key, Object value); /** like normal map.putAll, except config keys are dereferenced on the way in */ http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 c03f858..50add48 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 @@ -228,27 +228,32 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro protected BrooklynPropertiesImpl() { } + @Override public BrooklynPropertiesImpl addEnvironmentVars() { addFrom(System.getenv()); return this; } + @Override public BrooklynPropertiesImpl addSystemProperties() { addFrom(System.getProperties()); return this; } + @Override public BrooklynPropertiesImpl addFrom(ConfigBag cfg) { addFrom(cfg.getAllConfig()); return this; } + @Override @SuppressWarnings("unchecked") public BrooklynPropertiesImpl addFrom(Map map) { putAll(Maps.transformValues(map, StringFunctions.trim())); return this; } + @Override public BrooklynPropertiesImpl addFrom(InputStream i) { // Ugly way to load them in order, but Properties is a Hashtable so loses order otherwise. @SuppressWarnings({ "serial" }) @@ -273,6 +278,7 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro return this; } + @Override public BrooklynPropertiesImpl addFrom(File f) { if (!f.exists()) { LOG.warn("Unable to find file '"+f.getAbsolutePath()+"' when loading properties; ignoring"); @@ -285,6 +291,7 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro } } } + @Override public BrooklynPropertiesImpl addFrom(URL u) { try { return addFrom(u.openStream()); @@ -299,6 +306,7 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro * for convenience if not starting with xxx: it is treated as a classpath reference or a file; * throws if not found (but does nothing if argument is null) */ + @Override public BrooklynPropertiesImpl addFromUrl(String url) { try { if (url==null) return this; @@ -310,6 +318,7 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro /** expects a property already set in scope, whose value is acceptable to {@link #addFromUrl(String)}; * if property not set, does nothing */ + @Override public BrooklynPropertiesImpl addFromUrlProperty(String urlProperty) { String url = (String) get(urlProperty); if (url==null) addFromUrl(url); @@ -319,12 +328,14 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro /** * adds the indicated properties */ + @Override public BrooklynPropertiesImpl addFromMap(Map properties) { putAll(properties); return this; } /** inserts the value under the given key, if it was not present */ + @Override public boolean putIfAbsent(String key, Object value) { if (containsKey(key)) return false; put(key, value); @@ -334,7 +345,8 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro /** @deprecated attempts to call get with this syntax are probably mistakes; get(key, defaultValue) is fine but * Map is unlikely the key, much more likely they meant getFirst(flags, key). */ - @Deprecated + @Override +@Deprecated public String get(Map flags, String key) { LOG.warn("Discouraged use of 'BrooklynProperties.get(Map,String)' (ambiguous); use getFirst(Map,String) or get(String) -- assuming the former"); LOG.debug("Trace for discouraged use of 'BrooklynProperties.get(Map,String)'", @@ -400,16 +412,19 @@ public class BrooklynPropertiesImpl extends LinkedHashMap implements BrooklynPro } } + @Override @SuppressWarnings("unchecked") public <T> Object put(HasConfigKey<T> key, T value) { return super.put(key.getConfigKey().getName(), value); } + @Override @SuppressWarnings("unchecked") public <T> Object put(ConfigKey<T> key, T value) { return super.put(key.getName(), value); } + @Override public <T> boolean putIfAbsent(ConfigKey<T> key, T value) { return putIfAbsent(key.getName(), value); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/internal/storage/impl/BrooklynStorageImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/storage/impl/BrooklynStorageImpl.java b/core/src/main/java/org/apache/brooklyn/core/internal/storage/impl/BrooklynStorageImpl.java index 188955a..60a1e7e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/internal/storage/impl/BrooklynStorageImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/internal/storage/impl/BrooklynStorageImpl.java @@ -117,6 +117,7 @@ public class BrooklynStorageImpl implements BrooklynStorage { datagrid.terminate(); } + @Override public boolean isMostlyEmpty() { if (!refsMap.isEmpty() || !listsMap.isEmpty()) return false; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationDefinition.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationDefinition.java b/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationDefinition.java index 508a417..4add560 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationDefinition.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicLocationDefinition.java @@ -44,14 +44,17 @@ public class BasicLocationDefinition implements LocationDefinition { this.config = config==null ? ImmutableMap.<String, Object>of() : ImmutableMap.<String, Object>copyOf(config); } + @Override public String getId() { return id; } + @Override public String getName() { return name; } + @Override public String getSpec() { return spec; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java b/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java index 2590900..e8e49be 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java @@ -37,22 +37,27 @@ public class BasicMachineMetadata implements MachineManagementMixins.MachineMeta this.originalMetadata = originalMetadata; } + @Override public String getId() { return id; } + @Override public String getName() { return name; } + @Override public String getPrimaryIp() { return primaryIp; } + @Override public Boolean isRunning() { return isRunning; } + @Override public Object getOriginalMetadata() { return originalMetadata; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 aa0b337..22a037c 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 @@ -254,13 +254,13 @@ public class PortRanges { public static void init() { if (initialized.compareAndSet(false, true)) { TypeCoercions.registerAdapter(Integer.class, PortRange.class, new Function<Integer,PortRange>() { - public PortRange apply(Integer x) { return fromInteger(x); } + @Override public PortRange apply(Integer x) { return fromInteger(x); } }); TypeCoercions.registerAdapter(String.class, PortRange.class, new Function<String,PortRange>() { - public PortRange apply(String x) { return fromString(x); } + @Override public PortRange apply(String x) { return fromString(x); } }); TypeCoercions.registerAdapter(Iterable.class, PortRange.class, new Function<Iterable,PortRange>() { - public PortRange apply(Iterable x) { return fromIterable(x); } + @Override public PortRange apply(Iterable x) { return fromIterable(x); } }); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 b3497f1..e375f39 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 @@ -197,6 +197,7 @@ public interface PortForwardManager extends Location { */ public boolean forgetPortMappings(String publicIpId); + @Override public String toVerboseString(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/location/cloud/names/AbstractCloudMachineNamer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/location/cloud/names/AbstractCloudMachineNamer.java b/core/src/main/java/org/apache/brooklyn/core/location/cloud/names/AbstractCloudMachineNamer.java index 7f38964..66d55ac 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/cloud/names/AbstractCloudMachineNamer.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/cloud/names/AbstractCloudMachineNamer.java @@ -43,10 +43,12 @@ public abstract class AbstractCloudMachineNamer implements CloudMachineNamer { int defaultMachineNameSaltLength = CloudLocationConfig.VM_NAME_SALT_LENGTH.getDefaultValue(); protected String separator = "-"; + @Override public String generateNewMachineUniqueName(ConfigBag setup) { return generateNewIdReservingLength(setup, 0); } + @Override public String generateNewMachineUniqueNameFromGroupId(ConfigBag setup, String groupId) { int availSaltLength = getMaxNameLength(setup) - (groupId.length() + separator.length()); int requestedSaltLength = getLengthForMachineUniqueNameSalt(setup, false); @@ -57,6 +59,7 @@ public abstract class AbstractCloudMachineNamer implements CloudMachineNamer { return sanitize(groupId + separator + Identifiers.makeRandomId(Math.min(requestedSaltLength, availSaltLength))).toLowerCase(); } + @Override public String generateNewGroupId(ConfigBag setup) { return sanitize(generateNewIdReservingLength(setup, getLengthForMachineUniqueNameSalt(setup, true))).toLowerCase(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/location/geo/GeoBytesHostGeoLookup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/location/geo/GeoBytesHostGeoLookup.java b/core/src/main/java/org/apache/brooklyn/core/location/geo/GeoBytesHostGeoLookup.java index 3e46720..9863603 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/geo/GeoBytesHostGeoLookup.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/geo/GeoBytesHostGeoLookup.java @@ -78,6 +78,7 @@ public class GeoBytesHostGeoLookup implements HostGeoLookup { private static boolean LOGGED_GEO_LOOKUP_UNAVAILABLE = false; + @Override public HostGeoInfo getHostGeoInfo(InetAddress address) throws MalformedURLException, IOException { String url = getPropertiesLookupUrlFor(address); if (log.isDebugEnabled())
