Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@brooklyn.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: heneveld@apache.org
To: commits@brooklyn.apache.org
Date: Tue, 07 Nov 2017 12:09:15 -0000
Message-Id: <a92f64e61a724862aa82ebbb866dcc01@git.apache.org>
In-Reply-To: <f8935c4429544b9ba0f711ed3d5f31ea@git.apache.org>
References: <f8935c4429544b9ba0f711ed3d5f31ea@git.apache.org>
Subject: [06/10] brooklyn-server git commit: allow config default values to be
 tasks/dsl-suppliers that are evaluated
archived-at: Tue, 07 Nov 2017 12:09:13 -0000

allow config default values to be tasks/dsl-suppliers that are evaluated

    previously they could be pre-evaluated dsl but not anything dynamic.
    needed if we defer resolution of entity spec yaml in a default. but useful in any case.


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

Branch: refs/heads/master
Commit: ab132202888aa578dd81de1380e47bfeddca205a
Parents: 18fbcda
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Nov 2 01:44:57 2017 +0000
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Nov 2 01:44:57 2017 +0000

----------------------------------------------------------------------
 .../config/internal/AbstractConfigMapImpl.java  | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ab132202/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java b/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java
index bc4916b..f044e42 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/internal/AbstractConfigMapImpl.java
@@ -52,8 +52,11 @@ import org.apache.brooklyn.util.core.config.ConfigBag;
 import org.apache.brooklyn.util.core.flags.TypeCoercions;
 import org.apache.brooklyn.util.core.internal.ConfigKeySelfExtracting;
 import org.apache.brooklyn.util.core.task.DeferredSupplier;
+import org.apache.brooklyn.util.core.task.Tasks;
+import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.exceptions.ReferenceWithError;
 import org.apache.brooklyn.util.guava.Maybe;
+import org.apache.brooklyn.util.guava.Maybe.MaybeSupplier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -359,9 +362,18 @@ public abstract class AbstractConfigMapImpl<TContainer extends BrooklynObject> i
     }
 
     @SuppressWarnings("unchecked")
-    protected <T> T coerce(Object value, Class<T> type) {
+    protected <T> T coerce(TContainer container, String name, Object value, Class<T> type) {
         if (type==null || value==null) return (T) value;
-        return TypeCoercions.coerce(value, type);
+        ExecutionContext exec = getExecutionContext(container);
+        try {
+            if (value instanceof Collection || value instanceof Map) {
+                return (T) Tasks.resolveDeepValue(value, Object.class, exec, "Resolving deep default config "+name);
+            } else {
+                return Tasks.resolveValue(value, type, exec, "Resolving default config "+name);
+            }
+        } catch (Exception e) {
+            throw Exceptions.propagate(e);
+        }
     }
 
     protected <T> ReferenceWithError<ConfigValueAtContainer<TContainer,T>> getConfigImpl(final ConfigKey<T> queryKey, final boolean raw) {
@@ -390,7 +402,9 @@ public abstract class AbstractConfigMapImpl<TContainer extends BrooklynObject> i
         Function<Maybe<Object>, Maybe<T>> coerceFn = new Function<Maybe<Object>, Maybe<T>>() {
             @SuppressWarnings("unchecked") @Override public Maybe<T> apply(Maybe<Object> input) {
                 if (raw || input==null || input.isAbsent()) return (Maybe<T>)input;
-                return Maybe.ofAllowingNull(coerce(input.get(), type));
+                // use lambda to defer execution if default value not needed.
+                // this coercion should never be persisted so this is safe.
+                return new MaybeSupplier<T>(() -> (coerce(getContainer(), ownKey.getName(), input.get(), type)));
             }
         };
         // prefer default and type of ownKey