You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/08/01 17:45:55 UTC

[02/21] incubator-brooklyn git commit: Delete deprecated Entity/Policy.getAllConfig

Delete deprecated Entity/Policy.getAllConfig


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4fc46691
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4fc46691
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4fc46691

Branch: refs/heads/master
Commit: 4fc46691dd2482e345d516e831b3b41d1cf476c5
Parents: 12c8eeb
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jul 28 22:30:39 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Sat Aug 1 00:13:30 2015 +0100

----------------------------------------------------------------------
 api/src/main/java/brooklyn/policy/Enricher.java              | 6 ------
 api/src/main/java/brooklyn/policy/Policy.java                | 6 ------
 .../java/brooklyn/policy/basic/AbstractEntityAdjunct.java    | 8 --------
 3 files changed, 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4fc46691/api/src/main/java/brooklyn/policy/Enricher.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/policy/Enricher.java b/api/src/main/java/brooklyn/policy/Enricher.java
index 22a7ba6..a5b641e 100644
--- a/api/src/main/java/brooklyn/policy/Enricher.java
+++ b/api/src/main/java/brooklyn/policy/Enricher.java
@@ -59,12 +59,6 @@ public interface Enricher extends EntityAdjunct, Rebindable, Configurable {
     <T> T setConfig(ConfigKey<T> key, T val);
 
     /**
-     * @deprecated since 0.7.0; use {@link #config()}, such as {@code policy.config().getBag()}
-     */
-    @Deprecated
-    Map<ConfigKey<?>, Object> getAllConfig();
-
-    /**
      * 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/incubator-brooklyn/blob/4fc46691/api/src/main/java/brooklyn/policy/Policy.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/policy/Policy.java b/api/src/main/java/brooklyn/policy/Policy.java
index c314ec0..f13f299 100644
--- a/api/src/main/java/brooklyn/policy/Policy.java
+++ b/api/src/main/java/brooklyn/policy/Policy.java
@@ -72,12 +72,6 @@ public interface Policy extends EntityAdjunct, Rebindable, Configurable {
     <T> T setConfig(ConfigKey<T> key, T val);
     
     /**
-     * @deprecated since 0.7.0; use {@link #config()}, such as {@code policy.config().getBag()}
-     */
-    @Deprecated
-    Map<ConfigKey<?>, Object> getAllConfig();
-
-    /**
      * 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/incubator-brooklyn/blob/4fc46691/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
index 070ac5f..bdf1d70 100644
--- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
+++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
@@ -301,14 +301,6 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple
         return config().get(key);
     }
     
-    /**
-     * @deprecated since 0.7.0; use {@link #config()}, such as {@code entity.config().getBag()}
-     */
-    @Deprecated
-    public Map<ConfigKey<?>, Object> getAllConfig() {
-        return configsInternal.getAllConfig();
-    }
-    
     protected <K> K getRequiredConfig(ConfigKey<K> key) {
         K result = config().get(key);
         if (result==null)