Преглед изворни кода

AddCensusEntry refs added to constructor

Andrew Grant пре 2 месеци
родитељ
комит
3e45cd39f7

+ 6 - 1
src/main/java/scot/carricksoftware/grantswriter/data/TimeLineDataImpl.java

@@ -6,6 +6,7 @@
 package scot.carricksoftware.grantswriter.data;
 
 import org.springframework.stereotype.Component;
+import scot.carricksoftware.grantswriter.data.helpers.AddCensusEntry;
 import scot.carricksoftware.grantswriter.domains.census.CensusEntry;
 
 import java.util.ArrayList;
@@ -21,10 +22,13 @@ public class TimeLineDataImpl implements TimeLineData {
 
     private SortedSet<String> refs;
 
+    private final AddCensusEntry addCensusEntry;
+
     @SuppressWarnings({"FieldCanBeLocal", "unused"})
     private final TimeLineDateComparator timeLineDateComparator;
 
-    public TimeLineDataImpl( TimeLineDateComparator timeLineDateComparator) {
+    public TimeLineDataImpl(AddCensusEntry addCensusEntry, TimeLineDateComparator timeLineDateComparator) {
+        this.addCensusEntry = addCensusEntry;
         this.timeLineDateComparator = timeLineDateComparator;
         this.timeLine = new TreeMap<>();
         this.refs = new TreeSet<>();
@@ -33,6 +37,7 @@ public class TimeLineDataImpl implements TimeLineData {
 
     @Override
     public void addCensusEntry(List<CensusEntry> censusEntryList) {
+        addCensusEntry.add(timeLine, refs, censusEntryList);
         for (CensusEntry censusEntry : censusEntryList) {
             String key = censusEntry.getCensus().getCensusDate().label;
             DMY dmyKey = new DMYImpl();

+ 6 - 1
src/main/java/scot/carricksoftware/grantswriter/data/helpers/AddCensusEntryImpl.java

@@ -5,6 +5,9 @@
 
 package scot.carricksoftware.grantswriter.data.helpers;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
 import scot.carricksoftware.grantswriter.data.DMY;
 import scot.carricksoftware.grantswriter.domains.census.CensusEntry;
 
@@ -12,11 +15,13 @@ import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeMap;
 
+@Component
 public class AddCensusEntryImpl implements AddCensusEntry {
 
+    private static final Logger logger = LogManager.getLogger(AddCensusEntryImpl.class);
 
     @Override
     public void add(TreeMap<DMY, List<String>> timeline, SortedSet<String> refs, List<CensusEntry> censusEntryList) {
-        throw new UnsupportedOperationException();
+        logger.info("AddCensusEntry::addCensusEntry");
     }
 }

+ 5 - 1
src/test/java/scot/carricksoftware/grantswriter/data/TimeLineDataAddTest.java

@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grantswriter.data.helpers.AddCensusEntry;
 import scot.carricksoftware.grantswriter.domains.census.Census;
 import scot.carricksoftware.grantswriter.domains.census.CensusEntry;
 import scot.carricksoftware.grantswriter.domains.places.Place;
@@ -40,9 +41,12 @@ class TimeLineDataAddTest {
     @Mock
     private Census censusMock;
 
+    @Mock
+    AddCensusEntry addCensusEntryMock;
+
     @BeforeEach
     void setUp() {
-        timeLineData = new TimeLineDataImpl(timeLineDateComparatorMock);
+        timeLineData = new TimeLineDataImpl(addCensusEntryMock, timeLineDateComparatorMock);
     }
 
     @Test

+ 5 - 1
src/test/java/scot/carricksoftware/grantswriter/data/TimeLineDataSetterAndGetterTest.java

@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grantswriter.data.helpers.AddCensusEntry;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,10 +34,13 @@ class TimeLineDataSetterAndGetterTest {
     @Mock
     private TimeLineDateComparator timeLineDateComparatorMock;
 
+    @Mock
+    AddCensusEntry addCensusEntryMock;
+
 
     @BeforeEach
     void setUp() {
-        timeLineData = new TimeLineDataImpl(timeLineDateComparatorMock);
+        timeLineData = new TimeLineDataImpl(addCensusEntryMock, timeLineDateComparatorMock);
     }
 
     @Test