Updates for the following review comments. https://github.com/apache/brooklyn-server/pull/338#discussion_r94619869 This is just for persistence backwards compatibility, right? If so mark it as deprecated. - done
https://github.com/apache/brooklyn-server/pull/338#discussion_r94620517 Unused. - done https://github.com/apache/brooklyn-server/pull/338#discussion_r94620662 Unused, plus Strings, XmlUtil. - done https://github.com/apache/brooklyn-server/pull/338#discussion_r94753587 At the very least could log at higher level - code at AbstractManagementContext used to log at error. - changed to warn. https://github.com/apache/brooklyn-server/pull/338#discussion_r94756363 Use and return getCatalogItemSuperIds instead. - updated Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1e5ca519 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1e5ca519 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1e5ca519 Branch: refs/heads/master Commit: 1e5ca519224b5cac32abc2d7dcf76d33289c752f Parents: 78cfeda Author: Geoff Macartney <[email protected]> Authored: Tue Feb 21 09:37:01 2017 +0000 Committer: Geoff Macartney <[email protected]> Committed: Thu Apr 20 11:20:36 2017 +0100 ---------------------------------------------------------------------- .../mementos/BrooklynMementoManifest.java | 10 ++++-- .../api/mgmt/rebind/mementos/Memento.java | 4 ++- .../brooklyn/api/objs/BrooklynObject.java | 2 +- .../brooklyn/ConfigInheritanceYamlTest.java | 1 - .../brooklyn/camp/brooklyn/RebindOsgiTest.java | 4 --- .../catalog/CatalogOsgiYamlEntityTest.java | 6 ++-- .../brooklyn/catalog/CatalogYamlEntityTest.java | 8 ++--- .../core/catalog/internal/CatalogItemDo.java | 4 +-- .../internal/CatalogItemDtoAbstract.java | 2 +- .../core/catalog/internal/CatalogUtils.java | 4 +-- .../access/PortForwardManagerClient.java | 5 ++- .../internal/AbstractManagementContext.java | 3 +- .../core/mgmt/rebind/RebindIteration.java | 36 +++++++++++--------- .../core/mgmt/rebind/dto/AbstractMemento.java | 6 ++-- .../rebind/dto/EntityMementoManifestImpl.java | 2 +- .../mgmt/rebind/dto/MementosGenerators.java | 2 +- .../core/objs/AbstractBrooklynObject.java | 2 +- .../core/objs/AbstractEntityAdjunct.java | 2 +- .../util/core/ClassLoaderUtilsTest.java | 2 +- 19 files changed, 54 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java index d3c3cc3..bcf246e 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java +++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/BrooklynMementoManifest.java @@ -36,8 +36,14 @@ public interface BrooklynMementoManifest extends Serializable { String getId(); String getType(); String getParent(); - String getCatalogItemId(); - List<String> getCatalogItemSuperIds(); + + /** + * deprecated since 0.11.0, use {@link #getCatalogItemHierarchy()} instead + * @return + */ + @Deprecated String getCatalogItemId(); + + List<String> getCatalogItemHierarchy(); } String getPlaneId(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/Memento.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/Memento.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/Memento.java index d45df06..4ca219d 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/Memento.java +++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/mementos/Memento.java @@ -48,13 +48,15 @@ public interface Memento extends Serializable { /** * The principal catalog item id. + * @deprecated since 0.11.0 - use {@link #getCatalogItemHierarchy()} instead */ + @Deprecated String getCatalogItemId(); /** * Catalog Item Ids of all defining catalog items. */ - List<String> getCatalogItemSuperIds(); + List<String> getCatalogItemHierarchy(); String getDisplayName(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/api/src/main/java/org/apache/brooklyn/api/objs/BrooklynObject.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/objs/BrooklynObject.java b/api/src/main/java/org/apache/brooklyn/api/objs/BrooklynObject.java index 6167288..ff49e1b 100644 --- a/api/src/main/java/org/apache/brooklyn/api/objs/BrooklynObject.java +++ b/api/src/main/java/org/apache/brooklyn/api/objs/BrooklynObject.java @@ -69,7 +69,7 @@ public interface BrooklynObject extends Identifiable, Configurable { * </pre> * then the list will contain X, Y. */ - List<String> getCatalogItemSuperIds(); + List<String> getCatalogItemHierarchy(); /** * Tags are arbitrary objects which can be attached to an entity for subsequent reference. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java index 458c5ca..89f282b 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java @@ -42,7 +42,6 @@ import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; -import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.stock.BasicApplication; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java index b50e38a..07cab6d 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/RebindOsgiTest.java @@ -46,12 +46,10 @@ import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.osgi.Osgis; -import org.apache.brooklyn.util.core.xstream.XmlUtil; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.javalang.Reflections; import org.apache.brooklyn.util.osgi.OsgiTestResources; -import org.apache.brooklyn.util.text.Strings; import org.jclouds.compute.domain.OsFamily; import org.osgi.framework.Bundle; import org.osgi.framework.launch.Framework; @@ -67,8 +65,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import javax.xml.xpath.XPathConstants; - public class RebindOsgiTest extends AbstractYamlRebindTest { @SuppressWarnings("unused") http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java index ffc81b5..dbf9445 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiYamlEntityTest.java @@ -813,9 +813,9 @@ public class CatalogOsgiYamlEntityTest extends AbstractYamlTest { Entity entity = app.getChildren().iterator().next(); assertEquals(entity.getCatalogItemId(), ver(symbolicNameOuter)); - assertEquals(entity.getCatalogItemSuperIds().size(), 2); - assertEquals(entity.getCatalogItemSuperIds().get(0), ver(symbolicNameOuter)); - assertEquals(entity.getCatalogItemSuperIds().get(1), ver(symbolicNameInner)); + assertEquals(entity.getCatalogItemHierarchy().size(), 2); + assertEquals(entity.getCatalogItemHierarchy().get(0), ver(symbolicNameOuter)); + assertEquals(entity.getCatalogItemHierarchy().get(1), ver(symbolicNameInner)); deleteCatalogEntity(symbolicNameInner); deleteCatalogEntity(symbolicNameOuter); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java index d491860..c40f7f8 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java @@ -37,10 +37,8 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.apache.brooklyn.core.typereg.RegisteredTypes; -import org.apache.brooklyn.entity.software.base.EmptySoftwareProcess; import org.apache.brooklyn.entity.stock.BasicApplication; import org.apache.brooklyn.entity.stock.BasicEntity; -import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.osgi.OsgiTestResources; import org.testng.Assert; @@ -645,9 +643,9 @@ public class CatalogYamlEntityTest extends AbstractYamlTest { Entity entity = app.getChildren().iterator().next(); assertEquals(entity.getCatalogItemId(), ver(symbolicNameOuter)); - assertEquals(entity.getCatalogItemSuperIds().size(), 2); - assertEquals(entity.getCatalogItemSuperIds().get(0), ver(symbolicNameOuter)); - assertEquals(entity.getCatalogItemSuperIds().get(1), ver(symbolicNameInner)); + assertEquals(entity.getCatalogItemHierarchy().size(), 2); + assertEquals(entity.getCatalogItemHierarchy().get(0), ver(symbolicNameOuter)); + assertEquals(entity.getCatalogItemHierarchy().get(1), ver(symbolicNameInner)); deleteCatalogEntity(symbolicNameInner); deleteCatalogEntity(symbolicNameOuter); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/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 6699e39..7cf6635 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 @@ -137,8 +137,8 @@ public class CatalogItemDo<T,SpecT> implements CatalogItem<T,SpecT>, BrooklynObj } @Override - public List<String> getCatalogItemSuperIds() { - return itemDto.getCatalogItemSuperIds(); + public List<String> getCatalogItemHierarchy() { + return itemDto.getCatalogItemHierarchy(); } @Override http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java index dac5af8..539b8b1 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogItemDtoAbstract.java @@ -104,7 +104,7 @@ public abstract class CatalogItemDtoAbstract<T, SpecT> extends AbstractBrooklynO } @Override - public List<String> getCatalogItemSuperIds() { + public List<String> getCatalogItemHierarchy() { return ImmutableList.of(getCatalogItemId()); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/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 ff393b3..c56a77c 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 @@ -192,7 +192,7 @@ public class CatalogUtils { if (log.isDebugEnabled()) BrooklynLogging.log(log, BrooklynLogging.levelDebugOrTraceIfReadOnly(entity), "Catalog item addition: "+entity+" from "+entity.getCatalogItemId()+" applying its catalog item ID to "+itemBeingAdded); - ((BrooklynObjectInternal)itemBeingAdded).setCatalogItemIds(entity.getCatalogItemSuperIds()); + ((BrooklynObjectInternal)itemBeingAdded).setCatalogItemIds(entity.getCatalogItemHierarchy()); } else { if (!itemBeingAdded.getCatalogItemId().equals(entity.getCatalogItemId())) { // not a problem, but something to watch out for @@ -352,7 +352,7 @@ public class CatalogUtils { loader.add(itemLoader); } else { // TODO review what to do here - log.debug("Can't find catalog item " + catalogItemId); + log.warn("Can't find catalog item " + catalogItemId); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java index 1fb6ef5..d5781cd 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManagerClient.java @@ -27,7 +27,6 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.config.ConfigKey.HasConfigKey; -import org.apache.brooklyn.core.location.AbstractLocation; import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.base.Preconditions; @@ -389,8 +388,8 @@ public class PortForwardManagerClient implements PortForwardManager { } @Override - public List<String> getCatalogItemSuperIds() { - return getDelegate().getCatalogItemSuperIds(); + public List<String> getCatalogItemHierarchy() { + return getDelegate().getCatalogItemHierarchy(); } @Override http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java index 36ba8d1..9c45048 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java @@ -54,7 +54,6 @@ import org.apache.brooklyn.api.typereg.BrooklynTypeRegistry; import org.apache.brooklyn.config.StringConfigMap; import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog; import org.apache.brooklyn.core.catalog.internal.CatalogInitialization; -import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.drivers.BasicEntityDriverManager; @@ -131,7 +130,7 @@ public abstract class AbstractManagementContext implements ManagementContextInte public BrooklynClassLoadingContext apply(@Nullable Object input) { if (input instanceof EntityInternal) { EntityInternal internal = (EntityInternal)input; - final List<String> catalogItemSuperIds = internal.getCatalogItemSuperIds(); + final List<String> catalogItemSuperIds = internal.getCatalogItemHierarchy(); if (catalogItemSuperIds.size() > 0) { BrooklynClassLoadingContextSequential seqLoader = newClassLoadingContextForCatalogItems(internal.getManagementContext(), catalogItemSuperIds); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/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 a37d7ce..fa0a3af 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 @@ -797,24 +797,28 @@ public abstract class RebindIteration { } protected List<String> findCatalogItemIds(ClassLoader cl, Map<String, EntityMementoManifest> entityIdToManifest, EntityMementoManifest entityManifest) { - if (!entityManifest.getCatalogItemSuperIds().isEmpty()) { - return entityManifest.getCatalogItemSuperIds(); + if (!entityManifest.getCatalogItemHierarchy().isEmpty()) { + return entityManifest.getCatalogItemHierarchy(); } if (BrooklynFeatureEnablement.isEnabled(BrooklynFeatureEnablement.FEATURE_BACKWARDS_COMPATIBILITY_INFER_CATALOG_ITEM_ON_REBIND)) { //First check if any of the parent entities has a catalogItemId set. EntityMementoManifest ptr = entityManifest; while (ptr != null) { - if (ptr.getCatalogItemId() != null) { - RegisteredType type = managementContext.getTypeRegistry().get(ptr.getCatalogItemId()); - if (type != null) { - return ImmutableList.of(type.getId()); - } else { - //Couldn't find a catalog item with this id, but return it anyway and - //let the caller deal with the error. - //TODO under what circumstances is this permitted? - return ImmutableList.of(ptr.getCatalogItemId()); + if (ptr.getCatalogItemHierarchy() != null) { + List<String> ids = MutableList.of(); + for (String id : ptr.getCatalogItemHierarchy()) { + RegisteredType type = managementContext.getTypeRegistry().get(id); + if (type != null) { + ids.add(type.getId()); + } else { + //Couldn't find a catalog item with this id, but return it anyway and + //let the caller deal with the error. + //TODO under what circumstances is this permitted? + ids.add(id); + } } + return ids; } if (ptr.getParent() != null) { ptr = entityIdToManifest.get(ptr.getParent()); @@ -938,7 +942,7 @@ public abstract class RebindIteration { protected <T extends BrooklynObject> LoadedClass<? extends T> load(Class<T> bType, Memento memento) { - return load(bType, memento.getType(), memento.getCatalogItemSuperIds(), memento.getId()); + return load(bType, memento.getType(), memento.getCatalogItemHierarchy(), memento.getId()); } @SuppressWarnings("unchecked") @@ -1062,7 +1066,7 @@ public abstract class RebindIteration { */ protected Policy newPolicy(PolicyMemento memento) { String id = memento.getId(); - LoadedClass<? extends Policy> loaded = load(Policy.class, memento.getType(), memento.getCatalogItemSuperIds(), id); + LoadedClass<? extends Policy> loaded = load(Policy.class, memento.getType(), memento.getCatalogItemHierarchy(), id); Class<? extends Policy> policyClazz = loaded.clazz; Policy policy; @@ -1087,7 +1091,7 @@ public abstract class RebindIteration { policy = invokeConstructor(null, policyClazz, new Object[] {flags}); } - setCatalogItemIds(policy, memento.getCatalogItemSuperIds()); + setCatalogItemIds(policy, memento.getCatalogItemHierarchy()); return policy; } @@ -1121,7 +1125,7 @@ public abstract class RebindIteration { enricher = invokeConstructor(reflections, enricherClazz, new Object[] {flags}); } - setCatalogItemIds(enricher, memento.getCatalogItemSuperIds()); + setCatalogItemIds(enricher, memento.getCatalogItemHierarchy()); return enricher; } @@ -1144,7 +1148,7 @@ public abstract class RebindIteration { throw new IllegalStateException("rebind of feed without no-arg constructor unsupported: id="+id+"; type="+feedClazz); } - setCatalogItemIds(feed, memento.getCatalogItemSuperIds()); + setCatalogItemIds(feed, memento.getCatalogItemHierarchy()); return feed; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java index cf3a033..381c71b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java @@ -68,7 +68,7 @@ public abstract class AbstractMemento implements Memento, Serializable { type = other.getType(); typeClass = other.getTypeClass(); displayName = other.getDisplayName(); - setCatalogItemIds(other.getCatalogItemSuperIds(), other.getCatalogItemId()); + setCatalogItemIds(other.getCatalogItemHierarchy(), other.getCatalogItemId()); customFields.putAll(other.getCustomFields()); tags.addAll(other.getTags()); relations.putAll(other.getRelations()); @@ -180,11 +180,11 @@ public abstract class AbstractMemento implements Memento, Serializable { @Override public String getCatalogItemId() { normalizeCatalogItemIds(); - return Iterables.getFirst(getCatalogItemSuperIds(), null); + return Iterables.getFirst(getCatalogItemHierarchy(), null); } @Override - public List<String> getCatalogItemSuperIds() { + public List<String> getCatalogItemHierarchy() { normalizeCatalogItemIds(); return catalogItemSuperIds; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/EntityMementoManifestImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/EntityMementoManifestImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/EntityMementoManifestImpl.java index 0f20526..5ed1076 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/EntityMementoManifestImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/EntityMementoManifestImpl.java @@ -58,7 +58,7 @@ public class EntityMementoManifestImpl implements EntityMementoManifest { } @Override - public List<String> getCatalogItemSuperIds() { + public List<String> getCatalogItemHierarchy() { return catalogItemIds; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java index eac89e0..4a6ba9d 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java @@ -451,7 +451,7 @@ public class MementosGenerators { builder.id = instance.getId(); builder.displayName = instance.getDisplayName(); - builder.catalogItemSuperIds = instance.getCatalogItemSuperIds(); + builder.catalogItemSuperIds = instance.getCatalogItemHierarchy(); builder.type = (typePrefix.isPresent() ? typePrefix.get() : "") + instance.getClass().getName(); builder.typeClass = instance.getClass(); if (instance instanceof EntityAdjunct) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/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 fdfc624..b067fe4 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 @@ -219,7 +219,7 @@ public abstract class AbstractBrooklynObject implements BrooklynObjectInternal { } } - public List<String> getCatalogItemSuperIds() { + public List<String> getCatalogItemHierarchy() { return ImmutableList.copyOf(catalogItemIdStack); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/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 c9bdc35..4b21963 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,7 +379,7 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject imple this.entity = entity; this.execution = ((EntityInternal) entity).getExecutionContext(); if (entity!=null && getCatalogItemId() == null) { - setCatalogItemIds(entity.getCatalogItemSuperIds()); + setCatalogItemIds(entity.getCatalogItemHierarchy()); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1e5ca519/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 a6e75e2..21231aa 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 @@ -325,7 +325,7 @@ public class ClassLoaderUtilsTest { .plan("{\"services\":[{\"type\": \"" + clazz.getName() + "\"}]}") .build(); mgmt.getCatalog().addItem(item); - ((EntityInternal)entity).setCatalogItemIds(item.getCatalogItemSuperIds()); + ((EntityInternal)entity).setCatalogItemIds(item.getCatalogItemHierarchy()); return entity; }
