You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/11/29 13:40:17 UTC
[03/13] brooklyn-server git commit: Test+fix yaml config param
overriding java configKey
Test+fix yaml config param overriding java configKey
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/dba74943
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/dba74943
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/dba74943
Branch: refs/heads/master
Commit: dba74943bae5b86c6fe6e7d145e2c20dce58dd9b
Parents: 5d2d9b3
Author: Aled Sage <al...@gmail.com>
Authored: Wed Nov 16 21:36:16 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Nov 28 21:11:48 2016 +0000
----------------------------------------------------------------------
.../camp/brooklyn/ConfigParametersYamlTest.java | 25 ++++++++++++++++++++
.../brooklyn/core/objs/BasicSpecParameter.java | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dba74943/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
index 2f655c6..79ab2a4 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java
@@ -109,7 +109,32 @@ public class ConfigParametersYamlTest extends AbstractYamlRebindTest {
assertKeyEquals(newEntity, "testConfigParametersListedInType.mykey", "myDescription", String.class, "myDefaultVal", "myOverridingVal");
}
+ @Test
+ public void testConfigParameterOverridingJavaListedInType() throws Exception {
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " itemType: entity",
+ " items:",
+ " - id: entity-with-keys",
+ " item:",
+ " type: "+TestEntity.class.getName(),
+ " brooklyn.parameters:",
+ " - name: " + TestEntity.CONF_NAME.getName(),
+ " description: myDescription",
+ " type: String",
+ " default: myDefaultYamlVal");
+
+ String yaml = Joiner.on("\n").join(
+ "services:",
+ "- type: entity-with-keys");
+
+ Entity app = createStartWaitAndLogApplication(yaml);
+ TestEntity entity = (TestEntity) Iterables.getOnlyElement(app.getChildren());
+ // Check config key is listed
+ assertKeyEquals(entity, TestEntity.CONF_NAME.getName(), "myDescription", String.class, "myDefaultYamlVal", "myDefaultYamlVal");
+ }
+
@Test
public void testConfigParametersListedInType() throws Exception {
addCatalogItems(
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dba74943/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java b/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
index 82b29fb..cc9d66a 100644
--- a/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
+++ b/core/src/main/java/org/apache/brooklyn/core/objs/BasicSpecParameter.java
@@ -118,7 +118,7 @@ public class BasicSpecParameter<T> implements SpecParameter<T>{
@Override
public int hashCode() {
- return Objects.hashCode(label, pinned, configKey);
+ return Objects.hashCode(configKey);
}
@Override