Commit 1215495d authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #17611 from dreis2211

* pr/17611:
  Align JavaVersion.NINE name with JDK versioning

Closes gh-17611
parents 2e0ad19d c8097692
...@@ -80,14 +80,14 @@ class ConditionalOnJavaTests { ...@@ -80,14 +80,14 @@ class ConditionalOnJavaTests {
void equalOrNewerMessage() { void equalOrNewerMessage() {
ConditionOutcome outcome = this.condition.getMatchOutcome(Range.EQUAL_OR_NEWER, JavaVersion.NINE, ConditionOutcome outcome = this.condition.getMatchOutcome(Range.EQUAL_OR_NEWER, JavaVersion.NINE,
JavaVersion.EIGHT); JavaVersion.EIGHT);
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnJava (1.8 or newer) found 1.9"); assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnJava (1.8 or newer) found 9");
} }
@Test @Test
void olderThanMessage() { void olderThanMessage() {
ConditionOutcome outcome = this.condition.getMatchOutcome(Range.OLDER_THAN, JavaVersion.NINE, ConditionOutcome outcome = this.condition.getMatchOutcome(Range.OLDER_THAN, JavaVersion.NINE,
JavaVersion.EIGHT); JavaVersion.EIGHT);
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnJava (older than 1.8) found 1.9"); assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnJava (older than 1.8) found 9");
} }
@Test @Test
......
...@@ -38,9 +38,9 @@ public enum JavaVersion { ...@@ -38,9 +38,9 @@ public enum JavaVersion {
EIGHT("1.8", Optional.class, "empty"), EIGHT("1.8", Optional.class, "empty"),
/** /**
* Java 1.9. * Java 9.
*/ */
NINE("1.9", Optional.class, "stream"), NINE("9", Optional.class, "stream"),
/** /**
* Java 10. * Java 10.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment