Github user ahgittin commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/312#discussion_r20128678
--- Diff:
core/src/main/java/brooklyn/catalog/internal/CatalogItemDtoAbstract.java ---
@@ -32,55 +34,55 @@
import brooklyn.entity.rebind.BasicCatalogItemRebindSupport;
import brooklyn.entity.rebind.RebindSupport;
import brooklyn.mementos.CatalogItemMemento;
+import brooklyn.util.collections.MutableList;
import brooklyn.util.flags.FlagUtils;
import brooklyn.util.flags.SetFromFlag;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
public abstract class CatalogItemDtoAbstract<T, SpecT> extends
AbstractBrooklynObject implements CatalogItem<T, SpecT> {
- private static final Logger log =
LoggerFactory.getLogger(CatalogItemDtoAbstract.class);
-
- // TODO are ID and registeredType the same?
- @SetFromFlag Set<Object> tags = Sets.newLinkedHashSet();
- @SetFromFlag String registeredType;
- @SetFromFlag String javaType;
- @SetFromFlag String description;
- @SetFromFlag String iconUrl;
- @SetFromFlag String version;
- @SetFromFlag CatalogLibrariesDto libraries;
- @SetFromFlag String planYaml;
-
- // Field left named `name' to maintain the name element in existing
catalogues.
- @SetFromFlag("displayName") String name;
-
- /** @deprecated since 0.7.0.
- * used for backwards compatibility when deserializing.
- * when catalogs are converted to new yaml format, this can be
removed. */
- @Deprecated
- @SetFromFlag
- String type;
+ private static Logger LOG =
LoggerFactory.getLogger(CatalogItemDtoAbstract.class);
+
+ private @SetFromFlag String symbolicName;
+ private @SetFromFlag String version = BasicBrooklynCatalog.NO_VERSION;
+
+ /**@deprecated since 0.7.0, left for deserialization backwards
compatibility */
+ private @Deprecated @SetFromFlag String registeredTypeName;
--- End diff --
great, keeping these with deprecation comments
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
