chore: integrating dependencybuilder into the dependency class

Signed-off-by: Maximillian Arruda <[email protected]>

Author: dearrudam

src/main/java/br/org/soujava/pomeditor/api/Dependency.java

@@ -27,20 +27,115 @@
 public final class Dependency {
 
     /**
+     * Returns a {@link DependencyBuilder} instance
      * @return a {@link DependencyBuilder}
      */
     public static DependencyBuilder builder() {
         return new DependencyBuilder();
     }
 
+    /**
+     * Returns a {@link DependencyBuilder} based on a GAV - groupId:artifactId:version - parameter
+     * @return a {@link DependencyBuilder}
+     */
+    public static DependencyBuilder ofGav(String gav) {
+        DependencyBuilder builder = builder();
+        var gavValues = Arrays.stream(gav.split(":"))
+                .filter(Objects::nonNull)
+                .filter(item -> !item.isBlank())
+                .map(String::trim)
+                .collect(Collectors.toList());
+        if (gavValues.size() >= 1)
+            builder.withGroupId(gavValues.get(0));
+        if (gavValues.size() >= 2)
+            builder.withArtifactId(gavValues.get(1));
+        if (gavValues.size() >= 3)
+            builder.withVersion(gavValues.get(2));
+        return builder;
+    }
+
+    /**
+     * Dependency builder
+     */
+    public static class DependencyBuilder {
+
+        private String groupId;
+        private String artifactId;
+        private String version;
+        private String type;
+        private String classifier;
+        private String scope;
+
+        /**
+         * @param groupId groupId
+         * @return the same {@link DependencyBuilder} instance
+         */
+        public DependencyBuilder withGroupId(String groupId) {
+            this.groupId = groupId;
+            return this;
+        }
+
+        /**
+         * @param artifactId artifactId
+         * @return the same {@link DependencyBuilder} instance
+         */
+        public DependencyBuilder withArtifactId(String artifactId) {
+            this.artifactId = artifactId;
+            return this;
+        }
+
+        /**
+         * @param version version
+         * @return the same {@link DependencyBuilder} instance
+         */
+        public DependencyBuilder withVersion(String version) {
+            this.version = version;
+            return this;
+        }
+
+        /**
+         * @param type type
+         * @return the same {@link DependencyBuilder} instance
+         */
+        public DependencyBuilder withType(String type) {
+            this.type = type;
+            return this;
+        }
+
+        /**
+         * @param classifier classifier
+         * @return the same {@link DependencyBuilder} instance
+         */
+        public DependencyBuilder withClassifier(String classifier) {
+            this.classifier = classifier;
+            return this;
+        }
+
+        /**
+         * @param scope scope
+         * @return the same {@link DependencyBuilder} instance
+         */
+        public DependencyBuilder withScope(String scope) {
+            this.scope = scope;
+            return this;
+        }
+
+        /**
+         * @return a {@link Dependency} instance
+         */
+        public Dependency build() {
+            return new Dependency(groupId, artifactId, version, type, classifier, scope);
+        }
+    }
+
     private final String groupId;
     private final String artifactId;
     private final String version;
     private final String type;
     private final String classifier;
     private final String scope;
 
-    Dependency(String groupId, String artifactId, String version, String type, String classifier, String scope) {
+    private Dependency(String groupId, String artifactId, String version, String type, String classifier, String scope) {
         if (groupId == null || groupId.isBlank())
             throw new IllegalArgumentException("groupId must be provided");
 
@@ -55,23 +150,6 @@ public static DependencyBuilder builder() {
         this.scope = scope;
     }
 
-    public static DependencyBuilder ofGav(String gav) {
-        DependencyBuilder builder = new DependencyBuilder();
-        var gavValues = Arrays.stream(gav.split(":"))
-                .filter(Objects::nonNull)
-                .filter(item -> !item.isBlank())
-                .map(String::trim)
-                .collect(Collectors.toList());
-        if (gavValues.size() >= 1)
-            builder.setGroupId(gavValues.get(0));
-        if (gavValues.size() >= 2)
-            builder.setArtifactId(gavValues.get(1));
-        if (gavValues.size() >= 3)
-            builder.setVersion(gavValues.get(2));
-        return builder;
-    }
-
-
     /**
      * @return the groupId
      */

src/main/java/br/org/soujava/pomeditor/mojo/AddDependencyMojo.java

@@ -17,8 +17,8 @@
 
 package br.org.soujava.pomeditor.mojo;
 
-import br.org.soujava.pomeditor.api.Dependency;
 import br.org.soujava.pomeditor.api.AddDependency;
+import br.org.soujava.pomeditor.api.Dependency;
 import br.org.soujava.pomeditor.api.PomChange;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -67,11 +67,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         try {
             getLog().info(String.format("trying to add the dependency: %s to the \"%s\" file...", dependency, pomFile));
 
-            transactionFor(pomFile)
-                    .execute(() -> Optional
-                            .ofNullable(this.addDependencyCommand)
-                            .orElse(AddDependency::execute)
-                            .accept(pomFile, dependency));
+            change(pomFile).execute(() -> dependencyCommand().accept(pomFile, dependency));
 
             getLog().info(String.format("added the dependency: %s to the \"%s\" file.", dependency, pomFile));
         } catch (Throwable ex) {
@@ -82,7 +78,13 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
     }
 
-    private PomChange transactionFor(Path pomFile) {
+    private BiConsumer<Path, Dependency> dependencyCommand() {
+        return Optional
+                .ofNullable(this.addDependencyCommand)
+                .orElse(AddDependency::execute);
+    }
+
+    private PomChange change(Path pomFile) {
         return PomChange
                 .builder()
                 .withLogger(getLog()::info)
@@ -96,9 +98,9 @@ private Dependency buildDependency() throws MojoExecutionException {
         try {
             return Dependency
                     .ofGav(gav)
-                    .setType(type)
-                    .setClassifier(classifier)
-                    .setScope(scope)
+                    .withType(type)
+                    .withClassifier(classifier)
+                    .withScope(scope)
                     .build();
         } catch (RuntimeException ex) {
             throw new MojoExecutionException(ex.getMessage(), ex);