You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2018/01/15 14:01:36 UTC
[1/2] brooklyn-server git commit: Allow deprecation as the catalog
item level
Repository: brooklyn-server
Updated Branches:
refs/heads/master d9cc97767 -> d48217dbf
Allow deprecation as the catalog item level
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e968621e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e968621e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e968621e
Branch: refs/heads/master
Commit: e968621ed2e46e06fefd18c8b630d94c9408f342
Parents: d9cc977
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Mon Jan 8 14:00:21 2018 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Thu Jan 11 15:05:25 2018 +0000
----------------------------------------------------------------------
.../brooklyn/core/catalog/internal/BasicBrooklynCatalog.java | 6 ++++--
policy/src/main/resources/catalog.bom | 2 ++
test-framework/src/main/resources/catalog.bom | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e968621e/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 6ab68c2..e13c998 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
@@ -911,7 +911,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
catalogIconUrl = setFromItemIfUnset(catalogIconUrl, itemAsMap, "iconUrl", "icon_url", "icon.url");
final String deprecated = getFirstAs(catalogMetadata, String.class, "deprecated").orNull();
- final Boolean catalogDeprecated = Boolean.valueOf(deprecated);
+ final Boolean catalogDeprecated = Boolean.valueOf(setFromItemIfUnset(deprecated, itemAsMap, "deprecated"));
// run again now that we know the ID to catch recursive definitions and possibly other mistakes (itemType inconsistency?)
planInterpreter = new PlanInterpreterGuessingType(id, item, sourceYaml, itemType, libraryBundles, resultLegacyFormat).reconstruct();
@@ -1094,8 +1094,10 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
if (item!=null) {
for (String fieldAttr: fieldAttrs) {
Object newValue = item.get(fieldAttr);
- if (newValue instanceof String && Strings.isNonBlank((String)newValue)) {
+ if (newValue instanceof String && Strings.isNonBlank((String)newValue)) {
return (String)newValue;
+ } else if (newValue instanceof Number || newValue instanceof Boolean) {
+ return newValue.toString();
}
}
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e968621e/policy/src/main/resources/catalog.bom
----------------------------------------------------------------------
diff --git a/policy/src/main/resources/catalog.bom b/policy/src/main/resources/catalog.bom
index ab7796c..5ff4bbb 100644
--- a/policy/src/main/resources/catalog.bom
+++ b/policy/src/main/resources/catalog.bom
@@ -114,6 +114,7 @@ brooklyn.catalog:
type: org.apache.brooklyn.policy.enricher.RollingTimeWindowMeanEnricher
name: "[DEPRECATED] Rolling Mean in Time Window"
description: "[DEPRECATED] Prefer YamlRollingTimeWindowMeanEnricher"
+ deprecated: true
- id: org.apache.brooklyn.policy.enricher.TimeFractionDeltaEnricher
item:
type: org.apache.brooklyn.policy.enricher.TimeFractionDeltaEnricher
@@ -126,6 +127,7 @@ brooklyn.catalog:
type: org.apache.brooklyn.policy.enricher.TimeWeightedDeltaEnricher
name: "[DEPRECATED] Time Weighted Delta"
description: "[DEPRECATED] prefer 'YamlTimeWeightedDeltaEnricher'"
+ deprecated: true
- id: org.apache.brooklyn.policy.ha.ServiceFailureDetector
item:
type: org.apache.brooklyn.policy.ha.ServiceFailureDetector
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e968621e/test-framework/src/main/resources/catalog.bom
----------------------------------------------------------------------
diff --git a/test-framework/src/main/resources/catalog.bom b/test-framework/src/main/resources/catalog.bom
index b0d3c3c..d2c57ca 100644
--- a/test-framework/src/main/resources/catalog.bom
+++ b/test-framework/src/main/resources/catalog.bom
@@ -28,6 +28,7 @@ brooklyn.catalog:
type: org.apache.brooklyn.test.framework.SimpleShellCommandTest
name: "[DEPRECATED] Simple Shell Command Test"
description: "[DEPRECATED] Instead use TestSshCommand"
+ deprecated: true
- id: org.apache.brooklyn.test.framework.ParallelTestCase
item:
type: org.apache.brooklyn.test.framework.ParallelTestCase
[2/2] brooklyn-server git commit: This closes #928
Posted by dr...@apache.org.
This closes #928
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d48217db
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d48217db
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d48217db
Branch: refs/heads/master
Commit: d48217dbfde090acdf3e45e3558bdf7e332f77ab
Parents: d9cc977 e968621
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Mon Jan 15 14:01:28 2018 +0000
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Mon Jan 15 14:01:28 2018 +0000
----------------------------------------------------------------------
.../brooklyn/core/catalog/internal/BasicBrooklynCatalog.java | 6 ++++--
policy/src/main/resources/catalog.bom | 2 ++
test-framework/src/main/resources/catalog.bom | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------