Support of ObserveComposite for timestamped data on server side

eclipse-leshan · Dec 11, 2023 · aa5031c · aa5031c
1 parent ab645dd
commit aa5031c
Show file tree

Hide file tree

Showing 18 changed files with 416 additions and 36 deletions.
diff --git a/...-client-core/src/main/java/org/eclipse/leshan/client/request/DefaultDownlinkReceiver.java b/...-client-core/src/main/java/org/eclipse/leshan/client/request/DefaultDownlinkReceiver.java
@@ -367,7 +367,7 @@ public void visit(ReadCompositeRequest request) {
 
         @Override
         public void visit(ObserveCompositeRequest request) {
-            response = new ObserveCompositeResponse(code, null, errorMessage, null, null);
+            response = new ObserveCompositeResponse(code, null, errorMessage, null, null, null);
         }
 
         @Override

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mDecoder.java b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/DefaultLwM2mDecoder.java
@@ -207,8 +207,8 @@ public List<TimestampedLwM2mNode> decodeTimestampedData(byte[] content, ContentF
     }
 
     @Override
-    public TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, ContentFormat format, LwM2mModel model)
-            throws CodecException {
+    public TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, ContentFormat format, LwM2mModel model,
+            List<LwM2mPath> paths) throws CodecException {
         LOG.trace("Decoding value for format {}: {}", format, content);
 
         if (format == null) {
@@ -221,7 +221,7 @@ public TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, ContentForma
         }
 
         if (decoder instanceof TimestampedMultiNodeDecoder) {
-            return ((TimestampedMultiNodeDecoder) decoder).decodeTimestampedNodes(content, model);
+            return ((TimestampedMultiNodeDecoder) decoder).decodeTimestampedNodes(content, model, paths);
         } else if (decoder instanceof MultiNodeDecoder) {
             return new TimestampedLwM2mNodes.Builder()
                     .addNodes(((MultiNodeDecoder) decoder).decodeNodes(content, null, model)).build();

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mDecoder.java b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mDecoder.java
@@ -108,8 +108,8 @@ List<TimestampedLwM2mNode> decodeTimestampedData(byte[] content, ContentFormat f
      * @return the decoded timestamped nodes represented by {@link TimestampedLwM2mNodes}
      * @throws CodecException if content is malformed.
      */
-    TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, ContentFormat format, LwM2mModel model)
-            throws CodecException;
+    TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, ContentFormat format, LwM2mModel model,
+            List<LwM2mPath> paths) throws CodecException;
 
     /**
      * Deserializes a binary content into a list of {@link LwM2mPath}.

diff --git a/...an-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeDecoder.java b/...an-core/src/main/java/org/eclipse/leshan/core/node/codec/TimestampedMultiNodeDecoder.java
@@ -15,7 +15,10 @@
  *******************************************************************************/
 package org.eclipse.leshan.core.node.codec;
 
+import java.util.List;
+
 import org.eclipse.leshan.core.model.LwM2mModel;
+import org.eclipse.leshan.core.node.LwM2mPath;
 import org.eclipse.leshan.core.node.TimestampedLwM2mNodes;
 
 /**
@@ -33,6 +36,7 @@ public interface TimestampedMultiNodeDecoder {
      * @return the decoded timestamped nodes represented by {@link TimestampedLwM2mNodes}
      * @throws CodecException if content is malformed.
      */
-    TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, LwM2mModel model) throws CodecException;
+    TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, LwM2mModel model, List<LwM2mPath> paths)
+            throws CodecException;
 
 }
diff --git a/...an-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLDecoder.java b/...an-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLDecoder.java
@@ -193,7 +193,8 @@ public List<TimestampedLwM2mNode> decodeTimestampedData(byte[] content, LwM2mPat
     }
 
     @Override
-    public TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, LwM2mModel model) throws CodecException {
+    public TimestampedLwM2mNodes decodeTimestampedNodes(byte[] content, LwM2mModel model, List<LwM2mPath> paths)
+            throws CodecException {
         try {
             // Decode SenML pack
             SenMLPack pack = decoder.fromSenML(content);

diff --git a/...re/src/main/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponse.java b/...re/src/main/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponse.java
@@ -26,7 +26,7 @@ public class CancelCompositeObservationResponse extends ObserveCompositeResponse
 
     public CancelCompositeObservationResponse(ResponseCode code, Map<LwM2mPath, LwM2mNode> content, String errorMessage,
             Object coapResponse, CompositeObservation observation) {
-        super(code, content, errorMessage, coapResponse, observation);
+        super(code, content, errorMessage, coapResponse, observation, null);
     }
 
     @Override

diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/response/ObserveCompositeResponse.java b/leshan-core/src/main/java/org/eclipse/leshan/core/response/ObserveCompositeResponse.java
@@ -20,6 +20,7 @@
 import org.eclipse.leshan.core.ResponseCode;
 import org.eclipse.leshan.core.node.LwM2mNode;
 import org.eclipse.leshan.core.node.LwM2mPath;
+import org.eclipse.leshan.core.node.TimestampedLwM2mNodes;
 import org.eclipse.leshan.core.observation.CompositeObservation;
 
 /**
@@ -30,11 +31,13 @@
 public class ObserveCompositeResponse extends ReadCompositeResponse {
 
     protected final CompositeObservation observation;
+    protected final TimestampedLwM2mNodes timestampedValues;
 
     public ObserveCompositeResponse(ResponseCode code, Map<LwM2mPath, LwM2mNode> content, String errorMessage,
-            Object coapResponse, CompositeObservation observation) {
+            Object coapResponse, CompositeObservation observation, TimestampedLwM2mNodes timestampedValues) {
         super(code, content, errorMessage, coapResponse);
         this.observation = observation;
+        this.timestampedValues = timestampedValues;
     }
 
     public CompositeObservation getObservation() {
@@ -69,30 +72,38 @@ public boolean isValid() {
     // Syntactic sugar static constructors:
 
     public static ObserveCompositeResponse success(Map<LwM2mPath, LwM2mNode> content) {
-        return new ObserveCompositeResponse(ResponseCode.CONTENT, content, null, null, null);
+        return new ObserveCompositeResponse(ResponseCode.CONTENT, content, null, null, null, null);
+    }
+
+    public static ObserveCompositeResponse success(TimestampedLwM2mNodes timestampedValues) {
+        return new ObserveCompositeResponse(ResponseCode.CONTENT, null, null, null, null, timestampedValues);
     }
 
     public static ObserveCompositeResponse badRequest(String errorMessage) {
-        return new ObserveCompositeResponse(ResponseCode.BAD_REQUEST, null, errorMessage, null, null);
+        return new ObserveCompositeResponse(ResponseCode.BAD_REQUEST, null, errorMessage, null, null, null);
     }
 
     public static ObserveCompositeResponse notFound() {
-        return new ObserveCompositeResponse(ResponseCode.NOT_FOUND, null, null, null, null);
+        return new ObserveCompositeResponse(ResponseCode.NOT_FOUND, null, null, null, null, null);
     }
 
     public static ObserveCompositeResponse unauthorized() {
-        return new ObserveCompositeResponse(ResponseCode.UNAUTHORIZED, null, null, null, null);
+        return new ObserveCompositeResponse(ResponseCode.UNAUTHORIZED, null, null, null, null, null);
     }
 
     public static ObserveCompositeResponse methodNotAllowed() {
-        return new ObserveCompositeResponse(ResponseCode.METHOD_NOT_ALLOWED, null, null, null, null);
+        return new ObserveCompositeResponse(ResponseCode.METHOD_NOT_ALLOWED, null, null, null, null, null);
     }
 
     public static ObserveCompositeResponse notAcceptable() {
-        return new ObserveCompositeResponse(ResponseCode.UNSUPPORTED_CONTENT_FORMAT, null, null, null, null);
+        return new ObserveCompositeResponse(ResponseCode.UNSUPPORTED_CONTENT_FORMAT, null, null, null, null, null);
     }
 
     public static ObserveCompositeResponse internalServerError(String errorMessage) {
-        return new ObserveCompositeResponse(ResponseCode.INTERNAL_SERVER_ERROR, null, errorMessage, null, null);
+        return new ObserveCompositeResponse(ResponseCode.INTERNAL_SERVER_ERROR, null, errorMessage, null, null, null);
+    }
+
+    public TimestampedLwM2mNodes getTimestampedLwM2mNodes() {
+        return timestampedValues;
     }
 }
diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderTest.java b/leshan-core/src/test/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoderTest.java
@@ -1354,7 +1354,7 @@ public void senml_multiple_timestamped_nodes() throws CodecException {
 
         // when
         TimestampedLwM2mNodes data = decoder.decodeTimestampedNodes(b.toString().getBytes(), ContentFormat.SENML_JSON,
-                model);
+                model, null);
 
         // then
         Instant timestamp = Instant.ofEpochSecond(268600000);

diff --git a/leshan-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java b/leshan-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java
@@ -36,7 +36,8 @@ public void should_create_response_with_content() {
         exampleContent.put(new LwM2mPath("/2/3/4"), newResource(16, "example 2"));
 
         // when
-        ObserveCompositeResponse response = new ObserveCompositeResponse(CONTENT, exampleContent, null, null, null);
+        ObserveCompositeResponse response = new ObserveCompositeResponse(CONTENT, exampleContent, null, null, null,
+                null);
 
         // then
         assertEquals(exampleContent, response.getContent());
-Original file line number
+Diff line change
@@ Expand Up @@
             // when
             TimestampedLwM2mNodes data = decoder.decodeTimestampedNodes(b.toString().getBytes(), ContentFormat.SENML_JSON,
-                    model);
+                    model, null);
             // then
             Instant timestamp = Instant.ofEpochSecond(268600000);
@@ Expand Down @@