root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Switch mergeDependencies to use a set.

This commit is contained in:
Phillip Webb 2014-06-11 10:04:06 -07:00
parent d36f9ce8e0
commit c861f24ba3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/AbstractDependencies.java
View File

@ -19,14 +19,15 @@ package org.springframework.boot.dependency.tools;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.LinkedHashSet;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.springframework.boot.dependency.tools.Dependency.Exclusion; import org.springframework.boot.dependency.tools.Dependency.Exclusion;
/** /**
* Abstract base implementation for {@link Dependencies}. * Abstract base implementation for {@link Dependencies}.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.1.0 * @since 1.1.0
@ -68,12 +69,11 @@ abstract class AbstractDependencies implements Dependencies {
private Dependency mergeDependencies(Dependency existingDependency, private Dependency mergeDependencies(Dependency existingDependency,
Dependency newDependency) { Dependency newDependency) {
List<Exclusion> combinedExclusions = new ArrayList<Exclusion>(); Set<Exclusion> combinedExclusions = new LinkedHashSet<Exclusion>();
combinedExclusions.addAll(existingDependency.getExclusions()); combinedExclusions.addAll(existingDependency.getExclusions());
combinedExclusions.addAll(newDependency.getExclusions()); combinedExclusions.addAll(newDependency.getExclusions());
return new Dependency(newDependency.getGroupId(), newDependency.getArtifactId(), return new Dependency(newDependency.getGroupId(), newDependency.getArtifactId(),
newDependency.getVersion(), combinedExclusions); newDependency.getVersion(), new ArrayList<Exclusion>(combinedExclusions));
} }
/** /**