Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#2103] Refactor parser package for greater organisation of classes #2104

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/reposense/RepoSense.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import reposense.model.ReportConfiguration;
import reposense.model.RunConfigurationDecider;
import reposense.parser.ArgsParser;
import reposense.parser.InvalidCsvException;
import reposense.parser.InvalidHeaderException;
import reposense.parser.ParseException;
import reposense.parser.exceptions.InvalidCsvException;
import reposense.parser.exceptions.InvalidHeaderException;
import reposense.parser.exceptions.ParseException;
import reposense.report.ReportGenerator;
import reposense.system.LogsManager;
import reposense.system.ReportServer;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/reposense/model/CliRunConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import reposense.parser.InvalidLocationException;
import reposense.parser.ParseException;
import reposense.parser.exceptions.InvalidLocationException;
import reposense.parser.exceptions.ParseException;
import reposense.system.LogsManager;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/reposense/model/ConfigRunConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import reposense.parser.AuthorConfigCsvParser;
import reposense.parser.GroupConfigCsvParser;
import reposense.parser.InvalidCsvException;
import reposense.parser.InvalidHeaderException;
import reposense.parser.RepoConfigCsvParser;
import reposense.parser.exceptions.InvalidCsvException;
import reposense.parser.exceptions.InvalidHeaderException;
import reposense.system.LogsManager;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/reposense/model/RepoLocation.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.regex.Pattern;

import reposense.git.GitRemote;
import reposense.parser.InvalidLocationException;
import reposense.parser.exceptions.InvalidLocationException;
import reposense.report.ErrorSummary;
import reposense.util.StringsUtil;
import reposense.util.SystemUtil;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/reposense/model/RunConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import java.io.IOException;
import java.util.List;

import reposense.parser.InvalidCsvException;
import reposense.parser.InvalidHeaderException;
import reposense.parser.ParseException;
import reposense.parser.exceptions.InvalidCsvException;
import reposense.parser.exceptions.InvalidHeaderException;
import reposense.parser.exceptions.ParseException;

/**
* Interface to get configurations for current RepoSense run.
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/reposense/parser/ArgsParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
import reposense.model.CliArguments;
import reposense.model.FileType;
import reposense.model.ReportConfiguration;
import reposense.parser.exceptions.ParseException;
import reposense.parser.types.AlphanumericArgumentType;
import reposense.parser.types.AnalysisThreadsArgumentType;
import reposense.parser.types.AssetsFolderArgumentType;
import reposense.parser.types.CloningThreadsArgumentType;
import reposense.parser.types.ConfigFolderArgumentType;
import reposense.parser.types.OutputFolderArgumentType;
import reposense.parser.types.PeriodArgumentType;
import reposense.parser.types.ReportFolderArgumentType;
import reposense.parser.types.SinceDateArgumentType;
import reposense.parser.types.UntilDateArgumentType;
import reposense.parser.types.ZoneIdArgumentType;
import reposense.system.LogsManager;
import reposense.util.TimeUtil;

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/reposense/parser/AuthorConfigCsvParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import reposense.model.Author;
import reposense.model.AuthorConfiguration;
import reposense.model.RepoLocation;
import reposense.parser.exceptions.InvalidLocationException;
import reposense.parser.exceptions.ParseException;

/**
* Container for the values parsed from {@code author-config.csv} file.
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/reposense/parser/CsvParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVRecord;

import reposense.parser.exceptions.InvalidCsvException;
import reposense.parser.exceptions.InvalidHeaderException;
import reposense.parser.exceptions.ParseException;
import reposense.system.LogsManager;

/**
Expand Down
1 change: 1 addition & 0 deletions src/main/java/reposense/parser/GroupConfigCsvParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import reposense.model.FileType;
import reposense.model.GroupConfiguration;
import reposense.model.RepoLocation;
import reposense.parser.exceptions.InvalidLocationException;

/**
* Container for the values parsed from {@code group-config.csv} file.
Expand Down
1 change: 1 addition & 0 deletions src/main/java/reposense/parser/RepoConfigCsvParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import reposense.model.FileType;
import reposense.model.RepoConfiguration;
import reposense.model.RepoLocation;
import reposense.parser.exceptions.InvalidLocationException;
import reposense.util.FileUtil;
import reposense.util.StringsUtil;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.exceptions;

/**
* Signals that there is a major error in a CSV file (e.g. wrong number of columns, zero valid records).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.exceptions;

/**
* Signals that there is a problem in the header of csv config file.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.exceptions;

/**
* Signals that location cannot be represented by {@code URL} or {@code Path}.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.exceptions;

/**
* Signals that there is an exception when parsing a string.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.util.regex.Pattern;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import net.sourceforge.argparse4j.inf.Argument;
import net.sourceforge.argparse4j.inf.ArgumentParser;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import net.sourceforge.argparse4j.inf.Argument;
import net.sourceforge.argparse4j.inf.ArgumentParser;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.nio.file.Files;
import java.nio.file.Path;
Expand All @@ -9,6 +9,7 @@
import net.sourceforge.argparse4j.inf.ArgumentParser;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import net.sourceforge.argparse4j.inf.ArgumentType;
import reposense.parser.RepoConfigCsvParser;

/**
* Checks the argument of {@code --config} flag.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.time.LocalDateTime;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.nio.file.Path;
import java.nio.file.Paths;
Expand All @@ -8,6 +8,7 @@
import net.sourceforge.argparse4j.inf.ArgumentParser;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import net.sourceforge.argparse4j.inf.ArgumentType;
import reposense.parser.ArgsParser;

/**
* Checks the argument of {@code --output} flag.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.util.Optional;
import java.util.regex.Pattern;
Expand All @@ -7,6 +7,7 @@
import net.sourceforge.argparse4j.inf.ArgumentParser;
import net.sourceforge.argparse4j.inf.ArgumentParserException;
import net.sourceforge.argparse4j.inf.ArgumentType;
import reposense.parser.exceptions.ParseException;

/**
* Verifies and parses a string-formatted period to an integer.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.time.Instant;
import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.time.LocalDateTime;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package reposense.parser;
package reposense.parser.types;

import java.time.DateTimeException;
import java.time.ZoneId;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/reposense/util/TimeUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import reposense.parser.SinceDateArgumentType;
import reposense.parser.types.SinceDateArgumentType;
import reposense.system.LogsManager;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/systemtest/java/reposense/ConfigSystemTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.junit.jupiter.api.parallel.ExecutionMode;

import reposense.model.SupportedDomainUrlMap;
import reposense.parser.SinceDateArgumentType;
import reposense.parser.types.SinceDateArgumentType;
import reposense.report.ErrorSummary;
import reposense.util.FileUtil;
import reposense.util.InputBuilder;
Expand Down
2 changes: 1 addition & 1 deletion src/systemtest/java/reposense/LocalRepoSystemTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import reposense.model.RepoConfiguration;
import reposense.model.RepoLocation;
import reposense.model.SupportedDomainUrlMap;
import reposense.parser.SinceDateArgumentType;
import reposense.parser.types.SinceDateArgumentType;
import reposense.report.ErrorSummary;
import reposense.util.FileUtil;
import reposense.util.InputBuilder;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/reposense/model/RepoLocationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;

import reposense.parser.InvalidLocationException;
import reposense.parser.exceptions.InvalidLocationException;
import reposense.util.AssertUtil;
import reposense.util.SystemUtil;

Expand Down
2 changes: 2 additions & 0 deletions src/test/java/reposense/parser/ArgsParserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import reposense.model.FileTypeTest;
import reposense.model.RepoConfiguration;
import reposense.model.RunConfigurationDecider;
import reposense.parser.exceptions.ParseException;
import reposense.parser.types.SinceDateArgumentType;
import reposense.util.FileUtil;
import reposense.util.InputBuilder;
import reposense.util.TestUtil;
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/reposense/parser/AuthorConfigParserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import reposense.model.Author;
import reposense.model.AuthorConfiguration;
import reposense.model.RepoLocation;
import reposense.parser.exceptions.InvalidCsvException;
import reposense.parser.exceptions.InvalidHeaderException;

public class AuthorConfigParserTest {
private static final Path AUTHOR_CONFIG_EMPTY_LOCATION_FILE = loadResource(AuthorConfigParserTest.class,
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/reposense/parser/GroupConfigParserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

import reposense.model.FileType;
import reposense.model.GroupConfiguration;
import reposense.parser.exceptions.InvalidCsvException;
import reposense.parser.exceptions.InvalidHeaderException;

public class GroupConfigParserTest {
private static final Path GROUP_CONFIG_MULTI_LOCATION_FILE = loadResource(GroupConfigParserTest.class,
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/reposense/parser/RepoConfigParserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import reposense.model.FileType;
import reposense.model.RepoConfiguration;
import reposense.model.RepoLocation;
import reposense.parser.exceptions.InvalidCsvException;
import reposense.parser.exceptions.InvalidHeaderException;
import reposense.util.InputBuilder;
import reposense.util.TestUtil;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/reposense/report/ErrorSummaryTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.junit.jupiter.api.Test;

import reposense.model.RepoLocation;
import reposense.parser.InvalidLocationException;
import reposense.parser.exceptions.InvalidLocationException;

public class ErrorSummaryTest {
@Test
Expand Down
Loading