From a6e735a94797d08208a7cc0e84fef657829d498f Mon Sep 17 00:00:00 2001 From: Seth Date: Tue, 27 Aug 2024 14:54:14 -0400 Subject: [PATCH] Formatting --- .../java/datawave/iterators/IterationInterruptedException.java | 3 +-- .../test/java/datawave/iterators/SortedMultiMapIterator.java | 3 ++- .../java/datawave/query/function/AbstractVersionFilter.java | 2 +- .../java/datawave/query/function/DescendantCountFunction.java | 2 +- .../src/main/java/datawave/query/iterator/QueryIterator.java | 2 +- .../main/java/datawave/query/iterator/logic/AndIterator.java | 2 +- .../test/java/datawave/query/RebuildingScannerTestHelper.java | 2 +- .../test/java/datawave/query/iterator/logic/AndIteratorIT.java | 2 +- .../java/datawave/query/iterator/logic/AndOrIteratorIT.java | 2 +- .../datawave/query/iterator/logic/IndexIteratorBridgeTest.java | 2 +- .../java/datawave/query/iterator/logic/IndexIteratorTest.java | 2 +- .../test/java/datawave/query/iterator/logic/OrIteratorIT.java | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/warehouse/core/src/main/java/datawave/iterators/IterationInterruptedException.java b/warehouse/core/src/main/java/datawave/iterators/IterationInterruptedException.java index 68e5de65c1d..960322171f6 100644 --- a/warehouse/core/src/main/java/datawave/iterators/IterationInterruptedException.java +++ b/warehouse/core/src/main/java/datawave/iterators/IterationInterruptedException.java @@ -1,6 +1,5 @@ package datawave.iterators; - /** * Exception thrown if an interrupt flag is detected. */ @@ -13,4 +12,4 @@ public IterationInterruptedException() {} public IterationInterruptedException(String msg) { super(msg); } -} \ No newline at end of file +} diff --git a/warehouse/ingest-core/src/test/java/datawave/iterators/SortedMultiMapIterator.java b/warehouse/ingest-core/src/test/java/datawave/iterators/SortedMultiMapIterator.java index a23d9345812..ffba9bdcdfe 100644 --- a/warehouse/ingest-core/src/test/java/datawave/iterators/SortedMultiMapIterator.java +++ b/warehouse/ingest-core/src/test/java/datawave/iterators/SortedMultiMapIterator.java @@ -14,10 +14,11 @@ import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.iteratorsImpl.system.InterruptibleIterator; -import datawave.iterators.IterationInterruptedException; import com.google.common.collect.TreeMultimap; +import datawave.iterators.IterationInterruptedException; + /** * */ diff --git a/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java b/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java index 72dc7a8e66e..8af2277a1a4 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java @@ -19,7 +19,6 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import datawave.iterators.IterationInterruptedException; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.WritableComparator; @@ -30,6 +29,7 @@ import datawave.data.hash.UID; import datawave.data.type.NumberType; import datawave.data.type.util.NumericalEncoder; +import datawave.iterators.IterationInterruptedException; import datawave.query.attributes.Attribute; import datawave.query.attributes.Document; import datawave.query.iterator.SourcedOptions; diff --git a/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java b/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java index 839cdad3129..6b33de5f734 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java @@ -19,7 +19,6 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import datawave.iterators.IterationInterruptedException; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; @@ -28,6 +27,7 @@ import datawave.data.hash.UID; import datawave.data.hash.UIDConstants; +import datawave.iterators.IterationInterruptedException; import datawave.query.Constants; import datawave.query.iterator.QueryOptions; import datawave.query.util.Tuple3; diff --git a/warehouse/query-core/src/main/java/datawave/query/iterator/QueryIterator.java b/warehouse/query-core/src/main/java/datawave/query/iterator/QueryIterator.java index be385014901..c89b5911be8 100644 --- a/warehouse/query-core/src/main/java/datawave/query/iterator/QueryIterator.java +++ b/warehouse/query-core/src/main/java/datawave/query/iterator/QueryIterator.java @@ -29,7 +29,6 @@ import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.iterators.YieldCallback; import org.apache.accumulo.core.iterators.YieldingKeyValueIterator; -import datawave.iterators.IterationInterruptedException; import org.apache.accumulo.tserver.tablet.TabletClosedException; import org.apache.commons.collections4.iterators.EmptyIterator; import org.apache.commons.jexl3.JexlArithmetic; @@ -59,6 +58,7 @@ import datawave.data.type.Type; import datawave.data.type.util.NumericalEncoder; import datawave.ingest.data.config.ingest.CompositeIngest; +import datawave.iterators.IterationInterruptedException; import datawave.marking.MarkingFunctionsFactory; import datawave.query.Constants; import datawave.query.attributes.AttributeKeepFilter; diff --git a/warehouse/query-core/src/main/java/datawave/query/iterator/logic/AndIterator.java b/warehouse/query-core/src/main/java/datawave/query/iterator/logic/AndIterator.java index c5d4ff60b97..25760b2db75 100644 --- a/warehouse/query-core/src/main/java/datawave/query/iterator/logic/AndIterator.java +++ b/warehouse/query-core/src/main/java/datawave/query/iterator/logic/AndIterator.java @@ -15,11 +15,11 @@ import org.apache.accumulo.core.data.ByteSequence; import org.apache.accumulo.core.data.Range; -import datawave.iterators.IterationInterruptedException; import org.apache.log4j.Logger; import com.google.common.collect.TreeMultimap; +import datawave.iterators.IterationInterruptedException; import datawave.query.attributes.Document; import datawave.query.exceptions.DatawaveFatalQueryException; import datawave.query.exceptions.QueryIteratorYieldingException; diff --git a/warehouse/query-core/src/test/java/datawave/query/RebuildingScannerTestHelper.java b/warehouse/query-core/src/test/java/datawave/query/RebuildingScannerTestHelper.java index 5c20d013875..ddc1bea15df 100644 --- a/warehouse/query-core/src/test/java/datawave/query/RebuildingScannerTestHelper.java +++ b/warehouse/query-core/src/test/java/datawave/query/RebuildingScannerTestHelper.java @@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import datawave.iterators.IterationInterruptedException; import org.apache.accumulo.core.security.Authorizations; import org.apache.hadoop.io.Text; @@ -37,6 +36,7 @@ import datawave.accumulo.inmemory.InMemoryScanner; import datawave.accumulo.inmemory.InMemoryScannerBase; import datawave.accumulo.inmemory.ScannerRebuilder; +import datawave.iterators.IterationInterruptedException; import datawave.query.attributes.Document; import datawave.query.function.deserializer.KryoDocumentDeserializer; import datawave.query.iterator.profile.FinalDocumentTrackingIterator; diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndIteratorIT.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndIteratorIT.java index eadae910ac1..01ec5d5a7f8 100644 --- a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndIteratorIT.java +++ b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndIteratorIT.java @@ -16,11 +16,11 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; -import datawave.iterators.IterationInterruptedException; import org.junit.jupiter.api.Test; import com.google.common.collect.Sets; +import datawave.iterators.IterationInterruptedException; import datawave.query.attributes.Document; import datawave.query.iterator.NestedIterator; diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndOrIteratorIT.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndOrIteratorIT.java index c4d218cfbd8..d2d5f8bb06b 100644 --- a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndOrIteratorIT.java +++ b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/AndOrIteratorIT.java @@ -20,13 +20,13 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; -import datawave.iterators.IterationInterruptedException; import org.apache.log4j.Logger; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import com.google.common.collect.Sets; +import datawave.iterators.IterationInterruptedException; import datawave.query.attributes.Attribute; import datawave.query.attributes.Attributes; import datawave.query.attributes.Document; diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorBridgeTest.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorBridgeTest.java index bb8556651e3..21b92edd7ab 100644 --- a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorBridgeTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorBridgeTest.java @@ -12,10 +12,10 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; -import datawave.iterators.IterationInterruptedException; import org.apache.commons.jexl3.parser.JexlNode; import org.junit.jupiter.api.Test; +import datawave.iterators.IterationInterruptedException; import datawave.query.attributes.Document; import datawave.query.jexl.JexlNodeFactory; diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorTest.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorTest.java index ce954104220..02fe60ca213 100644 --- a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/IndexIteratorTest.java @@ -17,11 +17,11 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import datawave.iterators.IterationInterruptedException; import org.apache.accumulo.core.iteratorsImpl.system.SortedMapIterator; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; +import datawave.iterators.IterationInterruptedException; import datawave.query.attributes.Attribute; import datawave.query.attributes.Document; diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/OrIteratorIT.java b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/OrIteratorIT.java index f66757b599f..b8812659693 100644 --- a/warehouse/query-core/src/test/java/datawave/query/iterator/logic/OrIteratorIT.java +++ b/warehouse/query-core/src/test/java/datawave/query/iterator/logic/OrIteratorIT.java @@ -20,9 +20,9 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; -import datawave.iterators.IterationInterruptedException; import org.junit.jupiter.api.Test; +import datawave.iterators.IterationInterruptedException; import datawave.query.attributes.Document; import datawave.query.iterator.NestedIterator; import datawave.query.iterator.SeekableIterator;