Add a map based way to initialize SimpleInstanceEnabler.

eclipse-leshan · Dec 30, 2019 · bb159bf · bb159bf
1 parent 226e924
commit bb159bf
Showing 1 changed file with 58 additions and 25 deletions.
diff --git a/...n-client-core/src/main/java/org/eclipse/leshan/client/resource/SimpleInstanceEnabler.java b/...n-client-core/src/main/java/org/eclipse/leshan/client/resource/SimpleInstanceEnabler.java
@@ -36,6 +36,7 @@
 public class SimpleInstanceEnabler extends BaseInstanceEnabler {
 
     protected Map<Integer, LwM2mResource> resources = new HashMap<>();
+    protected Map<Integer, Object> initialValues;
 
     public SimpleInstanceEnabler() {
     }
@@ -44,6 +45,23 @@ public SimpleInstanceEnabler(int id) {
         super(id);
     }
 
+    public SimpleInstanceEnabler(int id, Map<Integer, Object> initialValues) {
+        super(id);
+        this.initialValues = initialValues;
+    }
+
+    public SimpleInstanceEnabler(int id, Object... initialValues) {
+        super(id);
+        if (initialValues.length % 2 == 1)
+            throw new IllegalArgumentException("initialValues length must be even, as this is a list of ID/value");
+        if (initialValues.length > 0) {
+            this.initialValues = new HashMap<>(initialValues.length / 2);
+            for (int i = 0; i < initialValues.length; i = i + 2) {
+                this.initialValues.put((Integer) initialValues[i], initialValues[i + 1]);
+            }
+        }
+    }
+
     @Override
     public ReadResponse read(ServerIdentity identity, int resourceid) {
         if (resources.containsKey(resourceid)) {
@@ -94,35 +112,50 @@ protected LwM2mResource initializeResource(ObjectModel objectModel, ResourceMode
     }
 
     protected LwM2mSingleResource initializeSingleResource(ObjectModel objectModel, ResourceModel resourceModel) {
-        switch (resourceModel.type) {
-        case STRING:
-            return LwM2mSingleResource.newStringResource(resourceModel.id,
-                    createDefaultStringValueFor(objectModel, resourceModel));
-        case BOOLEAN:
-            return LwM2mSingleResource.newBooleanResource(resourceModel.id,
-                    createDefaultBooleanValueFor(objectModel, resourceModel));
-        case INTEGER:
-            return LwM2mSingleResource.newIntegerResource(resourceModel.id,
-                    createDefaultIntegerValueFor(objectModel, resourceModel));
-        case FLOAT:
-            return LwM2mSingleResource.newFloatResource(resourceModel.id,
-                    createDefaultFloatValueFor(objectModel, resourceModel));
-        case TIME:
-            return LwM2mSingleResource.newDateResource(resourceModel.id,
-                    createDefaultDateValueFor(objectModel, resourceModel));
-        case OPAQUE:
-            return LwM2mSingleResource.newBinaryResource(resourceModel.id,
-                    createDefaultOpaqueValueFor(objectModel, resourceModel));
-        default:
-            // this should not happened
-            return null;
+        if (initialValues != null) {
+            Object initialValue = initialValues.get(resourceModel.id);
+            if (initialValue == null)
+                return null;
+            return LwM2mSingleResource.newResource(resourceModel.id, initialValue, resourceModel.type);
+        } else {
+            switch (resourceModel.type) {
+            case STRING:
+                return LwM2mSingleResource.newStringResource(resourceModel.id,
+                        createDefaultStringValueFor(objectModel, resourceModel));
+            case BOOLEAN:
+                return LwM2mSingleResource.newBooleanResource(resourceModel.id,
+                        createDefaultBooleanValueFor(objectModel, resourceModel));
+            case INTEGER:
+                return LwM2mSingleResource.newIntegerResource(resourceModel.id,
+                        createDefaultIntegerValueFor(objectModel, resourceModel));
+            case FLOAT:
+                return LwM2mSingleResource.newFloatResource(resourceModel.id,
+                        createDefaultFloatValueFor(objectModel, resourceModel));
+            case TIME:
+                return LwM2mSingleResource.newDateResource(resourceModel.id,
+                        createDefaultDateValueFor(objectModel, resourceModel));
+            case OPAQUE:
+                return LwM2mSingleResource.newBinaryResource(resourceModel.id,
+                        createDefaultOpaqueValueFor(objectModel, resourceModel));
+            default:
+                // this should not happened
+                return null;
+            }
         }
     }
 
     protected LwM2mMultipleResource initializeMultipleResource(ObjectModel objectModel, ResourceModel resourceModel) {
-        // no default value
-        Map<Integer, ?> emptyMap = Collections.emptyMap();
-        return LwM2mMultipleResource.newResource(resourceModel.id, emptyMap, resourceModel.type);
+        if (initialValues != null) {
+            @SuppressWarnings("unchecked")
+            Map<Integer, ?> initialValue = (Map<Integer, ?>) initialValues.get(resourceModel.id);
+            if (initialValue == null)
+                return null;
+            return LwM2mMultipleResource.newResource(resourceModel.id, initialValue, resourceModel.type);
+        } else {
+            // no default value
+            Map<Integer, ?> emptyMap = Collections.emptyMap();
+            return LwM2mMultipleResource.newResource(resourceModel.id, emptyMap, resourceModel.type);
+        }
     }
 
     protected String createDefaultStringValueFor(ObjectModel objectModel, ResourceModel resourceModel) {