You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2016/08/29 10:52:10 UTC

[2/3] brooklyn-server git commit: Add special flag decoration to parameters to enable EntitySpec values

Add special flag decoration to parameters to enable EntitySpec values


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/874fa262
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/874fa262
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/874fa262

Branch: refs/heads/master
Commit: 874fa2629f539aff22d98a32b2bbb07462f5380e
Parents: 196ce93
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Fri Jul 29 09:14:30 2016 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Mon Aug 29 11:51:23 2016 +0100

----------------------------------------------------------------------
 .../BrooklynComponentTemplateResolver.java         | 10 +++++-----
 .../creation/BrooklynEntityDecorationResolver.java | 17 +++++++++++------
 .../brooklyn/spi/creation/CampInternalUtils.java   |  2 +-
 .../brooklyn/core/objs/BasicSpecParameter.java     | 13 ++++++++-----
 .../core/objs/BasicSpecParameterFromListTest.java  |  2 +-
 5 files changed, 26 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/874fa262/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index 1654e5c..0cbc641 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -247,10 +247,10 @@ public class BrooklynComponentTemplateResolver {
     }
 
     private <T extends Entity> void decorateSpec(EntitySpec<T> spec, Set<String> encounteredRegisteredTypeIds) {
-        new BrooklynEntityDecorationResolver.PolicySpecResolver(yamlLoader).decorate(spec, attrs);
-        new BrooklynEntityDecorationResolver.EnricherSpecResolver(yamlLoader).decorate(spec, attrs);
-        new BrooklynEntityDecorationResolver.InitializerResolver(yamlLoader).decorate(spec, attrs);
-        new BrooklynEntityDecorationResolver.SpecParameterResolver(yamlLoader).decorate(spec, attrs);
+        new BrooklynEntityDecorationResolver.PolicySpecResolver(yamlLoader).decorate(spec, attrs, encounteredRegisteredTypeIds);
+        new BrooklynEntityDecorationResolver.EnricherSpecResolver(yamlLoader).decorate(spec, attrs, encounteredRegisteredTypeIds);
+        new BrooklynEntityDecorationResolver.InitializerResolver(yamlLoader).decorate(spec, attrs, encounteredRegisteredTypeIds);
+        new BrooklynEntityDecorationResolver.SpecParameterResolver(yamlLoader).decorate(spec, attrs, encounteredRegisteredTypeIds);
 
         configureEntityConfig(spec, encounteredRegisteredTypeIds);
     }
@@ -398,7 +398,7 @@ public class BrooklynComponentTemplateResolver {
         return result;
     }
 
-    private static class SpecialFlagsTransformer implements Function<Object, Object> {
+    public static class SpecialFlagsTransformer implements Function<Object, Object> {
         protected final ManagementContext mgmt;
         /* TODO find a way to make do without loader here?
          * it is not very nice having to serialize it; but serialization of BLCL is now relatively clean.

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/874fa262/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
index fd2a69b..9e6ed8c 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityDecorationResolver.java
@@ -20,8 +20,10 @@ package org.apache.brooklyn.camp.brooklyn.spi.creation;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import com.google.common.annotations.Beta;
+import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 
 import org.apache.brooklyn.api.entity.EntityInitializer;
@@ -55,7 +57,7 @@ public abstract class BrooklynEntityDecorationResolver<DT> {
         this.instantiator = instantiator;
     }
     
-    public abstract void decorate(EntitySpec<?> entitySpec, ConfigBag attrs);
+    public abstract void decorate(EntitySpec<?> entitySpec, ConfigBag attrs, Set<String> encounteredRegisteredTypeIds);
 
     protected List<? extends DT> buildListOfTheseDecorationsFromEntityAttributes(ConfigBag attrs) {
         Object value = getDecorationAttributeJsonValue(attrs); 
@@ -100,7 +102,7 @@ public abstract class BrooklynEntityDecorationResolver<DT> {
         @Override protected String getDecorationKind() { return "Policy"; }
 
         @Override
-        public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs) {
+        public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs, Set<String> encounteredRegisteredTypeIds) {
             entitySpec.policySpecs(buildListOfTheseDecorationsFromEntityAttributes(attrs));
         }
         
@@ -137,7 +139,7 @@ public abstract class BrooklynEntityDecorationResolver<DT> {
         @Override protected String getDecorationKind() { return "Enricher"; }
 
         @Override
-        public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs) {
+        public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs, Set<String> encounteredRegisteredTypeIds) {
             entitySpec.enricherSpecs(buildListOfTheseDecorationsFromEntityAttributes(attrs));
         }
         
@@ -162,7 +164,7 @@ public abstract class BrooklynEntityDecorationResolver<DT> {
         @Override protected String getDecorationKind() { return "Entity initializer"; }
 
         @Override
-        public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs) {
+        public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs, Set<String> encounteredRegisteredTypeIds) {
             entitySpec.addInitializers(buildListOfTheseDecorationsFromEntityAttributes(attrs));
         }
         
@@ -180,20 +182,23 @@ public abstract class BrooklynEntityDecorationResolver<DT> {
     // Not much value from extending from BrooklynEntityDecorationResolver, but let's not break the convention
     public static class SpecParameterResolver extends BrooklynEntityDecorationResolver<SpecParameter<?>> {
 
+        private Function<Object, Object> transformer;
+
         protected SpecParameterResolver(BrooklynYamlTypeInstantiator.Factory instantiator) { super(instantiator); }
 
         @Override
         protected String getDecorationKind() { return "Spec Parameter initializer"; }
 
         @Override
-        public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs) {
+        public void decorate(EntitySpec<?> entitySpec, ConfigBag attrs, Set<String> encounteredRegisteredTypeIds) {
+            transformer = new BrooklynComponentTemplateResolver.SpecialFlagsTransformer(instantiator.loader, encounteredRegisteredTypeIds);
             List<? extends SpecParameter<?>> explicitParams = buildListOfTheseDecorationsFromEntityAttributes(attrs);
             BasicSpecParameter.addParameters(entitySpec, explicitParams, instantiator.loader);
         }
 
         @Override
         protected List<SpecParameter<?>> buildListOfTheseDecorationsFromIterable(Iterable<?> value) {
-            return BasicSpecParameter.fromConfigList(ImmutableList.copyOf(value), instantiator.loader);
+            return BasicSpecParameter.fromConfigList(ImmutableList.copyOf(value), transformer, instantiator.loader);
         }
 
         @Override

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/874fa262/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
index b2ec074..e2519e3 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
@@ -180,7 +180,7 @@ class CampInternalUtils {
 
     private static void initParameters(List<?> explicitParams, AbstractBrooklynObjectSpec<?, ?> spec, BrooklynClassLoadingContext loader) {
         if (explicitParams != null) {
-            BasicSpecParameter.addParameters(spec, BasicSpecParameter.fromConfigList(explicitParams, loader), loader);
+            BasicSpecParameter.addParameters(spec, BasicSpecParameter.fromConfigList(explicitParams, null, loader), loader);
         } else {
             BasicSpecParameter.addParameters(spec, ImmutableList.<SpecParameter<?>>of(), loader);
         }

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/874fa262/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java b/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
index 08d0ad3..cda3696 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
@@ -143,8 +143,8 @@ public class BasicSpecParameter<T> implements SpecParameter<T>{
     }
 
     // Not CAMP specific since it's used to get the parameters from catalog items meta which are syntax independent.
-    public static List<SpecParameter<?>> fromConfigList(List<?> obj, BrooklynClassLoadingContext loader) {
-        return ParseYamlInputs.parseParameters(obj, loader);
+    public static List<SpecParameter<?>> fromConfigList(List<?> obj, Function<Object, Object> specialFlagsTransformer, BrooklynClassLoadingContext loader) {
+        return ParseYamlInputs.parseParameters(obj, specialFlagsTransformer, loader);
     }
 
     public static List<SpecParameter<?>> fromClass(ManagementContext mgmt, Class<?> type) {
@@ -204,17 +204,17 @@ public class BasicSpecParameter<T> implements SpecParameter<T>{
         private static final Map<String, Predicate<?>> BUILT_IN_CONSTRAINTS = ImmutableMap.<String, Predicate<?>>of(
                 "required", StringPredicates.isNonBlank());
 
-        public static List<SpecParameter<?>> parseParameters(List<?> inputsRaw, BrooklynClassLoadingContext loader) {
+        public static List<SpecParameter<?>> parseParameters(List<?> inputsRaw, Function<Object, Object> specialFlagTransformer, BrooklynClassLoadingContext loader) {
             if (inputsRaw == null) return ImmutableList.of();
             List<SpecParameter<?>> inputs = new ArrayList<>(inputsRaw.size());
             for (Object obj : inputsRaw) {
-                inputs.add(parseParameter(obj, loader));
+                inputs.add(parseParameter(obj, specialFlagTransformer, loader));
             }
             return inputs;
         }
 
         @SuppressWarnings({ "unchecked", "rawtypes" })
-        private static SpecParameter<?> parseParameter(Object obj, BrooklynClassLoadingContext loader) {
+        private static SpecParameter<?> parseParameter(Object obj, Function<Object, Object> specialFlagTransformer, BrooklynClassLoadingContext loader) {
             Map inputDef;
             if (obj instanceof String) {
                 inputDef = ImmutableMap.of("name", obj);
@@ -228,6 +228,9 @@ public class BasicSpecParameter<T> implements SpecParameter<T>{
             String description = (String)inputDef.get("description");
             String type = (String)inputDef.get("type");
             Object defaultValue = inputDef.get("default");
+            if (specialFlagTransformer != null) {
+                defaultValue = specialFlagTransformer.apply(defaultValue);
+            }
             Predicate<?> constraints = parseConstraints(inputDef.get("constraints"), loader);
             ConfigInheritance parentInheritance = parseInheritance(inputDef.get("inheritance.parent"), loader);
             ConfigInheritance typeInheritance = parseInheritance(inputDef.get("inheritance.type"), loader);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/874fa262/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java
index 07ad81a..a88b138 100644
--- a/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/objs/BasicSpecParameterFromListTest.java
@@ -174,7 +174,7 @@ public class BasicSpecParameterFromListTest {
 
     private SpecParameter<?> parse(Object def) {
         BrooklynClassLoadingContext loader = JavaBrooklynClassLoadingContext.create(mgmt);
-        List<SpecParameter<?>> inputs = BasicSpecParameter.fromConfigList(ImmutableList.of(def), loader);
+        List<SpecParameter<?>> inputs = BasicSpecParameter.fromConfigList(ImmutableList.of(def), null, loader);
         return Iterables.getOnlyElement(inputs);
     }