This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new 55b351b make the DSL classes public so others can inspect them
55b351b is described below
commit 55b351b0e3f3a7c1b29bb6d90d6bf9cb9ad87b9d
Author: Alex Heneveld <[email protected]>
AuthorDate: Tue Mar 9 01:32:50 2021 +0000
make the DSL classes public so others can inspect them
---
.../spi/dsl/methods/BrooklynDslCommon.java | 52 ++++++++++++++--
.../brooklyn/spi/dsl/methods/DslComponent.java | 70 +++++++++++++++++++---
2 files changed, 111 insertions(+), 11 deletions(-)
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 8a0ab07..91b85a1 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
@@ -183,6 +183,14 @@ public class BrooklynDslCommon {
this.keyName = keyName;
}
+ public BrooklynObjectInternal getObj() {
+ return obj;
+ }
+
+ public Object getKeyName() {
+ return keyName;
+ }
+
protected String resolveKeyName(boolean immediately) {
if (keyName instanceof String) {
return (String)keyName;
@@ -393,6 +401,14 @@ public class BrooklynDslCommon {
this.literalObjectJson = input instanceof String ? null :
Jsonya.render(input);
}
+ public String getLiteralObjectJson() {
+ return literalObjectJson;
+ }
+
+ public String getLiteralString() {
+ return literalString;
+ }
+
@Override
public Task<Object> newTask() {
return Tasks.builder().displayName("DSL literal value")
@@ -508,7 +524,7 @@ public class BrooklynDslCommon {
*
* @see DependentConfiguration#formatString(Object, Object...)
*/
- protected static class DslFormatString extends
BrooklynDslDeferredSupplier<String> {
+ public static class DslFormatString extends
BrooklynDslDeferredSupplier<String> {
private static final long serialVersionUID = -4849297712650560863L;
@@ -520,6 +536,14 @@ public class BrooklynDslCommon {
this.args = args;
}
+ public Object getPattern() {
+ return pattern;
+ }
+
+ public Object[] getArgs() {
+ return args;
+ }
+
@Override @JsonIgnore
public final Maybe<String> getImmediately() {
return DependentConfiguration.formatStringImmediately(pattern,
args);
@@ -550,7 +574,7 @@ public class BrooklynDslCommon {
}
}
- protected static class DslRegexReplacement extends
BrooklynDslDeferredSupplier<String> {
+ public static class DslRegexReplacement extends
BrooklynDslDeferredSupplier<String> {
private static final long serialVersionUID = 737189899361183341L;
@@ -564,6 +588,18 @@ public class BrooklynDslCommon {
this.source = source;
}
+ public Object getSource() {
+ return source;
+ }
+
+ public Object getPattern() {
+ return pattern;
+ }
+
+ public Object getReplacement() {
+ return replacement;
+ }
+
@Override @JsonIgnore
public Maybe<String> getImmediately() {
return DependentConfiguration.regexReplacementImmediately(source,
pattern, replacement);
@@ -605,7 +641,7 @@ public class BrooklynDslCommon {
}
/** Deferred execution of Object creation. */
- protected static class DslObject extends
BrooklynDslDeferredSupplier<Object> {
+ public static class DslObject extends BrooklynDslDeferredSupplier<Object> {
private static final long serialVersionUID = 8878388748085419L;
@@ -856,7 +892,7 @@ public class BrooklynDslCommon {
public static DslExternal external(final String providerName, final String
key) {
return new DslExternal(providerName, key);
}
- protected final static class DslExternal extends
BrooklynDslDeferredSupplier<Object> {
+ public final static class DslExternal extends
BrooklynDslDeferredSupplier<Object> {
private static final long serialVersionUID = -3860334240490397057L;
private final String providerName;
private final String key;
@@ -866,6 +902,14 @@ public class BrooklynDslCommon {
this.key = key;
}
+ public String getProviderName() {
+ return providerName;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
@Override @JsonIgnore
public final Maybe<Object> getImmediately() {
// Note this call to getConfig() is different from
entity.getConfig.
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 cf2b886..6226415 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
@@ -187,7 +187,19 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
public Scope getScope() {
return scope;
}
-
+
+ public DeferredSupplier<?> getComponentIdSupplier() {
+ return componentIdSupplier;
+ }
+
+ public String getComponentId() {
+ return componentId;
+ }
+
+ public DslComponent getScopeComponent() {
+ return scopeComponent;
+ }
+
@Override @JsonIgnore
public final Maybe<Entity> getImmediately() {
return new EntityInScopeFinder(scopeComponent, scope, componentId,
componentIdSupplier).getImmediately();
@@ -465,7 +477,7 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
public BrooklynDslDeferredSupplier<?> attributeWhenReady(final Object
sensorNameOrSupplier) {
return new AttributeWhenReady(this, sensorNameOrSupplier);
}
- protected static class AttributeWhenReady extends
BrooklynDslDeferredSupplier<Object> {
+ public static class AttributeWhenReady extends
BrooklynDslDeferredSupplier<Object> {
private static final long serialVersionUID = 1740899524088902383L;
private final DslComponent component;
@XStreamConverter(ObjectWithDefaultStringImplConverter.class)
@@ -481,6 +493,14 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
this.sensorName = sensorName;
}
+ public Object getSensorName() {
+ return sensorName;
+ }
+
+ public DslComponent getComponent() {
+ return component;
+ }
+
protected String resolveSensorName(boolean immediately) {
if (sensorName instanceof String) {
return (String)sensorName;
@@ -544,7 +564,7 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
public BrooklynDslDeferredSupplier<?> config(final Object
keyNameOrSupplier) {
return new DslConfigSupplier(this, keyNameOrSupplier);
}
- protected final static class DslConfigSupplier extends
BrooklynDslDeferredSupplier<Object> {
+ public final static class DslConfigSupplier extends
BrooklynDslDeferredSupplier<Object> {
private final DslComponent component;
@XStreamConverter(ObjectWithDefaultStringImplConverter.class)
private final Object keyName;
@@ -560,6 +580,14 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
this.keyName = keyName;
}
+ public Object getKeyName() {
+ return keyName;
+ }
+
+ public DslComponent getComponent() {
+ return component;
+ }
+
protected String resolveKeyName(boolean immediately) {
if (keyName instanceof String) {
return (String)keyName;
@@ -647,7 +675,7 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
public BrooklynDslDeferredSupplier<Sensor<?>> sensor(final Object
sensorIndicator) {
return new DslSensorSupplier(this, sensorIndicator);
}
- protected final static class DslSensorSupplier extends
BrooklynDslDeferredSupplier<Sensor<?>> {
+ public final static class DslSensorSupplier extends
BrooklynDslDeferredSupplier<Sensor<?>> {
private final DslComponent component;
@XStreamConverter(ObjectWithDefaultStringImplConverter.class)
private final Object sensorName;
@@ -658,6 +686,14 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
this.sensorName = sensorIndicator;
}
+ public Object getSensorName() {
+ return sensorName;
+ }
+
+ public DslComponent getComponent() {
+ return component;
+ }
+
@Override @JsonIgnore
public Maybe<Sensor<?>> getImmediately() {
return getImmediately(sensorName, false);
@@ -751,7 +787,7 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
return new DslLocationSupplier(this, index);
}
- protected final static class DslLocationSupplier extends
BrooklynDslDeferredSupplier<Object> {
+ public final static class DslLocationSupplier extends
BrooklynDslDeferredSupplier<Object> {
private static final long serialVersionUID = 5597335296158584040L;
private final DslComponent component;
private final Object index;
@@ -761,6 +797,14 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
this.index = index;
}
+ public Object getIndex() {
+ return index;
+ }
+
+ public DslComponent getComponent() {
+ return component;
+ }
+
@Override @JsonIgnore
public final Maybe<Object> getImmediately() {
Callable<Object> job = new Callable<Object>() {
@@ -874,7 +918,7 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
return new DslTemplate(this, template, substitutions);
}
- protected final static class DslTemplate extends
BrooklynDslDeferredSupplier<Object> {
+ public final static class DslTemplate extends
BrooklynDslDeferredSupplier<Object> {
private static final long serialVersionUID = -585564936781673667L;
private DslComponent component;
private Object template;
@@ -889,7 +933,19 @@ public class DslComponent extends
BrooklynDslDeferredSupplier<Entity> implements
this.template = template;
this.substitutions = substitutions;
}
-
+
+ public DslComponent getComponent() {
+ return component;
+ }
+
+ public Object getTemplate() {
+ return template;
+ }
+
+ public Map<?, ?> getSubstitutions() {
+ return substitutions;
+ }
+
private String resolveTemplate(boolean immediately) {
if (template instanceof String) {
return (String)template;
