Minor fix to GradleDependencyBuilder and GradleDependencyFacet

forge · Sep 22, 2013 · b89ca6d · b89ca6d
1 parent d9ab096
commit b89ca6d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 3 deletions.
diff --git a/api/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleDependencyBuilder.java b/api/src/main/java/org/jboss/forge/addon/gradle/projects/model/GradleDependencyBuilder.java
@@ -174,7 +174,14 @@ public String getPackaging()
 
    public GradleDependencyBuilder setPackaging(String packaging)
    {
-      this.packaging = packaging;
+      if (!Strings.isNullOrEmpty(packaging))
+      {
+         this.packaging = packaging;
+      }
+      else
+      {
+         this.packaging = DEFAULT_PACKAGING;
+      }
       return this;
    }
 

diff --git a/...cts/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacet.java b/...cts/src/main/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacet.java
@@ -21,6 +21,7 @@
 import org.jboss.forge.addon.dependencies.DependencyQuery;
 import org.jboss.forge.addon.dependencies.DependencyRepository;
 import org.jboss.forge.addon.dependencies.DependencyResolver;
+import org.jboss.forge.addon.dependencies.builder.CoordinateBuilder;
 import org.jboss.forge.addon.dependencies.builder.DependencyBuilder;
 import org.jboss.forge.addon.dependencies.builder.DependencyQueryBuilder;
 import org.jboss.forge.addon.dependencies.util.NonSnapshotDependencyFilter;
@@ -353,9 +354,24 @@ private Dependency gradleDepToForgeDep(GradleDependency gradleDep)
                .setArtifactId(gradleDep.getName())
                .setVersion(gradleDep.getVersion())
                .setClassifier(gradleDep.getClassifier())
-               .setPackaging(gradleDep.getPackaging());
+               .setPackaging(gradleDep.getPackaging())
+               .setExcludedCoordinates(gradleExclusionsToForge(gradleDep.getExcludedDependencies()));
       return forgeDep;
    }
+
+   private List<Coordinate> gradleExclusionsToForge(List<GradleDependency> exclusions)
+   {
+      List<Coordinate> list = Lists.newArrayList();
+
+      for (GradleDependency dep : exclusions)
+      {
+         list.add(CoordinateBuilder.create()
+                  .setGroupId(dep.getGroup())
+                  .setArtifactId(dep.getName()));
+      }
+
+      return list;
+   }
 
    private GradleDependency forgeDepToGradleDep(Dependency forgeDep)
    {
@@ -366,7 +382,27 @@ private GradleDependency forgeDepToGradleDep(Dependency forgeDep)
                .setName(forgeDep.getCoordinate().getArtifactId())
                .setVersion(forgeDep.getCoordinate().getVersion())
                .setClassifier(forgeDep.getCoordinate().getClassifier())
-               .setPackaging(forgeDep.getCoordinate().getPackaging());
+               .setPackaging(forgeDep.getCoordinate().getPackaging())
+               .setExcludedDependencies(forgeExclusionsToGradle(forgeDep.getExcludedCoordinates()));
+   }
+
+   private List<GradleDependency> forgeExclusionsToGradle(List<Coordinate> exclusions)
+   {
+      List<GradleDependency> list = Lists.newArrayList();
+
+      if (exclusions == null)
+      {
+         return list;
+      }
+
+      for (Coordinate coord : exclusions)
+      {
+         list.add(GradleDependencyBuilder.create()
+                  .setGroup(coord.getGroupId())
+                  .setName(coord.getArtifactId()));
+      }
+
+      return list;
    }
 
    private List<Dependency> filterDependenciesFromScopes(List<Dependency> deps, String... scopes)