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:38 UTC
[02/10] git commit: Rename getCatalogIdOrJavaType to getBrooklynType.
Rename getCatalogIdOrJavaType to getBrooklynType.
The type now can be one of:
* catalog id
* java class name
* URL to yaml file
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/918a2687
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/918a2687
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/918a2687
Branch: refs/heads/master
Commit: 918a2687053de57560e2a68b858c8a9b117a6f5d
Parents: d5a249f
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Jul 16 11:13:57 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Wed Jul 16 13:20:21 2014 +0300
----------------------------------------------------------------------
.../spi/creation/BrooklynAssemblyTemplateInstantiator.java | 8 ++++----
.../spi/creation/BrooklynComponentTemplateResolver.java | 8 ++++----
.../brooklyn/spi/creation/ChefComponentTemplateResolver.java | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/918a2687/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 7a0ab81..d57a99b 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
@@ -203,20 +203,20 @@ public class BrooklynAssemblyTemplateInstantiator implements AssemblyTemplateSpe
BrooklynComponentTemplateResolver entityResolver = BrooklynComponentTemplateResolver.Factory.newInstance(loader, appChildComponentTemplate);
ManagementContext mgmt = loader.getManagementContext();
- String catalogIdOrJavaType = entityResolver.getCatalogIdOrJavaType();
+ String brooklynType = entityResolver.getBrooklynType();
CatalogItem<Entity, EntitySpec<?>> item = entityResolver.getCatalogItem();
- boolean firstOccurrence = encounteredCatalogTypes.add(catalogIdOrJavaType);
+ boolean firstOccurrence = encounteredCatalogTypes.add(brooklynType);
boolean recursiveButTryJava = !firstOccurrence;
- if (log.isTraceEnabled()) log.trace("Building CAMP template services: type="+catalogIdOrJavaType+"; item="+item+"; loader="+loader+"; template="+template+"; encounteredCatalogTypes="+encounteredCatalogTypes);
+ if (log.isTraceEnabled()) log.trace("Building CAMP template services: type="+brooklynType+"; item="+item+"; loader="+loader+"; template="+template+"; encounteredCatalogTypes="+encounteredCatalogTypes);
EntitySpec<?> spec;
if (item == null || item.getJavaType() != null || entityResolver.isJavaTypePrefix()) {
spec = entityResolver.resolveSpec();
} else if (recursiveButTryJava) {
if (entityResolver.tryLoadEntityClass().isAbsent()) {
- throw new IllegalStateException("Recursive reference to " + catalogIdOrJavaType + " (and cannot be resolved as a Java type)");
+ throw new IllegalStateException("Recursive reference to " + brooklynType + " (and cannot be resolved as a Java type)");
}
spec = entityResolver.resolveSpec();
} else {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/918a2687/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index 2f000e8..7bd71f6 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -158,7 +158,7 @@ public class BrooklynComponentTemplateResolver {
return type != null && (type.toLowerCase().startsWith("java:") || type.toLowerCase().startsWith("brooklyn:java:"));
}
- protected String getCatalogIdOrJavaType() {
+ protected String getBrooklynType() {
String type = getDeclaredType();
type = Strings.removeFromStart(type, "brooklyn:", "java:");
if (type == null) return null;
@@ -179,7 +179,7 @@ public class BrooklynComponentTemplateResolver {
*/
@Nullable
public CatalogItem<Entity,EntitySpec<?>> getCatalogItem() {
- String type = getCatalogIdOrJavaType();
+ String type = getBrooklynType();
if (type != null) {
return loader.getManagementContext().getCatalog().getCatalogItem(Entity.class, type);
} else {
@@ -190,7 +190,7 @@ public class BrooklynComponentTemplateResolver {
public boolean canResolve() {
if (getCatalogItem()!=null)
return true;
- if (loader.tryLoadClass(getCatalogIdOrJavaType(), Entity.class).isPresent())
+ if (loader.tryLoadClass(getBrooklynType(), Entity.class).isPresent())
return true;
return false;
}
@@ -203,7 +203,7 @@ public class BrooklynComponentTemplateResolver {
/** tries to load the Java entity class */
public Maybe<Class<? extends Entity>> tryLoadEntityClass() {
CatalogItem<Entity, EntitySpec<?>> item = getCatalogItem();
- String typeName = getCatalogIdOrJavaType();
+ String typeName = getBrooklynType();
if (item!=null) {
// add additional bundles
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/918a2687/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/ChefComponentTemplateResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/ChefComponentTemplateResolver.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/ChefComponentTemplateResolver.java
index adb3537..83bb7cb 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/ChefComponentTemplateResolver.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/ChefComponentTemplateResolver.java
@@ -35,7 +35,7 @@ public class ChefComponentTemplateResolver extends BrooklynComponentTemplateReso
}
@Override
- protected String getCatalogIdOrJavaType() {
+ protected String getBrooklynType() {
return ChefEntity.class.getName();
}