Fix Sonar issues [patch]

Author: Hugo Dias

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java-gradle-plugin'
     id "com.diffplug.spotless" version "6.11.0"
-//    id 'pt.com.hugo-dias.git-versioner' version '1.0.0'
+    id "pt.com.hugo-dias.git-versioner" version "1.0.1"
     id 'maven-publish'
     id "com.gradle.plugin-publish" version "1.0.0"
     id "pl.droidsonroids.jacoco.testkit" version "1.0.7"
@@ -10,7 +10,6 @@ plugins {
 }
 
 group 'pt.com.hugo-dias.gradle.gitversioner'
-version '1.0.1'
 
 repositories {
     mavenCentral()
@@ -90,3 +89,11 @@ sonarqube {
 //        property "sonar.cpd.exclusions", "src/test/**/*"
     }
 }
+
+versioner {
+    startFrom {
+        major = 1
+        minor = 0
+        patch = 1
+    }
+}

src/main/java/pt/com/hugodias/gradle/gitversioner/VersionerPlugin.java

@@ -2,7 +2,6 @@
 package pt.com.hugodias.gradle.gitversioner;
 
 import java.io.File;
-import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.TaskProvider;
@@ -40,18 +39,15 @@ public void apply(Project project) {
                 });
 
     project.afterEvaluate(
-        new Action<Project>() {
-          @Override
-          public void execute(Project project) {
-            if (extension.getCalculatedVersion() == null) {
-              VersionerConfig config = VersionerConfig.fromExtension(extension);
-              String version = versioner.version(config).print(config.getPattern());
-              project.setVersion(version);
-            }
-
-            printVersionTask.get().getVersion().set(project.getVersion().toString());
-            tagVersionTask.get().getVersion().set(project.getVersion().toString());
+        innerProject -> {
+          if (extension.getCalculatedVersion() == null) {
+            VersionerConfig config = VersionerConfig.fromExtension(extension);
+            String version = versioner.version(config).print(config.getPattern());
+            innerProject.setVersion(version);
           }
+
+          printVersionTask.get().getVersion().set(innerProject.getVersion().toString());
+          tagVersionTask.get().getVersion().set(innerProject.getVersion().toString());
         });
   }
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/configuration/Match.java

@@ -3,10 +3,10 @@
 
 import org.gradle.api.provider.Property;
 
-public abstract class Match {
-  public abstract Property<String> getMajor();
+public interface Match {
+  Property<String> getMajor();
 
-  public abstract Property<String> getMinor();
+  Property<String> getMinor();
 
-  public abstract Property<String> getPatch();
+  Property<String> getPatch();
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/configuration/Pattern.java

@@ -3,6 +3,6 @@
 
 import org.gradle.api.provider.Property;
 
-public abstract class Pattern {
-  public abstract Property<String> getPattern();
+public interface Pattern {
+  Property<String> getPattern();
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/configuration/StartFrom.java

@@ -3,10 +3,10 @@
 
 import org.gradle.api.provider.Property;
 
-public abstract class StartFrom {
-  public abstract Property<Integer> getMajor();
+public interface StartFrom {
+  Property<Integer> getMajor();
 
-  public abstract Property<Integer> getMinor();
+  Property<Integer> getMinor();
 
-  public abstract Property<Integer> getPatch();
+  Property<Integer> getPatch();
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/configuration/Tag.java

@@ -3,8 +3,8 @@
 
 import org.gradle.api.provider.Property;
 
-public abstract class Tag {
-  public abstract Property<String> getPrefix();
+public interface Tag {
+  Property<String> getPrefix();
 
-  public abstract Property<Boolean> getUseCommitMessage();
+  Property<Boolean> getUseCommitMessage();
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/configuration/git/Authentication.java

@@ -3,10 +3,10 @@
 
 import org.gradle.api.tasks.Nested;
 
-public abstract class Authentication {
+public interface Authentication {
   @Nested
-  public abstract Ssh getSsh();
+  Ssh getSsh();
 
   @Nested
-  public abstract Https getHttps();
+  Https getHttps();
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/configuration/git/Git.java

@@ -3,7 +3,7 @@
 
 import org.gradle.api.tasks.Nested;
 
-public abstract class Git {
+public interface Git {
   @Nested
-  public abstract Authentication getAuthentication();
+  Authentication getAuthentication();
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/configuration/git/Https.java

@@ -3,10 +3,10 @@
 
 import org.gradle.api.provider.Property;
 
-public abstract class Https {
-  public abstract Property<String> getUsername();
+public interface Https {
+  Property<String> getUsername();
 
-  public abstract Property<String> getPassword();
+  Property<String> getPassword();
 
-  public abstract Property<String> getToken();
+  Property<String> getToken();
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/configuration/git/Ssh.java

@@ -3,6 +3,6 @@
 
 import org.gradle.api.provider.Property;
 
-public abstract class Ssh {
-  public abstract Property<Boolean> getStrictSsl();
+public interface Ssh {
+  Property<Boolean> getStrictSsl();
 }

src/main/java/pt/com/hugodias/gradle/gitversioner/core/exception/TaggingException.java

@@ -0,0 +1,8 @@
+/* (C) 2022 Hugo Dias */
+package pt.com.hugodias.gradle.gitversioner.core.exception;
+
+public class TaggingException extends RuntimeException {
+  public TaggingException(Throwable cause) {
+    super(cause);
+  }
+}

src/main/java/pt/com/hugodias/gradle/gitversioner/core/exception/VersionerException.java

@@ -0,0 +1,8 @@
+/* (C) 2022 Hugo Dias */
+package pt.com.hugodias.gradle.gitversioner.core.exception;
+
+public class VersionerException extends RuntimeException {
+  public VersionerException(Throwable cause) {
+    super(cause);
+  }
+}

src/main/java/pt/com/hugodias/gradle/gitversioner/core/tag/GitTagger.java

@@ -11,6 +11,7 @@
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
+import pt.com.hugodias.gradle.gitversioner.core.exception.TaggingException;
 
 @Data
 @Builder
@@ -30,7 +31,7 @@ public void tag(String version) {
       tagCommand.call();
       git.push().add(prefixedVersion).setCredentialsProvider(credentialsProvider).call();
     } catch (IOException | GitAPIException e) {
-      throw new RuntimeException(e);
+      throw new TaggingException(e);
     }
   }
 

src/main/java/pt/com/hugodias/gradle/gitversioner/core/version/Versioner.java

@@ -10,21 +10,20 @@
 import lombok.val;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.NoHeadException;
+import pt.com.hugodias.gradle.gitversioner.core.exception.VersionerException;
 
 @Data
 @Builder
 public class Versioner {
   private File gitFolder;
 
   public Version version(VersionerConfig config) {
-    try {
+    try (Git git = Git.open(gitFolder)) {
       var major = config.getStartFromMajor();
       var minor = config.getStartFromMinor();
       var patch = config.getStartFromPatch();
       var commit = 0;
 
-      val git = Git.open(gitFolder);
       val branch = git.getRepository().getBranch();
       val hash = git.getRepository().findRef("HEAD").getObjectId().getName();
 
@@ -56,12 +55,8 @@ public Version version(VersionerConfig config) {
           .branch(branch)
           .hash(hash)
           .build();
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    } catch (NoHeadException e) {
-      throw new RuntimeException(e);
-    } catch (GitAPIException e) {
-      throw new RuntimeException(e);
+    } catch (IOException | GitAPIException e) {
+      throw new VersionerException(e);
     }
   }
 

src/test/java/pt/com/hugodias/gradle/gitversioner/GitVersionerTest.java

@@ -13,29 +13,28 @@
 import pt.com.hugodias.gradle.gitversioner.util.Project;
 
 @FunctionalTest
-public class GitVersionerTest {
+class GitVersionerTest {
 
   private File directory;
   private Project project;
   private Gradle gradle;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     directory = new File("build/tmp/functionalTest/GitVersionerTest/");
     directory.mkdirs();
     project = Project.builder().directory(directory).build();
     gradle = Gradle.builder().directory(directory).build();
   }
 
   @AfterEach
-  public void tearDown() throws IOException {
+  void tearDown() throws IOException {
     FileUtils.deleteDirectory(directory);
   }
 
   @DisplayName("Version is available after forcing version resolution in Groovy")
   @Test
-  public void testVersionIsAvailableAfterForcingVersionGroovy()
-      throws IOException, GitAPIException {
+  void testVersionIsAvailableAfterForcingVersionGroovy() throws IOException, GitAPIException {
     project.withSettingsFile().withGit().withGroovyGradleFile("configured");
     addCommits();
 
@@ -46,8 +45,7 @@ public void testVersionIsAvailableAfterForcingVersionGroovy()
 
   @DisplayName("Version is available after forcing version resolution in Kotlin")
   @Test
-  public void testVersionIsAvailableAfterForcingVersionKotlin()
-      throws IOException, GitAPIException {
+  void testVersionIsAvailableAfterForcingVersionKotlin() throws IOException, GitAPIException {
     project.withSettingsFile().withGit().withKotlinGradleFile("configured");
     addCommits();
 

src/test/java/pt/com/hugodias/gradle/gitversioner/VersionerPluginTest.java

@@ -8,10 +8,10 @@
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.jupiter.api.Test;
 
-public class VersionerPluginTest {
+class VersionerPluginTest {
 
   @Test
-  public void greetingTest() {
+  void greetingTest() {
     Project project = ProjectBuilder.builder().build();
     project.getPluginManager().apply("pt.com.hugo-dias.git-versioner");