Do setCatalogItemIdAndSearchPath instead of just set search path.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fde6aa5f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fde6aa5f Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fde6aa5f Branch: refs/heads/master Commit: fde6aa5f5aa85e50496db3a3662ad2068dfd74a5 Parents: db2e23f Author: Geoff Macartney <[email protected]> Authored: Tue Mar 21 12:18:56 2017 +0000 Committer: Geoff Macartney <[email protected]> Committed: Thu Apr 20 11:20:36 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/catalog/internal/CatalogItemDo.java | 4 ++-- .../brooklyn/core/catalog/internal/CatalogUtils.java | 3 +-- .../apache/brooklyn/core/mgmt/rebind/RebindIteration.java | 3 +-- .../apache/brooklyn/core/objs/AbstractBrooklynObject.java | 10 ++-------- .../apache/brooklyn/core/objs/AbstractEntityAdjunct.java | 3 +-- .../apache/brooklyn/core/objs/BrooklynObjectInternal.java | 2 +- .../brooklyn/core/objs/proxy/InternalEntityFactory.java | 3 +-- .../brooklyn/core/objs/proxy/InternalLocationFactory.java | 3 +-- .../brooklyn/core/objs/proxy/InternalPolicyFactory.java | 6 ++---- .../apache/brooklyn/util/core/ClassLoaderUtilsTest.java | 3 +-- 10 files changed, 13 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java index 36e1192..0738d76 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDo.java @@ -132,8 +132,8 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj } @Override - public void setCatalogItemIdSearchPath(List<String> ids) { - itemDto.setCatalogItemIdSearchPath(ids); + public void setCatalogItemIdAndSearchPath(String catalogItemId, List<String> ids) { + itemDto.setCatalogItemIdAndSearchPath(catalogItemId, ids); } @Override http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java index 2f85db9..776894f 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java @@ -196,8 +196,7 @@ public class CatalogUtils { BrooklynLogging.log(log, BrooklynLogging.levelDebugOrTraceIfReadOnly(entity), "Catalog item addition: "+entity+" from "+entity.getCatalogItemId()+" applying its catalog item ID to "+itemBeingAdded); final BrooklynObjectInternal addInternal = (BrooklynObjectInternal) itemBeingAdded; - addInternal.setCatalogItemId(entity.getCatalogItemId()); - addInternal.setCatalogItemIdSearchPath(entity.getCatalogItemIdSearchPath()); + addInternal.setCatalogItemIdAndSearchPath(entity.getCatalogItemId(), entity.getCatalogItemIdSearchPath()); } else { if (!itemBeingAdded.getCatalogItemId().equals(entity.getCatalogItemId())) { // not a problem, but something to watch out for http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java index a12bd7e..e4fbaa6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java @@ -971,8 +971,7 @@ public abstract class RebindIteration { protected void setCatalogItemIds(BrooklynObject object, String catalogItemId, List<String> searchPath) { final BrooklynObjectInternal internal = (BrooklynObjectInternal) object; - internal.setCatalogItemId(catalogItemId); - internal.setCatalogItemIdSearchPath(searchPath); + internal.setCatalogItemIdAndSearchPath(catalogItemId, searchPath); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/objs/AbstractBrooklynObject.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractBrooklynObject.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractBrooklynObject.java index cadeab8..9a409ca 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractBrooklynObject.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractBrooklynObject.java @@ -45,13 +45,6 @@ import org.apache.brooklyn.core.relations.ByObjectBasicRelationSupport; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.text.Identifiers; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; public abstract class AbstractBrooklynObject implements BrooklynObjectInternal { @@ -215,7 +208,8 @@ public abstract class AbstractBrooklynObject implements BrooklynObjectInternal { } @Override - public void setCatalogItemIdSearchPath(List<String> ids) { + public void setCatalogItemIdAndSearchPath(String catalogItemId, List<String> ids) { + setCatalogItemId(catalogItemId); searchPath.clear(); searchPath.addAll(ids); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java index ea02877..69e51e6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java @@ -379,8 +379,7 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple this.entity = entity; this.execution = ((EntityInternal) entity).getExecutionContext(); if (entity!=null && getCatalogItemId() == null) { - setCatalogItemId(entity.getCatalogItemId()); - setCatalogItemIdSearchPath(entity.getCatalogItemIdSearchPath()); + setCatalogItemIdAndSearchPath(entity.getCatalogItemId(), entity.getCatalogItemIdSearchPath()); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java b/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java index 6cec5ab..d7fe17b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java @@ -38,7 +38,7 @@ import com.google.common.annotations.Beta; public interface BrooklynObjectInternal extends BrooklynObject, Rebindable { void setCatalogItemId(String id); - void setCatalogItemIdSearchPath(List<String> id); + void setCatalogItemIdAndSearchPath(String catalogItemId, List<String> searchPath); /** * Moves the current catalog item id onto the start of the search path, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java index 6d32aa8..0cf933c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java @@ -248,8 +248,7 @@ public class InternalEntityFactory extends InternalFactory { theEntity.setDisplayName(spec.getDisplayName()); if (spec.getCatalogItemId()!=null) { - theEntity.setCatalogItemId(spec.getCatalogItemId()); - theEntity.setCatalogItemIdSearchPath(spec.getCatalogItemIdSearchPath()); + theEntity.setCatalogItemIdAndSearchPath(spec.getCatalogItemId(), spec.getCatalogItemIdSearchPath()); } entity.tags().addTags(spec.getTags()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java index ad0d0db..b15863d 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalLocationFactory.java @@ -119,8 +119,7 @@ public class InternalLocationFactory extends InternalFactory { location.setDisplayName(spec.getDisplayName()); if (spec.getCatalogItemId()!=null) { - location.setCatalogItemId(spec.getCatalogItemId()); - location.setCatalogItemIdSearchPath(spec.getCatalogItemIdSearchPath()); + location.setCatalogItemIdAndSearchPath(spec.getCatalogItemId(), spec.getCatalogItemIdSearchPath()); } loc.tags().addTags(spec.getTags()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java index 4de113c..8ba7f81 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java @@ -108,8 +108,7 @@ public class InternalPolicyFactory extends InternalFactory { policy.setDisplayName(spec.getDisplayName()); } if (spec.getCatalogItemId()!=null) { - policy.setCatalogItemId(spec.getCatalogItemId()); - policy.setCatalogItemIdSearchPath(spec.getCatalogItemIdSearchPath()); + policy.setCatalogItemIdAndSearchPath(spec.getCatalogItemId(), spec.getCatalogItemIdSearchPath()); } pol.tags().addTags(spec.getTags()); @@ -151,8 +150,7 @@ public class InternalPolicyFactory extends InternalFactory { theEnricher.setDisplayName(spec.getDisplayName()); if (spec.getCatalogItemId()!=null) { - theEnricher.setCatalogItemId(spec.getCatalogItemId()); - theEnricher.setCatalogItemIdSearchPath(spec.getCatalogItemIdSearchPath()); + theEnricher.setCatalogItemIdAndSearchPath(spec.getCatalogItemId(), spec.getCatalogItemIdSearchPath()); } enricher.tags().addTags(spec.getTags()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fde6aa5f/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java b/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java index ce0470d..6310e3b 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java @@ -326,8 +326,7 @@ public class ClassLoaderUtilsTest { .build(); mgmt.getCatalog().addItem(item); final EntityInternal entityInternal = (EntityInternal) entity; - entityInternal.setCatalogItemId(item.getCatalogItemId()); - entityInternal.setCatalogItemIdSearchPath(item.getCatalogItemIdSearchPath()); + entityInternal.setCatalogItemIdAndSearchPath(item.getCatalogItemId(), item.getCatalogItemIdSearchPath()); return entity; }
