You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/11/11 19:32:38 UTC
[2/5] incubator-brooklyn git commit: Set sensible defaults for senor
addition
Set sensible defaults for senor addition
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/82852975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/82852975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/82852975
Branch: refs/heads/master
Commit: 828529750dc0d4f655af1e7805bac97acfeefc59
Parents: 523856b
Author: Andrew Kennedy <gr...@apache.org>
Authored: Fri Nov 7 22:21:12 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Sat Nov 8 00:38:33 2014 +0000
----------------------------------------------------------------------
.../brooklyn/entity/effector/AddSensor.java | 26 +++++++++++---------
.../entity/software/http/HttpRequestSensor.java | 3 +++
.../entity/software/ssh/SshCommandSensor.java | 3 +++
3 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/82852975/core/src/main/java/brooklyn/entity/effector/AddSensor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/effector/AddSensor.java b/core/src/main/java/brooklyn/entity/effector/AddSensor.java
index cdaa5df..3dfa91b 100644
--- a/core/src/main/java/brooklyn/entity/effector/AddSensor.java
+++ b/core/src/main/java/brooklyn/entity/effector/AddSensor.java
@@ -42,8 +42,8 @@ import com.google.common.base.Preconditions;
public class AddSensor<RT,T extends Sensor<RT>> implements EntityInitializer {
protected final T sensor;
public static final ConfigKey<String> SENSOR_NAME = ConfigKeys.newStringConfigKey("name");
- public static final ConfigKey<Duration> SENSOR_PERIOD = ConfigKeys.newConfigKey(Duration.class, "period", "Period, including units e.g. 1m or 5s or 200ms");
- public static final ConfigKey<String> SENSOR_TYPE = ConfigKeys.newStringConfigKey("targetType", "Target type for the value", "string");
+ public static final ConfigKey<Duration> SENSOR_PERIOD = ConfigKeys.newConfigKey(Duration.class, "period", "Period, including units e.g. 1m or 5s or 200ms; default 5 minutes", Duration.FIVE_MINUTES);
+ public static final ConfigKey<String> SENSOR_TYPE = ConfigKeys.newStringConfigKey("targetType", "Target type for the value; default String", "String");
public AddSensor(T sensor) {
this.sensor = Preconditions.checkNotNull(sensor, "sensor");
@@ -55,13 +55,13 @@ public class AddSensor<RT,T extends Sensor<RT>> implements EntityInitializer {
}
public static <T> AttributeSensor<T> newSensor(Class<T> type, ConfigBag params){
- String name = Preconditions.checkNotNull(params.get(SENSOR_NAME), "name must be supplied when defining a sensor");
+ String name = Preconditions.checkNotNull(params.get(SENSOR_NAME), "Name must be supplied when defining a sensor");
return Sensors.newSensor(type, name);
}
@SuppressWarnings("unchecked")
public static <T> AttributeSensor<T> newSensor(ConfigBag params) {
- String name = Preconditions.checkNotNull(params.get(SENSOR_NAME), "name must be supplied when defining a sensor");
+ String name = Preconditions.checkNotNull(params.get(SENSOR_NAME), "Name must be supplied when defining a sensor");
String className = getFullClassName(params.get(SENSOR_TYPE));
Class<T> type = null;
@@ -74,21 +74,23 @@ public class AddSensor<RT,T extends Sensor<RT>> implements EntityInitializer {
}
private static String getFullClassName(String className) {
- if(className.equalsIgnoreCase("string")){
+ if (className.equalsIgnoreCase("string")) {
return "java.lang.String";
- }else if(className.equalsIgnoreCase("int") || className.equalsIgnoreCase("integer")){
+ } else if (className.equalsIgnoreCase("int") || className.equalsIgnoreCase("integer")) {
return "java.lang.Integer";
- }else if(className.equalsIgnoreCase("long")){
+ } else if (className.equalsIgnoreCase("long")) {
return "java.lang.Long";
- }else if(className.equalsIgnoreCase("float")){
+ } else if (className.equalsIgnoreCase("float")) {
return "java.lang.Float";
- }else if(className.equalsIgnoreCase("double")){
+ } else if (className.equalsIgnoreCase("double")) {
return "java.lang.Double";
- }else if(className.equalsIgnoreCase("bool") || className.equalsIgnoreCase("boolean")){
+ } else if (className.equalsIgnoreCase("bool") || className.equalsIgnoreCase("boolean")) {
return "java.lang.Boolean";
- }else if(className.equalsIgnoreCase("object")){
+ } else if (className.equalsIgnoreCase("char") || className.equalsIgnoreCase("character")) {
+ return "java.lang.Character";
+ } else if (className.equalsIgnoreCase("object")) {
return "java.lang.Object";
- }else{
+ } else {
return className;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/82852975/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java b/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java
index cf78126..4c4e776 100644
--- a/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java
+++ b/software/base/src/main/java/brooklyn/entity/software/http/HttpRequestSensor.java
@@ -39,6 +39,9 @@ import java.util.Map;
/**
* Configurable {@link brooklyn.entity.proxying.EntityInitializer} which adds an HTTP sensor feed to retrieve the
* <code>JSONObject</code> from a JSON response in order to populate the sensor with the indicated <code>name</code>.
+ *
+ * @see SshCommandSensor
+ * @see JmxAttributeSensor
*/
@Beta
public final class HttpRequestSensor<T> extends AddSensor<T, AttributeSensor<T>> {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/82852975/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java
index 90a3384..56bc7d4 100644
--- a/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java
+++ b/software/base/src/main/java/brooklyn/entity/software/ssh/SshCommandSensor.java
@@ -42,6 +42,9 @@ import com.google.common.base.Supplier;
/**
* Configurable {@link EntityInitializer} which adds an SSH sensor feed running the <code>command</code> supplied
* in order to populate the sensor with the indicated <code>name</code>.
+ *
+ * @see HttpRequestSensor
+ * @see JmxAttributeSensor
*/
// generics introduced here because we might support a configurable 'targetType` parameter in future,
// with automatic casting (e.g. for ints); this way it remains compatible