Use Dependency's builder so that I can add a new field later without having to worry so much about source or binary incompatibility

Author: sambsnyd

rewrite-gradle/src/main/java/org/openrewrite/gradle/internal/AddDependencyVisitor.java

@@ -40,6 +40,7 @@
 import org.openrewrite.maven.MavenDownloadingExceptions;
 import org.openrewrite.maven.internal.MavenPomDownloader;
 import org.openrewrite.maven.tree.*;
+import org.openrewrite.maven.tree.Dependency;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
@@ -257,8 +258,12 @@ public static JavaSourceFile addDependency(
                 }
 
                 GradleDependencyConfiguration newGdc = gdc;
-                org.openrewrite.maven.tree.Dependency newRequested = new org.openrewrite.maven.tree.Dependency(
-                        gav, classifier, "jar", gdc.getName(), emptyList(), null);
+                org.openrewrite.maven.tree.Dependency newRequested = Dependency.builder()
+                                .gav(gav)
+                                .classifier(classifier)
+                                .type("jar")
+                                .scope(gdc.getName())
+                                .build();
                 newGdc = newGdc.withRequested(ListUtils.concat(
                         ListUtils.map(gdc.getRequested(), requested -> {
                             // Remove any existing dependency with the same group and artifact id

rewrite-maven/src/main/java/org/openrewrite/maven/UpdateMavenModel.java

@@ -75,18 +75,19 @@ public Xml visitDocument(Xml.Document document, P p) {
             List<Xml.Tag> eachDependency = dependencies.get().getChildren("dependency");
             List<Dependency> requestedDependencies = new ArrayList<>(eachDependency.size());
             for (Xml.Tag dependency : eachDependency) {
-                requestedDependencies.add(new Dependency(
-                        new GroupArtifactVersion(
+                requestedDependencies.add(Dependency.builder()
+                        .gav(new GroupArtifactVersion(
                                 dependency.getChildValue("groupId").orElse(null),
                                 dependency.getChildValue("artifactId").orElseThrow(() -> new IllegalStateException("Dependency must have artifactId")),
                                 dependency.getChildValue("version").orElse(null)
-                        ),
-                        dependency.getChildValue("classifier").orElse(null),
-                        dependency.getChildValue("type").orElse(null),
-                        dependency.getChildValue("scope").orElse("compile"),
-                        mapExclusions(dependency),
-                        dependency.getChildValue("optional").orElse(null)
-                ));
+                        ))
+                        .classifier(dependency.getChildValue("classifier").orElse(null))
+                        .type(dependency.getChildValue("type").orElse(null))
+                        .scope(dependency.getChildValue("scope").orElse("compile"))
+                        .exclusions(mapExclusions(dependency))
+                        .optional(dependency.getChildValue("optional").orElse(null))
+                        .build()
+                );
             }
             requested = requested.withDependencies(requestedDependencies);
         } else if (!requested.getDependencies().isEmpty()) {

rewrite-maven/src/main/java/org/openrewrite/maven/internal/RawPom.java

@@ -563,8 +563,15 @@ private List<org.openrewrite.maven.tree.Dependency> mapRequestedDependencies(@Nu
                 dependencies = new ArrayList<>(unmappedDependencies.size());
                 for (Dependency d : unmappedDependencies) {
                     GroupArtifactVersion dGav = new GroupArtifactVersion(d.getGroupId(), d.getArtifactId(), d.getVersion());
-                    dependencies.add(new org.openrewrite.maven.tree.Dependency(dGav, d.getClassifier(), d.getType(), d.getScope(), d.getExclusions(),
-                            d.getOptional()));
+                    dependencies.add(
+                            org.openrewrite.maven.tree.Dependency.builder()
+                                    .gav(dGav)
+                                    .classifier(d.getClassifier())
+                                    .type(d.getType())
+                                    .scope(d.getScope())
+                                    .exclusions(d.getExclusions())
+                                    .optional(d.getOptional())
+                                    .build());
                 }
             }
         }
@@ -577,8 +584,14 @@ private List<org.openrewrite.maven.tree.Dependency> mapRequestedDependencies(@Nu
             dependencies = new ArrayList<>(rawDependencies.size());
             for (Dependency d : rawDependencies) {
                 GroupArtifactVersion dGav = new GroupArtifactVersion(d.getGroupId(), d.getArtifactId(), d.getVersion());
-                dependencies.add(new org.openrewrite.maven.tree.Dependency(dGav, d.getClassifier(), d.getType(), d.getScope(), d.getExclusions(),
-                        d.getOptional()));
+                dependencies.add(org.openrewrite.maven.tree.Dependency.builder()
+                        .gav(dGav)
+                        .classifier(d.getClassifier())
+                        .type(d.getType())
+                        .scope(d.getScope())
+                        .exclusions(d.getExclusions())
+                        .optional(d.getOptional())
+                        .build());
             }
         }
         return dependencies;