tidy warnings observed these in normal operation so bumping them down, with justification
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c2d9bff5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c2d9bff5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c2d9bff5 Branch: refs/heads/master Commit: c2d9bff57868cc79e533007f1fad58773624ee3a Parents: 98d9b0a Author: Alex Heneveld <[email protected]> Authored: Tue Jul 18 10:58:50 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Jul 18 10:58:50 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/core/catalog/internal/CatalogUtils.java | 14 +++++++++----- .../internal/JavaCatalogToSpecTransformer.java | 4 +++- 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c2d9bff5/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java index 7fa3631..3e25384 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUtils.java @@ -153,9 +153,9 @@ public class CatalogUtils { ManagementContext managementContext, String primaryItemId, List<String> searchPath) { BrooklynClassLoadingContextSequential seqLoader = new BrooklynClassLoadingContextSequential(managementContext); - addSearchItem(managementContext, seqLoader, primaryItemId); + addSearchItem(managementContext, seqLoader, primaryItemId, false /* primary ID may be temporary */); for (String searchId : searchPath) { - addSearchItem(managementContext, seqLoader, searchId); + addSearchItem(managementContext, seqLoader, searchId, true); } return seqLoader; } @@ -375,7 +375,7 @@ public class CatalogUtils { } } - private static void addSearchItem(ManagementContext managementContext, BrooklynClassLoadingContextSequential loader, String itemId) { + private static void addSearchItem(ManagementContext managementContext, BrooklynClassLoadingContextSequential loader, String itemId, boolean warnIfNotFound) { OsgiManager osgi = ((ManagementContextInternal)managementContext).getOsgiManager().orNull(); boolean didSomething = false; if (osgi!=null) { @@ -395,8 +395,12 @@ public class CatalogUtils { } if (!didSomething) { - // TODO review what to do here - log.warn("Can't find catalog item " + itemId+"; ignoring, but a search path may be incomplete and other errors may follow"); + if (warnIfNotFound) { + log.warn("Can't find catalog item " + itemId+" when searching; a search path may be incomplete and other errors may follow"); + } else { + log.trace("Can't find catalog item " + itemId+" when searching; ignoring as this can be normal in setup/scans, " + + "but it can also mean a search path may be incomplete and other errors may follow"); + } } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c2d9bff5/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java index 7860fef..83dabc4 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/JavaCatalogToSpecTransformer.java @@ -100,7 +100,9 @@ public class JavaCatalogToSpecTransformer implements PlanToSpecTransformer { // TODO "JavaType" should never be used any more; but we do want to support a poor-man's camp // for tests that expect CAMP in core where CAMP module isn't available if (poorMansCamp) { - log.warn("Deprecated functionality (since 0.9.0). Using old-style java type attribute for " + item); + // cannot warn here as -- however all CatalogToSpec transformers including this will be removed; + // in favour of TypePlanTransformer instances + log.trace("Deprecated functionality (since 0.9.0). Using old-style java type attribute for " + item); } Class<?> type; try {
