Github user sjcorbett commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/71#discussion_r15052966
--- Diff:
usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
---
@@ -240,46 +204,94 @@ protected boolean shouldUnwrap(AssemblyTemplate
template, EntitySpec<? extends A
for (ResolvableLink<PlatformComponentTemplate> ctl:
template.getPlatformComponentTemplates().links()) {
PlatformComponentTemplate appChildComponentTemplate =
ctl.resolve();
BrooklynComponentTemplateResolver entityResolver =
BrooklynComponentTemplateResolver.Factory.newInstance(loader,
appChildComponentTemplate);
- ManagementContext mgmt = loader.getManagementContext();
+ EntitySpec<?> spec = resolveSpec(entityResolver,
encounteredCatalogTypes);
+
+ result.add(spec);
+ }
+ return result;
+ }
- String catalogIdOrJavaType =
entityResolver.getCatalogIdOrJavaType();
- CatalogItem<Entity, EntitySpec<?>> item =
entityResolver.getCatalogItem();
+ private EntitySpec<?> resolveSpec(
+ BrooklynComponentTemplateResolver entityResolver,
+ Set<String> encounteredCatalogTypes) {
+ ManagementContext mgmt =
entityResolver.loader.getManagementContext();
- boolean firstOccurrence =
encounteredCatalogTypes.add(catalogIdOrJavaType);
- boolean recursiveButTryJava = !firstOccurrence;
-
- if (log.isTraceEnabled()) log.trace("Building CAMP template
services: type="+catalogIdOrJavaType+"; item="+item+"; loader="+loader+";
template="+template+"; encounteredCatalogTypes="+encounteredCatalogTypes);
+ String brooklynType = entityResolver.getBrooklynType();
+ CatalogItem<Entity, EntitySpec<?>> item =
entityResolver.getCatalogItem();
+
+ boolean firstOccurrence =
encounteredCatalogTypes.add(brooklynType);
+ boolean recursiveButTryJava = !firstOccurrence;
+
+ if (log.isTraceEnabled()) log.trace("Building CAMP template
services: type="+brooklynType+"; item="+item+";
loader="+entityResolver.loader+";
encounteredCatalogTypes="+encounteredCatalogTypes);
- EntitySpec<?> spec;
+ EntitySpec<?> spec = null;
+ if
(BrooklynCampConstants.YAML_URL_PROTOCOL_WHITELIST.contains(Urls.getProtocol(brooklynType)))
{
--- End diff --
I think it's worth logging a warning if brooklynType is not null and is not
whitelisted.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
