minor refactorings and typos

Author: autayeu

README.md

@@ -118,7 +118,7 @@ It's really simple to setup this plugin; below is a sample pom that you may base
                     <!--
                         If you'd like to tell the plugin where your .git directory is,
                         use this setting, otherwise we'll perform a search trying to
-                        figure out the right directory. It's better to add it explicite IMHO.
+                        figure out the right directory. It's better to add it explicitly IMHO.
                     -->
                     <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
 
@@ -207,7 +207,7 @@ It's really simple to setup this plugin; below is a sample pom that you may base
 
                     <!-- @since 2.1.9 -->
                     <!--
-                        Can be used to exclude certain properties from being emited into the resulting file.
+                        Can be used to exclude certain properties from being emitted into the resulting file.
                         May be useful when you want to hide {@code git.remote.origin.url} (maybe because it contains your repo password?),
                         or the email of the committer etc.
 
@@ -236,8 +236,8 @@ It's really simple to setup this plugin; below is a sample pom that you may base
 
                     <!-- @since 2.1.10 -->
                     <!-- 
-                      false is default here, if set to true it uses native `git` excutable for extracting all data.
-                      This usually has better performance than the default (jgit) implemenation, but requires you to 
+                      false is default here, if set to true it uses native `git` executable for extracting all data.
+                      This usually has better performance than the default (jgit) implementation, but requires you to 
                       have git available as executable for the build as well as *might break unexpectedly* when you 
                       upgrade your system-wide git installation.
                        
@@ -260,7 +260,7 @@ It's really simple to setup this plugin; below is a sample pom that you may base
                     <!--
                          The option can be used to tell the plugin how it should generate the 'git.commit.id' property. Due to some naming issues when exporting the properties as an json-object (https://github.com/ktoso/maven-git-commit-id-plugin/issues/122) we needed to make it possible to export all properties as a valid json-object.
                          Due to the fact that this is one of the major properties the plugin is exporting we just don't want to change the exporting mechanism and somehow throw the backwards compatibility away.
-                         We rather provide a convient switch where you can choose if you would like the properties as they always had been, or if you rather need to support full json-object compatibility.
+                         We rather provide a convenient switch where you can choose if you would like the properties as they always had been, or if you rather need to support full json-object compatibility.
                          In the case you need to fully support json-object we unfortunately need to change the 'git.commit.id' property from 'git.commit.id' to 'git.commit.id.full' in the exporting mechanism to allow the generation of a fully valid json object.
 
                          Currently the switch allows two different options:
@@ -386,7 +386,7 @@ Start out with with adding the above steps to your project, next paste this **gi
         <property name="buildUserEmail" value="${git.build.user.email}"/>
         <property name="buildTime" value="${git.build.time}"/>
         <property name="buildHost" value="${git.build.host}"/>
-        <porperty name="buildVersion" value="${git.build.version}"/>
+        <property name="buildVersion" value="${git.build.version}"/>
     </bean>
 </beans>
 ```
@@ -671,7 +671,7 @@ Optional parameters:
 * **runOnlyOnce** - `(default: false)` *(available since v2.1.12)* - Use with caution! In a multi-module build, only run once. This means that the plugins effects will only execute once, for the parent project. This probably won't "do the right thing" if your project has more than one git repository. Important: If you're using `generateGitPropertiesFile`, setting `runOnlyOnce` will make the plugin only generate the file in the directory where you started your build :warning:. The `git.*` maven properties are available in all modules.
 * **excludeProperties** - `(default: empty)` *(available since v2.1.9)* - Allows to filter out properties that you *don't* want to expose. This feature was implemented in response to [this issue](https://github.com/ktoso/maven-git-commit-id-plugin/issues/91), so if you're curious about the use-case, check that issue.
 * **includeOnlyProperties** - `(default: empty)` *(available since v2.1.14)* - Allows to include only properties that you want to expose. This feature was implemented to avoid big exclude properties tag when we only want very few specific properties.
-* **useNativeGit** - `(default: false)` *(available since v2.1.10)* - Uses the native `git` binary instead of the custom `jgit` implementation shipped with this plugin to obtain all information. Although this should usualy give your build some performance boost, it may randomly break if you upgrade your git version and it decides to print information in a different format suddenly. As rule of thumb, keep using the default `jgit` implementation (keep this option set to `false`) until you notice performance problems within your build (usualy when you have *hundreds* of maven modules).
+* **useNativeGit** - `(default: false)` *(available since v2.1.10)* - Uses the native `git` binary instead of the custom `jgit` implementation shipped with this plugin to obtain all information. Although this should usually give your build some performance boost, it may randomly break if you upgrade your git version and it decides to print information in a different format suddenly. As rule of thumb, keep using the default `jgit` implementation (keep this option set to `false`) until you notice performance problems within your build (usually when you have *hundreds* of maven modules).
 * **abbrevLength** - `(default: 7)` *(available since v2.0.4)* - Configure the "git.commit.id.abbrev" property to be at least of length N (see gitDescribe abbrev for special case abbrev = 0).
 * **commitIdGenerationMode** - `(default: flat)` *(available since v2.2.0)* is an option that can be used to tell the plugin how it should generate the 'git.commit.id' property. Due to some naming issues when exporting the properties as an json-object (https://github.com/ktoso/maven-git-commit-id-plugin/issues/122) we needed to make it possible to export all properties as a valid json-object. Currently the switch allows two different options:
 1. By default this property is set to 'flat' and will generate the formerly known property 'git.commit.id' as it was in the previous versions of the plugin. Keeping it to 'flat' by default preserve backwards compatibility and does not require further adjustments by the end user.
@@ -684,8 +684,8 @@ Optional parameters:
 Worth pointing out is, that git-commit-id tries to be 1-to-1 compatible with git's plain output, even though the describe functionality has been reimplemented manually using JGit (you don't have to have a git executable to use the plugin). So if you're familiar with [git-describe](https://github.com/ktoso/maven-git-commit-id-plugin#git-describe---short-intro-to-an-awesome-command), you probably can skip this section, as it just explains the same options that git provides.
 
 * **abbrev** - `(default: 7)` in the describe output, the object id of the hash is always abbreviated to N letters, by default 7. The typical describe output you'll see therefore is: `v2.1.0-1-gf5cd254`, where `-1-` means the number of commits away from the mentioned tag and the `-gf5cd254` part means the first 7 chars of the current commit's id `f5cd254`. **Please note that the `g` prefix is included to notify you that it's a commit id, it is NOT part of the commit's object id** - *this is default git behaviour, so we're doing the same*. You can set this to any value between 0 and 40 (inclusive). 
-* **abbrev = 0** is a special case. Setting *abbrev* to `0` has the effect of hiding the "distance from tag" and "object id" parts of the output, so you endup with just the "nearest tag" (that is, instead `tag-12-gaaaaaaa` with `abbrev = 0` you'd get `tag`).
-* **dirty** - `(default: "-dirty")` when you run describe on a repository that's in "dirty state" (has uncommited changes), the describe output will contain an additional suffix, such as "-devel" in this example: `v3.5-3-g2222222-devel`. You can configure that suffix to be anything you want, "-DEV" being a nice example. The "-" sign should be inclided in the configuration parameter, as it will not be added automatically. If in doubt run `git describe --dirty=-my_thing` to see how the end result will look like.
+* **abbrev = 0** is a special case. Setting *abbrev* to `0` has the effect of hiding the "distance from tag" and "object id" parts of the output, so you end up with just the "nearest tag" (that is, instead `tag-12-gaaaaaaa` with `abbrev = 0` you'd get `tag`).
+* **dirty** - `(default: "-dirty")` when you run describe on a repository that's in "dirty state" (has uncommitted changes), the describe output will contain an additional suffix, such as "-devel" in this example: `v3.5-3-g2222222-devel`. You can configure that suffix to be anything you want, "-DEV" being a nice example. The "-" sign should be included in the configuration parameter, as it will not be added automatically. If in doubt run `git describe --dirty=-my_thing` to see how the end result will look like.
 * **tags** - `(default: false)` if true this option enables matching a lightweight (non-annotated) tag.
 * **match** - `(default: *)` only consider tags matching the given pattern (can be used to avoid leaking private tags made from the repository)
 * **long** - `(default: false)` git-describe, by default, returns just the tag name, if the current commit is tagged. Use this option to force it to format the output using the typical describe format. An example would be: `tagname-0-gc0ffebabe` - notice that the distance from the tag is 0 here, if you don't use **forceLongFormat** mode, the describe for such commit would look like this: `tagname`.

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

@@ -384,11 +384,9 @@ private String createMatchPattern() {
       return ".*";
     }
 
-    StringBuffer buf = new StringBuffer();
-    buf.append("^refs/tags/\\Q");
-    buf.append(matchOption.get().replace("*", "\\E.*\\Q").replace("?", "\\E.\\Q"));
-    buf.append("\\E$");
-    return buf.toString();
+    return "^refs/tags/\\Q" +
+            matchOption.get().replace("*", "\\E.*\\Q").replace("?", "\\E.\\Q") +
+            "\\E$";
   }
 }
 

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

@@ -160,7 +160,7 @@ public String dirtyMarker() {
   }
 
   /**
-   * <p>The (possibly) "g" prefixed <strong>abbriverated</strong> object id of a commit.</p>
+   * <p>The (possibly) "g" prefixed <strong>abbreviated</strong> object id of a commit.</p>
    * <p>
    * The "g" prefix is prepended to be compatible with git's describe output, please refer to
    * <b>man git-describe</b> to check why it's included.
@@ -170,8 +170,8 @@ public String dirtyMarker() {
    * This is following git's behaviour - so any git tooling should be happy with this output.
    * </p>
    * <p>
-   * Notes about the abbriverated object id:
-   * Git will try to use your given abbrev lenght, but when it's to short to guarantee uniqueness -
+   * Notes about the abbreviated object id:
+   * Git will try to use your given abbrev length, but when it's too short to guarantee uniqueness -
    * a longer one will be used (which WILL guarantee uniqueness).
    * If you need the full commit id, it's always available via {@link pl.project13.jgit.DescribeResult#commitObjectId()}.
    * </p>
@@ -208,14 +208,14 @@ private String gPrefixedCommitId(String name) {
    *
    * @return the abbreviated commit id, possibly longer than the requested len (if it wouldn't be unique)
    */
-  private static Optional<AbbreviatedObjectId> createAbbreviatedCommitId(@NotNull ObjectReader objectReader, ObjectId commitId, int requestedLenght) {
-    if(requestedLenght < 2) {
+  private static Optional<AbbreviatedObjectId> createAbbreviatedCommitId(@NotNull ObjectReader objectReader, ObjectId commitId, int requestedLength) {
+    if (requestedLength < 2) {
       // 0 means we don't want to print commit id's at all
       return Optional.absent();
     }
 
     try {
-      AbbreviatedObjectId abbreviatedObjectId = objectReader.abbreviate(commitId, requestedLenght);
+      AbbreviatedObjectId abbreviatedObjectId = objectReader.abbreviate(commitId, requestedLength);
       return Optional.of(abbreviatedObjectId);
     } catch (IOException e) {
       return Optional.absent();

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

@@ -85,8 +85,6 @@ public Collection<String> getTags(Repository repo, final ObjectId headId) throws
       });
 
       return tags;
-    } catch (GitAPIException e) {
-      throw e;
     } finally {
       if (walk != null) {
         walk.dispose();
@@ -130,7 +128,7 @@ private Map<ObjectId, List<DatedRevTag>> getClosestTagAsMap(@NotNull Repository
   }
 
   private LinkedHashMap<ObjectId, List<DatedRevTag>> sortByDatedRevTag(Map<ObjectId, List<DatedRevTag>> map) {
-    List<Map.Entry<ObjectId, List<DatedRevTag>>> list = new LinkedList<Map.Entry<ObjectId, List<DatedRevTag>>>(map.entrySet());
+    List<Map.Entry<ObjectId, List<DatedRevTag>>> list = new LinkedList<>(map.entrySet());
 
     Collections.sort(list, new Comparator<Map.Entry<ObjectId, List<DatedRevTag>>>() {
       public int compare(Map.Entry<ObjectId, List<DatedRevTag>> m1, Map.Entry<ObjectId, List<DatedRevTag>> m2) {
@@ -144,7 +142,7 @@ public int compare(Map.Entry<ObjectId, List<DatedRevTag>> m1, Map.Entry<ObjectId
       }
     });
 
-    LinkedHashMap<ObjectId, List<DatedRevTag>> result = new LinkedHashMap<ObjectId, List<DatedRevTag>>();
+    LinkedHashMap<ObjectId, List<DatedRevTag>> result = new LinkedHashMap<>();
     for (Map.Entry<ObjectId, List<DatedRevTag>> entry : list) {
       result.put(entry.getKey(), entry.getValue());
     }
@@ -154,8 +152,7 @@ public int compare(Map.Entry<ObjectId, List<DatedRevTag>> m1, Map.Entry<ObjectId
   protected Map<ObjectId, List<DatedRevTag>> getCommitIdsToTags(@NotNull Repository repo, boolean includeLightweightTags, String matchPattern, @NotNull Mojo mojo){
     Map<ObjectId, List<DatedRevTag>> commitIdsToTags = newHashMap();
 
-    RevWalk walk = new RevWalk(repo);
-    try {
+    try (RevWalk walk = new RevWalk(repo)) {
       walk.markStart(walk.parseCommit(repo.resolve("HEAD")));
 
       List<Ref> tagRefs = Git.wrap(repo).tagList().call();
@@ -210,11 +207,9 @@ protected Map<ObjectId, List<DatedRevTag>> getCommitIdsToTags(@NotNull Repositor
       for (Map.Entry<ObjectId, List<DatedRevTag>> entry : commitIdsToTags.entrySet()) {
         mojo.getLog().info("key [" + entry.getKey() + "], tags => [" + entry.getValue() + "] ");
       }
-        return commitIdsToTags;
+      return commitIdsToTags;
     } catch (Exception e) {
       mojo.getLog().info("Unable to locate tags", e);
-    } finally {
-      walk.close();
     }
     return Collections.emptyMap();
   }
@@ -264,8 +259,7 @@ protected String trimFullTagName(@NotNull String tagName) {
   }
 
   public List<RevCommit> findCommitsUntilSomeTag(Repository repo, RevCommit head, @NotNull Map<ObjectId, List<String>> tagObjectIdToName) {
-    RevWalk revWalk = new RevWalk(repo);
-    try {
+    try (RevWalk revWalk = new RevWalk(repo)) {
       revWalk.markStart(head);
 
       for (RevCommit commit : revWalk) {
@@ -291,9 +285,7 @@ public List<RevCommit> findCommitsUntilSomeTag(Repository repo, RevCommit head,
    * @see <a href="https://github.com/mdonoughe/jgit-describe/blob/master/src/org/mdonoughe/JGitDescribeTask.java">mdonoughe/jgit-describe/blob/master/src/org/mdonoughe/JGitDescribeTask.java</a>
    */
   protected int distanceBetween(@NotNull Repository repo, @NotNull RevCommit child, @NotNull RevCommit parent) {
-    RevWalk revWalk = new RevWalk(repo);
-
-    try {
+    try (RevWalk revWalk = new RevWalk(repo)) {
       revWalk.markStart(child);
 
       Set<ObjectId> seena = newHashSet();
@@ -336,8 +328,6 @@ protected int distanceBetween(@NotNull Repository repo, @NotNull RevCommit child
       return distance;
     } catch (Exception e) {
       throw new RuntimeException(String.format("Unable to calculate distance between [%s] and [%s]", child, parent), e);
-    } finally {
-      revWalk.dispose();
     }
   }
 

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

@@ -24,7 +24,7 @@ public enum CommitIdGenerationModeEnum{
   public static CommitIdGenerationModeEnum getValue(String o){
     if(o != null){
       for(CommitIdGenerationModeEnum v : values()){
-        if(v.name().toString().equalsIgnoreCase(o)){
+        if(v.name().equalsIgnoreCase(o)){
           return v;
         }
       }

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

@@ -262,7 +262,7 @@ public class GitCommitIdMojo extends AbstractMojo {
    * Setting this value to `false`, causes the plugin to gracefully tell you "I did my best" and abort it's execution
    * if unable to obtain git meta data - yet the build will continue to run (without failing).
    *
-   * See https://github.com/ktoso/maven-git-commit-id-plugin/issues/63 for a rationale behing this flag.
+   * See https://github.com/ktoso/maven-git-commit-id-plugin/issues/63 for a rationale behind this flag.
    *
    * @parameter default-value="true"
    */
@@ -303,7 +303,7 @@ public class GitCommitIdMojo extends AbstractMojo {
   private boolean runOnlyOnce = false;
 
   /**
-   * Can be used to exclude certain properties from being emited into the resulting file.
+   * Can be used to exclude certain properties from being emitted into the resulting file.
    * May be useful when you want to hide {@code git.remote.origin.url} (maybe because it contains your repo password?),
    * or the email of the committer etc.
    *
@@ -336,7 +336,7 @@ public class GitCommitIdMojo extends AbstractMojo {
   /**
    * The option can be used to tell the plugin how it should generate the 'git.commit.id' property. Due to some naming issues when exporting the properties as an json-object (https://github.com/ktoso/maven-git-commit-id-plugin/issues/122) we needed to make it possible to export all properties as a valid json-object.
    * Due to the fact that this is one of the major properties the plugin is exporting we just don't want to change the exporting mechanism and somehow throw the backwards compatibility away.
-   * We rather provide a convient switch where you can choose if you would like the properties as they always had been, or if you rather need to support full json-object compatibility.
+   * We rather provide a convenient switch where you can choose if you would like the properties as they always had been, or if you rather need to support full json-object compatibility.
    * In the case you need to fully support json-object we unfortunately need to change the 'git.commit.id' property from 'git.commit.id' to 'git.commit.id.full' in the exporting mechanism to allow the generation of a fully valid json object.
    *
    * Currently the switch allows two different options:
@@ -792,9 +792,7 @@ static Properties readProperties(@NotNull File propertiesFile) throws CannotRead
     }
   }
 
-  static class CannotReadFileException
-    extends Exception
-  {
+  static class CannotReadFileException extends Exception {
     private static final long serialVersionUID = -6290782570018307756L;
 
     CannotReadFileException( Throwable cause )