fix imports

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Mar 17, 2021 · 2c5dd20 · 2c5dd20
1 parent 631462f
commit 2c5dd20
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 10 deletions.
diff --git a/server/src/main/java/org/opensearch/action/support/ContextPreservingActionListener.java b/server/src/main/java/org/opensearch/action/support/ContextPreservingActionListener.java
@@ -24,7 +24,7 @@
 import java.util.function.Supplier;
 
 /**
- * Restores the given {@link ThreadContext.StoredContext}
+ * Restores the given {@link org.opensearch.common.util.concurrent.ThreadContext.StoredContext}
  * once the listener is invoked
  */
 public final class ContextPreservingActionListener<R> implements ActionListener<R> {

diff --git a/server/src/main/java/org/opensearch/common/io/stream/BytesStreamOutput.java b/server/src/main/java/org/opensearch/common/io/stream/BytesStreamOutput.java
@@ -174,8 +174,8 @@ public BytesReference copyBytes() {
     }
 
     /**
-     * Returns the number of bytes used by the underlying {@link ByteArray}
-     * @see ByteArray#ramBytesUsed()
+     * Returns the number of bytes used by the underlying {@link org.opensearch.common.util.ByteArray}
+     * @see org.opensearch.common.util.ByteArray#ramBytesUsed()
      */
     public long ramBytesUsed() {
         return bytes.ramBytesUsed();

diff --git a/server/src/main/java/org/opensearch/common/util/BigByteArray.java b/server/src/main/java/org/opensearch/common/util/BigByteArray.java
@@ -25,6 +25,8 @@
 
 import java.util.Arrays;
 
+import static org.opensearch.common.util.PageCacheRecycler.BYTE_PAGE_SIZE;
+
 /**
  * Byte array abstraction able to support more than 2B values. This implementation slices data into fixed-sized blocks of
  * configurable length.
@@ -37,7 +39,7 @@ final class BigByteArray extends AbstractBigArray implements ByteArray {
 
     /** Constructor. */
     BigByteArray(long size, BigArrays bigArrays, boolean clearOnResize) {
-        super(PageCacheRecycler.BYTE_PAGE_SIZE, bigArrays, clearOnResize);
+        super(BYTE_PAGE_SIZE, bigArrays, clearOnResize);
         this.size = size;
         pages = new byte[numPages(size)][];
         for (int i = 0; i < pages.length; ++i) {

diff --git a/server/src/main/java/org/opensearch/common/util/BigObjectArray.java b/server/src/main/java/org/opensearch/common/util/BigObjectArray.java
@@ -24,6 +24,8 @@
 
 import java.util.Arrays;
 
+import static org.opensearch.common.util.PageCacheRecycler.OBJECT_PAGE_SIZE;
+
 /**
  * Int array abstraction able to support more than 2B values. This implementation slices data into fixed-sized blocks of
  * configurable length.
@@ -36,7 +38,7 @@ final class BigObjectArray<T> extends AbstractBigArray implements ObjectArray<T>
 
     /** Constructor. */
     BigObjectArray(long size, BigArrays bigArrays) {
-        super(PageCacheRecycler.OBJECT_PAGE_SIZE, bigArrays, true);
+        super(OBJECT_PAGE_SIZE, bigArrays, true);
         this.size = size;
         pages = new Object[numPages(size)][];
         for (int i = 0; i < pages.length; ++i) {

diff --git a/server/src/main/java/org/opensearch/common/util/PageCacheRecycler.java b/server/src/main/java/org/opensearch/common/util/PageCacheRecycler.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.util;
+package org.opensearch.common.util;
 
 import org.apache.lucene.util.RamUsageEstimator;
 import org.opensearch.common.recycler.AbstractRecyclerC;

diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java b/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java
@@ -22,7 +22,7 @@
 import org.elasticsearch.Assertions;
 import org.opensearch.common.lease.Releasable;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.index.engine.EngineException;
+import org.opensearch.index.engine.EngineException;
 
 import java.util.concurrent.locks.Lock;
 

diff --git a/server/src/main/java/org/opensearch/node/ReportingService.java b/server/src/main/java/org/opensearch/node/ReportingService.java
@@ -20,7 +20,7 @@
 package org.opensearch.node;
 
 import org.opensearch.common.io.stream.Writeable;
-import org.opensearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.ToXContent;
 
 public interface ReportingService<I extends ReportingService.Info> {
     I info();

diff --git a/server/src/main/java/org/opensearch/threadpool/ThreadPoolInfo.java b/server/src/main/java/org/opensearch/threadpool/ThreadPoolInfo.java
@@ -22,7 +22,7 @@
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.node.ReportingService;
+import org.opensearch.node.ReportingService;
 
 import java.io.IOException;
 import java.util.Collections;

diff --git a/server/src/main/java/org/opensearch/transport/RemoteClusterConnection.java b/server/src/main/java/org/opensearch/transport/RemoteClusterConnection.java
@@ -28,7 +28,7 @@
 import org.opensearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.util.concurrent.ThreadContext;
+import org.opensearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.core.internal.io.IOUtils;
 import org.opensearch.threadpool.ThreadPool;