Skip to content

Commit 859f69d

Browse files
committed
Unify parsing with predicate methods on VersionScheme
Intoduce a left-to-right recursive-descent parser for version ranges. Use the predicates on `VersionScheme` to compose the resultant range.
1 parent a22b7c9 commit 859f69d

File tree

5 files changed

+256
-209
lines changed

5 files changed

+256
-209
lines changed

version/src/main/java/io/smallrye/common/version/Messages.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,22 @@ interface Messages {
4848
@Message(id = 3011, value = "Unbounded range: %s")
4949
IllegalArgumentException unboundedRange(String pattern);
5050

51-
@Message(id = 3012, value = "Ranges overlap: %s")
52-
IllegalArgumentException rangesOverlap(String version);
51+
// 3012
5352

54-
@Message(id = 3013, value = "Only fully-qualified sets allowed in multiple set scenario: %s")
55-
IllegalArgumentException onlyFullyQualifiedSetsAllowed(String version);
53+
// 3013
5654

5755
@Message(id = 3014, value = "Single version must be surrounded by []: %s")
5856
IllegalArgumentException singleVersionMustBeSurroundedByBrackets(String version);
5957

6058
@Message(id = 3015, value = "Range defies version ordering: %s")
6159
IllegalArgumentException rangeDefiesVersionOrdering(String version);
60+
61+
@Message(id = 3016, value = "Unexpected version range character: %s")
62+
IllegalArgumentException rangeUnexpected(String version);
63+
64+
@Message(id = 3017, value = "Standalone version cannot have an upper bound")
65+
IllegalArgumentException standaloneVersionCannotBeBound();
66+
67+
@Message(id = 3018, value = "Inclusive versions cannot be empty")
68+
IllegalArgumentException inclusiveVersionCannotBeEmpty();
6269
}

version/src/main/java/io/smallrye/common/version/VersionRange.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

version/src/main/java/io/smallrye/common/version/VersionRestriction.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)