Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added a few helper methods to ArrayValue

Michael Rademaker466d85cab12b
diff --git a/model/src/main/java/org/openremote/model/value/ArrayValue.java b/model/src/main/java/org/openremote/model/value/ArrayValue.java
index 2b21021f8..9b7a818c7 100644
--- a/model/src/main/java/org/openremote/model/value/ArrayValue.java
+++ b/model/src/main/java/org/openremote/model/value/ArrayValue.java
@@ -52,10 +52,22 @@ public interface ArrayValue extends Value {
ArrayValue add(Value value);
+ ArrayValue add(String string);
+
+ ArrayValue add(double number);
+
+ ArrayValue add(boolean bool);
+
ArrayValue add(int index, Value value);
ArrayValue addAll(Value... values);
+ ArrayValue addAll(String... strings);
+
+ ArrayValue addAll(double... numbers);
+
+ ArrayValue addAll(boolean... bools);
+
ArrayValue deepCopy();
boolean contains(String string, boolean ignoreCase);
diff --git a/model/src/main/java/org/openremote/model/value/impl/ArrayValueImpl.java b/model/src/main/java/org/openremote/model/value/impl/ArrayValueImpl.java
index 99ea708b0..d623f5915 100644
--- a/model/src/main/java/org/openremote/model/value/impl/ArrayValueImpl.java
+++ b/model/src/main/java/org/openremote/model/value/impl/ArrayValueImpl.java
@@ -46,36 +46,36 @@ public class ArrayValueImpl extends ValueImpl implements ArrayValue {
@Override
public Optional<String> getString(int index) {
return get(index)
- .filter(value -> value.getType() == ValueType.STRING && value instanceof StringValue)
- .map(value -> ((StringValue) value).getString());
+ .filter(value -> value.getType() == ValueType.STRING && value instanceof StringValue)
+ .map(value -> ((StringValue) value).getString());
}
@Override
public Optional<Boolean> getBoolean(int index) {
return get(index)
- .filter(value -> value.getType() == ValueType.BOOLEAN && value instanceof BooleanValue)
- .map(value -> ((BooleanValue) value).getBoolean());
+ .filter(value -> value.getType() == ValueType.BOOLEAN && value instanceof BooleanValue)
+ .map(value -> ((BooleanValue) value).getBoolean());
}
@Override
public Optional<Double> getNumber(int index) {
return get(index)
- .filter(value -> value.getType() == ValueType.NUMBER && value instanceof NumberValue)
- .map(value -> ((NumberValue) value).getNumber());
+ .filter(value -> value.getType() == ValueType.NUMBER && value instanceof NumberValue)
+ .map(value -> ((NumberValue) value).getNumber());
}
@Override
public Optional<ArrayValue> getArray(int index) {
return get(index)
- .filter(value -> value.getType() == ValueType.ARRAY && value instanceof ArrayValue)
- .map(value -> ((ArrayValue) value));
+ .filter(value -> value.getType() == ValueType.ARRAY && value instanceof ArrayValue)
+ .map(value -> ((ArrayValue) value));
}
@Override
public Optional<ObjectValue> getObject(int index) {
return get(index)
- .filter(value -> value.getType() == ValueType.OBJECT && value instanceof ObjectValue)
- .map(value -> ((ObjectValue) value));
+ .filter(value -> value.getType() == ValueType.OBJECT && value instanceof ObjectValue)
+ .map(value -> ((ObjectValue) value));
}
@Override
@@ -140,6 +140,21 @@ public class ArrayValueImpl extends ValueImpl implements ArrayValue {
return this;
}
+ @Override
+ public ArrayValue add(String string) {
+ return add(factory.create(string));
+ }
+
+ @Override
+ public ArrayValue add(double number) {
+ return add(factory.create(number));
+ }
+
+ @Override
+ public ArrayValue add(boolean bool) {
+ return add(factory.create(bool));
+ }
+
@Override
public ArrayValue add(int index, Value value) {
values.add(index, value);
@@ -156,6 +171,36 @@ public class ArrayValueImpl extends ValueImpl implements ArrayValue {
return this;
}
+ @Override
+ public ArrayValue addAll(String... strings) {
+ if (strings != null) {
+ for (String string : strings) {
+ set(length(), factory.create(string));
+ }
+ }
+ return this;
+ }
+
+ @Override
+ public ArrayValue addAll(double... numbers) {
+ if (numbers != null) {
+ for (double number : numbers) {
+ set(length(), factory.create(number));
+ }
+ }
+ return this;
+ }
+
+ @Override
+ public ArrayValue addAll(boolean... bools) {
+ if (bools != null) {
+ for (boolean bool : bools) {
+ set(length(), factory.create(bool));
+ }
+ }
+ return this;
+ }
+
@Override
public ArrayValue deepCopy() {
return Values.<ArrayValue>parse(toJson()).orElseThrow(() -> new IllegalStateException("Error copying array value"));