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 2014/11/04 15:30:00 UTC
[06/18] git commit: Fix compile warnings
Fix compile warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/246c29d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/246c29d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/246c29d3
Branch: refs/heads/master
Commit: 246c29d33cc859d160864d46a7385fb929459ae8
Parents: d2d4e61
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Oct 30 14:33:25 2014 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Oct 30 14:33:25 2014 +0200
----------------------------------------------------------------------
.../brooklyn/catalog/internal/BasicBrooklynCatalog.java | 7 +++----
.../creation/BrooklynAssemblyTemplateInstantiator.java | 1 -
.../spi/creation/BrooklynComponentTemplateResolver.java | 10 +++++++---
.../spi/lookup/AbstractTemplateBrooklynLookup.java | 2 +-
.../spi/lookup/AssemblyTemplateBrooklynLookup.java | 2 +-
.../lookup/PlatformComponentTemplateBrooklynLookup.java | 2 +-
6 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/246c29d3/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
index f8bd2c8..bdb73d7 100644
--- a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
@@ -42,7 +42,6 @@ import brooklyn.catalog.BrooklynCatalog;
import brooklyn.catalog.CatalogItem;
import brooklyn.catalog.CatalogPredicates;
import brooklyn.config.BrooklynServerConfig;
-import brooklyn.entity.basic.BrooklynTags;
import brooklyn.entity.proxying.EntitySpec;
import brooklyn.management.ManagementContext;
import brooklyn.management.classloading.BrooklynClassLoadingContext;
@@ -117,7 +116,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
public void reset(CatalogDto dto) {
// Unregister all existing persisted items.
- for (CatalogItem toRemove : getCatalogItems()) {
+ for (CatalogItem<?, ?> toRemove : getCatalogItems()) {
if (log.isTraceEnabled()) {
log.trace("Scheduling item for persistence removal: {}", toRemove.getId());
}
@@ -133,9 +132,9 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
for (CatalogItem<?, ?> entry : getCatalogItems()) {
boolean setManagementContext = false;
if (entry instanceof CatalogItemDo) {
- CatalogItemDo cid = CatalogItemDo.class.cast(entry);
+ CatalogItemDo<?, ?> cid = CatalogItemDo.class.cast(entry);
if (cid.getDto() instanceof CatalogItemDtoAbstract) {
- CatalogItemDtoAbstract cdto = CatalogItemDtoAbstract.class.cast(cid.getDto());
+ CatalogItemDtoAbstract<?, ?> cdto = CatalogItemDtoAbstract.class.cast(cid.getDto());
if (cdto.getManagementContext() == null) {
cdto.setManagementContext((ManagementContextInternal) mgmt);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/246c29d3/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 346b19c..8bd1073 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
@@ -47,7 +47,6 @@ import brooklyn.config.BrooklynServerConfig;
import brooklyn.entity.Application;
import brooklyn.entity.Entity;
import brooklyn.entity.basic.BasicApplicationImpl;
-import brooklyn.entity.basic.BrooklynTags;
import brooklyn.entity.proxying.EntitySpec;
import brooklyn.management.ManagementContext;
import brooklyn.management.classloading.BrooklynClassLoadingContext;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/246c29d3/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 d4192b4..14a932d 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
@@ -277,10 +277,14 @@ public class BrooklynComponentTemplateResolver {
if (planId==null)
planId = (String) attrs.getStringKey(BrooklynCampConstants.PLAN_ID_FLAG);
- Object children = attrs.getStringKey("brooklyn.children");
- if (children != null) {
+ Object childrenObj = attrs.getStringKey("brooklyn.children");
+ if (childrenObj != null) {
Set<String> encounteredCatalogTypes = MutableSet.of();
- for (Map<String,?> childAttrs : (Iterable<Map<String,?>>)children) {
+
+ @SuppressWarnings("unchecked")
+ Iterable<Map<String,?>> children = (Iterable<Map<String,?>>)childrenObj;
+
+ for (Map<String,?> childAttrs : children) {
BrooklynComponentTemplateResolver entityResolver = BrooklynComponentTemplateResolver.Factory.newInstance(loader, childAttrs);
BrooklynAssemblyTemplateInstantiator instantiator = new BrooklynAssemblyTemplateInstantiator();
// TODO: Creating a new set of encounteredCatalogTypes prevents the recursive definition check in
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/246c29d3/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java
index 9aac6ec..8d815ee 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AbstractTemplateBrooklynLookup.java
@@ -51,7 +51,7 @@ public abstract class AbstractTemplateBrooklynLookup<T extends AbstractResource>
public abstract T adapt(CatalogItem<?,?> item);
protected ResolvableLink<T> newLink(CatalogItem<? extends Entity,EntitySpec<?>> li) {
- return newLink(li.getId(), li.getName());
+ return newLink(li.getId(), li.getDisplayName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/246c29d3/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java
index 19baee6..adf9f70 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/AssemblyTemplateBrooklynLookup.java
@@ -42,7 +42,7 @@ public class AssemblyTemplateBrooklynLookup extends AbstractTemplateBrooklynLook
@Override
public AssemblyTemplate adapt(CatalogItem<?,?> item) {
return AssemblyTemplate.builder().
- name(item.getName()).
+ name(item.getDisplayName()).
id(item.getId()).
description(item.getDescription()).
created(root.getCreated()).
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/246c29d3/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java
index e9d415d..9cabc33 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/lookup/PlatformComponentTemplateBrooklynLookup.java
@@ -40,7 +40,7 @@ public class PlatformComponentTemplateBrooklynLookup extends AbstractTemplateBro
@Override
public PlatformComponentTemplate adapt(CatalogItem<?,?> item) {
return PlatformComponentTemplate.builder().
- name(item.getName()).
+ name(item.getDisplayName()).
id(item.getId()).
description(item.getDescription()).
created(root.getCreated()).