minor style improvements

BrightSpots · Jan 14, 2025 · cd8fef5 · cd8fef5
1 parent e2ec8be
commit cd8fef5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/network/brightspots/rcv/BaseCvrReader.java b/src/main/java/network/brightspots/rcv/BaseCvrReader.java
@@ -68,7 +68,7 @@ public void runAdditionalValidations(List<CastVoteRecord> castVoteRecords)
   // Some CVRs have a list of candidates in the file. Read that list and return it.
   // This will be used in tandem with gatherUnknownCandidateCounts, which only looks for candidates
   // that have at least one vote.
-  public List<String> readCandidateListFromCvr(List<CastVoteRecord> castVoteRecords)
+  public List<String> readCandidateListFromCvr()
       throws IOException {
     return new ArrayList<>();
   }
@@ -100,7 +100,7 @@ public Map<Candidate, Integer> gatherUnknownCandidateCounts(
       // during auto-load candidates and just use readCandidateListFromCvr.
       List<String> allCandidates = new ArrayList<>();
       try {
-        allCandidates = readCandidateListFromCvr(castVoteRecords);
+        allCandidates = readCandidateListFromCvr();
       } catch (IOException e) {
         // If we can't read the candidate list, we can't check for unrecognized candidates.
         Logger.warning("IOException reading candidate list from CVR: %s", e.getMessage());

diff --git a/src/main/java/network/brightspots/rcv/CsvCvrReader.java b/src/main/java/network/brightspots/rcv/CsvCvrReader.java
@@ -48,7 +48,7 @@ public String readerName() {
   }
 
   @Override
-  public List<String> readCandidateListFromCvr(List<CastVoteRecord> castVoteRecords)
+  public List<String> readCandidateListFromCvr()
       throws IOException {
     try (FileInputStream inputStream = new FileInputStream(Path.of(cvrPath).toFile())) {
       return getCandidateNamesAndInitializeParser(getCsvParser(inputStream));

diff --git a/src/main/java/network/brightspots/rcv/TabulatorSession.java b/src/main/java/network/brightspots/rcv/TabulatorSession.java
@@ -39,6 +39,7 @@
 import network.brightspots.rcv.ContestConfig.UnrecognizedProviderException;
 import network.brightspots.rcv.FileUtils.UnableToCreateDirectoryException;
 import network.brightspots.rcv.OutputWriter.RoundSnapshotDataMissingException;
+import network.brightspots.rcv.RawContestConfig.Candidate;
 import network.brightspots.rcv.Tabulator.TabulationAbortedException;
 
 @SuppressWarnings("RedundantSuppression")
@@ -357,7 +358,7 @@ private LoadedCvrData parseCastVoteRecords(
                 source, reader, sourceIndex, startIndex, castVoteRecords.size() - 1));
 
         // Check for unrecognized candidates
-        Map<RawContestConfig.Candidate, Integer> unrecognizedCandidateCounts =
+        Map<Candidate, Integer> unrecognizedCandidateCounts =
             reader.gatherUnknownCandidateCounts(castVoteRecords, false);
 
         if (!unrecognizedCandidateCounts.isEmpty()) {
@@ -440,9 +441,9 @@ private LoadedCvrData parseCastVoteRecords(
   static class UnrecognizedCandidatesException extends Exception {
 
     // count of how many times each unrecognized candidate was encountered during CVR parsing
-    final Map<RawContestConfig.Candidate, Integer> candidateCounts;
+    final Map<Candidate, Integer> candidateCounts;
 
-    UnrecognizedCandidatesException(Map<RawContestConfig.Candidate, Integer> candidateCounts) {
+    UnrecognizedCandidatesException(Map<Candidate, Integer> candidateCounts) {
       this.candidateCounts = candidateCounts;
     }
   }