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 7ac4ca5e3529006844ab82653dc44631d8f03a1d Author: Alex Heneveld <[email protected]> AuthorDate: Mon Oct 24 01:16:35 2022 +0100 better logging for bundle metadata and errors --- .../java/org/apache/brooklyn/core/typereg/BundleUpgradeParser.java | 2 +- .../java/org/apache/brooklyn/core/typereg/RegisteredTypes.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/BundleUpgradeParser.java b/core/src/main/java/org/apache/brooklyn/core/typereg/BundleUpgradeParser.java index f3e2a5b028..89a77258e3 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/BundleUpgradeParser.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/BundleUpgradeParser.java @@ -609,7 +609,7 @@ public class BundleUpgradeParser { (i) -> { VersionedName targetTypeAtBundleVersion = new VersionedName(i.getSymbolicName(), bundle.getVersion()); if (!typeSupplierNames.contains(VersionedName.toOsgiVersionedName(targetTypeAtBundleVersion))) { - throw new IllegalStateException("Bundle manifest declares it upgrades "+i+" " + throw new IllegalStateException("Bundle manifest for "+bundle+" declares it upgrades "+i+" " + "but does not declare an explicit target and does not contain inferred target "+targetTypeAtBundleVersion); } return targetTypeAtBundleVersion; diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java index da1d5a97f8..f8fec6e810 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java @@ -174,6 +174,13 @@ public class RegisteredTypes { } @Override public String getPlanYaml() { throw new UnsupportedOperationException(); } @Override public RebindSupport<CatalogItemMemento> getRebindSupport() { throw new UnsupportedOperationException(); } + + @Override + public String toString() { + return "CatalogItemFromRegisteredType{" + + "type=" + type + + '}'; + } } /** Preferred mechanism for defining a bean {@link RegisteredType}.
