Skip to content

Commit d79b622

Browse files
Removed RepositoryLogReader
Removed RepositoryLogReader - it was getting in the way more than it was helping
1 parent b34dea1 commit d79b622

File tree

5 files changed

+8
-34
lines changed

5 files changed

+8
-34
lines changed

change-proneness-ranker/src/main/java/org/hjug/git/ChangePronenessRanker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
public class ChangePronenessRanker {
1313

1414
private Repository repository;
15-
private RepositoryLogReader repositoryLogReader;
15+
private GitLogReader repositoryLogReader;
1616

17-
public ChangePronenessRanker(Repository repository, RepositoryLogReader repositoryLogReader) {
17+
public ChangePronenessRanker(Repository repository, GitLogReader repositoryLogReader) {
1818
this.repositoryLogReader = repositoryLogReader;
1919
this.repository = repository;
2020
}

change-proneness-ranker/src/main/java/org/hjug/git/GitLogReader.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
import org.eclipse.jgit.util.io.NullOutputStream;
1616

1717
@Slf4j
18-
public class GitLogReader implements RepositoryLogReader {
18+
public class GitLogReader {
1919

2020
static final String JAVA_FILE_TYPE = ".java";
2121

2222
// Based on
2323
// https://github.com/Cosium/git-code-format-maven-plugin/blob/master/src/main/java/com/cosium/code/format/AbstractMavenGitCodeFormatMojo.java
2424
// MIT License
2525
// Move to a provider?
26-
@Override
2726
public Repository gitRepository(File basedir) throws IOException {
2827
Repository gitRepository;
2928
FileRepositoryBuilder repositoryBuilder = new FileRepositoryBuilder().findGitDir(basedir);
@@ -46,7 +45,6 @@ public File getGitDir(File basedir) {
4645
// https://stackoverflow.com/a/19950970/346247
4746
// and
4847
// https://github.com/centic9/jgit-cookbook/blob/master/src/main/java/org/dstadler/jgit/api/ReadFileFromCommit.java
49-
@Override
5048
public Map<String, ByteArrayOutputStream> listRepositoryContentsAtHEAD(Repository repository) throws IOException {
5149
Ref head = repository.exactRef("HEAD");
5250
// a RevWalk allows us to walk over commits based on some filtering that is defined
@@ -88,7 +86,6 @@ public Map<String, ByteArrayOutputStream> listRepositoryContentsAtHEAD(Repositor
8886
* @return a LogInfo object
8987
* @throws GitAPIException
9088
*/
91-
@Override
9289
public ScmLogInfo fileLog(Repository repository, String path) throws GitAPIException, IOException {
9390
Git git = new Git(repository);
9491
ObjectId branchId = repository.resolve("HEAD");
@@ -118,7 +115,6 @@ public ScmLogInfo fileLog(Repository repository, String path) throws GitAPIExcep
118115
}
119116

120117
// based on https://stackoverflow.com/questions/27361538/how-to-show-changes-between-commits-with-jgit
121-
@Override
122118
public TreeMap<Integer, Integer> captureChangeCountByCommitTimestamp(Repository repository)
123119
throws IOException, GitAPIException {
124120

change-proneness-ranker/src/main/java/org/hjug/git/RepositoryLogReader.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

change-proneness-ranker/src/test/java/org/hjug/git/ChangePronenessRankerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
public class ChangePronenessRankerTest {
1515

1616
private ChangePronenessRanker changePronenessRanker;
17-
private RepositoryLogReader repositoryLogReader;
17+
private GitLogReader repositoryLogReader;
1818

1919
@BeforeEach
2020
public void setUp() {
21-
repositoryLogReader = mock(RepositoryLogReader.class);
21+
repositoryLogReader = mock(GitLogReader.class);
2222
changePronenessRanker = new ChangePronenessRanker(null, repositoryLogReader);
2323
}
2424

cost-benefit-calculator/src/main/java/org/hjug/cbc/CostBenefitCalculator.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.eclipse.jgit.lib.Repository;
1919
import org.hjug.git.ChangePronenessRanker;
2020
import org.hjug.git.GitLogReader;
21-
import org.hjug.git.RepositoryLogReader;
2221
import org.hjug.git.ScmLogInfo;
2322
import org.hjug.metrics.*;
2423
import org.hjug.metrics.rules.CBORule;
@@ -54,7 +53,7 @@ public void runPmdAnalysis(String projectBaseDir) throws IOException {
5453

5554
public List<RankedDisharmony> calculateGodClassCostBenefitValues(String repositoryPath) {
5655

57-
RepositoryLogReader repositoryLogReader = new GitLogReader();
56+
GitLogReader repositoryLogReader = new GitLogReader();
5857
Repository repository = null;
5958
log.info("Initiating Cost Benefit calculation");
6059
try {
@@ -115,7 +114,7 @@ private List<GodClass> getGodClasses() {
115114
}
116115

117116
<T extends Disharmony> List<ScmLogInfo> getRankedChangeProneness(
118-
RepositoryLogReader repositoryLogReader, Repository repository, List<T> disharmonies) {
117+
GitLogReader repositoryLogReader, Repository repository, List<T> disharmonies) {
119118
List<ScmLogInfo> scmLogInfos = new ArrayList<>();
120119
log.info("Calculating Change Proneness");
121120
for (Disharmony disharmony : disharmonies) {
@@ -143,7 +142,7 @@ <T extends Disharmony> List<ScmLogInfo> getRankedChangeProneness(
143142

144143
public List<RankedDisharmony> calculateCBOCostBenefitValues(String repositoryPath) {
145144

146-
RepositoryLogReader repositoryLogReader = new GitLogReader();
145+
GitLogReader repositoryLogReader = new GitLogReader();
147146
Repository repository = null;
148147
log.info("Initiating Cost Benefit calculation");
149148
try {

0 commit comments

Comments
 (0)