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.
dmlloyd · Jul 22, 2024 · 859f69d · 859f69d
1 parent a22b7c9
commit 859f69d
Show file tree

Hide file tree

Showing 5 changed files with 256 additions and 209 deletions.
diff --git a/version/src/main/java/io/smallrye/common/version/Messages.java b/version/src/main/java/io/smallrye/common/version/Messages.java
@@ -48,15 +48,22 @@ interface Messages {
  @Message(id = 3011, value = "Unbounded range: %s")
  IllegalArgumentException unboundedRange(String pattern);
 
- @Message(id = 3012, value = "Ranges overlap: %s")
- IllegalArgumentException rangesOverlap(String version);
+ // 3012
 
- @Message(id = 3013, value = "Only fully-qualified sets allowed in multiple set scenario: %s")
- IllegalArgumentException onlyFullyQualifiedSetsAllowed(String version);
+ // 3013
 
  @Message(id = 3014, value = "Single version must be surrounded by []: %s")
  IllegalArgumentException singleVersionMustBeSurroundedByBrackets(String version);
 
  @Message(id = 3015, value = "Range defies version ordering: %s")
  IllegalArgumentException rangeDefiesVersionOrdering(String version);
+
+ @Message(id = 3016, value = "Unexpected version range character: %s")
+ IllegalArgumentException rangeUnexpected(String version);
+
+ @Message(id = 3017, value = "Standalone version cannot have an upper bound")
+ IllegalArgumentException standaloneVersionCannotBeBound();
+
+ @Message(id = 3018, value = "Inclusive versions cannot be empty")
+ IllegalArgumentException inclusiveVersionCannotBeEmpty();
 }
diff --git a/version/src/main/java/io/smallrye/common/version/VersionRange.java b/version/src/main/java/io/smallrye/common/version/VersionRange.java
diff --git a/version/src/main/java/io/smallrye/common/version/VersionRestriction.java b/version/src/main/java/io/smallrye/common/version/VersionRestriction.java