This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from ae5a75f Merge pull request #1115 from
ahgittin/catalog-bundle-resolvers
new 489c2a2 make autodetect format more forgiving (allow blank), and
better error messages
new b86c57e rest api for bundle/catalog add now accepts format
new 3ed9605 add format argument when deploying an app as well
new 0abde86 Merge branch 'master' into catalog-bundle-resolvers
new 5114cb8 minor tidies to tests and bundle resolution
new 23c3367 show errors when an unresolved item is attempted to be used
new bead6bc make the external supplier message debug - doesn't need to be
info
new 7215abd extend Maybe to support java.util.Optional
new fb8bd6e guard against null arguments in collection methods, esp in
var args
new c32a56e This closes #1116
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
