Github user aledsage commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/485#discussion_r107144489
--- Diff:
core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
---
@@ -417,6 +419,53 @@ else for (String key: otherKeys) {
return result;
}
+ public static Map<?,?> getCatalogMetadata(String yaml) {
+ Map<?,?> itemDef = Yamls.getAs(Yamls.parseAll(yaml), Map.class);
+ return getFirstAsMap(itemDef, "brooklyn.catalog").orNull();
+ }
+
+ public static VersionedName getVersionedName(Map<?,?> catalogMetadata)
{
+ String id = getFirstAs(catalogMetadata, String.class,
"id").orNull();
+ String version = getFirstAs(catalogMetadata, String.class,
"version").orNull();
+ String symbolicName = getFirstAs(catalogMetadata, String.class,
"symbolicName").orNull();
+ symbolicName = findAssertingConsistentIfSet("symbolicName",
symbolicName, getFirstAs(catalogMetadata, String.class,
"symbolic-name").orNull());
+ // prefer symbolic name and version, if supplied
+ // else use id as symbolic name : version or just symbolic name
+ // (must match if both supplied)
+ if (Strings.isNonBlank(id)) {
+ if (CatalogUtils.looksLikeVersionedId(id)) {
+ symbolicName =
findAssertingConsistentIfSet("symbolicName", symbolicName,
CatalogUtils.getSymbolicNameFromVersionedId(id));
+ version = findAssertingConsistentIfSet("version", version,
CatalogUtils.getVersionFromVersionedId(id));
+ } else {
+ symbolicName =
findAssertingConsistentIfSet("symbolicName", symbolicName, id);
+ }
+ }
+ if (Strings.isBlank(symbolicName) && Strings.isBlank(version)) {
--- End diff --
Should be `||` instead of `&&`? (or exception message is wrong).
---
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.
---
