Display client error message in tooltip

eclipse-leshan · Feb 7, 2020 · f9e0627 · f9e0627
1 parent 6ffb0c7
commit f9e0627
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/...er-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/ResponseSerializer.java b/...er-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/ResponseSerializer.java
@@ -47,6 +47,8 @@ public JsonElement serialize(LwM2mResponse src, Type typeOfSrc, JsonSerializatio
                 element.add("location", context.serialize(((CreateResponse) src).getLocation()));
             }
         }
+        if (src.isFailure() && src.getErrorMessage() != null && !src.getErrorMessage().isEmpty())
+            element.addProperty("errormessage", src.getErrorMessage());
 
         return element;
     }

diff --git a/leshan-server-demo/src/main/resources/webapp/js/helper-services.js b/leshan-server-demo/src/main/resources/webapp/js/helper-services.js
@@ -20,23 +20,26 @@ myModule.factory('helper', ["$filter", function($filter) {
   var serviceInstance = {};
 
   serviceInstance.handleResponse = function (response, lwm2mNode, successCallback) {
-	  lwm2mNode.date = new Date();
+      lwm2mNode.date = new Date();
       var formattedDate = $filter('date')(lwm2mNode.date, 'HH:mm:ss.sss');
       if (!response.valid){
-    	  lwm2mNode.status = "INVALID";  
+          lwm2mNode.status = "INVALID";  
       }else if (response.success){
-    	  lwm2mNode.status = "SUCCESS";
+          lwm2mNode.status = "SUCCESS";
       }else {
-    	  lwm2mNode.status = "ERROR";
+          lwm2mNode.status = "ERROR";
       }
-      
+
       if (response.valid)
-    	  lwm2mNode.tooltip = formattedDate + "<br/>" + response.status ;
+          lwm2mNode.tooltip = formattedDate + "<br/>" + response.status ;
       else
-    	  lwm2mNode.tooltip = formattedDate + "<br/> Not LWM2M Code <br/>" + response.status;
+          lwm2mNode.tooltip = formattedDate + "<br/> Not LWM2M Code <br/>" + response.status;
 
+      if (response.errormessage)
+          lwm2mNode.tooltip = lwm2mNode.tooltip + "<br/>" + response.errormessage;
+
       if (successCallback && response.success) {
-    	  successCallback(formattedDate);
+          successCallback(formattedDate);
       }
   };
   return serviceInstance;