Github user ahgittin commented on a diff in the pull request:
https://github.com/apache/brooklyn-server/pull/746#discussion_r126890840
--- Diff:
core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
---
@@ -511,30 +597,76 @@ private void collectCatalogItems(String sourceYaml,
Map<?,?> itemMetadata, List<
// brooklyn.libraries we treat specially, to append the list, with
the child's list preferred in classloading order
// `libraries` is supported in some places as a legacy syntax; it
should always be `brooklyn.libraries` for new apps
// TODO in 0.8.0 require brooklyn.libraries, don't allow
"libraries" on its own
- List<?> librariesNew =
MutableList.copyOf(getFirstAs(itemMetadataWithoutItemDef, List.class,
"brooklyn.libraries", "libraries").orNull());
- Collection<CatalogBundle> libraryBundlesNew =
CatalogItemDtoAbstract.parseLibraries(librariesNew);
-
- List<?> librariesCombined = MutableList.copyOf(librariesNew)
- .appendAll(getFirstAs(parentMetadata, List.class,
"brooklyn.libraries", "libraries").orNull());
- if (!librariesCombined.isEmpty())
- catalogMetadata.put("brooklyn.libraries", librariesCombined);
- Collection<CatalogBundle> libraryBundles =
CatalogItemDtoAbstract.parseLibraries(librariesCombined);
+ List<?> librariesAddedHereNames =
MutableList.copyOf(getFirstAs(itemMetadataWithoutItemDef, List.class,
"brooklyn.libraries", "libraries").orNull());
--- End diff --
now is a good time but not as part of this PR :)
lots of tests use the old syntax still :(
---
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.
---
