You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/18 08:29:07 UTC
[5/7] brooklyn-server git commit: Deletes old deprecated code
Deletes old deprecated code
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7df1d382
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7df1d382
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7df1d382
Branch: refs/heads/master
Commit: 7df1d382f73638d25c0e85518a64ea26abebc269
Parents: 7c6f7d4
Author: Aled Sage <al...@gmail.com>
Authored: Mon Oct 9 10:59:10 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 17 12:32:15 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/catalog/BrooklynCatalog.java | 23 --
.../brooklyn/api/catalog/CatalogItem.java | 11 -
.../org/apache/brooklyn/api/entity/Entity.java | 100 ------
.../apache/brooklyn/api/entity/EntityLocal.java | 131 -------
.../apache/brooklyn/api/entity/EntitySpec.java | 48 ---
.../apache/brooklyn/api/location/Location.java | 17 -
.../apache/brooklyn/api/objs/Configurable.java | 9 +-
.../org/apache/brooklyn/api/policy/Policy.java | 8 -
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 4 -
.../spi/dsl/methods/BrooklynDslCommon.java | 6 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 5 -
.../apache/brooklyn/core/BrooklynVersion.java | 25 --
.../core/catalog/CatalogPredicates.java | 11 -
.../catalog/internal/BasicBrooklynCatalog.java | 10 -
.../core/catalog/internal/CatalogBundleDto.java | 3 -
.../catalog/internal/CatalogItemBuilder.java | 6 -
.../core/catalog/internal/CatalogItemDo.java | 33 --
.../internal/CatalogItemDtoAbstract.java | 17 -
.../core/catalog/internal/CatalogUtils.java | 36 +-
.../brooklyn/core/config/ConfigPredicates.java | 24 --
.../core/config/render/RendererHints.java | 21 --
.../core/effector/AbstractEffector.java | 4 -
.../brooklyn/core/effector/EffectorTasks.java | 4 -
.../core/enricher/AbstractEnricher.java | 1 -
.../brooklyn/core/entity/AbstractEntity.java | 340 -------------------
.../core/entity/BrooklynConfigKeys.java | 7 -
.../apache/brooklyn/core/entity/Entities.java | 32 --
.../core/entity/EntityAndAttribute.java | 8 -
.../brooklyn/core/entity/EntityDynamicType.java | 8 -
.../brooklyn/core/entity/EntityFunctions.java | 2 +-
.../brooklyn/core/entity/EntityInternal.java | 27 --
.../brooklyn/core/entity/EntityPredicates.java | 11 -
.../internal/EntityTransientCopyInternal.java | 10 -
.../core/feed/AttributePollHandler.java | 2 +-
.../apache/brooklyn/core/feed/FeedConfig.java | 4 -
.../core/internal/BrooklynInitialization.java | 9 -
.../core/internal/BrooklynPropertiesImpl.java | 6 -
.../core/location/AbstractLocation.java | 62 +---
.../core/location/LocationPredicates.java | 2 +-
.../apache/brooklyn/core/location/Machines.java | 9 -
.../location/access/PortForwardManager.java | 72 ----
.../access/PortForwardManagerClient.java | 106 +-----
.../location/access/PortForwardManagerImpl.java | 96 +-----
.../core/location/geo/UtraceHostGeoLookup.java | 16 -
.../location/internal/LocationInternal.java | 17 -
.../core/mgmt/EntityManagementUtils.java | 27 --
.../JavaBrooklynClassLoadingContext.java | 5 -
.../core/mgmt/entitlement/Entitlements.java | 9 -
.../mgmt/ha/HighAvailabilityManagerImpl.java | 14 -
.../core/mgmt/ha/OsgiArchiveInstaller.java | 7 +-
.../core/objs/AbstractEntityAdjunct.java | 118 +------
.../core/objs/BasicConfigurableObject.java | 6 -
.../core/objs/proxy/InternalEntityFactory.java | 10 -
.../objs/proxy/InternalLocationFactory.java | 30 --
.../core/objs/proxy/InternalPolicyFactory.java | 42 ---
.../brooklyn/core/sensor/AttributeMap.java | 2 +-
.../core/sensor/DependentConfiguration.java | 13 -
.../core/server/BrooklynServerConfig.java | 39 ---
.../core/server/BrooklynServiceAttributes.java | 12 -
.../core/typereg/BasicManagedBundle.java | 5 -
.../core/typereg/BasicOsgiBundleWithUrl.java | 6 -
.../brooklyn/core/typereg/RegisteredTypes.java | 3 -
.../enricher/stock/reducer/Reducer.java | 2 +-
.../group/AbstractMembershipTrackingPolicy.java | 28 +-
.../brooklyn/entity/group/DynamicGroup.java | 4 -
.../brooklyn/entity/group/DynamicGroupImpl.java | 9 -
.../apache/brooklyn/feed/CommandPollConfig.java | 12 -
.../brooklyn/feed/function/FunctionFeed.java | 4 +-
.../org/apache/brooklyn/feed/http/HttpFeed.java | 3 +-
.../brooklyn/feed/http/HttpPollValue.java | 40 ---
.../apache/brooklyn/feed/http/HttpPolls.java | 39 ---
.../apache/brooklyn/feed/shell/ShellFeed.java | 2 +-
.../brooklyn/feed/ssh/SshValueFunctions.java | 18 +-
.../LocalhostMachineProvisioningLocation.java | 8 +-
.../location/ssh/SshMachineLocation.java | 15 +-
.../util/core/BrooklynLanguageExtensions.java | 46 ---
.../brooklyn/util/core/ResourceUtils.java | 89 +----
.../brooklyn/util/core/config/ConfigBag.java | 2 +-
.../brooklyn/util/core/crypto/SecureKeys.java | 23 +-
.../brooklyn/util/core/file/ArchiveBuilder.java | 92 -----
.../brooklyn/util/core/flags/FlagUtils.java | 14 -
.../brooklyn/util/core/http/HttpTool.java | 28 --
.../util/core/http/HttpToolResponse.java | 31 --
.../util/core/internal/ssh/SshTool.java | 9 -
.../util/core/internal/ssh/cli/SshCliTool.java | 5 -
.../core/internal/ssh/process/ProcessTool.java | 25 --
.../util/core/internal/ssh/sshj/SshjTool.java | 6 -
.../brooklyn/util/core/osgi/BundleMaker.java | 40 +--
.../apache/brooklyn/util/core/osgi/Osgis.java | 55 ---
.../brooklyn/util/core/task/TaskBuilder.java | 8 -
.../brooklyn/util/core/task/TaskPredicates.java | 6 -
.../util/core/text/TemplateProcessor.java | 10 -
.../brooklyn/core/BrooklynVersionTest.java | 7 -
.../internal/CatalogItemBuilderTest.java | 10 -
.../core/config/BrooklynPropertiesTest.java | 8 +-
.../core/config/ConfigPredicatesTest.java | 18 +-
.../brooklyn/core/entity/AttributeTest.java | 11 -
.../brooklyn/core/entity/EntitiesTest.java | 6 -
.../core/entity/EntityConfigGroovyTest.groovy | 2 +-
.../brooklyn/core/entity/EntitySpecTest.java | 21 --
.../brooklyn/core/entity/EntityTypeTest.java | 2 +-
.../core/entity/PolicyRegistrationTest.java | 7 -
.../core/location/LocationConfigTest.java | 16 -
.../brooklyn/core/location/MachinesTest.java | 9 -
.../access/PortForwardManagerRebindTest.java | 26 --
.../location/access/PortForwardManagerTest.java | 27 +-
...agementPlaneSyncRecordPersisterInMemory.java | 99 ------
.../core/mgmt/rebind/RebindEnricherTest.java | 5 +-
.../core/mgmt/rebind/RebindFeedWithHaTest.java | 2 +-
.../core/mgmt/rebind/RebindTestFixture.java | 57 ----
.../core/mgmt/rebind/RebindTestUtils.java | 125 -------
.../core/test/entity/TestApplicationImpl.java | 13 +-
.../qa/performance/AbstractPerformanceTest.java | 93 -----
.../apache/brooklyn/feed/http/HttpFeedTest.java | 12 +-
.../util/core/internal/FlagUtilsTest.java | 5 -
.../core/internal/ssh/RecordingSshTool.java | 3 -
.../BrooklynEntityMirrorIntegrationTest.java | 4 +-
.../jclouds/BlobStoreContextFactoryImpl.java | 4 +-
.../location/jclouds/BrooklynImageChooser.java | 15 +-
.../location/jclouds/JcloudsLocation.java | 2 -
.../jclouds/JcloudsMachineLocation.java | 9 -
.../location/jclouds/JcloudsPredicates.java | 7 +-
.../jclouds/JcloudsSshMachineLocation.java | 78 -----
.../jclouds/JcloudsWinRmMachineLocation.java | 17 -
.../api/JcloudsLocationConfigPublic.java | 15 -
.../customize/AutoCreateFloatingIpsOption.java | 42 ---
.../customize/TemplateOptionCustomizers.java | 8 -
.../customize/UserDataUuencodedOption.java | 54 ---
.../jclouds/JcloudsByonRebindLiveTest.java | 2 -
.../JcloudsImageChoiceStubbedLiveTest.java | 2 -
.../jclouds/JcloudsLocationResolverTest.java | 2 +-
.../location/jclouds/JcloudsRebindLiveTest.java | 3 -
.../location/jclouds/JcloudsRebindStubTest.java | 1 -
.../jclouds/JcloudsRebindStubUnitTest.java | 1 -
.../policy/enricher/HttpLatencyDetector.java | 6 +-
.../enricher/RollingTimeWindowMeanEnricher.java | 10 -
.../RollingTimeWindowMeanEnricherTest.java | 24 +-
.../loadbalancing/MockContainerEntityImpl.java | 8 -
.../loadbalancing/MockItemEntityImpl.java | 7 -
.../apache/brooklyn/rest/domain/ApiError.java | 12 -
.../brooklyn/rest/domain/TaskSummary.java | 14 -
.../rest/filter/HaHotCheckResourceFilter.java | 6 -
.../resources/AbstractBrooklynRestResource.java | 5 -
.../rest/resources/LocationResource.java | 6 -
.../rest/transform/LocationTransformer.java | 12 -
.../brooklyn/rest/util/ShutdownHandler.java | 26 --
.../brooklyn/rest/util/URLParamEncoder.java | 28 --
.../brooklyn/rest/util/WebResourceUtils.java | 7 -
.../util/json/BrooklynJacksonJsonProvider.java | 23 --
.../BrooklynPropertiesSecurityFilter.java | 11 +-
.../BrooklynRestApiLauncherTestFixture.java | 6 -
.../entity/brooklynnode/BrooklynNodeImpl.java | 2 +-
.../brooklyn/entity/java/JavaAppUtils.java | 6 -
.../java/JavaSoftwareProcessSshDriver.java | 8 -
.../software/base/SameServerEntityImpl.java | 6 -
.../org/apache/brooklyn/feed/jmx/JmxFeed.java | 20 +-
.../feed/jmx/JmxNotificationFilters.java | 10 +-
.../entity/java/VanillaJavaAppRebindTest.java | 2 +-
...twareProcessOpenIptablesStreamsLiveTest.java | 2 +-
.../java/org/apache/brooklyn/test/Asserts.java | 24 +-
.../brooklyn/util/collections/MutableList.java | 4 -
.../brooklyn/util/collections/MutableMap.java | 4 -
.../brooklyn/util/collections/MutableSet.java | 5 -
.../util/collections/TimeWindowedList.java | 10 -
.../brooklyn/util/exceptions/Exceptions.java | 7 -
.../util/javalang/AggregateClassLoader.java | 7 -
.../apache/brooklyn/util/javalang/Enums.java | 5 +-
.../util/javalang/StackTraceSimplifier.java | 15 -
.../brooklyn/util/math/MathFunctions.java | 8 -
.../java/org/apache/brooklyn/util/os/Os.java | 6 -
.../apache/brooklyn/util/repeat/Repeater.java | 12 -
.../brooklyn/util/ssh/IptablesCommands.java | 34 +-
.../util/stream/InputStreamSupplier.java | 4 +-
.../apache/brooklyn/util/stream/Streams.java | 5 -
.../org/apache/brooklyn/util/text/Strings.java | 7 -
.../brooklyn/util/time/CountdownTimer.java | 3 -
.../org/apache/brooklyn/util/time/Duration.java | 11 -
.../org/apache/brooklyn/util/time/Time.java | 38 +--
178 files changed, 177 insertions(+), 3573 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java b/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
index e03adbf..2e5bce9 100644
--- a/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
+++ b/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java
@@ -153,29 +153,6 @@ public interface BrooklynCatalog {
@Beta // method may move elsewhere
Collection<Throwable> validateType(RegisteredType typeToValidate, @Nullable RegisteredTypeLoadingContext optionalConstraint);
-
- /**
- * Adds an item (represented in yaml) to the catalog.
- * Fails if the same version exists in catalog.
- *
- * @throws IllegalArgumentException if the yaml was invalid
- * @deprecated since 0.7.0 use {@link #addItems(String, boolean)}
- */
- @Deprecated
- CatalogItem<?,?> addItem(String yaml);
-
- /**
- * Adds an item (represented in yaml) to the catalog.
- *
- * @param forceUpdate If true allows catalog update even when an
- * item exists with the same symbolicName and version
- *
- * @throws IllegalArgumentException if the yaml was invalid
- * @deprecated since 0.7.0 use {@link #addItems(String, boolean)}
- */
- @Deprecated
- CatalogItem<?,?> addItem(String yaml, boolean forceUpdate);
-
/**
* As {@link #addItemsFromBundle(String, ManagedBundle)} with a null bundle.
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java b/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
index f3440d9..b26b652 100644
--- a/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
+++ b/api/src/main/java/org/apache/brooklyn/api/catalog/CatalogItem.java
@@ -76,9 +76,6 @@ public interface CatalogItem<T,SpecT> extends BrooklynObject, Rebindable {
}
public static interface CatalogBundle extends OsgiBundleWithUrl {
- /** @deprecated since 0.9.0, use {@link #isNameResolved()} */
- @Deprecated
- public boolean isNamed();
}
/**
@@ -115,14 +112,6 @@ public interface CatalogItem<T,SpecT> extends BrooklynObject, Rebindable {
@Deprecated
@Nullable public String getJavaType();
- /** @deprecated since 0.7.0. Use {@link #getDisplayName} */
- @Deprecated
- public String getName();
-
- /** @deprecated since 0.7.0. Use {@link #getSymbolicName} */
- @Deprecated
- public String getRegisteredTypeName();
-
@Nullable public String getDescription();
@Nullable public String getIconUrl();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/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 cafe0ed..d981efd 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
@@ -164,56 +164,6 @@ public interface Entity extends BrooklynObject {
boolean removeChild(Entity child);
/**
- * @return an immutable thread-safe view of the policies.
- *
- * @deprecated since 0.9.0; see {@link PolicySupport#asList()}
- */
- @Deprecated
- Collection<Policy> getPolicies();
-
- /**
- * @return an immutable thread-safe view of the enrichers.
- *
- * @deprecated since 0.9.0; see {@link EnricherSupport#asList()}
- */
- @Deprecated
- Collection<Enricher> getEnrichers();
-
- /**
- * The {@link Collection} of {@link Group}s that this entity is a member of.
- *
- * Groupings can be used to allow easy management/monitoring of a group of entities.
- *
- * @deprecated since 0.9.0; see {@link #groups()} and {@link GroupSupport#iterator()}
- */
- @Deprecated
- Collection<Group> getGroups();
-
- /**
- * Add this entity as a member of the given {@link Group}. Called by framework.
- * <p>
- * Users should call {@link Group#addMember(Entity)} instead; this method will then
- * automatically be called. However, the reverse is not true (calling this method will
- * not tell the group; this behaviour may change in a future release!)
- *
- * @deprecated since 0.9.0; see {@link GroupSupport#add()} and {@link #groups()}
- */
- @Deprecated
- void addGroup(Group group);
-
- /**
- * Removes this entity as a member of the given {@link Group}. Called by framework.
- * <p>
- * Users should call {@link Group#removeMember(Entity)} instead; this method will then
- * automatically be called. However, the reverse is not true (calling this method will
- * not tell the group; this behaviour may change in a future release!)
- *
- * @deprecated since 0.9.0; see {@link GroupSupport#remove()} and {@link #groups()}
- */
- @Deprecated
- void removeGroup(Group group);
-
- /**
* Return all the {@link Location}s this entity is deployed to.
*/
Collection<Location> getLocations();
@@ -235,56 +185,6 @@ public interface Entity extends BrooklynObject {
<T> Task<T> invoke(Effector<T> eff, Map<String,?> parameters);
/**
- * Adds the given policy to this entity. Also calls policy.setEntity if available.
- *
- * @deprecated since 0.9.0; see {@link PolicySupport#add(Policy)}
- */
- @Deprecated
- void addPolicy(Policy policy);
-
- /**
- * Adds the given policy to this entity. Also calls policy.setEntity if available.
- *
- * @deprecated since 0.9.0; see {@link PolicySupport#add(PolicySpec)}
- */
- @Deprecated
- <T extends Policy> T addPolicy(PolicySpec<T> policy);
-
- /**
- * Removes the given policy from this entity.
- * @return True if the policy existed at this entity; false otherwise
- *
- * @deprecated since 0.9.0; see {@link PolicySupport#remove(Policy)}
- */
- @Deprecated
- boolean removePolicy(Policy policy);
-
- /**
- * Adds the given enricher to this entity. Also calls enricher.setEntity if available.
- *
- * @deprecated since 0.9.0; see {@link EnricherSupport#add(Enricher)}
- */
- @Deprecated
- void addEnricher(Enricher enricher);
-
- /**
- * Adds the given enricher to this entity. Also calls enricher.setEntity if available.
- *
- * @deprecated since 0.9.0; see {@link EnricherSupport#add(EnricherSpec)}
- */
- @Deprecated
- <T extends Enricher> T addEnricher(EnricherSpec<T> enricher);
-
- /**
- * Removes the given enricher from this entity.
- * @return True if the policy enricher at this entity; false otherwise
- *
- * @deprecated since 0.9.0; see {@link EnricherSupport#remove(Enricher)}
- */
- @Deprecated
- boolean removeEnricher(Enricher enricher);
-
- /**
* Adds the given feed to this entity. Also calls feed.setEntity if available.
*
* @deprecated since 1.0.0; see {@link FeedSupport#add(Feed)}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/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 bc3b818..c6511e5 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
@@ -18,22 +18,6 @@
*/
package org.apache.brooklyn.api.entity;
-import java.util.Map;
-
-import org.apache.brooklyn.api.mgmt.SubscriptionContext;
-import org.apache.brooklyn.api.mgmt.SubscriptionHandle;
-import org.apache.brooklyn.api.mgmt.SubscriptionManager;
-import org.apache.brooklyn.api.mgmt.Task;
-import org.apache.brooklyn.api.sensor.AttributeSensor;
-import org.apache.brooklyn.api.sensor.Sensor;
-import org.apache.brooklyn.api.sensor.SensorEventListener;
-import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
-import org.apache.brooklyn.util.guava.Maybe;
-
-import com.google.common.annotations.Beta;
-import com.google.common.base.Function;
-
/**
* Extended Entity interface for use in places where the caller should have certain privileges,
* such as setting attribute values, adding policies, etc.
@@ -52,119 +36,4 @@ public interface EntityLocal extends Entity {
// FIXME Rename to something other than EntityLocal.
// Separate out what is specific to "local jvm", and what is here for an SPI rather than API.
- /**
- * @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);
-
- /**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().set(key, val)}
- */
- @Deprecated
- <T> T setConfig(ConfigKey<T> key, Task<T> val);
-
- /**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().set(key, val)}
- */
- @Deprecated
- <T> T setConfig(HasConfigKey<T> key, T val);
-
- /**
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().set(key, val)}
- */
- @Deprecated
- <T> T setConfig(HasConfigKey<T> key, Task<T> val);
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupport#set(AttributeSensor, Object)} via code like {@code sensors().set(attribute, val)}.
- */
- @Deprecated
- <T> T setAttribute(AttributeSensor<T> attribute, T val);
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupport#modify(AttributeSensor, Function)} via code like {@code sensors().modify(attribute, modifier)}.
- */
- @Deprecated
- @Beta
- <T> T modifyAttribute(AttributeSensor<T> attribute, Function<? super T, Maybe<T>> modifier);
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupport#emit(Sensor, Object)} via code like {@code sensors().emit(sensor, val)}.
- */
- @Deprecated
- <T> void emit(Sensor<T> sensor, T value);
-
- /**
- * Allow us to subscribe to data from a {@link Sensor} on another entity.
- *
- * @return a subscription id which can be used to unsubscribe
- *
- * @see SubscriptionManager#subscribe(Map, Entity, Sensor, SensorEventListener)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupportInternal#getSubscriptionContext()}, e.g. with {@code subscriptions().getSubscriptionContext()}
- */
- @Deprecated
- @Beta
- <T> SubscriptionHandle subscribe(Entity producer, Sensor<T> sensor, SensorEventListener<? super T> listener);
-
- /**
- * @see SubscriptionManager#subscribeToChildren(Map, Entity, Sensor, SensorEventListener)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#subscribeToChildren(Entity, Sensor, SensorEventListener)}, e.g. with {@code subscriptions().subscribeToChildren(...)}
- */
- @Deprecated
- @Beta
- <T> SubscriptionHandle subscribeToChildren(Entity parent, Sensor<T> sensor, SensorEventListener<? super T> listener);
-
- /**
- * @see SubscriptionManager#subscribeToMembers(Group, Sensor, SensorEventListener)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#subscribeToMembers(Entity, Sensor, SensorEventListener)}, e.g. with {@code subscriptions().subscribeToMembers(...)}
- */
- @Deprecated
- @Beta
- <T> SubscriptionHandle subscribeToMembers(Group group, Sensor<T> sensor, SensorEventListener<? super T> listener);
-
- /**
- * Unsubscribes from the given producer.
- *
- * @see SubscriptionContext#unsubscribe(SubscriptionHandle)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#unsubscribe(Entity)}, e.g. with {@code subscriptions().unsubscribe(...)}
- */
- @Deprecated
- @Beta
- boolean unsubscribe(Entity producer);
-
- /**
- * Unsubscribes the given handle.
- *
- * @see SubscriptionContext#unsubscribe(SubscriptionHandle)
- *
- * @deprecated since 0.9.0; see {@link SubscriptionSupport#unsubscribe(Entity, SubscriptionHandle)}, e.g. with {@code subscriptions().unsubscribe(...)}
- */
- @Deprecated
- @Beta
- boolean unsubscribe(Entity producer, SubscriptionHandle handle);
-
- /**
- * Removes all policy from this entity.
- * @return True if any policies existed at this entity; false otherwise
- *
- * @deprecated since 0.9.0; see {@link PolicySupportInternal#removeAllPolicies()}, e.g. {@code ((EntityInternal)entity).policies().removeAllPolicies()}
- */
- @Deprecated
- boolean removeAllPolicies();
-
- /**
- * Removes all enricher from this entity.
- * Use with caution as some entities automatically register enrichers; this will remove those enrichers as well.
- * @return True if any enrichers existed at this entity; false otherwise
- *
- * @deprecated since 0.9.0; see {@link EnricherSupportInternal#removeAllEnrichers()}, e.g. {@code ((EntityInternal)entity).enrichers().removeAllEnrichers()}
- */
- @Deprecated
- boolean removeAllEnrichers();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java b/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
index d431c17..7e11387 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/EntitySpec.java
@@ -29,9 +29,7 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.internal.AbstractBrooklynObjectSpec;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationSpec;
-import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.policy.PolicySpec;
-import org.apache.brooklyn.api.sensor.Enricher;
import org.apache.brooklyn.api.sensor.EnricherSpec;
import org.apache.brooklyn.util.collections.MutableList;
@@ -104,9 +102,7 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
private Class<? extends T> impl;
private Entity parent;
- private final List<Policy> policies = Lists.newArrayList();
private final List<PolicySpec<?>> policySpecs = Lists.newArrayList();
- private final List<Enricher> enrichers = Lists.newArrayList();
private final List<EnricherSpec<?>> enricherSpecs = Lists.newArrayList();
private final List<Location> locations = Lists.newArrayList();
private final List<LocationSpec<?>> locationSpecs = Lists.newArrayList();
@@ -126,9 +122,7 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
super.copyFrom(otherSpec)
.additionalInterfaces(otherSpec.getAdditionalInterfaces())
.policySpecs(otherSpec.getPolicySpecs())
- .policies(otherSpec.getPolicies())
.enricherSpecs(otherSpec.getEnricherSpecs())
- .enrichers(otherSpec.getEnrichers())
.addInitializers(otherSpec.getInitializers())
.children(copyFromSpecs(otherSpec.getChildren()))
.members(otherSpec.getMembers())
@@ -210,20 +204,10 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
return policySpecs;
}
- /** @deprecated since 0.9.0 in future only {@link #getPolicySpecs()} will be supported */ @Deprecated
- public List<Policy> getPolicies() {
- return policies;
- }
-
public List<EnricherSpec<?>> getEnricherSpecs() {
return enricherSpecs;
}
- /** @deprecated since 0.9.0 in future only {@link #getEnricherSpecs()} will be supported */ @Deprecated
- public List<Enricher> getEnrichers() {
- return enrichers;
- }
-
public List<LocationSpec<?>> getLocationSpecs() {
return locationSpecs;
}
@@ -321,14 +305,6 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
return this;
}
- /** adds a policy to the spec
- * @deprecated since 0.9.0 pass a spec, using {@link #policy(EnricherSpec)} */ @Deprecated
- public <V> EntitySpec<T> policy(Policy val) {
- checkMutable();
- policies.add(checkNotNull(val, "policy"));
- return this;
- }
-
/** adds a policy to the spec */
public <V> EntitySpec<T> policy(PolicySpec<?> val) {
checkMutable();
@@ -343,22 +319,6 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
return this;
}
- /** adds the supplied policies to the spec
- * @deprecated since 0.9.0 pass a spec, using {@link #policySpecs(Iterable)} */ @Deprecated
- public <V> EntitySpec<T> policies(Iterable<? extends Policy> val) {
- checkMutable();
- policies.addAll(MutableList.copyOf(checkNotNull(val, "policies")));
- return this;
- }
-
- /** adds an enricher to the spec
- * @deprecated since 0.9.0 pass a spec, using {@link #enricher(EnricherSpec)} */ @Deprecated
- public <V> EntitySpec<T> enricher(Enricher val) {
- checkMutable();
- enrichers.add(checkNotNull(val, "enricher"));
- return this;
- }
-
/** adds an enricher to the spec */
public <V> EntitySpec<T> enricher(EnricherSpec<?> val) {
checkMutable();
@@ -373,14 +333,6 @@ public class EntitySpec<T extends Entity> extends AbstractBrooklynObjectSpec<T,E
return this;
}
- /** adds the supplied policies to the spec
- * @deprecated since 0.9.0 pass a spec, using {@link #enricherSpecs(Iterable)} */ @Deprecated
- public <V> EntitySpec<T> enrichers(Iterable<? extends Enricher> val) {
- checkMutable();
- enrichers.addAll(MutableList.copyOf(checkNotNull(val, "enrichers")));
- return this;
- }
-
/** adds a location to the spec
* @deprecated since 0.9.0 pass a spec, using {@link #location(LocationSpec)} */
@Deprecated
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/location/Location.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/location/Location.java b/api/src/main/java/org/apache/brooklyn/api/location/Location.java
index ea43bfd..efbb801 100644
--- a/api/src/main/java/org/apache/brooklyn/api/location/Location.java
+++ b/api/src/main/java/org/apache/brooklyn/api/location/Location.java
@@ -19,7 +19,6 @@
package org.apache.brooklyn.api.location;
import java.util.Collection;
-import java.util.Map;
import org.apache.brooklyn.api.objs.BrooklynObject;
import org.apache.brooklyn.config.ConfigKey;
@@ -94,22 +93,6 @@ public interface Location extends BrooklynObject {
* @see {@link #getConfig(ConfigKey)}
*/
<T> T getConfig(HasConfigKey<T> key);
-
- /**
- * True iff the indication config key is set, either inherited (second argument true) or locally-only (second argument false).
- *
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code ((LocationInternal)location).config().getRaw(key).isPresent()}
- */
- @Deprecated
- boolean hasConfig(ConfigKey<?> key, boolean includeInherited);
-
- /**
- * Returns all config set, either inherited (argument true) or locally-only (argument false).
- *
- * @deprecated since 0.7.0; use {@link #config()}, such as {@code policy.config().getBag()}
- */
- @Deprecated
- public Map<String,Object> getAllConfig(boolean includeInherited);
/**
* Whether this location has support for the given extension type.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java b/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java
index e0226b0..40de655 100644
--- a/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java
+++ b/api/src/main/java/org/apache/brooklyn/api/objs/Configurable.java
@@ -22,8 +22,8 @@ import java.util.Set;
import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.config.ConfigKey;
-import org.apache.brooklyn.config.ConfigMap;
import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
+import org.apache.brooklyn.config.ConfigMap;
import com.google.common.annotations.Beta;
import com.google.common.base.Predicate;
@@ -36,13 +36,6 @@ import com.google.common.base.Predicate;
public interface Configurable {
/**
- * @return the old value, or null if there was not one
- * @deprecated since 0.7.0; use {@link ConfigurationSupport#set(ConfigKey, Object)}, such as {@code config().set(key, val)}
- */
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, T val);
-
- /**
* Convenience for calling {@link ConfigurationSupport#get(ConfigKey)},
* via code like {@code config().get(key)}.
*
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/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 c1a9899..6297727 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
@@ -23,7 +23,6 @@ import org.apache.brooklyn.api.mgmt.rebind.Rebindable;
import org.apache.brooklyn.api.mgmt.rebind.mementos.PolicyMemento;
import org.apache.brooklyn.api.objs.Configurable;
import org.apache.brooklyn.api.objs.EntityAdjunct;
-import org.apache.brooklyn.config.ConfigKey;
import com.google.common.annotations.Beta;
@@ -60,13 +59,6 @@ public interface Policy extends EntityAdjunct, Rebindable, Configurable {
boolean isSuspended();
/**
- * @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);
-
- /**
* Users are strongly discouraged from calling or overriding this method.
* It is for internal calls only, relating to persisting/rebinding entities.
* This method may change (or be removed) in a future release without notice.
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java
----------------------------------------------------------------------
diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java
index f7dbaf2..e154971 100644
--- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java
+++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/pdp/DeploymentPlan.java
@@ -40,10 +40,6 @@ public class DeploymentPlan {
List<Service> services;
Map<String,Object> customAttributes;
- @Deprecated /** @deprecated since 0.7.0; supply source code also, for reference */
- public static DeploymentPlan of(Map<String,Object> root) {
- return of(root, null);
- }
@SuppressWarnings("unchecked")
public static DeploymentPlan of(Map<String,Object> root, String optionalSourceCode) {
Map<String,Object> attrs = MutableMap.copyOf(root);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
index f3f39e7..e265e84 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
@@ -512,10 +512,10 @@ public class BrooklynDslCommon {
}
}
- /** @deprecated since 0.7.0; use {@link DslFormatString} */
- @SuppressWarnings("serial")
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
+ @SuppressWarnings({ "serial", "unused" })
@Deprecated
- protected static class FormatString extends DslFormatString {
+ private static class FormatString extends DslFormatString {
public FormatString(String pattern, Object[] args) {
super(pattern, args);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
index ec9937c..f96348d 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java
@@ -143,11 +143,6 @@ public class ObjectsYamlTest extends AbstractYamlTest {
}
@Override
- public <T> T setConfig(ConfigKey<T> key, T value) {
- return config().set(key, value);
- }
-
- @Override
public ConfigurationSupport config() {
return configSupport;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
index d2c4b9c..ed48c98 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
@@ -35,12 +35,10 @@ import java.util.jar.Attributes;
import javax.annotation.Nullable;
-import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.typereg.ManagedBundle;
import org.apache.brooklyn.api.typereg.OsgiBundleWithUrl;
import org.apache.brooklyn.api.typereg.RegisteredType;
-import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog;
import org.apache.brooklyn.core.mgmt.classloading.OsgiBrooklynClassLoadingContext;
import org.apache.brooklyn.core.mgmt.ha.OsgiManager;
import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal;
@@ -121,21 +119,6 @@ public class BrooklynVersion implements BrooklynVersionService {
}
}
- /**
- * Returns version as inferred from classpath/osgi, if possible, or 0.0.0-SNAPSHOT.
- * See also {@link #getVersionFromMavenProperties()} and {@link #getVersionFromOsgiManifest()}.
- *
- * @deprecated since 0.7.0, in favour of the more specific methods (and does anyone need that default value?)
- */
- @Deprecated
- public String getVersionFromClasspath() {
- String v = getVersionFromMavenProperties();
- if (Strings.isNonBlank(v)) return v;
- v = getVersionFromOsgiManifest();
- if (Strings.isNonBlank(v)) return v;
- return BasicBrooklynCatalog.NO_VERSION;
- }
-
@Override
@Nullable
public String getVersionFromMavenProperties() {
@@ -285,14 +268,6 @@ public class BrooklynVersion implements BrooklynVersionService {
log.debug("Brooklyn version " + getVersion() + " (git SHA1 " + getSha1FromOsgiManifest() + ")");
}
- /**
- * @deprecated since 0.7.0, redundant with {@link #get()}
- */
- @Deprecated
- public static String getVersionFromStatic() {
- return VERSION_FROM_STATIC;
- }
-
public static String get() {
return INSTANCE.getVersion();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java b/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java
index 849cdd8..4756007 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/CatalogPredicates.java
@@ -174,12 +174,6 @@ public class CatalogPredicates {
}
};
- /** @deprecated since 0.7.0 use {@link #displayName(Predicate)} */
- @Deprecated
- public static <T,SpecT> Predicate<CatalogItem<T,SpecT>> name(final Predicate<? super String> filter) {
- return displayName(filter);
- }
-
/**
* @since 0.7.0
*/
@@ -213,11 +207,6 @@ public class CatalogPredicates {
}
}
- @Deprecated
- public static <T,SpecT> Predicate<CatalogItem<T,SpecT>> registeredTypeName(final Predicate<? super String> filter) {
- return symbolicName(filter);
- }
-
public static <T,SpecT> Predicate<CatalogItem<T,SpecT>> symbolicName(final Predicate<? super String> filter) {
// TODO PERSISTENCE WORKAROUND kept anonymous function in case referenced in persisted state
new Predicate<CatalogItem<T,SpecT>>() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index 4126d5d..e6b092d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@ -1420,21 +1420,11 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
//------------------------
@Override
- public CatalogItem<?,?> addItem(String yaml) {
- return addItem(yaml, false);
- }
-
- @Override
public List<? extends CatalogItem<?,?>> addItems(String yaml) {
return addItems(yaml, false);
}
@Override
- public CatalogItem<?,?> addItem(String yaml, boolean forceUpdate) {
- return Iterables.getOnlyElement(addItems(yaml, forceUpdate));
- }
-
- @Override
public List<? extends CatalogItem<?,?>> addItems(String yaml, boolean forceUpdate) {
Maybe<OsgiManager> osgiManager = ((ManagementContextInternal)mgmt).getOsgiManager();
if (osgiManager.isPresent() && AUTO_WRAP_CATALOG_YAML_AS_BUNDLE) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java
index 1653fcc..bf49cb6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java
@@ -57,9 +57,6 @@ public class CatalogBundleDto implements CatalogBundle {
}
@Override
- public boolean isNamed() { return isNameResolved(); }
-
- @Override
public String getSymbolicName() {
return symbolicName;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java
index 82ab357..f08ef17 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilder.java
@@ -87,12 +87,6 @@ public class CatalogItemBuilder<CIConcreteType extends CatalogItemDtoAbstract<?,
return this;
}
- /** @deprecated since 0.7.0 use {@link #displayName}*/
- @Deprecated
- public CatalogItemBuilder<CIConcreteType> name(String name) {
- return displayName(name);
- }
-
public CatalogItemBuilder<CIConcreteType> displayName(String displayName) {
dto.setDisplayName(displayName);
return this;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
index 2c1bec6..7f4f6c8 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java
@@ -87,11 +87,6 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj
}
@Override
- public <U> U setConfig(ConfigKey<U> key, U val) {
- return config().set(key, val);
- }
-
- @Override
public CatalogItemType getCatalogItemType() {
return itemDto.getCatalogItemType();
}
@@ -161,18 +156,6 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj
return itemDto.getJavaType();
}
- @Deprecated
- @Override
- public String getName() {
- return getDisplayName();
- }
-
- @Deprecated
- @Override
- public String getRegisteredTypeName() {
- return getSymbolicName();
- }
-
@Override
public String getDisplayName() {
return itemDto.getDisplayName();
@@ -214,22 +197,6 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj
return itemDto.getLibraries();
}
- /** @deprecated since 0.7.0 this is the legacy mechanism; still needed for policies and apps, but being phased out.
- * new items should use {@link #getPlanYaml} and {@link #newClassLoadingContext} */
- @Deprecated
- public Class<T> getJavaClass() {
- if (javaClass==null) loadJavaClass(null);
- return javaClass;
- }
-
- @SuppressWarnings("unchecked")
- @Deprecated
- Class<? extends T> loadJavaClass(final ManagementContext mgmt) {
- if (javaClass!=null) return javaClass;
- javaClass = (Class<T>)CatalogUtils.newClassLoadingContext(mgmt, getId(), getLibraries(), catalog.getRootClassLoader()).loadClass(getJavaType());
- return javaClass;
- }
-
@Override
public String toString() {
return getClass().getCanonicalName()+"["+itemDto+"]";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
index 9f6e3d4..eb1ef5e 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java
@@ -93,11 +93,6 @@ public abstract class CatalogItemDtoAbstract<T, SpecT> extends AbstractBrooklynO
}
@Override
- public <U> U setConfig(ConfigKey<U> key, U val) {
- return config().set(key, val);
- }
-
- @Override
public String getId() {
return getCatalogItemId();
}
@@ -114,18 +109,6 @@ public abstract class CatalogItemDtoAbstract<T, SpecT> extends AbstractBrooklynO
}
@Override
- @Deprecated
- public String getName() {
- return getDisplayName();
- }
-
- @Override
- @Deprecated
- public String getRegisteredTypeName() {
- return getSymbolicName();
- }
-
- @Override
public String getContainingBundle() {
return containingBundle;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
index 5621588..5912ffa 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java
@@ -112,8 +112,8 @@ public class CatalogUtils {
return newClassLoadingContext(mgmt, catalogItemId, libraries, JavaBrooklynClassLoadingContext.create(mgmt));
}
- @Deprecated /** @deprecated since 0.9.0; becoming private because we should now always have a registered type callers can pass instead of the catalog item id */
- public static BrooklynClassLoadingContext newClassLoadingContext(@Nullable ManagementContext mgmt, String catalogItemId, Collection<? extends OsgiBundleWithUrl> libraries, BrooklynClassLoadingContext loader) {
+ @Deprecated /** @deprecated since 0.9.0; we should now always have a registered type callers can pass instead of the catalog item id */
+ private static BrooklynClassLoadingContext newClassLoadingContext(@Nullable ManagementContext mgmt, String catalogItemId, Collection<? extends OsgiBundleWithUrl> libraries, BrooklynClassLoadingContext loader) {
BrooklynClassLoadingContextSequential result = new BrooklynClassLoadingContextSequential(mgmt);
if (libraries!=null && !libraries.isEmpty()) {
@@ -134,25 +134,6 @@ public class CatalogUtils {
return result;
}
- /**
- * @deprecated since 0.7.0 only for legacy catalog items which provide a non-osgi loader; see {@link #newDefault(ManagementContext)}
- */ @Deprecated
- public static BrooklynClassLoadingContext newClassLoadingContext(@Nullable ManagementContext mgmt, String catalogItemId, Collection<CatalogBundle> libraries, ClassLoader customClassLoader) {
- BrooklynClassLoadingContextSequential result = new BrooklynClassLoadingContextSequential(mgmt);
-
- if (libraries!=null && !libraries.isEmpty()) {
- result.add(new OsgiBrooklynClassLoadingContext(mgmt, catalogItemId, libraries));
- }
-
- BrooklynClassLoadingContext loader = BrooklynLoaderTracker.getLoader();
- if (loader != null) {
- result.add(loader);
- }
-
- result.addSecondary(JavaBrooklynClassLoadingContext.create(mgmt, customClassLoader));
- return result;
- }
-
public static BrooklynClassLoadingContext newClassLoadingContextForCatalogItems(
ManagementContext managementContext, String primaryItemId, List<String> searchPath) {
@@ -342,19 +323,6 @@ public class CatalogUtils {
return (best.getVersion().equals(item.getVersion()));
}
- /** @deprecated since 0.9.0 use {@link BrooklynTypeRegistry#get(String, org.apache.brooklyn.api.typereg.BrooklynTypeRegistry.RegisteredTypeKind, Class)} */
- // not used
- @Deprecated
- public static <T,SpecT> CatalogItem<T, SpecT> getCatalogItemOptionalVersion(ManagementContext mgmt, Class<T> type, String versionedId) {
- if (looksLikeVersionedId(versionedId)) {
- String id = getSymbolicNameFromVersionedId(versionedId);
- String version = getVersionFromVersionedId(versionedId);
- return mgmt.getCatalog().getCatalogItem(type, id, version);
- } else {
- return mgmt.getCatalog().getCatalogItem(type, versionedId, BrooklynCatalog.DEFAULT_VERSION);
- }
- }
-
/** @deprecated since it was introduced in 0.9.0; TBD where this should live */
@Deprecated
public static void setDeprecated(ManagementContext mgmt, String symbolicNameAndOptionalVersion, boolean newValue) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java b/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java
index 16ffca4..0f86759 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/ConfigPredicates.java
@@ -82,30 +82,6 @@ public class ConfigPredicates {
};
}
- /** @deprecated since 0.9.0; use {@link #nameStartsWith(String)} */
- @Deprecated
- public static Predicate<ConfigKey<?>> startingWith(final String prefix) {
- return nameStartsWith(prefix);
- }
-
- /** @deprecated since 0.9.0; use {@link #nameMatchesGlob(String)} */
- @Deprecated
- public static Predicate<ConfigKey<?>> matchingGlob(final String glob) {
- return nameMatchesGlob(glob);
- }
-
- /** @deprecated since 0.9.0; use {@link #nameMatchesRegex(String)} */
- @Deprecated
- public static Predicate<ConfigKey<?>> matchingRegex(final String regex) {
- return nameMatchesRegex(regex);
- }
-
- /** @deprecated since 0.9.0; use {@link #nameSatisfies(Predicate)} */
- @Deprecated
- public static Predicate<ConfigKey<?>> nameMatching(final Predicate<String> filter) {
- return nameSatisfies(filter);
- }
-
/**
* @since 0.9.0
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/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 2cef27e..b843aad 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
@@ -18,15 +18,12 @@
*/
package org.apache.brooklyn.core.config.render;
-import groovy.lang.Closure;
-
import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.render.RendererHints;
-import org.apache.brooklyn.util.groovy.GroovyJavaMethods;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,13 +82,6 @@ public class RendererHints {
/** as {@link #getHintsFor(AttributeSensor)} */
public static Set<Hint<?>> getHintsFor(Class<?> element) { return _getHintsFor(element, null); }
- @Deprecated /** @deprecated since 0.7.0 only supported for certain types */
- public static Set<Hint<?>> getHintsFor(Object element) { return getHintsFor(element, null); }
-
- @Deprecated /** @deprecated since 0.7.0 only supported for certain types */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- public static Set<Hint<?>> getHintsFor(Object element, Class<? extends Hint> optionalHintSuperClass) { return (Set<Hint<?>>) _getHintsFor(element, optionalHintSuperClass); }
-
@SuppressWarnings({ "unchecked", "rawtypes" })
private static <T extends Hint> Set<T> _getHintsFor(Object element, Class<T> optionalHintSuperClass) {
Set<Hint<?>> found = ImmutableSet.copyOf(registry.get(element));
@@ -159,22 +149,11 @@ public class RendererHints {
this(actionName, (Function<T, String>)null);
}
- @SuppressWarnings("unchecked") @Deprecated /** @deprecated since 0.7.0 use Function */
- public NamedActionWithUrl(String actionName, Closure<String> postProcessing) {
- this.actionName = actionName;
- this.postProcessing = (Function<T, String>) ((postProcessing == null) ? null : GroovyJavaMethods.functionFromClosure(postProcessing));
- }
-
public NamedActionWithUrl(String actionName, Function<T, String> postProcessing) {
this.actionName = actionName;
this.postProcessing = postProcessing;
}
- /** @deprecated since 0.7.0 call {@link #getUrlFromValue(Object)}, parsing the sensor value yourself */ @Deprecated
- public String getUrl(Entity e, AttributeSensor<T> s) {
- return getUrlFromValue(e.getAttribute(s));
- }
-
@Override
public String getActionName() {
return actionName;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java b/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java
index 4acd0e0..bea48c6 100644
--- a/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java
+++ b/core/src/main/java/org/apache/brooklyn/core/effector/AbstractEffector.java
@@ -60,10 +60,6 @@ public abstract class AbstractEffector<T> extends EffectorBase<T> implements Eff
/** Convenience for named-parameter syntax (needs map in first argument) */
public T call(@SuppressWarnings("rawtypes") Map parameters, Entity entity) { return call(entity, parameters); }
- /** @deprecated since 0.7.0 use {@link #getFlagsForTaskInvocationAt(Entity, Effector, ConfigBag)} */ @Deprecated
- protected final Map<Object,Object> getFlagsForTaskInvocationAt(Entity entity) {
- return getFlagsForTaskInvocationAt(entity, this, null);
- }
/** subclasses may override to add additional flags, but they should include the flags returned here
* unless there is very good reason not to */
protected Map<Object,Object> getFlagsForTaskInvocationAt(Entity entity, Effector<T> effector, ConfigBag parameters) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java b/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java
index b9429a0..db49227 100644
--- a/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java
+++ b/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java
@@ -93,10 +93,6 @@ public class EffectorTasks {
return dst.get();
};
- /** @deprecated since 0.7.0 use {@link #getFlagsForTaskInvocationAt(Entity, Effector, ConfigBag)} */ @Deprecated
- protected final Map<Object,Object> getFlagsForTaskInvocationAt(Entity entity, Effector<?> effector) {
- return getFlagsForTaskInvocationAt(entity, effector, null);
- }
/** subclasses may override to add additional flags, but they should include the flags returned here
* unless there is very good reason not to; default impl returns a MutableMap */
protected Map<Object,Object> getFlagsForTaskInvocationAt(Entity entity, Effector<?> effector, ConfigBag parameters) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java b/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
index 08a39be..b92e930 100644
--- a/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
+++ b/core/src/main/java/org/apache/brooklyn/core/enricher/AbstractEnricher.java
@@ -122,7 +122,6 @@ public abstract class AbstractEnricher extends AbstractEntityAdjunct implements
requestPersist();
}
- @Override
protected <T> void emit(Sensor<T> sensor, Object val) {
checkState(entity != null, "entity must first be set");
if (val == Entities.UNCHANGED) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/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 73275e4..70942a0 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
@@ -71,7 +71,6 @@ import org.apache.brooklyn.core.entity.lifecycle.PolicyDescriptor;
import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic;
import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic;
import org.apache.brooklyn.core.feed.AbstractFeed;
-import org.apache.brooklyn.core.feed.ConfigToAttributes;
import org.apache.brooklyn.core.internal.BrooklynInitialization;
import org.apache.brooklyn.core.internal.storage.BrooklynStorage;
import org.apache.brooklyn.core.internal.storage.Reference;
@@ -90,7 +89,6 @@ import org.apache.brooklyn.core.objs.AbstractEntityAdjunct;
import org.apache.brooklyn.core.objs.AbstractEntityAdjunct.AdjunctTagSupport;
import org.apache.brooklyn.core.policy.AbstractPolicy;
import org.apache.brooklyn.core.sensor.AttributeMap;
-import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey;
import org.apache.brooklyn.core.sensor.BasicNotificationSensor;
import org.apache.brooklyn.core.sensor.Sensors;
import org.apache.brooklyn.core.typereg.RegisteredTypes;
@@ -282,15 +280,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
// If FEATURE_USE_BROOKLYN_LIVE_OBJECTS_DATAGRID_STORAGE, this value will be only temporary.
private AttributeMap attributesInternal = new AttributeMap(this);
- /**
- * For temporary data, e.g. timestamps etc for calculating real attribute values, such as when
- * calculating averages over time etc.
- *
- * @deprecated since 0.6; use attributes
- */
- @Deprecated
- protected final Map<String,Object> tempWorkings = Maps.newLinkedHashMap();
-
protected transient volatile SubscriptionTracker _subscriptionTracker;
public AbstractEntity() {
@@ -479,46 +468,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return getProxy()!=null ? getProxy() : this;
}
- /**
- * Sets a config key value, and returns this Entity instance for use in fluent-API style coding.
- *
- * @deprecated since 0.7.0; see {@link #config()}, such as {@code config().set(key, value)}
- */
- @Deprecated
- public <T> AbstractEntity configure(ConfigKey<T> key, T value) {
- setConfig(key, value);
- return this;
- }
-
- /**
- * @deprecated since 0.7.0; see {@link #config()}, such as {@code config().set(key, value)}
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public <T> AbstractEntity configure(ConfigKey<T> key, String value) {
- config().set((ConfigKey)key, value);
- return this;
- }
-
- /**
- * @deprecated since 0.7.0; see {@link #config()}, such as {@code config().set(key, value)}
- */
- @Deprecated
- public <T> AbstractEntity configure(HasConfigKey<T> key, T value) {
- config().set(key, value);
- return this;
- }
-
- /**
- * @deprecated since 0.7.0; see {@link #config()}, such as {@code config().set(key, value)}
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public <T> AbstractEntity configure(HasConfigKey<T> key, String value) {
- config().set((ConfigKey)key, value);
- return this;
- }
-
@Override
public void setManagementContext(ManagementContextInternal managementContext) {
super.setManagementContext(managementContext);
@@ -769,33 +718,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
}
}
- /**
- * @deprecated since 0.9.0; see {@link #groups()} and {@link GroupSupport#addGroup(Group)}
- */
- @Override
- @Deprecated
- public void addGroup(Group group) {
- groups().add(group);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link #groups()} and {@link GroupSupport#removeGroup(Group)}
- */
- @Override
- @Deprecated
- public void removeGroup(Group group) {
- groups().remove(group);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link #groups()} and {@link GroupSupport#iterator()}
- */
- @Override
- @Deprecated
- public Collection<Group> getGroups() {
- return groups().asList();
- }
-
@Override
public Entity getParent() {
return parent.get();
@@ -978,64 +900,8 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return sensors().get(attribute);
}
- /**
- * @deprecated since 0.8.0; use {@link SensorSupport#get(AttributeSensor)},
- * which may require constructing a temporary sensor using {@link Sensors#newSensor(Class, String)}.
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public <T> T getAttributeByNameParts(List<String> nameParts) {
- return (T) attributesInternal.getValue(nameParts);
- }
-
static Set<String> WARNED_READ_ONLY_ATTRIBUTES = Collections.synchronizedSet(MutableSet.<String>of());
- @Override
- @Deprecated
- public <T> T setAttribute(AttributeSensor<T> attribute, T val) {
- return sensors().set(attribute, val);
- }
-
- @Override
- @Deprecated
- public <T> T setAttributeWithoutPublishing(AttributeSensor<T> attribute, T val) {
- return sensors().setWithoutPublishing(attribute, val);
- }
-
- @Beta
- @Override
- @Deprecated
- public <T> T modifyAttribute(AttributeSensor<T> attribute, Function<? super T, Maybe<T>> modifier) {
- return sensors().modify(attribute, modifier);
- }
-
- @Override
- @Deprecated
- public void removeAttribute(AttributeSensor<?> attribute) {
- sensors().remove(attribute);
- }
-
- /** sets the value of the given attribute sensor from the config key value herein
- * if the attribtue sensor is not-set or null
- * <p>
- * returns old value
- * @deprecated on interface since 0.5.0; use {@link ConfigToAttributes#apply(Entity, AttributeSensorAndConfigKey)} */
- @Deprecated
- public <T> T setAttribute(AttributeSensorAndConfigKey<?,T> configuredSensor) {
- T v = getAttribute(configuredSensor);
- if (v!=null) return v;
- v = configuredSensor.getAsSensorValue(this);
- if (v!=null) return setAttribute(configuredSensor, v);
- return null;
- }
-
- @Override
- @Deprecated
- @SuppressWarnings("rawtypes")
- public Map<AttributeSensor, Object> getAllAttributes() {
- return Collections.<AttributeSensor, Object>unmodifiableMap(sensors().getAll());
- }
-
// -------- CONFIGURATION --------------
@@ -1286,30 +1152,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return result;
}
- @Override
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, T val) {
- return config().set(key, val);
- }
-
- @Override
- @Deprecated
- public <T> T setConfig(ConfigKey<T> key, Task<T> val) {
- return config().set(key, val);
- }
-
- @Override
- @Deprecated
- public <T> T setConfig(HasConfigKey<T> key, T val) {
- return config().set(key, val);
- }
-
- @Override
- @Deprecated
- public <T> T setConfig(HasConfigKey<T> key, Task<T> val) {
- return config().set(key, val);
- }
-
@SuppressWarnings("unchecked")
public <T> T setConfigEvenIfOwned(ConfigKey<T> key, T val) {
return (T) configsInternal.setConfig(key, val);
@@ -1319,24 +1161,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return setConfigEvenIfOwned(key.getConfigKey(), val);
}
- /**
- * @deprecated since 0.7.0; use {@code if (val != null) config().set(key, val)}
- */
- @Deprecated
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected void setConfigIfValNonNull(ConfigKey key, Object val) {
- if (val != null) config().set(key, val);
- }
-
- /**
- * @deprecated since 0.7.0; use {@code if (val != null) config().set(key, val)}
- */
- @Deprecated
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected void setConfigIfValNonNull(HasConfigKey key, Object val) {
- if (val != null) config().set(key, val);
- }
-
// -------- SUBSCRIPTIONS --------------
@Override
@@ -1439,59 +1263,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
}
}
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().subscribe(producer, sensor, listener)}
- */
- @Override
- @Deprecated
- public <T> SubscriptionHandle subscribe(Entity producer, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- return subscriptions().subscribe(producer, sensor, listener);
- }
-
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().subscribeToChildren(parent, sensor, listener)}
- */
- @Override
- @Deprecated
- public <T> SubscriptionHandle subscribeToChildren(Entity parent, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- return subscriptions().subscribeToChildren(parent, sensor, listener);
- }
-
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().subscribeToMembers(producer, sensor, listener)}
- */
- @Override
- @Deprecated
- public <T> SubscriptionHandle subscribeToMembers(Group group, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- return subscriptions().subscribeToMembers(group, sensor, listener);
- }
-
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().unsubscribe(producer)}
- */
- @Override
- @Deprecated
- public boolean unsubscribe(Entity producer) {
- return subscriptions().unsubscribe(producer);
- }
-
- /**
- * @deprecated since 0.9.0; see {@code subscriptions().unsubscribe(producer, handle)}
- */
- @Override
- @Deprecated
- public boolean unsubscribe(Entity producer, SubscriptionHandle handle) {
- return subscriptions().unsubscribe(producer, handle);
- }
-
- /**
- * @deprecated since 0.9.0; for internal use only
- */
- @Deprecated
- protected SubscriptionTracker getSubscriptionTracker() {
- return subscriptions().getSubscriptionTracker();
- }
-
@Override
public ExecutionContext getExecutionContext() {
// NB May 2016 - removed synch keyword above due to deadlock (see https://issues.apache.org/jira/browse/BROOKLYN-284).
@@ -1712,78 +1483,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
}
}
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#iterator()}; e.g. {@code policies().iterator()}
- */
- @Override
- @Deprecated
- public Collection<Policy> getPolicies() {
- return policies().asList();
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#addPolicy(Policy)}; e.g. {@code policies().addPolicy(policy)}
- */
- @Override
- @Deprecated
- public void addPolicy(Policy policy) {
- policies().add(policy);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#addPolicy(PolicySpec)}; e.g. {@code policies().addPolicy(spec)}
- */
- @Override
- @Deprecated
- public <T extends Policy> T addPolicy(PolicySpec<T> spec) {
- return policies().add(spec);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#; e.g. {@code enrichers().addEnricher(spec)}
- */
- @Override
- @Deprecated
- public <T extends Enricher> T addEnricher(EnricherSpec<T> spec) {
- return enrichers().add(spec);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#removePolicy(Policy)}; e.g. {@code policies().removePolicy(policy)}
- */
- @Override
- @Deprecated
- public boolean removePolicy(Policy policy) {
- return policies().remove(policy);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicPolicySupport#removeAllPolicies()}; e.g. {@code policies().removeAllPolicies()}
- */
- @Override
- @Deprecated
- public boolean removeAllPolicies() {
- return policies().removeAllPolicies();
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#iterator()}; e.g. {@code enrichers().iterator()}
- */
- @Override
- @Deprecated
- public Collection<Enricher> getEnrichers() {
- return enrichers().asList();
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#addEnricher(Enricher)}; e.g. {@code enrichers().addEnricher(enricher)}
- */
- @Override
- @Deprecated
- public void addEnricher(Enricher enricher) {
- enrichers().add(enricher);
- }
-
private <T extends EntityAdjunct> T findApparentlyEqualAndWarnIfNotSameUniqueTag(Collection<? extends T> items, T newItem) {
T oldItem = findApparentlyEqual(items, newItem, true);
@@ -1861,24 +1560,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return null;
}
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#removeEnricher(Enricher)}; e.g. {@code enrichers().removeEnricher(enricher)}
- */
- @Override
- @Deprecated
- public boolean removeEnricher(Enricher enricher) {
- return enrichers().remove(enricher);
- }
-
- /**
- * @deprecated since 0.9.0; see {@link BasicEnricherSupport#removeAllEnrichers()}; e.g. {@code enrichers().removeAllEnrichers()}
- */
- @Override
- @Deprecated
- public boolean removeAllEnrichers() {
- return enrichers().removeAll();
- }
-
// -------- FEEDS --------------------
/**
@@ -1895,12 +1576,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
return feeds;
}
- @Override
- @Deprecated
- public FeedSupport getFeedSupport() {
- return feeds();
- }
-
protected class BasicFeedSupport implements FeedSupport {
@Override
@@ -1996,21 +1671,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements E
// }
}
- // -------- SENSORS --------------------
-
- @Override
- @Deprecated
- public <T> void emit(Sensor<T> sensor, T val) {
- sensors().emit(sensor, val);
- }
-
- /**
- * Warning: for internal purposes only; this method may be deleted without notice in future releases.
- */
- public <T> void emitInternal(Sensor<T> sensor, T val) {
- sensors().emitInternal(sensor, val);
- }
-
// -------- EFFECTORS --------------
/** Convenience for finding named effector in {@link EntityType#getEffectors()} {@link Map}. */
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
index ab7013b..f3dca6b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/BrooklynConfigKeys.java
@@ -184,13 +184,6 @@ public class BrooklynConfigKeys {
"Directory for installed artifacts (e.g. expanded dir after unpacking .tgz)",
null);
- /** @deprecated since 0.7.0; use {@link #INSTALL_DIR} */
- @Deprecated
- public static final ConfigKey<String> SUGGESTED_INSTALL_DIR = INSTALL_DIR.getConfigKey();
- /** @deprecated since 0.7.0; use {@link #RUN_DIR} */
- @Deprecated
- public static final ConfigKey<String> SUGGESTED_RUN_DIR = RUN_DIR.getConfigKey();
-
/*
* Intention is to use these with DependentConfiguration.attributeWhenReady, to allow an entity's start
* to block until dependents are ready. This is particularly useful when we want to block until a dependent
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/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 df904d3..9f1853f 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
@@ -130,22 +130,6 @@ public class Entities {
private static final Logger log = LoggerFactory.getLogger(Entities.class);
- /**
- * Names that, if they appear anywhere in an attribute/config/field indicates that it
- * may be private, so should not be logged etc.
- *
- * @deprecated since 0.7; instead use {@link Sanitizer#SECRET_NAMES}
- */
- @Deprecated
- public static final List<String> SECRET_NAMES = ImmutableList.of(
- "password",
- "passwd",
- "credential",
- "secret",
- "private",
- "access.cert",
- "access.key");
-
// Don't use `new Object()` - deserialization creates a different object from the constant.
// Instead, use this enum.
private enum ValueMarkers {
@@ -286,22 +270,6 @@ public class Entities {
(v instanceof CharSequence&& ((CharSequence)v).length() == 0);
}
- /**
- * @deprecated since 0.7; instead use {@link Sanitizer#sanitize(ConfigBag)}
- */
- @Deprecated
- public static Map<String,Object> sanitize(ConfigBag input) {
- return Sanitizer.sanitize(input );
- }
-
- /**
- * @deprecated since 0.7; instead use {@link Sanitizer#sanitize(Map)}
- */
- @Deprecated
- public static <K> Map<K,Object> sanitize(Map<K,?> input) {
- return Sanitizer.sanitize(input);
- }
-
public static void dumpInfo(Iterable<? extends Entity> entities) {
for (Entity e : entities) {
dumpInfo(e);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java
index ce86c53..31ef985 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java
@@ -42,14 +42,6 @@ public class EntityAndAttribute<T> implements Supplier<T> {
return new EntityAndAttribute<T>(entity, attribute);
}
- /**
- * @deprecated since 0.7.0; use {@link #create(Entity, AttributeSensor)}; this does not relate to {@link Supplier}
- */
- @Deprecated
- public static <T> EntityAndAttribute<T> supplier(Entity entity, AttributeSensor<T> attribute) {
- return create(entity, attribute);
- }
-
public EntityAndAttribute(Entity entity, AttributeSensor<T> attribute) {
this.entity = checkNotNull(entity, "entity");
this.attribute = checkNotNull(attribute, "attribute");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java
index ecf2a17..a0dfa5f 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityDynamicType.java
@@ -92,14 +92,6 @@ public class EntityDynamicType extends BrooklynDynamicType<Entity, AbstractEntit
refreshSnapshot();
}
- /**
- * @deprecated since 0.7; unused code; instead use {@link #getBrooklynClass()}
- */
- @Deprecated
- public Class<? extends Entity> getEntityClass() {
- return super.getBrooklynClass();
- }
-
@Override
public EntityType getSnapshot() {
return (EntityType) super.getSnapshot();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java
index fa7438f..8270f54 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityFunctions.java
@@ -108,7 +108,7 @@ public class EntityFunctions {
if (value==Entities.UNCHANGED) {
// nothing
} else if (value==Entities.REMOVE) {
- ((EntityInternal)input).removeAttribute(sensor);
+ ((EntityInternal)input).sensors().remove(sensor);
} else {
value = TypeCoercions.coerce(value, sensor.getTypeToken());
((EntityInternal)input).sensors().set(sensor, value);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
index cc76f8c..a185824 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityInternal.java
@@ -63,26 +63,6 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
void clearLocations();
/**
- * @deprecated since 0.8.0; use {@link SensorSupportInternal#setWithoutPublishing(AttributeSensor, Object)} via code like {@code sensors().setWithoutPublishing(attribute, val)}.
- */
- @Deprecated
- <T> T setAttributeWithoutPublishing(AttributeSensor<T> sensor, T val);
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupportInternal#getAll()} via code like {@code sensors().getAll()}.
- */
- @Deprecated
- @Beta
- Map<AttributeSensor, Object> getAllAttributes();
-
- /**
- * @deprecated since 0.8.0; use {@link SensorSupportInternal#remove(AttributeSensor)} via code like {@code sensors().remove(attribute)}.
- */
- @Deprecated
- @Beta
- void removeAttribute(AttributeSensor<?> attribute);
-
- /**
* Must be called before the entity is started.
*
* @return this entity (i.e. itself)
@@ -127,13 +107,6 @@ public interface EntityInternal extends BrooklynObjectInternal, EntityLocal, Reb
FeedSupport feeds();
- /**
- * @since 0.7.0-M2
- * @deprecated since 0.7.0-M2; use {@link #feeds()}
- */
- @Deprecated
- FeedSupport getFeedSupport();
-
Map<String, String> toMetadataRecord();
/**
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java
index 4b85724..4cdc2cd 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityPredicates.java
@@ -454,12 +454,6 @@ public class EntityPredicates {
}
}
- /** @deprecated since 0.7.0 use {@link #locationsIncludes(Location)} */
- @Deprecated
- public static <T> Predicate<Entity> withLocation(final Location location) {
- return locationsIncludes(location);
- }
-
/** @deprecated since 0.7.0 use {@link #locationsIncludes(Location)}, introduced to allow deserialization of anonymous inner class */
@SuppressWarnings("unused") @Deprecated
private static <T> Predicate<Entity> withLocationOld(final Location location) {
@@ -488,11 +482,6 @@ public class EntityPredicates {
}
}
- /** @deprecated since 0.7.0 use {@link #isManaged()} */ @Deprecated
- public static <T> Predicate<Entity> managed() {
- return isManaged();
- }
-
/** @deprecated since 0.7.0 use {@link #isManaged()}, introduced to allow deserialization of anonymous inner class */
@SuppressWarnings("unused") @Deprecated
private static <T> Predicate<Entity> managedOld() {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java b/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java
index 548f159..06b9a51 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/internal/EntityTransientCopyInternal.java
@@ -19,7 +19,6 @@
package org.apache.brooklyn.core.entity.internal;
import java.util.Collection;
-import java.util.Map;
import javax.annotation.Nullable;
@@ -27,16 +26,13 @@ import org.apache.brooklyn.api.effector.Effector;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntityType;
-import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.mgmt.ExecutionContext;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.rebind.RebindSupport;
import org.apache.brooklyn.api.mgmt.rebind.mementos.EntityMemento;
import org.apache.brooklyn.api.objs.BrooklynObject.TagSupport;
-import org.apache.brooklyn.api.policy.Policy;
import org.apache.brooklyn.api.sensor.AttributeSensor;
-import org.apache.brooklyn.api.sensor.Enricher;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.config.ConfigKey.HasConfigKey;
import org.apache.brooklyn.core.entity.EntityInternal;
@@ -70,9 +66,6 @@ public interface EntityTransientCopyInternal {
String getApplicationId();
Entity getParent();
Collection<Entity> getChildren();
- Collection<Policy> getPolicies();
- Collection<Enricher> getEnrichers();
- Collection<Group> getGroups();
Collection<Location> getLocations();
<T> T getAttribute(AttributeSensor<T> sensor);
<T> T getConfig(ConfigKey<T> key);
@@ -82,12 +75,9 @@ public interface EntityTransientCopyInternal {
// from EntityInternal:
- @SuppressWarnings("rawtypes")
- Map<AttributeSensor, Object> getAllAttributes();
EntityManagementSupport getManagementSupport();
ManagementContext getManagementContext();
Effector<?> getEffector(String effectorName);
- @Deprecated FeedSupport getFeedSupport();
FeedSupport feeds();
RebindSupport<EntityMemento> getRebindSupport();
// for REST calls on read-only entities which want to resolve values