From 8bd44165974185db0cda954bc5ac177f4a3338be Mon Sep 17 00:00:00 2001
From: Simon Bernard <code@simonbernard.eu>
Date: Wed, 20 Nov 2024 16:29:00 +0100
Subject: [PATCH] GH-1674: Fix NPE when creating Composite failure Response

---
 .../core/response/ReadCompositeResponse.java  |  9 ++---
 ...ancelCompositeObservationResponseTest.java | 33 +++++++++++++++++++
 .../ObserveCompositeResponseTest.java         |  9 +++++
 .../response/ReadCompositeResponseTest.java   | 32 ++++++++++++++++++
 4 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponseTest.java
 create mode 100644 leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ReadCompositeResponseTest.java

diff --git a/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
index 511b34f1f6..6a4c0a075e 100644
--- a/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
+++ b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
@@ -76,14 +76,15 @@ public ReadCompositeResponse(ResponseCode responseCode, Map<LwM2mPath, LwM2mNode
             }
         } else {
             // handle if content (not timestamped) value is passed
+            this.timestampedValues = null;
+            this.content = content;
+        }
 
+        if (ResponseCode.CONTENT.equals(code)) {
             // check content is not null
-            if (content == null) {
+            if (this.content == null) {
                 throw new IllegalArgumentException("content OR timestampedValue should be not null");
             }
-
-            this.timestampedValues = null;
-            this.content = content;
         }
     }
 
diff --git a/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponseTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponseTest.java
new file mode 100644
index 0000000000..8fe16afd32
--- /dev/null
+++ b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/CancelCompositeObservationResponseTest.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Sierra Wireless and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v20.html
+ * and the Eclipse Distribution License is available at
+ *    http://www.eclipse.org/org/documents/edl-v10.html.
+ *
+ * Contributors:
+ *     Michał Wadowski (Orange) - Add Observe-Composite feature.
+ *******************************************************************************/
+package org.eclipse.leshan.core.response;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.eclipse.leshan.core.ResponseCode;
+import org.junit.jupiter.api.Test;
+
+public class CancelCompositeObservationResponseTest {
+
+    @Test
+    public void create_failure_reponse() {
+        CancelCompositeObservationResponse response = new CancelCompositeObservationResponse(ResponseCode.NOT_FOUND,
+                null, null, null, null, null);
+        assertEquals(response.getCode(), ResponseCode.NOT_FOUND);
+        assertNull(response.getContent());
+    }
+}
diff --git a/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java
index ef1b654afb..93905d810c 100644
--- a/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java
+++ b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ObserveCompositeResponseTest.java
@@ -18,10 +18,12 @@
 import static org.eclipse.leshan.core.ResponseCode.CONTENT;
 import static org.eclipse.leshan.core.node.LwM2mSingleResource.newResource;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.leshan.core.ResponseCode;
 import org.eclipse.leshan.core.node.LwM2mNode;
 import org.eclipse.leshan.core.node.LwM2mPath;
 import org.junit.jupiter.api.Test;
@@ -42,4 +44,11 @@ public void should_create_response_with_content() {
         // then
         assertEquals(exampleContent, response.getContent());
     }
+
+    @Test
+    public void create_failure_reponse() {
+        ObserveCompositeResponse response = ObserveCompositeResponse.notFound();
+        assertEquals(response.getCode(), ResponseCode.NOT_FOUND);
+        assertNull(response.getContent());
+    }
 }
diff --git a/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ReadCompositeResponseTest.java b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ReadCompositeResponseTest.java
new file mode 100644
index 0000000000..1afddbb5e7
--- /dev/null
+++ b/leshan-lwm2m-core/src/test/java/org/eclipse/leshan/core/response/ReadCompositeResponseTest.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Sierra Wireless and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v20.html
+ * and the Eclipse Distribution License is available at
+ *    http://www.eclipse.org/org/documents/edl-v10.html.
+ *
+ * Contributors:
+ *     Sierra Wireless - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.leshan.core.response;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.eclipse.leshan.core.ResponseCode;
+import org.junit.jupiter.api.Test;
+
+public class ReadCompositeResponseTest {
+
+    @Test
+    public void create_failure_reponse() {
+        ReadCompositeResponse response = ReadCompositeResponse.notFound();
+        assertEquals(response.getCode(), ResponseCode.NOT_FOUND);
+        assertNull(response.getContent());
+    }
+}