refactor: cleanup config and extension

Author: qoomon

src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPluginConfig.java

@@ -15,30 +15,30 @@ public class GitVersioningPluginConfig {
 
     public boolean preferTags = false;
 
-    public void addBranchVersionDescription(VersionDescription versionDescription) {
-        this.branchVersionDescriptions.add(versionDescription);
-    }
-
-    public void addTagVersionDescription(VersionDescription versionDescription) {
-        this.tagVersionDescriptions.add(versionDescription);
-    }
-
-    public void commit(Closure closure) {
+    public void commit(Closure<CommitVersionDescription> closure) {
         CommitVersionDescription versionDescription = new CommitVersionDescription();
         configure(closure, versionDescription);
         this.commitVersionDescription = versionDescription;
     }
 
-    public void branch(Closure closure) {
+    public void branch(VersionDescription versionDescription) {
+        this.branchVersionDescriptions.add(versionDescription);
+    }
+
+    public void branch(Closure<VersionDescription> closure) {
         VersionDescription versionDescription = new VersionDescription();
         configure(closure, versionDescription);
-        addBranchVersionDescription(versionDescription);
+        branch(versionDescription);
+    }
+
+    public void tag(VersionDescription versionDescription) {
+        this.tagVersionDescriptions.add(versionDescription);
     }
 
-    public void tag(Closure closure) {
+    public void tag(Closure<VersionDescription> closure) {
         VersionDescription versionDescription = new VersionDescription();
         configure(closure, versionDescription);
-        addTagVersionDescription(versionDescription);
+        tag(versionDescription);
     }
 
     public static class VersionDescription {
@@ -47,10 +47,14 @@ public static class VersionDescription {
         public String versionFormat;
         public List<PropertyDescription> properties = new ArrayList<>();
 
-        public void property(Closure closure) {
+        public void property(PropertyDescription propertyDescription) {
+            this.properties.add(propertyDescription);
+        }
+
+        public void property(Closure<PropertyDescription> closure) {
             PropertyDescription propertyDescription = new PropertyDescription();
             configure(closure, propertyDescription);
-            this.properties.add(propertyDescription);
+            property(propertyDescription);
         }
     }
 
@@ -59,10 +63,14 @@ public static class CommitVersionDescription {
         public String versionFormat;
         public List<PropertyDescription> properties = new ArrayList<>();
 
-        public void property(Closure closure) {
+        public void property(PropertyDescription propertyDescription) {
+            this.properties.add(propertyDescription);
+        }
+
+        public void property(Closure<PropertyDescription> closure) {
             PropertyDescription propertyDescription = new PropertyDescription();
             configure(closure, propertyDescription);
-            this.properties.add(propertyDescription);
+            property(propertyDescription);
         }
     }
 
@@ -71,10 +79,14 @@ public static class PropertyDescription {
         public String pattern;
         public ValueDescription value;
 
-        public void value(Closure closure) {
+        public void value(ValueDescription valueDescription) {
+            this.value = valueDescription;
+        }
+
+        public void value(Closure<ValueDescription> closure) {
             ValueDescription valueDescription = new ValueDescription();
             configure(closure, valueDescription);
-            this.value = valueDescription;
+            value(valueDescription);
         }
     }
 

src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPluginExtension.java

@@ -29,12 +29,6 @@ public GitVersioningPluginExtension(Project project) {
         this.rootProject = project;
     }
 
-    public void apply(Closure closure) {
-        GitVersioningPluginConfig config = new GitVersioningPluginConfig();
-        configure(closure, config);
-        apply(config);
-    }
-
     public void apply(GitVersioningPluginConfig config) {
 
         if (parseBoolean(getCommandOption(rootProject, OPTION_NAME_DISABLE))) {
@@ -96,6 +90,12 @@ public void apply(GitVersioningPluginConfig config) {
         });
     }
 
+    public void apply(Closure<GitVersioningPluginConfig> closure) {
+        GitVersioningPluginConfig config = new GitVersioningPluginConfig();
+        configure(closure, config);
+        apply(config);
+    }
+
     private String resolveOriginVersion(Project project, Map<String, Object> originVersionMap) {
         String projectVersion = originVersionMap.get(project.getPath()).toString();
         if (!projectVersion.equals("unspecified")) {

src/test/java/me/qoomon/gradle/gitversioning/GitVersioningPluginTest.java

@@ -113,7 +113,7 @@ void apply_with_extension_branch_description() throws GitAPIException {
                 .getByName("gitVersioning");
 
         GitVersioningPluginConfig config = new GitVersioningPluginConfig() {{
-            addBranchVersionDescription(new VersionDescription() {{
+            branch(new VersionDescription() {{
                 versionFormat = "${branch}-gitVersioning";
             }});
         }};
@@ -143,7 +143,7 @@ void apply_with_extension_tag_description() throws GitAPIException {
                 .getByName("gitVersioning");
 
         GitVersioningPluginConfig config = new GitVersioningPluginConfig() {{
-            addTagVersionDescription(new VersionDescription() {{
+            tag(new VersionDescription() {{
                 versionFormat = "${tag}-gitVersioning";
             }});
         }};