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 2015/09/21 19:36:24 UTC
[1/2] incubator-brooklyn git commit: Resolve DSL functions for a
configuration key within any collection
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master e81e9dc79 -> 29954710c
Resolve DSL functions for a configuration key within any collection
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/996fc8f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/996fc8f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/996fc8f7
Branch: refs/heads/master
Commit: 996fc8f78b59cf8313817fc500b2242d9a679671
Parents: 032c533
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Mon Sep 21 17:12:18 2015 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Mon Sep 21 17:12:18 2015 +0100
----------------------------------------------------------------------
.../spi/creation/BrooklynComponentTemplateResolver.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/996fc8f7/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index aef991f..5857d61 100644
--- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -403,12 +403,12 @@ public class BrooklynComponentTemplateResolver {
Set<String> keyNamesUsed = new LinkedHashSet<String>();
for (FlagConfigKeyAndValueRecord r: records) {
if (r.getFlagMaybeValue().isPresent()) {
- Object transformed = new SpecialFlagsTransformer(loader).transformSpecialFlags(r.getFlagMaybeValue().get());
+ Object transformed = new SpecialFlagsTransformer(loader).apply(r.getFlagMaybeValue().get());
spec.configure(r.getFlagName(), transformed);
keyNamesUsed.add(r.getFlagName());
}
if (r.getConfigKeyMaybeValue().isPresent()) {
- Object transformed = new SpecialFlagsTransformer(loader).transformSpecialFlags(r.getConfigKeyMaybeValue().get());
+ Object transformed = new SpecialFlagsTransformer(loader).apply(r.getConfigKeyMaybeValue().get());
spec.configure((ConfigKey<Object>)r.getConfigKey(), transformed);
keyNamesUsed.add(r.getConfigKey().getName());
}
@@ -421,7 +421,7 @@ public class BrooklynComponentTemplateResolver {
// we don't let a flag with the same name as a config key override the config key
// (that's why we check whether it is used)
if (!keyNamesUsed.contains(key)) {
- Object transformed = new SpecialFlagsTransformer(loader).transformSpecialFlags(bag.getStringKey(key));
+ Object transformed = new SpecialFlagsTransformer(loader).apply(bag.getStringKey(key));
spec.configure(ConfigKeys.newConfigKey(Object.class, key.toString()), transformed);
}
}
[2/2] incubator-brooklyn git commit: This closes #915
Posted by he...@apache.org.
This closes #915
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/29954710
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/29954710
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/29954710
Branch: refs/heads/master
Commit: 29954710c5f363d2f94d647010684085f2d70a46
Parents: e81e9dc 996fc8f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Sep 21 12:35:21 2015 -0500
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 21 12:35:21 2015 -0500
----------------------------------------------------------------------
.../spi/creation/BrooklynComponentTemplateResolver.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------