From 720c51c9221909c752a4f6945817700d0828414a Mon Sep 17 00:00:00 2001 From: Laura Schanno Date: Fri, 4 Oct 2024 13:00:10 -0400 Subject: [PATCH] Replace usage of non-public Accumulo API PeekingIterator org.apache.accumulo.core.util.PeekingIterator is part of Accumulo's non-public API. Replace all usages of it with org.apache.commons.collections4.iterators.PeekingIterator. Part of work for #2443 --- .../java/datawave/query/index/lookup/ShardLimitingIterator.java | 2 +- .../main/java/datawave/query/index/lookup/ShardRangeStream.java | 2 +- .../src/main/java/datawave/query/tables/RangeStreamScanner.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/warehouse/query-core/src/main/java/datawave/query/index/lookup/ShardLimitingIterator.java b/warehouse/query-core/src/main/java/datawave/query/index/lookup/ShardLimitingIterator.java index 6681b9ebd0b..4972d173f5f 100644 --- a/warehouse/query-core/src/main/java/datawave/query/index/lookup/ShardLimitingIterator.java +++ b/warehouse/query-core/src/main/java/datawave/query/index/lookup/ShardLimitingIterator.java @@ -9,7 +9,7 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.util.PeekingIterator; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; diff --git a/warehouse/query-core/src/main/java/datawave/query/index/lookup/ShardRangeStream.java b/warehouse/query-core/src/main/java/datawave/query/index/lookup/ShardRangeStream.java index 2b437ea61c5..1d763edb37a 100644 --- a/warehouse/query-core/src/main/java/datawave/query/index/lookup/ShardRangeStream.java +++ b/warehouse/query-core/src/main/java/datawave/query/index/lookup/ShardRangeStream.java @@ -12,7 +12,7 @@ import org.apache.accumulo.core.data.PartialKey; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.util.PeekingIterator; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.commons.jexl3.parser.JexlNode; import com.google.common.base.Function; diff --git a/warehouse/query-core/src/main/java/datawave/query/tables/RangeStreamScanner.java b/warehouse/query-core/src/main/java/datawave/query/tables/RangeStreamScanner.java index 94a332e9772..1f3623a3ae1 100644 --- a/warehouse/query-core/src/main/java/datawave/query/tables/RangeStreamScanner.java +++ b/warehouse/query-core/src/main/java/datawave/query/tables/RangeStreamScanner.java @@ -28,7 +28,7 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.util.PeekingIterator; +import org.apache.commons.collections4.iterators.PeekingIterator; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger;