This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit c32a56e1b0ca5b0591cdf75fd0ca5b3be0ef9053
Merge: ae5a75f fb8bd6e
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Tue Oct 20 17:45:21 2020 +0100
This closes #1116
.../brooklyn/api/catalog/BrooklynCatalog.java | 23 +--
.../brooklyn/camp/brooklyn/AbstractYamlTest.java | 4 +-
.../catalog/CatalogOsgiYamlEntityTest.java | 4 +-
.../CatalogYamlEntityOsgiTypeRegistryTest.java | 7 +-
.../catalog/CatalogYamlVersioningTest.java | 18 +--
.../catalog/internal/BasicBrooklynCatalog.java | 52 +++++--
.../mgmt/ha/BrooklynBomOsgiArchiveInstaller.java | 49 ++++++-
.../BasicExternalConfigSupplierRegistry.java | 10 +-
.../typereg/AbstractCatalogBundleResolver.java | 6 +-
.../core/typereg/AbstractTypePlanTransformer.java | 3 +-
.../core/typereg/BasicBrooklynTypeRegistry.java | 3 +-
.../BrooklynBomBundleCatalogBundleResolver.java | 14 +-
.../BrooklynBomYamlCatalogBundleResolver.java | 16 +--
.../typereg/BrooklynCatalogBundleResolver.java | 28 ++++
.../typereg/BrooklynCatalogBundleResolvers.java | 5 +-
.../core/typereg/TypePlanTransformers.java | 5 +-
.../apache/brooklyn/rest/api/ApplicationApi.java | 54 ++++---
.../org/apache/brooklyn/rest/api/BundleApi.java | 52 ++++---
.../org/apache/brooklyn/rest/api/CatalogApi.java | 109 +++++++-------
.../rest/resources/ApplicationResource.java | 66 +++++----
.../brooklyn/rest/resources/BundleResource.java | 32 ++---
.../brooklyn/rest/resources/CatalogResource.java | 70 +++------
.../brooklyn/rest/transform/TypeTransformer.java | 43 ++++--
.../rest/resources/ApplicationResourceTest.java | 17 ++-
.../rest/resources/BundleAndTypeResourcesTest.java | 2 +-
.../rest/resources/CatalogResourceTest.java | 2 +-
.../rest/resources/LocationResourceTest.java | 7 +
.../brooklyn/rest/testing/BrooklynRestApiTest.java | 10 +-
.../brooklyn/util/collections/MutableList.java | 42 ++++--
.../brooklyn/util/collections/MutableSet.java | 12 +-
.../java/org/apache/brooklyn/util/guava/Maybe.java | 156 ++++++++++++++++++---
31 files changed, 598 insertions(+), 323 deletions(-)
