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 2017/04/21 22:55:40 UTC
[21/39] brooklyn-server git commit: catalogItemIdIfNotNull is no
longer used
catalogItemIdIfNotNull is no longer used
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3f986ec9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3f986ec9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3f986ec9
Branch: refs/heads/master
Commit: 3f986ec9c5340bd1f4dbef9cbdf5e26a27e1f3d7
Parents: daaf039
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Wed Oct 5 13:40:33 2016 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Thu Apr 20 11:20:36 2017 +0100
----------------------------------------------------------------------
.../api/internal/AbstractBrooklynObjectSpec.java | 14 ++------------
.../core/typereg/AbstractTypePlanTransformer.java | 1 -
2 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f986ec9/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java b/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
index d7442fe..c659782 100644
--- a/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
@@ -131,18 +131,8 @@ public abstract class AbstractBrooklynObjectSpec<T,SpecT extends AbstractBrookly
}
return self();
}
- // TODO in many places (callers to this method) we prefer a wrapper item ID;
- // that is right, because the wrapper's defn will refer to the wrapped,
- // but we might need also to collect the item ID's so that *all* can be searched, see #catalogItemId.
- // e.g. if R3 references R2 which references R1 any one of these might supply config keys
- // referencing resources or types in their local bundles.
- @Beta
- public SpecT catalogItemIdIfNotNull(String val) {
- if (val!=null) {
- catalogItemId(val);
- }
- return self();
- }
+
+
public SpecT tag(Object tag) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f986ec9/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java b/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
index dab0c35..1227b42 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
@@ -103,7 +103,6 @@ public abstract class AbstractTypePlanTransformer implements BrooklynTypePlanTra
@Override protected Object visitSpec() {
try {
AbstractBrooklynObjectSpec<?, ?> result = createSpec(type, context);
- // see notes on catalogItemIdIfNotNull
result.nestCatalogItemId(type.getId());
return result;
} catch (Exception e) { throw Exceptions.propagate(e); }