Simplify usage of Optional

Author: marcphilipp

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodOrderingVisitor.java

@@ -73,9 +73,8 @@ protected boolean shouldNonMatchingDescriptorsComeBeforeOrderedOnes() {
 	private void orderContainedMethods(ClassBasedTestDescriptor classBasedTestDescriptor, Class<?> testClass) {
 		Optional<MethodOrderer> methodOrderer = findAnnotation(testClass, TestMethodOrder.class)//
 				.map(TestMethodOrder::value)//
-				.<MethodOrderer> map(ReflectionSupport::newInstance)//
-				.map(Optional::of)//
-				.orElseGet(configuration::getDefaultTestMethodOrderer);
+				.<MethodOrderer> map(ReflectionSupport::newInstance) //
+				.or(configuration::getDefaultTestMethodOrderer);
 		orderContainedMethods(classBasedTestDescriptor, testClass, methodOrderer);
 	}
 

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ResourceLock.java

@@ -90,6 +90,6 @@ default boolean isCompatible(ResourceLock other) {
 				.filter(resource -> ExclusiveResource.COMPARATOR.compare(resource,
 					ownResources.get(ownResources.size() - 1)) < 0);
 
-		return !(potentiallyDeadlockCausingAdditionalResource.isPresent());
+		return potentiallyDeadlockCausingAdditionalResource.isEmpty();
 	}
 }