Replace !Optional.isPresent with Optional.isEmpty

tobias-lippert · philwebb · commit 24e0864105d5 · 2024-01-23T10:18:50.000-08:00
See gh-39259
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeDependencies.java
@@ -194,7 +194,7 @@ private Milestone determineMilestone(GitHubRepository repository) {
 		java.util.Optional<Milestone> matchingMilestone = milestones.stream()
 			.filter((milestone) -> milestone.getName().equals(getMilestone().get()))
 			.findFirst();
-		if (!matchingMilestone.isPresent()) {
+		if (matchingMilestone.isEmpty()) {
 			throw new InvalidUserDataException("Unknown milestone: " + getMilestone().get());
 		}
 		return matchingMilestone.get();
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOsCondition.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/junit/DisabledOnOsCondition.java
@@ -37,7 +37,7 @@ class DisabledOnOsCondition implements ExecutionCondition {
 
 	@Override
 	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
-		if (!context.getElement().isPresent()) {
+		if (context.getElement().isEmpty()) {
 			return ConditionEvaluationResult.enabled("No element for @DisabledOnOs found");
 		}
 		MergedAnnotation<DisabledOnOs> annotation = MergedAnnotations

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ private Milestone determineMilestone(GitHubRepository repository) {`
`194`	`194`	`java.util.Optional<Milestone> matchingMilestone = milestones.stream()`
`195`	`195`	`.filter((milestone) -> milestone.getName().equals(getMilestone().get()))`
`196`	`196`	`.findFirst();`
`197`		`- if (!matchingMilestone.isPresent()) {`
	`197`	`+ if (matchingMilestone.isEmpty()) {`
`198`	`198`	`throw new InvalidUserDataException("Unknown milestone: " + getMilestone().get());`
`199`	`199`	`}`
`200`	`200`	`return matchingMilestone.get();`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class DisabledOnOsCondition implements ExecutionCondition {`
`37`	`37`
`38`	`38`	`@Override`
`39`	`39`	`public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {`
`40`		`- if (!context.getElement().isPresent()) {`
	`40`	`+ if (context.getElement().isEmpty()) {`
`41`	`41`	`return ConditionEvaluationResult.enabled("No element for @DisabledOnOs found");`
`42`	`42`	`}`
`43`	`43`	`MergedAnnotation<DisabledOnOs> annotation = MergedAnnotations`