SelectedCensusListControllerPageNumberTest (2)

src/main/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListController.java

@@ -7,7 +7,6 @@ package scot.carricksoftware.grants.controllers.census.selectedcensus;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
 
 @SuppressWarnings("unused")
 @Controller
@@ -23,7 +22,5 @@ public interface SelectedCensusListController {
 
     String getLastPage(final Model model);
 
-    String censusEntryDelete(@PathVariable String id);
-
     int getPageNumber();
 }

src/main/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListControllerImpl.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import scot.carricksoftware.grants.constants.*;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
-import scot.carricksoftware.grants.controllers.census.censusentry.CensusEntryListController;
 import scot.carricksoftware.grants.domains.census.Census;
 import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.census.selectedcensus.SelectedCensusEntryService;
@@ -22,7 +21,7 @@ import scot.carricksoftware.grants.services.census.selectedcensus.SelectedCensus
 import static java.lang.Integer.max;
 
 @Controller
-public class SelectedCensusListControllerImpl implements CensusEntryListController {
+public class SelectedCensusListControllerImpl implements SelectedCensusListController {
 
     private static final Logger logger = LogManager.getLogger(SelectedCensusListControllerImpl.class);
 
@@ -86,7 +85,6 @@ public class SelectedCensusListControllerImpl implements CensusEntryListControll
         return sendAttributesAndReturn(model);
     }
 
-
     @GetMapping(CensusMappingConstants.SELECTED_CENSUS_FF)
     @Override
     public final String getLastPage(final Model model) {
@@ -97,15 +95,6 @@ public class SelectedCensusListControllerImpl implements CensusEntryListControll
     }
 
 
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_DELETE)
-    @Override
-    public final String censusEntryDelete(@PathVariable final String id) {
-        logger.debug("SelectedCensusListControllerImpl::censusEntryDelete");
-        selectedCensusEntryService.deleteById(Long.valueOf(id));
-        return MappingConstants.REDIRECT + CensusMappingConstants.SELECTED_CENSUS_LIST;
-    }
-
     @SuppressWarnings("SameReturnValue")
     @GetMapping(CensusMappingConstants.SELECTED_CENSUS_ENTRIES)
     public final String censusEntryList(@Valid @PathVariable final String id, Model model) {

src/main/java/scot/carricksoftware/grants/services/census/selectedcensus/SelectedCensusEntryService.java

@@ -17,6 +17,7 @@ public interface SelectedCensusEntryService {
     @SuppressWarnings("unused")
     CensusEntry findById(Long id);
 
+    @SuppressWarnings("unused")
     void deleteById(Long id);
 
     List<CensusEntry> getPagedCensusEntries(Census census, int pageNumber);

src/test/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListControllerPageNumberTest.java

@@ -42,6 +42,12 @@ public class SelectedCensusListControllerPageNumberTest {
                 censusServiceMock);
     }
 
+    @Test
+    public void getListPageTest() {
+        controller.getListPage(modelMock);
+        assertEquals(0, controller.getPageNumber());
+    }
+
     @Test
     public void getNextPlaceTest() {
         controller.getListPage(modelMock);