refactored commitIdGenerationMode processing because changing static variable violates thread safety

Author: autayeu

src/main/java/pl/project13/maven/git/CommitIdGenerationModeEnum.java renamed to src/main/java/pl/project13/maven/git/CommitIdGenerationMode.java

@@ -16,19 +16,7 @@
  */
 package pl.project13.maven.git;
 
-public enum CommitIdGenerationModeEnum{
+public enum CommitIdGenerationMode {
   FULL,
-  FLAT,
-  UNKNOWN;
-	
-  public static CommitIdGenerationModeEnum getValue(String o){
-    if(o != null){
-      for(CommitIdGenerationModeEnum v : values()){
-        if(v.name().equalsIgnoreCase(o)){
-          return v;
-        }
-      }
-    }
-    return CommitIdGenerationModeEnum.UNKNOWN;
-  }	
+  FLAT;
 }

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

@@ -46,7 +46,6 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -65,12 +64,9 @@ public class GitCommitIdMojo extends AbstractMojo {
   // these properties will be exposed to maven
   public static final String BRANCH = "branch";
   public static final String DIRTY = "dirty";
+  // only one of the following two will be exposed, depending on the commitIdGenerationMode
   public static final String COMMIT_ID_FLAT = "commit.id";
   public static final String COMMIT_ID_FULL = "commit.id.full";
-
-  // TODO this should be private instance field with getter and setter
-  public static String COMMIT_ID = COMMIT_ID_FLAT;
-
   public static final String COMMIT_ID_ABBREV = "commit.id.abbrev";
   public static final String COMMIT_DESCRIBE = "commit.id.describe";
   public static final String COMMIT_SHORT_DESCRIBE = "commit.id.describe-short";
@@ -134,7 +130,7 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Defaults to {@code true}.</p>
    */
-  @Parameter(defaultValue = "true", name = "git.skipPoms")
+  @Parameter(defaultValue = "true")
   private boolean skipPoms;
 
   /**
@@ -351,6 +347,7 @@ public class GitCommitIdMojo extends AbstractMojo {
    */
   @Parameter(defaultValue = "flat")
   private String commitIdGenerationMode;
+  private CommitIdGenerationMode commitIdGenerationModeEnum;
 
   /**
    * The properties we store our data in and then expose them.
@@ -399,15 +396,11 @@ public void execute() throws MojoExecutionException {
     }
 
     try {
-      switch(CommitIdGenerationModeEnum.getValue(commitIdGenerationMode)){
-      default:
+      try {
+        commitIdGenerationModeEnum = CommitIdGenerationMode.valueOf(commitIdGenerationMode.toUpperCase());
+      } catch (IllegalArgumentException e) {
         log.warn("Detected wrong setting for 'commitIdGenerationMode'. Falling back to default 'flat' mode!");
-      case FLAT:
-        COMMIT_ID = COMMIT_ID_FLAT;
-        break;
-      case FULL:
-        COMMIT_ID = COMMIT_ID_FULL;
-        break;
+        commitIdGenerationModeEnum = CommitIdGenerationMode.FLAT;
       }
 
       properties = initProperties();
@@ -603,7 +596,8 @@ void loadGitDataWithNativeGit(@NotNull Properties properties) throws IOException
       .setAbbrevLength(abbrevLength)
       .setDateFormat(dateFormat)
       .setDateFormatTimeZone(dateFormatTimeZone)
-      .setGitDescribe(gitDescribe);
+      .setGitDescribe(gitDescribe)
+      .setCommitIdGenerationMode(commitIdGenerationModeEnum);
 
     nativeGitProvider.loadGitData(properties);
   }
@@ -615,7 +609,8 @@ void loadGitDataWithJGit(@NotNull Properties properties) throws IOException, Moj
       .setAbbrevLength(abbrevLength)
       .setDateFormat(dateFormat)
       .setDateFormatTimeZone(dateFormatTimeZone)
-      .setGitDescribe(gitDescribe);
+      .setGitDescribe(gitDescribe)
+      .setCommitIdGenerationMode(commitIdGenerationModeEnum);
 
     jGitProvider.loadGitData(properties);
   }

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

@@ -45,6 +45,8 @@ public abstract class GitDataProvider {
 
   protected GitDescribeConfig gitDescribe = new GitDescribeConfig();
 
+  protected CommitIdGenerationMode commitIdGenerationMode;
+
   public GitDataProvider(@NotNull Mojo mojo) {
     this.mojo = mojo;
   }
@@ -69,6 +71,11 @@ public GitDataProvider setDateFormat(String dateFormat) {
     return this;
   }
 
+  public GitDataProvider setCommitIdGenerationMode(CommitIdGenerationMode commitIdGenerationMode) {
+    this.commitIdGenerationMode = commitIdGenerationMode;
+    return this;
+  }
+
   public GitDataProvider setDateFormatTimeZone(String dateFormatTimeZone){
     this.dateFormatTimeZone = dateFormatTimeZone;
     return this;
@@ -110,8 +117,11 @@ public void loadGitData(@NotNull Properties properties) throws IOException, Mojo
       // git.commit.id.describe
       maybePutGitDescribe(properties);
       // git.commit.id
-      put(properties, GitCommitIdMojo.COMMIT_ID, getCommitId());
-      // git.commit.id.abbrev      
+      switch (commitIdGenerationMode) {
+        case FULL: put(properties, GitCommitIdMojo.COMMIT_ID_FULL, getCommitId());
+        default: put(properties, GitCommitIdMojo.COMMIT_ID_FLAT, getCommitId());
+      }
+      // git.commit.id.abbrev
       put(properties, GitCommitIdMojo.COMMIT_ID_ABBREV, getAbbrevCommitId());
       // git.dirty
       put(properties, GitCommitIdMojo.DIRTY, Boolean.toString(isDirty()));

src/test/java/pl/project13/maven/git/GitCommitIdMojoDirtyFilesTest.java

@@ -47,6 +47,7 @@ public void testDetectCleanWorkingDirectory() throws Exception {
     mojo.setVerbose(true);
     mojo.useNativeGit(false);
     mojo.setGitDescribe(gitDescribeConfig);
+    mojo.setCommitIdGenerationMode("flat");
 
 
     mojo.project = mock(MavenProject.class, RETURNS_MOCKS);
@@ -79,6 +80,7 @@ public void testDetectDirtyWorkingDirectory() throws Exception {
     mojo.setVerbose(true);
     mojo.useNativeGit(false);
     mojo.setGitDescribe(gitDescribeConfig);
+    mojo.setCommitIdGenerationMode("flat");
 
 
     mojo.project = mock(MavenProject.class, RETURNS_MOCKS);