You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/07/07 13:37:46 UTC
svn commit: r1891363 -
/poi/trunk/poi/src/test/java/org/apache/poi/util/ConditionalExecution.java
Author: fanningpj
Date: Wed Jul 7 13:37:46 2021
New Revision: 1891363
URL: http://svn.apache.org/viewvc?rev=1891363&view=rev
Log:
convert indents to spaces
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/util/ConditionalExecution.java
Modified: poi/trunk/poi/src/test/java/org/apache/poi/util/ConditionalExecution.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/util/ConditionalExecution.java?rev=1891363&r1=1891362&r2=1891363&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/util/ConditionalExecution.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/util/ConditionalExecution.java Wed Jul 7 13:37:46 2021
@@ -72,14 +72,14 @@ public class ConditionalExecution {
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
String version = Runtime.class.getPackage().getImplementationVersion();
try {
- return findAnnotation(context.getElement(), DisabledOnJreEx.class).filter(annotation -> !isEnabled(annotation))
- .map(annotation -> disabled("PatchLevel skipped", "JRE version " + version + " skipped"))
- .orElseGet(() -> enabled("PatchLevel not matched"));
- } catch (IllegalAccessError e) {
- // cannot access org.junit.platform.commons.util.AnnotationUtils when run in JPMS
- // for now let's ignore this check and report "enabled"
- return ConditionEvaluationResult.enabled("Cannot check annotation: " + e);
- }
+ return findAnnotation(context.getElement(), DisabledOnJreEx.class).filter(annotation -> !isEnabled(annotation))
+ .map(annotation -> disabled("PatchLevel skipped", "JRE version " + version + " skipped"))
+ .orElseGet(() -> enabled("PatchLevel not matched"));
+ } catch (IllegalAccessError e) {
+ // cannot access org.junit.platform.commons.util.AnnotationUtils when run in JPMS
+ // for now let's ignore this check and report "enabled"
+ return ConditionEvaluationResult.enabled("Cannot check annotation: " + e);
+ }
}
boolean isEnabled(DisabledOnJreEx annotation) {
@@ -87,9 +87,9 @@ public class ConditionalExecution {
Preconditions.condition(versions.length > 0, "You must declare at least one JRE version in @DisabledOnJreEx");
String version1 = Runtime.class.getPackage().getImplementationVersion();
if (version1 == null) {
- // revert to system-property if no implementation version is available
- version1 = System.getProperty("java.version");
- }
+ // revert to system-property if no implementation version is available
+ version1 = System.getProperty("java.version");
+ }
String version = version1;
return Arrays.stream(versions).noneMatch(p -> Pattern.matches(p, version));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org