You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2018/01/11 14:54:14 UTC
[1/4] brooklyn-server git commit: fix config key name spelling in
dynamic fabric java
Repository: brooklyn-server
Updated Branches:
refs/heads/master a850dc87d -> d9cc97767
fix config key name spelling in dynamic fabric java
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c8452e38
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c8452e38
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c8452e38
Branch: refs/heads/master
Commit: c8452e38208a48b2ff21a616ac11e08b75248303
Parents: 792f4dd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jan 11 11:12:16 2018 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jan 11 11:12:16 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/brooklyn/entity/group/DynamicFabric.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c8452e38/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java
index ede190a..1808d0e 100644
--- a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java
+++ b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicFabric.java
@@ -55,14 +55,14 @@ public interface DynamicFabric extends AbstractGroup, Startable, Fabric {
@SetFromFlag("memberSpec")
ConfigKey<EntitySpec<?>> MEMBER_SPEC = ConfigKeys.newConfigKey(
new TypeToken<EntitySpec<?>>() {},
- "dynamiccfabric.memberspec",
+ "dynamicfabric.memberspec",
"Entity spec for creating new members (one per location)",
null);
@SetFromFlag("firstMemberSpec")
ConfigKey<EntitySpec<?>> FIRST_MEMBER_SPEC = ConfigKeys.newConfigKey(
new TypeToken<EntitySpec<?>>() {},
- "dynamiccfabric.firstmemberspec",
+ "dynamicfabric.firstmemberspec",
"Entity spec for the first member",
null);
[2/4] brooklyn-server git commit: only declare version once
Posted by al...@apache.org.
only declare version once
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1b1e7853
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1b1e7853
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1b1e7853
Branch: refs/heads/master
Commit: 1b1e7853832a5e06e017e412954bc99c3c2afa90
Parents: c8452e3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jan 11 11:13:40 2018 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jan 11 11:13:40 2018 +0000
----------------------------------------------------------------------
.../apache/brooklyn/rest/resources/BundleAndTypeResourcesTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1b1e7853/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/BundleAndTypeResourcesTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/BundleAndTypeResourcesTest.java b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/BundleAndTypeResourcesTest.java
index a15b04a..49a20d5 100644
--- a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/BundleAndTypeResourcesTest.java
+++ b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/BundleAndTypeResourcesTest.java
@@ -280,7 +280,6 @@ public class BundleAndTypeResourcesTest extends BrooklynRestResourceTest {
String yaml = Joiner.on("\n").join(
"brooklyn.catalog:",
" id: " + catalogItemId,
- " version: " + TEST_VERSION,
" itemType: " + checkNotNull(itemType),
" name: My Catalog App",
" description: My description",
[4/4] brooklyn-server git commit: This closes #929
Posted by al...@apache.org.
This closes #929
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d9cc9776
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d9cc9776
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d9cc9776
Branch: refs/heads/master
Commit: d9cc977670068a80817f290b8b33eb288c176867
Parents: a850dc8 26b8f4f
Author: Aled Sage <al...@gmail.com>
Authored: Thu Jan 11 14:54:04 2018 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Jan 11 14:54:04 2018 +0000
----------------------------------------------------------------------
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 42 +++++++++++++++++++-
.../catalog/internal/BasicBrooklynCatalog.java | 14 ++++---
.../brooklyn/entity/group/DynamicFabric.java | 4 +-
.../resources/BundleAndTypeResourcesTest.java | 1 -
4 files changed, 52 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[3/4] brooklyn-server git commit: allow iconUrl to come from item,
match behaviour for name and description
Posted by al...@apache.org.
allow iconUrl to come from item, match behaviour for name and description
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/26b8f4f9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/26b8f4f9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/26b8f4f9
Branch: refs/heads/master
Commit: 26b8f4f95bdaf279d5ac387a22cc5030f4362229
Parents: 1b1e785
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Jan 11 11:45:36 2018 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Jan 11 11:45:36 2018 +0000
----------------------------------------------------------------------
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 42 +++++++++++++++++++-
.../catalog/internal/BasicBrooklynCatalog.java | 14 ++++---
2 files changed, 50 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/26b8f4f9/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
index e1cbbb7..0dffd28 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java
@@ -27,6 +27,7 @@ import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest;
import org.apache.brooklyn.core.config.BasicConfigKey;
import org.apache.brooklyn.core.test.policy.TestPolicy;
import org.apache.brooklyn.entity.stock.BasicEntity;
+import org.testng.Assert;
import org.testng.annotations.Test;
import com.google.common.collect.Iterables;
@@ -43,6 +44,28 @@ public class CatalogYamlPolicyTest extends AbstractYamlTest {
RegisteredType item = mgmt().getTypeRegistry().get(symbolicName, TEST_VERSION);
assertEquals(item.getSymbolicName(), symbolicName);
+ Assert.assertNotNull(item.getDisplayName());
+ Assert.assertNotNull(item.getIconUrl());
+ Assert.assertNotNull(item.getDescription());
+ assertEquals(countCatalogPolicies(), 1);
+
+ deleteCatalogEntity(symbolicName);
+ }
+
+ @Test
+ public void testAddCatalogItemDetailsFromItemNotMetadata() throws Exception {
+ assertEquals(countCatalogPolicies(), 0);
+
+ String symbolicName = "my.catalog.policy.id.load";
+ addCatalogPolicyDetailsFromItemNotMetadata(symbolicName, POLICY_TYPE);
+
+ RegisteredType item = mgmt().getTypeRegistry().get(symbolicName, TEST_VERSION);
+ assertEquals(item.getSymbolicName(), symbolicName);
+ Assert.assertNotNull(item.getDisplayName());
+ Assert.assertNotNull(item.getDescription());
+ // prior to 2018-01 the above could come from either but icon for policy could only come from metadata;
+ // fixed by the other change made in the same commit as this test and comment
+ Assert.assertNotNull(item.getIconUrl());
assertEquals(countCatalogPolicies(), 1);
deleteCatalogEntity(symbolicName);
@@ -146,8 +169,25 @@ public class CatalogYamlPolicyTest extends AbstractYamlTest {
" itemType: policy",
" name: My Catalog Policy",
" description: My description",
- " icon_url: classpath://path/to/myicon.jpg",
+ " iconUrl: classpath://path/to/myicon.jpg",
+ " item:",
+ " type: " + policyType,
+ " brooklyn.config:",
+ " config1: config1",
+ " config2: config2");
+ }
+
+ private void addCatalogPolicyDetailsFromItemNotMetadata(String symbolicName, String policyType) {
+ // name, description, and icon can be set in the item _or_ in metadata
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " id: " + symbolicName,
+ " version: " + TEST_VERSION,
+ " itemType: policy",
" item:",
+ " name: My Catalog Policy",
+ " description: My description",
+ " iconUrl: classpath://path/to/myicon.jpg",
" type: " + policyType,
" brooklyn.config:",
" config1: config1",
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/26b8f4f9/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 2b6d169..6ab68c2 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
@@ -907,7 +907,8 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
description = setFromItemIfUnset(description, itemAsMap, "description");
// icon.url is discouraged (using '.'), but kept for legacy compatibility; should deprecate this
- final String catalogIconUrl = getFirstAs(catalogMetadata, String.class, "iconUrl", "icon_url", "icon.url").orNull();
+ String catalogIconUrl = getFirstAs(catalogMetadata, String.class, "iconUrl", "icon_url", "icon.url").orNull();
+ catalogIconUrl = setFromItemIfUnset(catalogIconUrl, itemAsMap, "iconUrl", "icon_url", "icon.url");
final String deprecated = getFirstAs(catalogMetadata, String.class, "deprecated").orNull();
final Boolean catalogDeprecated = Boolean.valueOf(deprecated);
@@ -1088,12 +1089,15 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
throw new UserFacingException("Expected "+JavaClassNames.superSimpleClassName(type)+" for "+description+", not "+JavaClassNames.superSimpleClassName(x));
}
- private String setFromItemIfUnset(String oldValue, Map<?,?> item, String fieldAttr) {
+ private String setFromItemIfUnset(String oldValue, Map<?,?> item, String ...fieldAttrs) {
if (Strings.isNonBlank(oldValue)) return oldValue;
if (item!=null) {
- Object newValue = item.get(fieldAttr);
- if (newValue instanceof String && Strings.isNonBlank((String)newValue))
- return (String)newValue;
+ for (String fieldAttr: fieldAttrs) {
+ Object newValue = item.get(fieldAttr);
+ if (newValue instanceof String && Strings.isNonBlank((String)newValue)) {
+ return (String)newValue;
+ }
+ }
}
return oldValue;
}