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.git
The following commit(s) were added to refs/heads/main by this push:
new acc8746d2e Changed Accumulo-Access dependency version to pick up
latest changes (#4734)
acc8746d2e is described below
commit acc8746d2ebac3e2038bae792e982fef0b8839d5
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Jul 10 14:08:43 2024 -0400
Changed Accumulo-Access dependency version to pick up latest changes (#4734)
---
.../org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java | 4 ++--
.../apache/accumulo/core/data/constraints/VisibilityConstraint.java | 4 ++--
.../apache/accumulo/core/iterators/user/TransformingIterator.java | 6 +++---
.../org/apache/accumulo/core/iterators/user/VisibilityFilter.java | 6 +++---
.../apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java | 4 ++--
.../java/org/apache/accumulo/core/security/ColumnVisibility.java | 4 ++--
.../java/org/apache/accumulo/core/security/VisibilityEvaluator.java | 4 ++--
.../org/apache/accumulo/core/security/VisibilityParseException.java | 4 ++--
.../java/org/apache/accumulo/core/util/BadArgumentException.java | 4 ++--
pom.xml | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
index 4ddcdae552..94e9ff8a73 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
@@ -43,7 +43,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.accumulo.access.AccessEvaluator;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -823,7 +823,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
boolean bb = accessEvaluator.canAccess(arrayVis);
cache.put(new Text(testVis), bb);
return bb;
- } catch (IllegalAccessExpressionException e) {
+ } catch (InvalidAccessExpressionException e) {
return false;
}
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/data/constraints/VisibilityConstraint.java
b/core/src/main/java/org/apache/accumulo/core/data/constraints/VisibilityConstraint.java
index 26f55f109a..87b60df7cc 100644
---
a/core/src/main/java/org/apache/accumulo/core/data/constraints/VisibilityConstraint.java
+++
b/core/src/main/java/org/apache/accumulo/core/data/constraints/VisibilityConstraint.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
import java.util.List;
import org.apache.accumulo.access.AccessEvaluator;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
import org.apache.accumulo.core.data.ArrayByteSequence;
import org.apache.accumulo.core.data.ColumnUpdate;
import org.apache.accumulo.core.data.Mutation;
@@ -85,7 +85,7 @@ public class VisibilityConstraint implements Constraint {
return Collections.singletonList((short) 2);
}
- } catch (IllegalAccessExpressionException iaee) {
+ } catch (InvalidAccessExpressionException iaee) {
return Collections.singletonList((short) 1);
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
index 10dffb0083..492ef6d272 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
@@ -32,7 +32,7 @@ import java.util.NoSuchElementException;
import org.apache.accumulo.access.AccessEvaluator;
import org.apache.accumulo.access.AccessExpression;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
import org.apache.accumulo.core.data.ByteSequence;
@@ -413,7 +413,7 @@ public abstract class TransformingIterator extends
WrappingIterator implements O
try {
AccessExpression.validate(visibility.toArray());
parsedVisibilitiesCache.put(visibility, Boolean.TRUE);
- } catch (IllegalAccessExpressionException e) {
+ } catch (InvalidAccessExpressionException e) {
log.error("Parse error after transformation : {}", visibility);
parsedVisibilitiesCache.put(visibility, Boolean.FALSE);
if (scanning) {
@@ -441,7 +441,7 @@ public abstract class TransformingIterator extends
WrappingIterator implements O
try {
visible = ve.canAccess(visibility.toArray());
visibleCache.put(visibility, visible);
- } catch (IllegalAccessExpressionException e) {
+ } catch (InvalidAccessExpressionException e) {
log.error("Parse Error", e);
visible = Boolean.FALSE;
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
index 92fb75a72d..3bbb77f8fb 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.accumulo.access.AccessEvaluator;
import org.apache.accumulo.access.AccessExpression;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
@@ -83,7 +83,7 @@ public class VisibilityFilter extends Filter implements
OptionDescriber {
AccessExpression.validate(testVis.toArray());
cache.put(testVis, true);
return true;
- } catch (IllegalAccessExpressionException e) {
+ } catch (InvalidAccessExpressionException e) {
cache.put(testVis, false);
return false;
}
@@ -101,7 +101,7 @@ public class VisibilityFilter extends Filter implements
OptionDescriber {
boolean bb = accessEvaluator.canAccess(testVis.toArray());
cache.put(testVis, bb);
return bb;
- } catch (IllegalAccessExpressionException e) {
+ } catch (InvalidAccessExpressionException e) {
log.error("Parse Error", e);
return false;
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java
index 22acd782ea..ddb60cacaf 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/VisibilityFilter.java
@@ -19,7 +19,7 @@
package org.apache.accumulo.core.iteratorsImpl.system;
import org.apache.accumulo.access.AccessEvaluator;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
import org.apache.accumulo.core.data.ArrayByteSequence;
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
@@ -81,7 +81,7 @@ public class VisibilityFilter extends
SynchronizedServerFilter {
boolean bb = ve.canAccess(testVis.toArray());
cache.put(testVis, bb);
return bb;
- } catch (IllegalAccessExpressionException e) {
+ } catch (InvalidAccessExpressionException e) {
log.error("IllegalAccessExpressionException with visibility of Key: {}",
k, e);
return false;
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index 338cf1396c..bc49baca5f 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -30,7 +30,7 @@ import java.util.TreeSet;
import java.util.function.Supplier;
import org.apache.accumulo.access.AccessExpression;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
import org.apache.accumulo.core.data.ArrayByteSequence;
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.util.BadArgumentException;
@@ -519,7 +519,7 @@ public class ColumnVisibility {
this.expression = expression;
try {
AccessExpression.validate(this.expression);
- } catch (IllegalAccessExpressionException e) {
+ } catch (InvalidAccessExpressionException e) {
// This is thrown for compatability with the exception this class used
to throw when it parsed
// exceptions itself.
throw new BadArgumentException(e);
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
index aa5d85f530..3c97c26e69 100644
---
a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
+++
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
@@ -19,7 +19,7 @@
package org.apache.accumulo.core.security;
import org.apache.accumulo.access.AccessEvaluator;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
import org.apache.accumulo.core.data.ArrayByteSequence;
/**
@@ -101,7 +101,7 @@ public class VisibilityEvaluator {
public boolean evaluate(ColumnVisibility visibility) throws
VisibilityParseException {
try {
return accessEvaluator.canAccess(visibility.getExpression());
- } catch (IllegalAccessExpressionException e) {
+ } catch (InvalidAccessExpressionException e) {
// This is thrown for compatability with the exception this class used
to evaluate expressions
// itself.
throw new VisibilityParseException(e);
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
index 46dc634db8..2d01c2c7bb 100644
---
a/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
+++
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
@@ -22,7 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import java.text.ParseException;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
/**
* An exception thrown when a visibility string cannot be parsed.
@@ -46,7 +46,7 @@ public class VisibilityParseException extends ParseException {
/**
* @since 3.1.0
*/
- public VisibilityParseException(IllegalAccessExpressionException e) {
+ public VisibilityParseException(InvalidAccessExpressionException e) {
// TODO need to look at output for this
super(e.getDescription(), e.getIndex());
this.visibility = e.getPattern();
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/BadArgumentException.java
b/core/src/main/java/org/apache/accumulo/core/util/BadArgumentException.java
index 88e1b6f3a6..374c4f86ec 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/BadArgumentException.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/BadArgumentException.java
@@ -20,7 +20,7 @@ package org.apache.accumulo.core.util;
import java.util.regex.PatternSyntaxException;
-import org.apache.accumulo.access.IllegalAccessExpressionException;
+import org.apache.accumulo.access.InvalidAccessExpressionException;
public final class BadArgumentException extends PatternSyntaxException {
private static final long serialVersionUID = 1L;
@@ -29,7 +29,7 @@ public final class BadArgumentException extends
PatternSyntaxException {
super(desc, badarg, index);
}
- public BadArgumentException(IllegalAccessExpressionException e) {
+ public BadArgumentException(InvalidAccessExpressionException e) {
super(e.getDescription(), e.getPattern(), e.getIndex());
super.initCause(e);
}
diff --git a/pom.xml b/pom.xml
index 014424cdc9..ca8db04a0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
<surefire.reuseForks>true</surefire.reuseForks>
<unitTestMemSize>-Xmx1G</unitTestMemSize>
<!-- dependency and plugin versions managed with properties -->
- <version.accumulo-access>1.0.0-beta</version.accumulo-access>
+ <version.accumulo-access>1.0.0-SNAPSHOT</version.accumulo-access>
<version.auto-service>1.1.1</version.auto-service>
<version.bouncycastle>1.78.1</version.bouncycastle>
<version.curator>5.5.0</version.curator>
