Browse Source

Polish 'Use pattern variables'

See gh-39259
pull/39285/head
Phillip Webb 2 years ago
parent
commit
e40f49d173
  1. 16
      buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/ReleaseTrainDependencyVersion.java

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

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

Loading…
Cancel
Save