Update imports to point at the new classes

deephaven · May 23, 2024 · a066314 · a066314
1 parent f5ad3c3
commit a066314
Show file tree

Hide file tree

Showing 353 changed files with 389 additions and 393 deletions.
diff --git a/ClientSupport/src/main/java/io/deephaven/clientsupport/plotdownsampling/BucketState.java b/ClientSupport/src/main/java/io/deephaven/clientsupport/plotdownsampling/BucketState.java
@@ -14,7 +14,7 @@
 import io.deephaven.util.QueryConstants;
 import io.deephaven.chunk.Chunk;
 import io.deephaven.chunk.LongChunk;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;

diff --git a/ModelFarm/src/test/java/io/deephaven/modelfarm/TestModelFarm.java b/ModelFarm/src/test/java/io/deephaven/modelfarm/TestModelFarm.java
@@ -9,7 +9,7 @@
 import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.engine.table.ColumnSource;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.concurrent.CountDownLatch;

diff --git a/Util/src/main/java/io/deephaven/util/datastructures/ReleaseTracker.java b/Util/src/main/java/io/deephaven/util/datastructures/ReleaseTracker.java
@@ -4,7 +4,7 @@
 package io.deephaven.util.datastructures;
 
 import io.deephaven.configuration.Configuration;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.ReferenceQueue;

diff --git a/Util/src/main/java/io/deephaven/util/datastructures/SimpleReferenceManager.java b/Util/src/main/java/io/deephaven/util/datastructures/SimpleReferenceManager.java
@@ -4,7 +4,7 @@
 package io.deephaven.util.datastructures;
 
 import io.deephaven.base.reference.SimpleReference;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/Util/src/test/java/io/deephaven/util/datastructures/TestSegmentedSoftPool.java b/Util/src/test/java/io/deephaven/util/datastructures/TestSegmentedSoftPool.java
@@ -4,8 +4,8 @@
 package io.deephaven.util.datastructures;
 
 import io.deephaven.util.annotations.ReferentialIntegrity;
+import io.deephaven.util.mutable.MutableInt;
 import junit.framework.TestCase;
-import org.apache.commons.lang3.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assume;
 import org.junit.Test;

diff --git a/Util/src/test/java/io/deephaven/util/datastructures/TestSimpleReferenceManager.java b/Util/src/test/java/io/deephaven/util/datastructures/TestSimpleReferenceManager.java
@@ -4,8 +4,8 @@
 package io.deephaven.util.datastructures;
 
 import io.deephaven.base.reference.SimpleReference;
+import io.deephaven.util.mutable.MutableInt;
 import junit.framework.TestCase;
-import org.apache.commons.lang3.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 

diff --git a/Util/src/test/java/io/deephaven/util/datastructures/TestWeakIdentityHashSet.java b/Util/src/test/java/io/deephaven/util/datastructures/TestWeakIdentityHashSet.java
@@ -3,8 +3,8 @@
 //
 package io.deephaven.util.datastructures;
 
+import io.deephaven.util.mutable.MutableInt;
 import junit.framework.TestCase;
-import org.apache.commons.lang3.mutable.MutableInt;
 import org.junit.Test;
 
 import java.util.Arrays;

diff --git a/engine/api/src/test/java/io/deephaven/engine/table/iterators/TestColumnIterators.java b/engine/api/src/test/java/io/deephaven/engine/table/iterators/TestColumnIterators.java
@@ -11,7 +11,7 @@
 import io.deephaven.engine.testutil.TstUtils;
 import io.deephaven.engine.testutil.generator.*;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.junit.*;
 
 import java.util.Objects;

diff --git a/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/SortBenchmark.java b/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/SortBenchmark.java
@@ -19,7 +19,7 @@
 import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.benchmarking.*;
 import io.deephaven.engine.testutil.ControlledUpdateGraph;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.BenchmarkParams;
 

diff --git a/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/util/RowSequenceBench.java b/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/util/RowSequenceBench.java
@@ -13,7 +13,7 @@
 import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.benchmarking.BenchUtil;
 import io.deephaven.engine.rowset.impl.TstValues;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.RunnerException;

diff --git a/...e/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/util/RowSetGetFindBench.java b/...e/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/util/RowSetGetFindBench.java
@@ -11,7 +11,7 @@
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.impl.rsp.RspBitmap;
 import io.deephaven.util.metrics.MetricsManager;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import org.openjdk.jmh.runner.RunnerException;

diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/ExternalizableRowSetUtils.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/ExternalizableRowSetUtils.java
@@ -7,7 +7,7 @@
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetBuilderSequential;
 import io.deephaven.engine.rowset.RowSetFactory;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.DataInput;

diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/RowSetUtils.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/RowSetUtils.java
@@ -8,12 +8,12 @@
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeyRanges;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.util.datastructures.LongRangeConsumer;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.util.datastructures.LongRangeConsumer;
+import io.deephaven.util.mutable.MutableLong;
 import gnu.trove.list.array.TLongArrayList;
 import org.apache.commons.lang3.mutable.MutableBoolean;
-import org.apache.commons.lang3.mutable.MutableLong;
 
 public class RowSetUtils {
 

diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/ShiftedRowSequence.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/ShiftedRowSequence.java
@@ -11,7 +11,7 @@
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.datastructures.LongRangeAbortableConsumer;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 
 public class ShiftedRowSequence extends RowSequenceAsChunkImpl implements RowSequence {
 

diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/WritableRowSetImpl.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/WritableRowSetImpl.java
@@ -17,7 +17,7 @@
 import io.deephaven.engine.rowset.impl.sortedranges.SortedRanges;
 import io.deephaven.util.datastructures.LongRangeAbortableConsumer;
 import io.deephaven.util.annotations.VisibleForTesting;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.OverridingMethodsMustInvokeSuper;

diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/rsp/RspArray.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/rsp/RspArray.java
@@ -17,7 +17,7 @@
 import io.deephaven.util.annotations.VisibleForTesting;
 import io.deephaven.util.datastructures.LongAbortableConsumer;
 import io.deephaven.util.datastructures.LongRangeAbortableConsumer;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 import org.apache.commons.lang3.mutable.MutableObject;
 
 import java.util.PrimitiveIterator;

diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/rsp/RspRowSequence.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/rsp/RspRowSequence.java
@@ -15,7 +15,7 @@
 import io.deephaven.engine.rowset.impl.RowSequenceAsChunkImpl;
 import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.datastructures.LongRangeAbortableConsumer;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 
 public class RspRowSequence extends RowSequenceAsChunkImpl {
     private RspArray arr;

diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRanges.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRanges.java
@@ -16,8 +16,8 @@
 import io.deephaven.engine.rowset.impl.rsp.RspBitmap;
 import io.deephaven.engine.rowset.impl.singlerange.SingleRange;
 import io.deephaven.util.datastructures.LongRangeAbortableConsumer;
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableLong;
 import org.apache.commons.lang3.mutable.MutableObject;
 
 import java.util.PrimitiveIterator;

diff --git a/engine/rowset/src/test/java/io/deephaven/engine/rowset/impl/RowSequenceTestBase.java b/engine/rowset/src/test/java/io/deephaven/engine/rowset/impl/RowSequenceTestBase.java
@@ -13,7 +13,7 @@
 import io.deephaven.engine.testutil.rowset.RowSetTstUtils;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.SafeCloseableList;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Before;

diff --git a/engine/rowset/src/test/java/io/deephaven/engine/rowset/impl/WritableRowSetImplTest.java b/engine/rowset/src/test/java/io/deephaven/engine/rowset/impl/WritableRowSetImplTest.java
@@ -28,9 +28,9 @@
 import io.deephaven.engine.rowset.impl.sortedranges.SortedRangesLong;
 import io.deephaven.engine.rowset.impl.sortedranges.SortedRangesShort;
 import io.deephaven.test.types.OutOfBandTest;
+import io.deephaven.util.mutable.MutableLong;
 import junit.framework.TestCase;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.mutable.MutableLong;
 import org.jetbrains.annotations.NotNull;
 import org.junit.experimental.categories.Category;
 

diff --git a/engine/rowset/src/test/java/io/deephaven/engine/rowset/impl/rsp/RspBitmapTest.java b/engine/rowset/src/test/java/io/deephaven/engine/rowset/impl/rsp/RspBitmapTest.java
@@ -17,8 +17,8 @@
 import io.deephaven.engine.rowset.impl.sortedranges.SortedRanges;
 import io.deephaven.test.types.OutOfBandTest;
 import io.deephaven.util.datastructures.LongAbortableConsumer;
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableLong;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 

diff --git a/...c/test/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRangesRowSequenceTest.java b/...c/test/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRangesRowSequenceTest.java
@@ -10,7 +10,7 @@
 import io.deephaven.engine.rowset.impl.RowSequenceTestBase;
 import io.deephaven.engine.rowset.impl.WritableRowSetImpl;
 import io.deephaven.engine.testutil.rowset.RowSetTstUtils;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.junit.Test;
 
 public class SortedRangesRowSequenceTest extends RowSequenceTestBase {

diff --git a/...e/rowset/src/test/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRangesTest.java b/...e/rowset/src/test/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRangesTest.java
@@ -18,8 +18,8 @@
 import io.deephaven.engine.rowset.impl.rsp.RspBitmap;
 import io.deephaven.engine.rowset.impl.singlerange.SingleRange;
 import io.deephaven.test.types.OutOfBandTest;
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableLong;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

diff --git a/engine/table/src/main/java/io/deephaven/engine/context/QueryCompilerImpl.java b/engine/table/src/main/java/io/deephaven/engine/context/QueryCompilerImpl.java
@@ -22,7 +22,7 @@
 import io.deephaven.io.logger.Logger;
 import io.deephaven.util.ByteUtils;
 import io.deephaven.util.CompletionStageFuture;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.apache.commons.text.StringEscapeUtils;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/CrossJoinHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/CrossJoinHelper.java
@@ -15,9 +15,9 @@
 import io.deephaven.engine.table.impl.sources.BitShiftingColumnSource;
 import io.deephaven.engine.table.impl.sources.CrossJoinRightColumnSource;
 import io.deephaven.util.SafeCloseableList;
+import io.deephaven.util.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableLong;
 import org.apache.commons.lang3.mutable.MutableBoolean;
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.mutable.MutableLong;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/NaturalJoinHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/NaturalJoinHelper.java
@@ -13,8 +13,8 @@
 import io.deephaven.engine.table.impl.sources.*;
 import io.deephaven.engine.table.impl.util.*;
 import io.deephaven.util.annotations.VisibleForTesting;
+import io.deephaven.util.mutable.MutableInt;
 import org.apache.commons.lang3.mutable.MutableBoolean;
-import org.apache.commons.lang3.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/PartitionAwareSourceTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/PartitionAwareSourceTable.java
@@ -17,7 +17,7 @@
 import io.deephaven.engine.table.impl.select.*;
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.table.WritableColumnSource;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
@@ -69,9 +69,9 @@
 import io.deephaven.util.annotations.ReferentialIntegrity;
 import io.deephaven.util.annotations.TestUseOnly;
 import io.deephaven.util.annotations.VisibleForTesting;
+import io.deephaven.util.mutable.MutableInt;
 import io.deephaven.vector.Vector;
 import org.apache.commons.lang3.mutable.Mutable;
-import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftedColumnOperation.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftedColumnOperation.java
@@ -15,7 +15,7 @@
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
 import io.deephaven.engine.table.impl.select.MatchPairFactory;
 import io.deephaven.engine.table.impl.sources.ShiftedColumnSource;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftedColumnsFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftedColumnsFactory.java
@@ -118,7 +118,7 @@
 import io.deephaven.engine.table.impl.select.WhereFilter;
 import io.deephaven.engine.table.impl.select.WhereFilterFactory;
 import io.deephaven.engine.table.impl.select.analyzers.SelectAndViewAnalyzerWrapper;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/...c/main/java/io/deephaven/engine/table/impl/SimpleUniqueStaticNaturalJoinStateManager.java b/...c/main/java/io/deephaven/engine/table/impl/SimpleUniqueStaticNaturalJoinStateManager.java
@@ -13,7 +13,7 @@
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.table.impl.util.WritableRowRedirection;
 import io.deephaven.engine.rowset.RowSet;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.table.impl.JoinControl.CHUNK_SIZE;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SortHelpers.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SortHelpers.java
@@ -36,7 +36,7 @@
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.annotations.VisibleForTesting;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SortListener.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SortListener.java
@@ -11,6 +11,7 @@
 import io.deephaven.engine.rowset.RowSequenceFactory;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.*;
+import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
 import io.deephaven.util.datastructures.hash.HashMapK4V4;
 import io.deephaven.engine.table.impl.sort.LongSortKernel;
@@ -21,9 +22,8 @@
 import io.deephaven.engine.table.impl.util.*;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.SafeCloseableList;
+import io.deephaven.util.mutable.MutableInt;
 import gnu.trove.list.array.TLongArrayList;
-import io.deephaven.internal.log.LoggerFactory;
-import org.apache.commons.lang3.mutable.MutableInt;
 
 import java.util.*;
 import java.util.function.LongUnaryOperator;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SourcePartitionedTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SourcePartitionedTable.java
@@ -19,7 +19,7 @@
 import io.deephaven.engine.updategraph.UpdateSourceCombiner;
 import io.deephaven.util.datastructures.linked.IntrusiveDoublyLinkedNode;
 import io.deephaven.util.datastructures.linked.IntrusiveDoublyLinkedQueue;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SymbolTableCombiner.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SymbolTableCombiner.java
@@ -43,7 +43,7 @@
 
 // region extra imports
 import io.deephaven.engine.table.impl.sources.regioned.SymbolTableSource;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableLong;
 // endregion extra imports
 
 import static io.deephaven.util.SafeCloseable.closeAll;

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateValidator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateValidator.java
@@ -21,7 +21,7 @@
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.SafeCloseableList;
 import io.deephaven.vector.*;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...o/deephaven/engine/table/impl/asofjoin/RightIncrementalAsOfJoinStateManagerTypedBase.java b/...o/deephaven/engine/table/impl/asofjoin/RightIncrementalAsOfJoinStateManagerTypedBase.java
@@ -23,7 +23,7 @@
 import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext.ProbeContext;
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
-import org.apache.commons.lang3.mutable.MutableInt;
+import io.deephaven.util.mutable.MutableInt;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/...ain/java/io/deephaven/engine/table/impl/asofjoin/StaticAsOfJoinStateManagerTypedBase.java b/...ain/java/io/deephaven/engine/table/impl/asofjoin/StaticAsOfJoinStateManagerTypedBase.java
@@ -17,8 +17,7 @@
 import io.deephaven.engine.table.impl.util.TypedHasherUtil;
 import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext.BuildContext;
 import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext.ProbeContext;
-import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.commons.lang3.mutable.MutableLong;
+import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.table.impl.JoinControl.CHUNK_SIZE;

diff --git a/...o/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherByte.java b/...o/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherByte.java
@@ -23,10 +23,10 @@
 import io.deephaven.engine.table.impl.asofjoin.StaticAsOfJoinStateManagerTypedBase;
 import io.deephaven.engine.table.impl.sources.IntegerArraySource;
 import io.deephaven.engine.table.impl.sources.immutable.ImmutableByteArraySource;
+import io.deephaven.util.mutable.MutableInt;
 import java.lang.Object;
 import java.lang.Override;
 import java.util.Arrays;
-import org.apache.commons.lang3.mutable.MutableInt;
 
 final class StaticAsOfJoinHasherByte extends StaticAsOfJoinStateManagerTypedBase {
     private final ImmutableByteArraySource mainKeySource0;

diff --git a/...o/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherChar.java b/...o/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherChar.java
@@ -23,10 +23,10 @@
 import io.deephaven.engine.table.impl.asofjoin.StaticAsOfJoinStateManagerTypedBase;
 import io.deephaven.engine.table.impl.sources.IntegerArraySource;
 import io.deephaven.engine.table.impl.sources.immutable.ImmutableCharArraySource;
+import io.deephaven.util.mutable.MutableInt;
 import java.lang.Object;
 import java.lang.Override;
 import java.util.Arrays;
-import org.apache.commons.lang3.mutable.MutableInt;
 
 final class StaticAsOfJoinHasherChar extends StaticAsOfJoinStateManagerTypedBase {
     private final ImmutableCharArraySource mainKeySource0;