You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/08/07 23:55:38 UTC
[4/9] git commit: Tidy Internal*Factory
Tidy Internal*Factory
- deprecates isNewStyleEnricher etc, in preference for general
InternalFactory.isNewStyle
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2a0d03a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2a0d03a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2a0d03a9
Branch: refs/heads/master
Commit: 2a0d03a9fe05fdaf384f67b4323916a31b30408a
Parents: bf0b3e7
Author: Aled Sage <al...@gmail.com>
Authored: Wed Aug 6 22:39:42 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Aug 6 23:17:46 2014 +0100
----------------------------------------------------------------------
.../entity/proxying/BasicEntityTypeRegistry.java | 2 --
.../entity/proxying/InternalLocationFactory.java | 9 ++++++++-
.../entity/proxying/InternalPolicyFactory.java | 15 +++++++++++++--
.../brooklyn/entity/rebind/RebindManagerImpl.java | 4 ++--
4 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a0d03a9/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java b/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java
index aeb4365..09f0cfb 100644
--- a/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java
+++ b/core/src/main/java/brooklyn/entity/proxying/BasicEntityTypeRegistry.java
@@ -30,9 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.Entity;
-import brooklyn.entity.basic.AbstractEntity;
import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.javalang.Reflections;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a0d03a9/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
index 804b5d5..b989392 100644
--- a/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
+++ b/core/src/main/java/brooklyn/entity/proxying/InternalLocationFactory.java
@@ -51,7 +51,10 @@ public class InternalLocationFactory extends InternalFactory {
*
* @param managementContext
* @param clazz
+ *
+ * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
*/
+ @Deprecated
public static boolean isNewStyleLocation(ManagementContext managementContext, Class<?> clazz) {
try {
return isNewStyleLocation(clazz);
@@ -60,6 +63,10 @@ public class InternalLocationFactory extends InternalFactory {
}
}
+ /**
+ * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
+ */
+ @Deprecated
public static boolean isNewStyleLocation(Class<?> clazz) {
if (!Location.class.isAssignableFrom(clazz)) {
throw new IllegalArgumentException("Class "+clazz+" is not an location");
@@ -97,7 +104,7 @@ public class InternalLocationFactory extends InternalFactory {
if (spec.getDisplayName()!=null)
((AbstractLocation)loc).setName(spec.getDisplayName());
- if (isNewStyleLocation(clazz)) {
+ if (isNewStyle(clazz)) {
((AbstractLocation)loc).setManagementContext(managementContext);
((AbstractLocation)loc).configure(ConfigBag.newInstance().putAll(spec.getFlags()).putAll(spec.getConfig()).getAllConfig());
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a0d03a9/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java
index ebf13dd..d52d368 100644
--- a/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java
+++ b/core/src/main/java/brooklyn/entity/proxying/InternalPolicyFactory.java
@@ -51,7 +51,10 @@ public class InternalPolicyFactory extends InternalFactory {
*
* @param managementContext
* @param clazz
+ *
+ * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
*/
+ @Deprecated
public static boolean isNewStylePolicy(ManagementContext managementContext, Class<?> clazz) {
try {
return isNewStylePolicy(clazz);
@@ -60,6 +63,10 @@ public class InternalPolicyFactory extends InternalFactory {
}
}
+ /**
+ * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
+ */
+ @Deprecated
public static boolean isNewStylePolicy(Class<?> clazz) {
if (!Policy.class.isAssignableFrom(clazz)) {
throw new IllegalArgumentException("Class "+clazz+" is not a policy");
@@ -68,6 +75,10 @@ public class InternalPolicyFactory extends InternalFactory {
return InternalFactory.isNewStyle(clazz);
}
+ /**
+ * @deprecated since 0.7.0; use {@link InternalFactory#isNewStyle(Class)}
+ */
+ @Deprecated
public static boolean isNewStyleEnricher(Class<?> clazz) {
if (!Enricher.class.isAssignableFrom(clazz)) {
throw new IllegalArgumentException("Class "+clazz+" is not an enricher");
@@ -94,7 +105,7 @@ public class InternalPolicyFactory extends InternalFactory {
if (spec.getDisplayName()!=null)
((AbstractPolicy)pol).setDisplayName(spec.getDisplayName());
- if (isNewStylePolicy(clazz)) {
+ if (isNewStyle(clazz)) {
((AbstractPolicy)pol).setManagementContext(managementContext);
Map<String, Object> config = ConfigBag.newInstance().putAll(spec.getFlags()).putAll(spec.getConfig()).getAllConfig();
((AbstractPolicy)pol).configure(MutableMap.copyOf(config)); // TODO AbstractPolicy.configure modifies the map
@@ -129,7 +140,7 @@ public class InternalPolicyFactory extends InternalFactory {
if (spec.getDisplayName()!=null)
((AbstractEnricher)enricher).setDisplayName(spec.getDisplayName());
- if (isNewStyleEnricher(clazz)) {
+ if (isNewStyle(clazz)) {
((AbstractEnricher)enricher).setManagementContext(managementContext);
Map<String, Object> config = ConfigBag.newInstance().putAll(spec.getFlags()).putAll(spec.getConfig()).getAllConfig();
((AbstractEnricher)enricher).configure(MutableMap.copyOf(config)); // TODO AbstractEnricher.configure modifies the map
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a0d03a9/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
index 4e8ffc8..5094e78 100644
--- a/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
+++ b/core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
@@ -645,7 +645,7 @@ public class RebindManagerImpl implements RebindManager {
String policyType = checkNotNull(memento.getType(), "policy type of %s must not be null in memento", id);
Class<? extends Policy> policyClazz = (Class<? extends Policy>) reflections.loadClass(policyType);
- if (InternalPolicyFactory.isNewStylePolicy(policyClazz)) {
+ if (InternalFactory.isNewStyle(policyClazz)) {
InternalPolicyFactory policyFactory = managementContext.getPolicyFactory();
Policy policy = policyFactory.constructPolicy(policyClazz);
FlagUtils.setFieldsFromFlags(ImmutableMap.of("id", id), policy);
@@ -677,7 +677,7 @@ public class RebindManagerImpl implements RebindManager {
String enricherType = checkNotNull(memento.getType(), "enricher type of %s must not be null in memento", id);
Class<? extends Enricher> enricherClazz = (Class<? extends Enricher>) reflections.loadClass(enricherType);
- if (InternalPolicyFactory.isNewStyleEnricher(enricherClazz)) {
+ if (InternalFactory.isNewStyle(enricherClazz)) {
InternalPolicyFactory policyFactory = managementContext.getPolicyFactory();
Enricher enricher = policyFactory.constructEnricher(enricherClazz);
FlagUtils.setFieldsFromFlags(ImmutableMap.of("id", id), enricher);