brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geom...@apache.org
Subject [30/39] brooklyn-server git commit: address PR comments
Date Wed, 19 Jul 2017 16:26:00 GMT
address PR comments


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d0183c26
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d0183c26
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d0183c26

Branch: refs/heads/master
Commit: d0183c264914ebca14f74e41e5d080d91fe85f1d
Parents: ab75195
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Jul 12 09:20:02 2017 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Jul 12 09:20:02 2017 +0100

----------------------------------------------------------------------
 .../core/catalog/internal/BasicBrooklynCatalog.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d0183c26/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index f718180..046543b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@ -512,10 +512,9 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
         if (!itemDef.isEmpty()) {
             // AH - i forgot we even supported this. probably no point anymore,
             // now that catalog defs can reference an item yaml and things can be bundled
together?
-            log.warn("Reading catalog item from sibling keys of `brooklyn.catalog` section,
"
+            log.warn("Deprecated read of catalog item from sibling keys of `brooklyn.catalog`
section, "
                 + "instead of the more common appraoch of putting inside an `item` within
it. "
-                + "This behavior is not deprecated yet but it is being considered. "
-                + "If you find it useful please inform the community.");
+                + "Rewrite to use nested/reference syntax instead or contact the community
for assistance or feedback.");
             Map<String,?> rootItem = MutableMap.of("item", itemDef);
             String rootItemYaml = yaml;
             YamlExtract yamlExtract = Yamls.getTextOfYamlAtPath(rootItemYaml, "brooklyn.catalog");
@@ -532,12 +531,12 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
      * Expects item metadata, containing an `item` containing the definition,
      * and/or `items` containing a list of item metadata (recursing with depth).
      * 
-     * Supports two modes:
+     * Supports two modes depending whether <code>result</code> is passed here:
      * 
-     * * CatalogItems validated and returned, but not added to catalog here;
+     * * CatalogItems validated and returned, but not added to catalog here, instead returned
in <code>result</code>;
      *   caller does that, and CI instances are persisted and loaded directly after rebind
      *   
-     * * RegisteredTypes added to (unpersisted) type registry;
+     * * RegisteredTypes added to (unpersisted) type registry if <code>result</code>
is null;
      *   caller than validates, optionally removes broken ones,
      *   given the ability to add multiple interdependent BOMs/bundles and then validate;
      *   bundles with BOMs are persisted instead of catalog items
@@ -1050,7 +1049,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
         if (url==null) {
             // NOT available after persistence/rebind 
             // as shown by test in CatalogOsgiVersionMoreEntityRebindTest
-            throw new IllegalArgumentException("Error prepaing to scan "+containingBundle.getVersionedName()+":
no URL available");
+            throw new IllegalArgumentException("Error preparing to scan "+containingBundle.getVersionedName()+":
no URL available");
         }
         // org.reflections requires the URL to be "file:" containg ".jar"
         File fJar = Os.newTempFile(containingBundle.getVersionedName().toOsgiString(), ".jar");


Mime
View raw message