ソースを参照

Eliminate unused (6)

Andrew Grant 1 ヶ月 前
コミット
3808985d45

+ 1 - 3
src/main/java/scot/carricksoftware/grantswriter/data/DMYImpl.java

@@ -15,11 +15,9 @@ import java.time.LocalDate;
 @Component
 public class DMYImpl implements DMY {
 
-    @SuppressWarnings("unused")
     String day;
-    @SuppressWarnings("unused")
+
     String month;
-    @SuppressWarnings("unused")
     String year;
 
     @Override

+ 0 - 4
src/main/java/scot/carricksoftware/grantswriter/data/TimeLineData.java

@@ -17,15 +17,11 @@ public interface TimeLineData {
 
     void clear();
 
-    @SuppressWarnings("unused")
     TreeMap<DMY, List<String>> getTimeLine();
 
-    @SuppressWarnings("unused")
     void setTimeline(TreeMap<DMY, List<String>> timeLine);
 
-    @SuppressWarnings("unused")
     SortedSet<String> getRefs();
 
-    @SuppressWarnings("unused")
     void setRefs(SortedSet<String> refs);
 }

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

@@ -27,12 +27,8 @@ public class TimeLineDataImpl implements TimeLineData {
 
     private final AddCensusEntry addCensusEntry;
 
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private final TimeLineDateComparator timeLineDateComparator;
-
-    public TimeLineDataImpl(AddCensusEntry addCensusEntry, TimeLineDateComparator timeLineDateComparator) {
+    public TimeLineDataImpl(AddCensusEntry addCensusEntry) {
         this.addCensusEntry = addCensusEntry;
-        this.timeLineDateComparator = timeLineDateComparator;
         this.timeLine = new TreeMap<>();
         this.refs = new TreeSet<>();
     }

+ 2 - 2
src/main/java/scot/carricksoftware/grantswriter/domains/census/CensusEntry.java

@@ -15,7 +15,7 @@ import scot.carricksoftware.grantswriter.domains.people.Person;
 @Entity
 public class CensusEntry extends BaseEntity {
 
-    @SuppressWarnings({"unused", "JpaDataSourceORMInspection"})
+    @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`name`")
     private String name;
 
@@ -54,7 +54,7 @@ public class CensusEntry extends BaseEntity {
     public String getPersonalOccupation() {
         return personalOccupation;
     }
-    
+
     public void setPersonalOccupation(String personalOccupation) {
         this.personalOccupation = personalOccupation;
     }

+ 1 - 14
src/main/java/scot/carricksoftware/grantswriter/domains/certificates/BaseCertificate.java

@@ -47,7 +47,6 @@ public class BaseCertificate extends BaseEntity {
     @Column(name = "`number`")
     private String number;
 
-    @SuppressWarnings("unused")
     public String getCertificateNumber() {
         return certificateNumber;
     }
@@ -57,62 +56,50 @@ public class BaseCertificate extends BaseEntity {
         this.certificateNumber = certificateNumber;
     }
 
-    @SuppressWarnings("unused")
     public Organisation getCertificateSource() {
         return certificateSource;
     }
 
-    @SuppressWarnings("unused")
     public String getCertificateDate() {
         return certificateDate;
     }
 
-    @SuppressWarnings("unused")
     public void setCertificateDate(String certificateDate) {
         this.certificateDate = certificateDate;
     }
 
-    @SuppressWarnings("unused")
     public void setCertificateSource(Organisation organisation) {
         this.certificateSource = organisation;
     }
 
-    @SuppressWarnings("unused")
     public CertificateType getCertificateType() {
         return certificateType;
     }
 
-    @SuppressWarnings("unused")
     public void setCertificateType(CertificateType certificateType) {
         this.certificateType = certificateType;
     }
 
-    @SuppressWarnings("unused")
     public Organisation getRegistrationAuthority() {
         return registrationAuthority;
     }
 
-    @SuppressWarnings("unused")
     public void setRegistrationAuthority(Organisation registrationAuthority) {
         this.registrationAuthority = registrationAuthority;
     }
 
-    @SuppressWarnings("unused")
     public String getVolume() {
         return volume;
     }
 
-    @SuppressWarnings("unused")
     public void setVolume(String volume) {
         this.volume = volume;
     }
 
-    @SuppressWarnings("unused")
     public String getNumber() {
         return number;
     }
-
-    @SuppressWarnings("unused")
+    
     public void setNumber(String number) {
         this.number = number;
     }

+ 1 - 4
src/test/java/scot/carricksoftware/grantswriter/data/TimeLineDataAddCensusEntryTest.java

@@ -25,16 +25,13 @@ class TimeLineDataAddCensusEntryTest {
     private TimeLineData timeLineData;
 
 
-    @Mock
-    private TimeLineDateComparator timeLineDateComparatorMock;
-
     @Mock
     AddCensusEntry addCensusEntryMock;
 
 
     @BeforeEach
     void setUp() {
-        timeLineData = new TimeLineDataImpl(addCensusEntryMock, timeLineDateComparatorMock);
+        timeLineData = new TimeLineDataImpl(addCensusEntryMock);
     }
 
     @Test

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

@@ -31,8 +31,6 @@ class TimeLineDataSetterAndGetterTest {
     @Mock
     private DMY dmyMock;
 
-    @Mock
-    private TimeLineDateComparator timeLineDateComparatorMock;
 
     @Mock
     AddCensusEntry addCensusEntryMock;
@@ -40,7 +38,7 @@ class TimeLineDataSetterAndGetterTest {
 
     @BeforeEach
     void setUp() {
-        timeLineData = new TimeLineDataImpl(addCensusEntryMock, timeLineDateComparatorMock);
+        timeLineData = new TimeLineDataImpl(addCensusEntryMock);
     }
 
     @Test