From 0a27008cfd19c4cdfdb2e03b2dfc058ffc871606 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Micha=C5=82ek?= <marcin.marcim@gmail.com>
Date: Thu, 12 Feb 2015 09:47:16 +0100
Subject: [PATCH] refactor list doors in json

---
 .../controllers/DoorController.java           | 13 ++-------
 .../controllers/EventController.java          |  1 -
 src/main/java/test/DoorControllerTest.java    | 28 ++-----------------
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/src/main/java/application/controllers/DoorController.java b/src/main/java/application/controllers/DoorController.java
index d931bf5..0ea2f06 100644
--- a/src/main/java/application/controllers/DoorController.java
+++ b/src/main/java/application/controllers/DoorController.java
@@ -3,12 +3,10 @@ package application.controllers;
 import application.model.Door;
 import application.model.DoorMessage;
 import application.repositories.DoorRepository;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -30,15 +28,8 @@ public class DoorController {
     @RequestMapping
     public
     @ResponseBody
-    String listDoorsJson(ModelMap model) throws JSONException {
-        JSONArray doorArray = new JSONArray();
-        for (Door door : doorRepository.findAll()) {
-            JSONObject doorJSON = new JSONObject();
-            doorJSON.put("doorId", door.getDoorId());
-            doorJSON.put("message", door.getDoorMessage());
-            doorArray.put(doorJSON);
-        }
-        return doorArray.toString();
+    Iterable<Door> listDoorsJson() throws JSONException {
+        return doorRepository.findAll();
     }
 
     @RequestMapping("/{doorId}/message")
diff --git a/src/main/java/application/controllers/EventController.java b/src/main/java/application/controllers/EventController.java
index aacaa50..db776bd 100644
--- a/src/main/java/application/controllers/EventController.java
+++ b/src/main/java/application/controllers/EventController.java
@@ -58,7 +58,6 @@ public class EventController {
     @RequestMapping(value = "/eventEntry/getAll")
     @ResponseBody
     public Iterable<EntryEvent> getAllEntry() throws JSONException {
-        Iterable<EntryEvent> a = entryEventRepository.findAll();
         return entryEventRepository.findAll();
     }
 
diff --git a/src/main/java/test/DoorControllerTest.java b/src/main/java/test/DoorControllerTest.java
index b1a5a51..7ce122b 100644
--- a/src/main/java/test/DoorControllerTest.java
+++ b/src/main/java/test/DoorControllerTest.java
@@ -6,38 +6,14 @@ package test;
 import application.controllers.DoorController;
 import application.model.Door;
 import application.repositories.DoorRepository;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.springframework.ui.ModelMap;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
-import static java.util.Arrays.*;
-
-import java.util.List;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class DoorControllerTest {
-    @Test
-    public void listDoorsJsonTest(){
-        DoorController  doorController=new DoorController();
-        ModelMap model = new ModelMap();
-        String expectedDoorList="[{},{},{}]";
-        List<Door> doorList = asList(new Door(), new Door(), new Door());
-
-        DoorRepository doorRepository= mock(DoorRepository.class);
-        when(doorRepository.findAll()).thenReturn(doorList);
-        String result=null;
-        doorController.setDoorRepository(doorRepository);
-        try {
-            result= doorController.listDoorsJson(model);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        assertEquals(expectedDoorList,result);
-    }
 
     @Test
     public void getUserMessageTest(){