You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2017/12/07 15:23:41 UTC
[3/4] brooklyn-server git commit: simpler just-in-time entity spec
config resolution
simpler just-in-time entity spec config resolution
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/32284602
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/32284602
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/32284602
Branch: refs/heads/master
Commit: 32284602775680ba94359ccc12d8df08e88ec2de
Parents: b6d7a25
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 6 16:25:37 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 6 16:25:37 2017 +0000
----------------------------------------------------------------------
.../spi/creation/BrooklynComponentTemplateResolver.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/32284602/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 e0d9030..b4233a1 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
@@ -509,13 +509,11 @@ public class BrooklynComponentTemplateResolver {
this.flag = flag;
}
@Override public EntitySpec<?> get() {
- EntitySpecConfiguration specConfig = new EntitySpecConfiguration(flag.getSpecConfiguration());
// TODO: This should called from BrooklynAssemblyTemplateInstantiator.configureEntityConfig
// And have transformSpecialFlags(Object flag, ManagementContext mgmt) drill into the Object flag if it's a map or iterable?
@SuppressWarnings("unchecked")
- Map<String, Object> resolvedConfig = (Map<String, Object>)transformSpecialFlags(specConfig.getSpecConfiguration());
- specConfig.setSpecConfiguration(resolvedConfig);
- EntitySpec<?> entitySpec = Factory.newInstance(getLoader(), specConfig.getSpecConfiguration()).resolveSpec(encounteredRegisteredTypeIds);
+ Map<String, Object> resolvedConfig = (Map<String, Object>)transformSpecialFlags(flag.getSpecConfiguration());
+ EntitySpec<?> entitySpec = Factory.newInstance(getLoader(), resolvedConfig).resolveSpec(encounteredRegisteredTypeIds);
return EntityManagementUtils.unwrapEntity(entitySpec);
}