Skip to content

Commit

Permalink
Don't offer upgrade for version that is already aligned
Browse files Browse the repository at this point in the history
  • Loading branch information
wilkinsona committed Jun 24, 2021
1 parent a7872f4 commit 316d2cc
Showing 1 changed file with 20 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,12 @@ private Upgrade resolveUpgrade(Library library, Map<String, Library> libraries)

private List<VersionOption> getVersionOptions(Library library, Map<String, Library> libraries) {
if (library.getVersion().getVersionAlignment() != null) {
VersionOption alignedVersionOption = alignedVersionOption(library, libraries);
if (!isPermitted(alignedVersionOption.version, library.getProhibitedVersions())) {
throw new InvalidUserDataException("Version alignment failed. Version " + alignedVersionOption.version
+ " from " + library.getName() + " is prohibited");
}
return Collections.singletonList(alignedVersionOption);
return determineAlignedVersionOption(library, libraries);
}
return determineResolvedVersionOptions(library);
}

private List<VersionOption> determineResolvedVersionOptions(Library library) {
Map<String, SortedSet<DependencyVersion>> moduleVersions = new LinkedHashMap<>();
DependencyVersion libraryVersion = library.getVersion().getVersion();
for (Group group : library.getGroups()) {
Expand Down Expand Up @@ -120,6 +119,18 @@ private List<VersionOption> getVersionOptions(Library library, Map<String, Libra
.collect(Collectors.toList());
}

private List<VersionOption> determineAlignedVersionOption(Library library, Map<String, Library> libraries) {
VersionOption alignedVersionOption = alignedVersionOption(library, libraries);
if (alignedVersionOption == null) {
return Collections.emptyList();
}
if (!isPermitted(alignedVersionOption.version, library.getProhibitedVersions())) {
throw new InvalidUserDataException("Version alignment failed. Version " + alignedVersionOption.version
+ " from " + library.getName() + " is prohibited");
}
return Collections.singletonList(alignedVersionOption);
}

private VersionOption alignedVersionOption(Library library, Map<String, Library> libraries) {
VersionAlignment versionAlignment = library.getVersion().getVersionAlignment();
Library alignmentLibrary = libraries.get(versionAlignment.getLibraryName());
Expand Down Expand Up @@ -148,8 +159,9 @@ private VersionOption alignedVersionOption(Library library, Map<String, Library>
throw new InvalidUserDataException("Cannot align with library '" + versionAlignment.getLibraryName()
+ "' as it uses multiple different versions of this library's modules");
}
String requiredVersion = versions.iterator().next();
return new AlignedVersionOption(DependencyVersion.parse(requiredVersion), alignmentLibrary);
DependencyVersion version = DependencyVersion.parse(versions.iterator().next());
return library.getVersion().getVersion().equals(version) ? null
: new AlignedVersionOption(version, alignmentLibrary);
}

private boolean isPermitted(DependencyVersion dependencyVersion, List<ProhibitedVersion> prohibitedVersions) {
Expand Down

0 comments on commit 316d2cc

Please sign in to comment.