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 2017/02/15 11:56:00 UTC
[06/10] brooklyn-server git commit: add DSL support for config and
attributeWhenReady to take functional arguments
add DSL support for config and attributeWhenReady to take functional arguments
implementing several of the tests marked WIP
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b70346cc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b70346cc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b70346cc
Branch: refs/heads/master
Commit: b70346cc6fd6c7a898305157082565e527649104
Parents: db14c5e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Jan 17 18:10:33 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Jan 17 18:10:33 2017 +0000
----------------------------------------------------------------------
.../spi/dsl/methods/BrooklynDslCommon.java | 35 +++++---
.../brooklyn/spi/dsl/methods/DslComponent.java | 85 ++++++++++++++------
.../camp/brooklyn/spi/dsl/DslYamlTest.java | 8 +-
.../brooklyn/util/core/task/ValueResolver.java | 2 +-
4 files changed, 90 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b70346cc/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
index a6774d4..4491097 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/BrooklynDslCommon.java
@@ -122,26 +122,26 @@ public class BrooklynDslCommon {
}
// prefer the syntax above to the below now, but not deprecating the below
@DslAccessible
- public static DslComponent component(String id) {
+ public static DslComponent component(Object id) {
return component("global", id);
}
@DslAccessible
- public static DslComponent component(String scope, String id) {
+ public static DslComponent component(String scope, Object id) {
if (!DslComponent.Scope.isValid(scope)) {
throw new IllegalArgumentException(scope + " is not a valid scope");
}
- return new DslComponent(DslComponent.Scope.fromString(scope), id);
+ return DslComponent.newInstance(DslComponent.Scope.fromString(scope), id);
}
// Access things on entities
@DslAccessible
- public static BrooklynDslDeferredSupplier<?> config(String keyName) {
+ public static BrooklynDslDeferredSupplier<?> config(Object keyName) {
return new DslComponent(Scope.THIS, "").config(keyName);
}
@DslAccessible
- public static BrooklynDslDeferredSupplier<?> config(BrooklynObjectInternal obj, String keyName) {
+ public static BrooklynDslDeferredSupplier<?> config(BrooklynObjectInternal obj, Object keyName) {
return new DslBrooklynObjectConfigSupplier(obj, keyName);
}
@@ -150,9 +150,9 @@ public class BrooklynDslCommon {
// Keep in mind this object gets serialized so is the following reference
private BrooklynObjectInternal obj;
- private String keyName;
+ private Object keyName;
- public DslBrooklynObjectConfigSupplier(BrooklynObjectInternal obj, String keyName) {
+ public DslBrooklynObjectConfigSupplier(BrooklynObjectInternal obj, Object keyName) {
checkNotNull(obj, "obj");
checkNotNull(keyName, "keyName");
@@ -160,6 +160,19 @@ public class BrooklynDslCommon {
this.keyName = keyName;
}
+ protected String resolveKeyName(boolean immediately) {
+ if (keyName instanceof String) {
+ return (String)keyName;
+ }
+
+ return Tasks.resolving(keyName)
+ .as(String.class)
+ .context(DslComponent.findExecutionContext(this))
+ .immediately(immediately)
+ .description("Resolving key name from " + keyName)
+ .get();
+ }
+
@Override
public Maybe<Object> getImmediately() {
if (obj instanceof Entity) {
@@ -167,7 +180,8 @@ public class BrooklynDslCommon {
// Just in case check whether it's same app for entities.
checkState(entity().getApplicationId().equals(((Entity)obj).getApplicationId()));
}
- ConfigKey<Object> key = ConfigKeys.newConfigKey(Object.class, keyName);
+ String keyNameS = resolveKeyName(true);
+ ConfigKey<Object> key = ConfigKeys.newConfigKey(Object.class, keyNameS);
Maybe<? extends Object> result = ((AbstractConfigurationSupportInternal)obj.config()).getNonBlocking(key);
return Maybe.<Object>cast(result);
}
@@ -181,7 +195,8 @@ public class BrooklynDslCommon {
.body(new Callable<Object>() {
@Override
public Object call() throws Exception {
- ConfigKey<Object> key = ConfigKeys.newConfigKey(Object.class, keyName);
+ String keyNameS = resolveKeyName(true);
+ ConfigKey<Object> key = ConfigKeys.newConfigKey(Object.class, keyNameS);
return obj.getConfig(key);
}})
.build();
@@ -208,7 +223,7 @@ public class BrooklynDslCommon {
}
@DslAccessible
- public static BrooklynDslDeferredSupplier<?> attributeWhenReady(String sensorName) {
+ public static BrooklynDslDeferredSupplier<?> attributeWhenReady(Object sensorName) {
return new DslComponent(Scope.THIS, "").attributeWhenReady(sensorName);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b70346cc/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
index 7484c3f..06716e8 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
@@ -318,17 +318,21 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> implements
}
private ExecutionContext getExecutionContext() {
- EntityInternal contextEntity = (EntityInternal) BrooklynTaskTags.getTargetOrContextEntity(Tasks.current());
- ExecutionContext execContext =
- (contextEntity != null) ? contextEntity.getExecutionContext()
- : BasicExecutionContext.getCurrentExecutionContext();
- if (execContext == null) {
- throw new IllegalStateException("No execution context available to resolve " + toString());
- }
- return execContext;
+ return findExecutionContext(this);
}
}
-
+
+ static ExecutionContext findExecutionContext(Object callerContext) {
+ EntityInternal contextEntity = (EntityInternal) BrooklynTaskTags.getTargetOrContextEntity(Tasks.current());
+ ExecutionContext execContext =
+ (contextEntity != null) ? contextEntity.getExecutionContext()
+ : BasicExecutionContext.getCurrentExecutionContext();
+ if (execContext == null) {
+ throw new IllegalStateException("No execution context available to resolve " + callerContext);
+ }
+ return execContext;
+ }
+
// -------------------------------
// DSL words which move to a new component
@@ -433,28 +437,42 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> implements
}
@DslAccessible
- public BrooklynDslDeferredSupplier<?> attributeWhenReady(final String sensorName) {
- return new AttributeWhenReady(this, sensorName);
+ public BrooklynDslDeferredSupplier<?> attributeWhenReady(final Object sensorNameOrSupplier) {
+ return new AttributeWhenReady(this, sensorNameOrSupplier);
}
protected static class AttributeWhenReady extends BrooklynDslDeferredSupplier<Object> {
private static final long serialVersionUID = 1740899524088902383L;
private final DslComponent component;
- private final String sensorName;
+ private final Object sensorName;
- public AttributeWhenReady(DslComponent component, String sensorName) {
+ public AttributeWhenReady(DslComponent component, Object sensorName) {
this.component = Preconditions.checkNotNull(component);
this.sensorName = sensorName;
}
+ protected String resolveSensorName(boolean immediately) {
+ if (sensorName instanceof String) {
+ return (String)sensorName;
+ }
+
+ return Tasks.resolving(sensorName)
+ .as(String.class)
+ .context(findExecutionContext(this))
+ .immediately(immediately)
+ .description("Resolving sensorName from " + sensorName)
+ .get();
+ }
+
@Override
public final Maybe<Object> getImmediately() {
Maybe<Entity> targetEntityMaybe = component.getImmediately();
if (targetEntityMaybe.isAbsent()) return Maybe.absent("Target entity not available");
Entity targetEntity = targetEntityMaybe.get();
- AttributeSensor<?> targetSensor = (AttributeSensor<?>) targetEntity.getEntityType().getSensor(sensorName);
+ String sensorNameS = resolveSensorName(true);
+ AttributeSensor<?> targetSensor = (AttributeSensor<?>) targetEntity.getEntityType().getSensor(sensorNameS);
if (targetSensor == null) {
- targetSensor = Sensors.newSensor(Object.class, sensorName);
+ targetSensor = Sensors.newSensor(Object.class, sensorNameS);
}
Object result = targetEntity.sensors().get(targetSensor);
return GroovyJavaMethods.truth(result) ? Maybe.of(result) : Maybe.absent();
@@ -464,9 +482,11 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> implements
@Override
public Task<Object> newTask() {
Entity targetEntity = component.get();
- Sensor<?> targetSensor = targetEntity.getEntityType().getSensor(sensorName);
+
+ String sensorNameS = resolveSensorName(false);
+ Sensor<?> targetSensor = targetEntity.getEntityType().getSensor(sensorNameS);
if (!(targetSensor instanceof AttributeSensor<?>)) {
- targetSensor = Sensors.newSensor(Object.class, sensorName);
+ targetSensor = Sensors.newSensor(Object.class, sensorNameS);
}
return (Task<Object>) DependentConfiguration.attributeWhenReady(targetEntity, (AttributeSensor<?>)targetSensor);
}
@@ -490,27 +510,41 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> implements
}
@DslAccessible
- public BrooklynDslDeferredSupplier<?> config(final String keyName) {
- return new DslConfigSupplier(this, keyName);
+ public BrooklynDslDeferredSupplier<?> config(final Object keyNameOrSupplier) {
+ return new DslConfigSupplier(this, keyNameOrSupplier);
}
protected final static class DslConfigSupplier extends BrooklynDslDeferredSupplier<Object> {
private final DslComponent component;
- private final String keyName;
+ private final Object keyName;
private static final long serialVersionUID = -4735177561947722511L;
- public DslConfigSupplier(DslComponent component, String keyName) {
+ public DslConfigSupplier(DslComponent component, Object keyName) {
this.component = Preconditions.checkNotNull(component);
this.keyName = keyName;
}
+ protected String resolveKeyName(boolean immediately) {
+ if (keyName instanceof String) {
+ return (String)keyName;
+ }
+
+ return Tasks.resolving(keyName)
+ .as(String.class)
+ .context(findExecutionContext(this))
+ .immediately(immediately)
+ .description("Resolving key name from " + keyName)
+ .get();
+ }
+
@Override
public final Maybe<Object> getImmediately() {
Maybe<Entity> targetEntityMaybe = component.getImmediately();
if (targetEntityMaybe.isAbsent()) return Maybe.absent("Target entity not available");
EntityInternal targetEntity = (EntityInternal) targetEntityMaybe.get();
- ConfigKey<?> key = targetEntity.getEntityType().getConfigKey(keyName);
- Maybe<? extends Object> result = targetEntity.config().getNonBlocking(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
+ String keyNameS = resolveKeyName(true);
+ ConfigKey<?> key = targetEntity.getEntityType().getConfigKey(keyNameS);
+ Maybe<? extends Object> result = targetEntity.config().getNonBlocking(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyNameS));
return Maybe.<Object>cast(result);
}
@@ -524,8 +558,9 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> implements
@Override
public Object call() throws Exception {
Entity targetEntity = component.get();
- ConfigKey<?> key = targetEntity.getEntityType().getConfigKey(keyName);
- return targetEntity.getConfig(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
+ String keyNameS = resolveKeyName(true);
+ ConfigKey<?> key = targetEntity.getEntityType().getConfigKey(keyNameS);
+ return targetEntity.getConfig(key != null ? key : ConfigKeys.newConfigKey(Object.class, keyNameS));
}})
.build();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b70346cc/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
index be4e9d5..5eba70a 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java
@@ -290,7 +290,7 @@ public class DslYamlTest extends AbstractYamlTest {
assertEquals(getConfigEventually(app, DEST), "myvalue");
}
- @Test(groups="WIP") // config accepts strings only, no suppliers
+ @Test
public void testDslConfigWithDeferredArg() throws Exception {
final Entity app = createAndStartApplication(
"services:",
@@ -302,7 +302,7 @@ public class DslYamlTest extends AbstractYamlTest {
assertEquals(getConfigEventually(app, DEST), "myvalue");
}
- @Test(groups="WIP") // config accepts strings only, no suppliers
+ @Test
public void testDslConfigOnEntityWithDeferredArg() throws Exception {
final Entity app = createAndStartApplication(
"services:",
@@ -352,7 +352,7 @@ public class DslYamlTest extends AbstractYamlTest {
assertEquals(getConfigEventually(app, DEST), "myvalue");
}
- @Test(groups="WIP") // attributeWhenReady accepts strings only, no suppliers
+ @Test
public void testDslAttributeWhenReadyWithDeferredArg() throws Exception {
final Entity app = createAndStartApplication(
"services:",
@@ -368,7 +368,7 @@ public class DslYamlTest extends AbstractYamlTest {
assertEquals(getConfigEventually(app, DEST), "myvalue");
}
- @Test(groups="WIP") // attributeWhenReady accepts strings only, no suppliers
+ @Test
public void testDslAttributeWhenReadyOnEntityWithDeferredArg() throws Exception {
final Entity app = createAndStartApplication(
"services:",
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b70346cc/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
index 3b00252..5ebe5db 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java
@@ -322,7 +322,7 @@ public class ValueResolver<T> implements DeferredSupplier<T> {
if (timerU==null && timeout!=null)
timerU = timeout.countdownTimer();
final CountdownTimer timer = timerU;
- if (timer!=null && !timer.isRunning())
+ if (timer!=null && !timer.isNotPaused())
timer.start();
checkTypeNotNull();