DoorControllerTest

src/main/java/application/controllers/DoorController.java

@@ -20,6 +20,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping(value = "/doors")
 public class DoorController {
+    public void setDoorRepository(DoorRepository doorRepository) {
+        this.doorRepository = doorRepository;
+    }
+
     @Autowired
     DoorRepository doorRepository;
 
@@ -46,11 +50,12 @@ public class DoorController {
         loginResponse.put("success", true);
         loginResponse.put("doorId", door.getDoorId());
         JSONObject jsonmessage  = new JSONObject();
-        jsonmessage.put("dateTime",message.getDateTime() );
-        jsonmessage.put("message",message.getMessage() );
-        jsonmessage.put("serverMessageId",message.getServerMessageId() );
-        loginResponse.put("serverMessage", jsonmessage);
-
+        if(message!=null) {
+            jsonmessage.put("dateTime", message.getDateTime());
+            jsonmessage.put("message", message.getMessage());
+            jsonmessage.put("serverMessageId", message.getServerMessageId());
+            loginResponse.put("serverMessage", jsonmessage);
+        }
         return loginResponse.toString();
     }
 }