Commit 5341b4fb authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #13943 from izeye:polish-select-imports

* pr/13943:
  Polish AutoConfigurationGroup.selectImports()
parents d12a099a daf3f820
...@@ -433,19 +433,11 @@ public class AutoConfigurationImportSelector ...@@ -433,19 +433,11 @@ public class AutoConfigurationImportSelector
Set<String> allExclusions = this.autoConfigurationEntries.stream() Set<String> allExclusions = this.autoConfigurationEntries.stream()
.map(AutoConfigurationEntry::getExclusions) .map(AutoConfigurationEntry::getExclusions)
.flatMap(Collection::stream).collect(Collectors.toSet()); .flatMap(Collection::stream).collect(Collectors.toSet());
Set<String> processedConfigurations = new LinkedHashSet<>(); Set<String> processedConfigurations = this.autoConfigurationEntries.stream()
Set<String> processedExclusions = new LinkedHashSet<>(); .map(AutoConfigurationEntry::getConfigurations)
this.autoConfigurationEntries.forEach((entry) -> { .flatMap(Collection::stream)
List<String> configurations = new ArrayList<>(entry.getConfigurations()); .collect(Collectors.toCollection(LinkedHashSet::new));
configurations.removeAll(allExclusions); processedConfigurations.removeAll(allExclusions);
configurations.removeIf(processedConfigurations::contains);
Set<String> exclusions = new HashSet<>(entry.getExclusions());
exclusions.removeIf(processedExclusions::contains);
// This now represents the exact state of this entry based on the
// state of all other entries
processedConfigurations.addAll(configurations);
processedExclusions.addAll(exclusions);
});
return sortAutoConfigurations(processedConfigurations, return sortAutoConfigurations(processedConfigurations,
getAutoConfigurationMetadata()) getAutoConfigurationMetadata())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment