refactoring: extracting some functionality to a new class JGitCommon

Author: S L

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

@@ -0,0 +1,76 @@
+/*
+ * This file is part of git-commit-id-plugin by Konrad Malawski <konrad.malawski@java.pl>
+ *
+ * git-commit-id-plugin is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * git-commit-id-plugin is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with git-commit-id-plugin.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package pl.project13.jgit;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevWalk;
+
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+
+/**
+ * @author <a href="mailto:konrad.malawski@java.pl">Konrad 'ktoso' Malawski</a>
+ */
+public class JGitCommon {
+  public Collection<String> getTags(Repository repo, final ObjectId headId) throws GitAPIException{
+    RevWalk walk = null;
+    try {
+      Git git = Git.wrap(repo);
+      walk = new RevWalk(repo);
+      List<Ref> tagRefs = git.tagList().call();
+
+      final RevWalk finalWalk = walk;
+      Collection<Ref> tagsForHeadCommit = Collections2.filter(tagRefs, new Predicate<Ref>() {
+        @Override public boolean apply(Ref tagRef) {
+        boolean lightweightTag = tagRef.getObjectId().equals(headId);
+
+          try {
+            // TODO make this configurable (most users shouldn't really care too much what kind of tag it is though)
+            return lightweightTag || finalWalk.parseTag(tagRef.getObjectId()).getObject().getId().equals(headId); // or normal tag
+          } catch (IOException e) {
+            return false;
+          }
+        }
+      });
+
+      Collection<String> tags = Collections2.transform(tagsForHeadCommit, new Function<Ref, String>() {
+        @Override public String apply(Ref input) {
+          return input.getName().replaceAll("refs/tags/", "");
+        }
+      });
+
+      return tags;
+    } catch (GitAPIException e) {
+      throw e;
+    } finally {
+      if (walk != null) {
+        walk.dispose();
+      }
+    }
+  }
+
+}

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

@@ -24,6 +24,7 @@
 
 import pl.project13.jgit.DescribeCommand;
 import pl.project13.jgit.DescribeResult;
+import pl.project13.jgit.JGitCommon;
 import pl.project13.maven.git.log.LoggerBridge;
 
 import java.io.File;
@@ -175,42 +176,14 @@ protected String getRemoteOriginUrl() throws MojoExecutionException {
 
   @Override
   protected String getTags() throws MojoExecutionException {
-    RevWalk walk = null;
     try {
       Repository repo = getGitRepository();
-      Git git = Git.wrap(repo);
-      walk = new RevWalk(repo);
-      List<Ref> tagRefs = git.tagList().call();
-
-      final ObjectId headId = headCommit.toObjectId();
-      final RevWalk finalWalk = walk;
-      Collection<Ref> tagsForHeadCommit = Collections2.filter(tagRefs, new Predicate<Ref>() {
-        @Override public boolean apply(Ref tagRef) {
-          boolean lightweightTag = tagRef.getObjectId().equals(headId);
-
-          try {
-            // TODO make this configurable (most users shouldn't really care too much what kind of tag it is though)
-            return lightweightTag || finalWalk.parseTag(tagRef.getObjectId()).getObject().getId().equals(headId); // or normal tag
-          } catch (IOException e) {
-            return false;
-          }
-        }
-      });
-
-      Collection<String> tags = Collections2.transform(tagsForHeadCommit, new Function<Ref, String>() {
-        @Override public String apply(Ref input) {
-          return input.getName().replaceAll("refs/tags/", "");
-        }
-      });
-
+      ObjectId headId = headCommit.toObjectId();
+      Collection<String> tags = new 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() + ")");
       return "";
-    } finally {
-      if (walk != null) {
-        walk.dispose();
-      }
     }
   }