Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish 'Use pattern variables'

Browse Source 
See gh-39259
This commit is contained in:
Phillip Webb
2024-01-23 09:01:43 -08:00
parent 06265ee617
commit e40f49d173
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/ReleaseTrainDependencyVersion.java
View File

@@ -64,21 +64,25 @@ final class ReleaseTrainDependencyVersion implements DependencyVersion {
@Override
public boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots) {
if (!(candidate instanceof ReleaseTrainDependencyVersion candidateReleaseTrain)) {
return true;
if (candidate instanceof ReleaseTrainDependencyVersion candidateReleaseTrain) {
return isUpgrade(candidateReleaseTrain, movingToSnapshots);
}
int comparison = this.releaseTrain.compareTo(candidateReleaseTrain.releaseTrain);
return true;
}
private boolean isUpgrade(ReleaseTrainDependencyVersion candidate, boolean movingToSnapshots) {
int comparison = this.releaseTrain.compareTo(candidate.releaseTrain);
if (comparison != 0) {
return comparison < 0;
}
if (movingToSnapshots && !isSnapshot() && candidateReleaseTrain.isSnapshot()) {
if (movingToSnapshots && !isSnapshot() && candidate.isSnapshot()) {
return true;
}
comparison = this.type.compareTo(candidateReleaseTrain.type);
comparison = this.type.compareTo(candidate.type);
if (comparison != 0) {
return comparison < 0;
}
return Integer.compare(this.version, candidateReleaseTrain.version) < 0;
return Integer.compare(this.version, candidate.version) < 0;
}
private boolean isSnapshot() {