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 2014/07/18 12:00:44 UTC
[08/10] git commit: Log a warning
Log a warning
in case the protocol of a url referenced YAML is not white listed
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/977a6be7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/977a6be7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/977a6be7
Branch: refs/heads/master
Commit: 977a6be7bb54abd305871bf93841417198d4ebc0
Parents: f142526
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Jul 17 19:13:51 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Jul 17 19:14:25 2014 +0300
----------------------------------------------------------------------
.../BrooklynAssemblyTemplateInstantiator.java | 15 +++++++++++----
.../brooklyn/spi/creation/BrooklynEntityMatcher.java | 11 +++++++++--
2 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/977a6be7/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
index a5a67ea..2457812 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
@@ -225,10 +225,17 @@ public class BrooklynAssemblyTemplateInstantiator implements AssemblyTemplateSpe
if (log.isTraceEnabled()) log.trace("Building CAMP template services: type="+brooklynType+"; item="+item+"; loader="+entityResolver.loader+"; encounteredCatalogTypes="+encounteredCatalogTypes);
EntitySpec<?> spec = null;
- if (BrooklynCampConstants.YAML_URL_PROTOCOL_WHITELIST.contains(Urls.getProtocol(brooklynType))) {
- spec = tryResolveYamlURLReferenceSpec(brooklynType, entityResolver.loader, encounteredCatalogTypes);
- if (spec != null) {
- entityResolver.populateSpec(spec);
+ String protocol = Urls.getProtocol(brooklynType);
+ if (protocol != null) {
+ if (BrooklynCampConstants.YAML_URL_PROTOCOL_WHITELIST.contains(protocol)) {
+ spec = tryResolveYamlURLReferenceSpec(brooklynType, entityResolver.loader, encounteredCatalogTypes);
+ if (spec != null) {
+ entityResolver.populateSpec(spec);
+ }
+ } else {
+ log.warn("The reference " + brooklynType + " looks like an URL but the protocol " +
+ protocol + " isn't white listed (" + BrooklynCampConstants.YAML_URL_PROTOCOL_WHITELIST + "). " +
+ "Will try to load it as catalog item or java type.");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/977a6be7/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
index 28a3b2e..bd54f3e 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
@@ -80,8 +80,15 @@ public class BrooklynEntityMatcher implements PdpMatcher {
if (BrooklynComponentTemplateResolver.Factory.supportsType(loader, serviceType))
return serviceType;
- if (BrooklynCampConstants.YAML_URL_PROTOCOL_WHITELIST.contains(Urls.getProtocol(serviceType))) {
- return serviceType;
+ String protocol = Urls.getProtocol(serviceType);
+ if (protocol != null) {
+ if (BrooklynCampConstants.YAML_URL_PROTOCOL_WHITELIST.contains(protocol)) {
+ return serviceType;
+ } else {
+ log.warn("The reference '" + serviceType + "' looks like an URL but the protocol '" +
+ protocol + "' isn't white listed " + BrooklynCampConstants.YAML_URL_PROTOCOL_WHITELIST + ". " +
+ "Not recognized as catalog item or java item as well!");
+ }
}
}
return null;