Use a single instance of JGitCommon

Author: S L

src/main/java/pl/project13/jgit/DescribeCommand.java

@@ -48,6 +48,7 @@
 public class DescribeCommand extends GitCommand<DescribeResult> {
 
   private LoggerBridge loggerBridge;
+  private JGitCommon jGitCommon;
 
 //  TODO not yet implemented options:
 //  private boolean containsFlag = false;
@@ -122,6 +123,12 @@ public DescribeCommand withLoggerBridge(LoggerBridge bridge) {
     return this;
   }
 
+  @NotNull
+  public DescribeCommand withJGitCommon(JGitCommon jGitCommon) {
+    this.jGitCommon = jGitCommon;
+    return this;
+  }
+
   /**
    * <pre>--always</pre>
    *
@@ -293,7 +300,7 @@ public DescribeResult call() throws GitAPIException {
     }
 
     // get commits, up until the nearest tag
-    List<RevCommit> commits = new JGitCommon().findCommitsUntilSomeTag(repo, headCommit, tagObjectIdToName);
+    List<RevCommit> commits = jGitCommon.findCommitsUntilSomeTag(repo, headCommit, tagObjectIdToName);
 
     // if there is no tags or any tag is not on that branch then return generic describe
     if (foundZeroTags(tagObjectIdToName) || commits.isEmpty()) {
@@ -303,7 +310,7 @@ public DescribeResult call() throws GitAPIException {
 
     // check how far away from a tag we are
 
-    int distance = new JGitCommon().distanceBetween(repo, headCommit, commits.get(0));
+    int distance = jGitCommon.distanceBetween(repo, headCommit, commits.get(0));
     String tagName = tagObjectIdToName.get(commits.get(0)).iterator().next();
     Pair<Integer, String> howFarFromWhichTag = Pair.of(distance, tagName);
 
@@ -387,8 +394,8 @@ RevCommit findHeadObjectId(@NotNull Repository repo) throws RuntimeException {
   // git commit id -> its tag (or tags)
   private Map<ObjectId, List<String>> findTagObjectIds(@NotNull Repository repo, boolean tagsFlag) {
 	  String matchPattern = createMatchPattern();
-	  Map<ObjectId, List<DatedRevTag>> commitIdsToTags = new JGitCommon().getCommitIdsToTags(loggerBridge, repo, tagsFlag, matchPattern);
-      Map<ObjectId, List<String>> commitIdsToTagNames = new JGitCommon().transformRevTagsMapToDateSortedTagNames(commitIdsToTags);
+	  Map<ObjectId, List<DatedRevTag>> commitIdsToTags = jGitCommon.getCommitIdsToTags(loggerBridge, repo, tagsFlag, matchPattern);
+      Map<ObjectId, List<String>> commitIdsToTagNames = jGitCommon.transformRevTagsMapToDateSortedTagNames(commitIdsToTags);
       log("Created map: [",commitIdsToTagNames,"] ");
 
       return commitIdsToTagNames;

src/main/java/pl/project13/maven/git/JGitProvider.java

@@ -54,6 +54,7 @@ public class JGitProvider extends GitDataProvider {
   private ObjectReader objectReader;
   private RevWalk revWalk;
   private RevCommit headCommit;
+  private JGitCommon jGitCommon;
 
   @NotNull
   public static JGitProvider on(@NotNull File dotGitDirectory, @NotNull LoggerBridge loggerBridge) {
@@ -63,6 +64,7 @@ public static JGitProvider on(@NotNull File dotGitDirectory, @NotNull LoggerBrid
   JGitProvider(@NotNull File dotGitDirectory, @NotNull LoggerBridge loggerBridge) {
     super(loggerBridge);
     this.dotGitDirectory = dotGitDirectory;
+    this.jGitCommon = new JGitCommon();
   }
 
   @NotNull
@@ -189,7 +191,7 @@ protected String getTags() throws MojoExecutionException {
     try {
       Repository repo = getGitRepository();
       ObjectId headId = headCommit.toObjectId();
-      Collection<String> tags = new JGitCommon().getTags(repo,headId);
+      Collection<String> tags = jGitCommon.getTags(repo,headId);
       return Joiner.on(",").join(tags);
     } catch (GitAPIException e) {
       loggerBridge.error("Unable to extract tags from commit: " + headCommit.getName() + " (" + e.getClass().getName() + ")");
@@ -201,7 +203,7 @@ protected String getTags() throws MojoExecutionException {
   protected String getClosestTagName() throws MojoExecutionException {
     Repository repo = getGitRepository();
     try {
-      return new JGitCommon().getClosestTagName(loggerBridge,repo);
+      return jGitCommon.getClosestTagName(loggerBridge,repo);
     } catch (Throwable t) {
       // could not find any tags to describe
     }
@@ -212,7 +214,7 @@ protected String getClosestTagName() throws MojoExecutionException {
   protected String getClosestTagCommitCount() throws MojoExecutionException {
     Repository repo = getGitRepository();
     try {
-      return new JGitCommon().getClosestTagCommitCount(loggerBridge,repo,headCommit);
+      return jGitCommon.getClosestTagCommitCount(loggerBridge,repo,headCommit);
     } catch (Throwable t) {
       // could not find any tags to describe
     }
@@ -232,6 +234,7 @@ protected void finalCleanUp() {
       DescribeResult describeResult = DescribeCommand
         .on(repository)
         .withLoggerBridge(super.loggerBridge)
+        .withJGitCommon(jGitCommon)
         .setVerbose(super.verbose)
         .apply(super.gitDescribe)
         .call();