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.

Sign up for GitHub

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

Jump to bottom

[#2076] Refactor RepoConfiguration to simplify constructor complexity #2078

Merged
merged 13 commits into from
Feb 16, 2024
Merged

[#2076] Refactor RepoConfiguration to simplify constructor complexity #2078

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7c321de
Refactor RepoConfiguration to obey Builder Pattern
asdfghjkxd Dec 29, 2023
6228ec8
Merge branch 'master' into enhancement-repoconfig-builder-pattern
gok99 Jan 20, 2024
be1ef45
Merge branch 'master' into enhancement-repoconfig-builder-pattern
ckcherry23 Jan 27, 2024
ae80634
Fix bugs and implement new unit test cases
asdfghjkxd Jan 30, 2024
a50e488
Merge branch 'master' into enhancement-repoconfig-builder-pattern
gok99 Feb 2, 2024
052050b
Refactor RepoBuilder into Builder
asdfghjkxd Feb 4, 2024
d58ccee
Combine processOrganization with processNames
asdfghjkxd Feb 5, 2024
4b5cf86
Remove redundant copy constructor
asdfghjkxd Feb 6, 2024
749f005
Merge branch 'master' into enhancement-repoconfig-builder-pattern
MarcusTXK Feb 7, 2024
237f8d7
Add new unit tests and remove print statements
asdfghjkxd Feb 9, 2024
2e8cc4c
Merge branch 'enhancement-repoconfig-builder-pattern' of https://gith…
asdfghjkxd Feb 9, 2024
53d8a3e
Merge branch 'master' into enhancement-repoconfig-builder-pattern
gok99 Feb 11, 2024
0e9e213
Merge branch 'master' into enhancement-repoconfig-builder-pattern
ckcherry23 Feb 16, 2024
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: 5 additions & 1 deletion src/main/java/reposense/model/CliRunConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ public List<RepoConfiguration> getRepoConfigurations() throws ParseException {
List<RepoConfiguration> configs = new ArrayList<>();
for (String locationString : cliArguments.getLocations()) {
try {
configs.add(new RepoConfiguration(new RepoLocation(locationString)));
configs.add(
new RepoConfiguration.RepoBuilder()
.location(new RepoLocation(locationString))
.build()
);
} catch (InvalidLocationException ile) {
logger.log(Level.WARNING, ile.getMessage(), ile);
}
Expand Down
456 changes: 401 additions & 55 deletions src/main/java/reposense/model/RepoConfiguration.java
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For lines 38 - 39, new ArrayList<>() Initializer for ignoreGlobList and ignoredAuthorsList is now redundant

Large diffs are not rendered by default.

25 changes: 20 additions & 5 deletions src/main/java/reposense/parser/RepoConfigCsvParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import reposense.model.CommitHash;
import reposense.model.FileType;
import reposense.model.FileTypeManager;
import reposense.model.RepoConfiguration;
import reposense.model.RepoLocation;
import reposense.util.FileUtil;
Expand Down Expand Up @@ -171,11 +172,25 @@ private void addConfig(List<RepoConfiguration> results, RepoLocation location, S
boolean isIgnoredFileAnalysisSkipped, boolean isFileSizeLimitOverriding, long fileSizeLimit,
boolean isStandaloneConfigIgnored, boolean isShallowCloningPerformed,
boolean isFindingPreviousAuthorsPerformed) {
RepoConfiguration config = new RepoConfiguration(location, branch, formats, ignoreGlobList, fileSizeLimit,
isStandaloneConfigIgnored, isFileSizeLimitIgnored, ignoreCommitList, isFormatsOverriding,
isIgnoreGlobListOverriding, isIgnoreCommitListOverriding, isFileSizeLimitOverriding,
isShallowCloningPerformed, isFindingPreviousAuthorsPerformed, isIgnoredFileAnalysisSkipped,
ignoredAuthorsList, isIgnoredAuthorsListOverriding);
RepoConfiguration config = new RepoConfiguration.RepoBuilder()
.location(location)
.branch(branch)
.fileTypeManager(new FileTypeManager(formats))
.ignoreGlobList(ignoreGlobList)
.fileSizeLimit(fileSizeLimit)
.isStandaloneConfigIgnored(isStandaloneConfigIgnored)
.isFileSizeLimitIgnored(isFileSizeLimitIgnored)
.ignoreCommitList(ignoreCommitList)
.isFormatsOverriding(isFormatsOverriding)
.isIgnoreGlobListOverriding(isIgnoreGlobListOverriding)
.isIgnoreCommitListOverriding(isIgnoreCommitListOverriding)
.isFileSizeLimitOverriding(isFileSizeLimitOverriding)
.isShallowCloningPerformed(isShallowCloningPerformed)
.isFindingPreviousAuthorsPerformed(isFindingPreviousAuthorsPerformed)
.isIgnoredFileAnalysisSkipped(isIgnoredFileAnalysisSkipped)
.ignoredAuthorsList(ignoredAuthorsList)
.isIgnoredAuthorsListOverriding(isIgnoredAuthorsListOverriding)
.build();

if (results.contains(config)) {
logger.warning("Ignoring duplicated repository " + location + " " + branch);
Expand Down
16 changes: 12 additions & 4 deletions src/systemtest/java/reposense/LocalRepoSystemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,18 @@ public class LocalRepoSystemTest {

@BeforeAll
public static void setupLocalRepos() throws Exception {
TestRepoCloner.clone(new RepoConfiguration(new RepoLocation("https://github.com/reposense/testrepo-Alpha")),
Paths.get("."), LOCAL_DIRECTORY_ONE);
TestRepoCloner.clone(new RepoConfiguration(new RepoLocation("https://github.com/reposense/testrepo-Alpha")),
Paths.get("."), LOCAL_DIRECTORY_TWO);
TestRepoCloner.clone(
new RepoConfiguration.RepoBuilder()
.location(new RepoLocation("https://github.com/reposense/testrepo-Alpha"))
.build(),
Paths.get("."), LOCAL_DIRECTORY_ONE
);
TestRepoCloner.clone(
new RepoConfiguration.RepoBuilder()
.location(new RepoLocation("https://github.com/reposense/testrepo-Alpha"))
.build(),
Paths.get("."), LOCAL_DIRECTORY_TWO
);
}

@BeforeEach
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/reposense/git/GitBranchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ public void getCurrentBranch_masterBranch_success() throws Exception {

@Test
public void getCurrentBranch_uncommonDefaultBranch_success() throws Exception {
RepoConfiguration uncommonDefaultConfig = new RepoConfiguration(
new RepoLocation(TEST_REPO_UNCOMMON_DEFAULT_GIT_LOCATION), RepoConfiguration.DEFAULT_BRANCH);
RepoConfiguration uncommonDefaultConfig = new RepoConfiguration.RepoBuilder()
.location(new RepoLocation(TEST_REPO_UNCOMMON_DEFAULT_GIT_LOCATION))
.branch(RepoConfiguration.DEFAULT_BRANCH)
.build();
uncommonDefaultConfig.setFormats(FileTypeTest.DEFAULT_TEST_FORMATS);
TestRepoCloner.cloneAndBranch(uncommonDefaultConfig);
String currentBranch = GitBranch.getCurrentBranch(uncommonDefaultConfig.getRepoRoot());
Expand Down
Loading
Loading