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 2014/10/09 00:45:53 UTC
[3/5] git commit: YAML support for specifying entity impl
YAML support for specifying entity impl
- support was already there with `type: <concrete-class>`
- just added test
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2b9240b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2b9240b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2b9240b0
Branch: refs/heads/master
Commit: 2b9240b0a082fd4562c3c99bee6b5868b8fef6f7
Parents: 61b3621
Author: Aled Sage <al...@gmail.com>
Authored: Tue Oct 7 14:57:57 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Oct 8 23:29:49 2014 +0100
----------------------------------------------------------------------
.../BrooklynComponentTemplateResolver.java | 2 +-
.../spi/creation/BrooklynEntityMatcher.java | 2 +-
.../camp/brooklyn/EntitiesYamlTest.java | 23 ++++++++++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b9240b0/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index 5da971e..323e1a5 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -274,7 +274,7 @@ public class BrooklynComponentTemplateResolver {
planId = (String)attrs.getStringKey("id");
if (planId==null)
planId = (String) attrs.getStringKey(BrooklynCampConstants.PLAN_ID_FLAG);
-
+
if (!Strings.isBlank(name))
spec.displayName(name);
if (templateId != null)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b9240b0/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
index bd54f3e..1e4a877 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynEntityMatcher.java
@@ -135,7 +135,7 @@ public class BrooklynEntityMatcher implements PdpMatcher {
Object locations = attrs.remove("locations");
if (locations!=null)
builder.customAttribute("locations", locations);
-
+
MutableMap<Object, Object> brooklynConfig = MutableMap.of();
Object origBrooklynConfig = attrs.remove("brooklyn.config");
if (origBrooklynConfig!=null) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2b9240b0/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java
index 588faf0..8529163 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/EntitiesYamlTest.java
@@ -60,6 +60,7 @@ import brooklyn.location.Location;
import brooklyn.management.Task;
import brooklyn.management.internal.EntityManagerInternal;
import brooklyn.test.entity.TestEntity;
+import brooklyn.test.entity.TestEntityImpl;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.guava.Functionals;
@@ -738,6 +739,28 @@ public class EntitiesYamlTest extends AbstractYamlTest {
Assert.assertEquals(saying.get(Duration.TEN_SECONDS), "Hey Bob");
}
+ @Test
+ public void testEntityTypeAsImpl() throws Exception {
+ String yaml =
+ "services:"+"\n"+
+ "- type: "+CustomTestEntityImpl.class.getName()+"\n";
+
+ Entity app = createStartWaitAndLogApplication(new StringReader(yaml));
+
+ Entity testEntity = Iterables.getOnlyElement(app.getChildren());
+ assertEquals(testEntity.getEntityType().getName(), "CustomTestEntityImpl");
+ }
+
+ public static class CustomTestEntityImpl extends TestEntityImpl {
+ public CustomTestEntityImpl() {
+ System.out.println("in CustomTestEntityImpl");
+ }
+ @Override
+ protected String getEntityTypeName() {
+ return "CustomTestEntityImpl";
+ }
+ }
+
@Override
protected Logger getLogger() {
return log;