forked from jirutka/rsql-parser
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add support for operators without arguments
=null=, =notnull=.
This commit introduces mor flexible way of parsing and validating operators and it's arguments. Two new operators `=null=` and `=notnull=` were added which wasn't possible previously due to grammar and API level limitations. Closes: gh-8
- Loading branch information
Showing
15 changed files
with
420 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2024 Edgar Asatryan <nstdio@gmail.com>. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package cz.jirutka.rsql.parser.ast; | ||
|
|
||
| /** | ||
| * The arity of an operator. | ||
| * | ||
| * @since 2.3.0 | ||
| */ | ||
| public interface Arity { | ||
|
|
||
| /** | ||
| * The minimum number of arguments operator can receive. | ||
| * | ||
| * @return The minimum number of arguments operator can receive. Positive or zero. | ||
| * @apiNote The minimum values is always less than or equal to {@linkplain #max()} | ||
| */ | ||
| int min(); | ||
|
|
||
| /** | ||
| * The maximum number of arguments operator can receive. | ||
| * | ||
| * @return The maximum number of arguments operator can receive. Positive or zero. | ||
| * @apiNote The maximum values is always greater than or equal to {@linkplain #min()}. For practically unlimited | ||
| * arity the implementations should return {@link Integer#MAX_VALUE}. | ||
| */ | ||
| int max(); | ||
|
|
||
| /** | ||
| * Creates arity with given {@code min} and {@code max}. | ||
| * | ||
| * @param min The minimum number of arguments. Must be zero or positive. | ||
| * @param max The maximum number of arguments. Must be zero or positive and greater than or equal to {@code min}. | ||
| * @return the created arity | ||
| */ | ||
| static Arity of(int min, int max) { | ||
| return new DynamicArity(min, max); | ||
| } | ||
|
|
||
| /** | ||
| * Creates N-ary object. | ||
| * | ||
| * @param n The N. | ||
| * @return the created arity | ||
| */ | ||
| static Arity nary(int n) { | ||
| return new NAry(n); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
src/main/java/cz/jirutka/rsql/parser/ast/DynamicArity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2024 Edgar Asatryan <nstdio@gmail.com>. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package cz.jirutka.rsql.parser.ast; | ||
|
|
||
| final class DynamicArity implements Arity { | ||
|
|
||
| private final int min; | ||
| private final int max; | ||
|
|
||
| DynamicArity(int min, int max) { | ||
| if (min < 0) { | ||
| throw new IllegalArgumentException("min must be positive or zero"); | ||
| } | ||
| if (max < 0) { | ||
| throw new IllegalArgumentException("max must be positive or zero"); | ||
| } | ||
| if (min > max) { | ||
| throw new IllegalArgumentException("min must be less than or equal to max"); | ||
| } | ||
|
|
||
| this.min = min; | ||
| this.max = max; | ||
| } | ||
|
|
||
| @Override | ||
| public int min() { | ||
| return min; | ||
| } | ||
|
|
||
| @Override | ||
| public int max() { | ||
| return max; | ||
| } | ||
| } |
Oops, something went wrong.