This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-access.git
The following commit(s) were added to refs/heads/main by this push:
new 7926fac Update antlr contrib maven project with recent changes (#38)
7926fac is described below
commit 7926fac5283710592ad7ebe37d5753210f3d1b51
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Jan 31 11:47:54 2024 -0500
Update antlr contrib maven project with recent changes (#38)
---
.../accumulo/access/{ => antlr}/TestDataLoader.java | 2 +-
.../antlr/AccessExpressionAntlrBenchmark.java | 2 +-
.../accumulo/access/grammar/antlr/Antlr4Tests.java | 20 +++++++++-----------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git
a/contrib/antlr4/src/test/java/org/apache/accumulo/access/TestDataLoader.java
b/contrib/antlr4/src/test/java/org/apache/accumulo/access/antlr/TestDataLoader.java
similarity index 98%
rename from
contrib/antlr4/src/test/java/org/apache/accumulo/access/TestDataLoader.java
rename to
contrib/antlr4/src/test/java/org/apache/accumulo/access/antlr/TestDataLoader.java
index bb858d0..0fcc76e 100644
---
a/contrib/antlr4/src/test/java/org/apache/accumulo/access/TestDataLoader.java
+++
b/contrib/antlr4/src/test/java/org/apache/accumulo/access/antlr/TestDataLoader.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.access;
+package org.apache.accumulo.access.antlr;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git
a/contrib/antlr4/src/test/java/org/apache/accumulo/access/grammar/antlr/AccessExpressionAntlrBenchmark.java
b/contrib/antlr4/src/test/java/org/apache/accumulo/access/grammar/antlr/AccessExpressionAntlrBenchmark.java
index e9e9725..0c3422f 100644
---
a/contrib/antlr4/src/test/java/org/apache/accumulo/access/grammar/antlr/AccessExpressionAntlrBenchmark.java
+++
b/contrib/antlr4/src/test/java/org/apache/accumulo/access/grammar/antlr/AccessExpressionAntlrBenchmark.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.accumulo.access.Authorizations;
-import org.apache.accumulo.access.TestDataLoader;
+import org.apache.accumulo.access.antlr.TestDataLoader;
import
org.apache.accumulo.access.grammars.AccessExpressionParser.Access_expressionContext;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Mode;
diff --git
a/contrib/antlr4/src/test/java/org/apache/accumulo/access/grammar/antlr/Antlr4Tests.java
b/contrib/antlr4/src/test/java/org/apache/accumulo/access/grammar/antlr/Antlr4Tests.java
index 1849de0..be40f3b 100644
---
a/contrib/antlr4/src/test/java/org/apache/accumulo/access/grammar/antlr/Antlr4Tests.java
+++
b/contrib/antlr4/src/test/java/org/apache/accumulo/access/grammar/antlr/Antlr4Tests.java
@@ -42,10 +42,10 @@ import org.apache.accumulo.access.AccessEvaluator;
import org.apache.accumulo.access.AccessExpression;
import org.apache.accumulo.access.Authorizations;
import org.apache.accumulo.access.IllegalAccessExpressionException;
-import org.apache.accumulo.access.TestDataLoader;
-import org.apache.accumulo.access.TestDataLoader.ExpectedResult;
-import org.apache.accumulo.access.TestDataLoader.TestDataSet;
-import org.apache.accumulo.access.TestDataLoader.TestExpressions;
+import org.apache.accumulo.access.antlr.TestDataLoader;
+import org.apache.accumulo.access.antlr.TestDataLoader.ExpectedResult;
+import org.apache.accumulo.access.antlr.TestDataLoader.TestDataSet;
+import org.apache.accumulo.access.antlr.TestDataLoader.TestExpressions;
import org.apache.accumulo.access.grammars.AccessExpressionLexer;
import org.apache.accumulo.access.grammars.AccessExpressionParser;
import
org.apache.accumulo.access.grammars.AccessExpressionParser.Access_expressionContext;
@@ -142,7 +142,7 @@ public class Antlr4Tests {
List<Authorizations> authSets =
Stream.of(testSet.auths).map(Authorizations::of).collect(Collectors.toList());
- AccessEvaluator evaluator =
AccessEvaluator.builder().authorizations(authSets).build();
+ AccessEvaluator evaluator = AccessEvaluator.of(authSets);
AccessExpressionAntlrEvaluator antlr = new
AccessExpressionAntlrEvaluator(authSets);
for (TestExpressions test : testSet.tests) {
@@ -154,8 +154,7 @@ public class Antlr4Tests {
assertTrue(evaluator.canAccess(AccessExpression.of(expression)),
expression);
assertTrue(evaluator.canAccess(AccessExpression.of(expression.getBytes(UTF_8))),
expression);
-
assertTrue(evaluator.canAccess(AccessExpression.of(expression).normalize()),
- expression);
+ assertTrue(evaluator.canAccess(AccessExpression.of(expression,
true)), expression);
assertEquals(expression,
AccessExpression.of(expression.getBytes(UTF_8)).getExpression());
assertEquals(expression,
AccessExpression.of(expression).getExpression());
@@ -165,7 +164,7 @@ public class Antlr4Tests {
assertTrue(antlr.canAccess(AccessExpression.of(expression)),
expression);
assertTrue(antlr.canAccess(AccessExpression.of(expression.getBytes(UTF_8))),
expression);
-
assertTrue(antlr.canAccess(AccessExpression.of(expression).normalize()),
expression);
+ assertTrue(antlr.canAccess(AccessExpression.of(expression,
true)), expression);
break;
case INACCESSIBLE:
@@ -174,8 +173,7 @@ public class Antlr4Tests {
assertFalse(evaluator.canAccess(AccessExpression.of(expression)), expression);
assertFalse(evaluator.canAccess(AccessExpression.of(expression.getBytes(UTF_8))),
expression);
-
assertFalse(evaluator.canAccess(AccessExpression.of(expression).normalize()),
- expression);
+ assertFalse(evaluator.canAccess(AccessExpression.of(expression,
true)), expression);
assertEquals(expression,
AccessExpression.of(expression.getBytes(UTF_8)).getExpression());
assertEquals(expression,
AccessExpression.of(expression).getExpression());
@@ -185,7 +183,7 @@ public class Antlr4Tests {
assertFalse(antlr.canAccess(AccessExpression.of(expression)),
expression);
assertFalse(antlr.canAccess(AccessExpression.of(expression.getBytes(UTF_8))),
expression);
-
assertFalse(antlr.canAccess(AccessExpression.of(expression).normalize()),
expression);
+ assertFalse(antlr.canAccess(AccessExpression.of(expression,
true)), expression);
break;
case ERROR:
