cleanup PR

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
nknize · May 11, 2023 · f71b607 · f71b607
1 parent 66f3a96
commit f71b607
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/.../geo/src/main/java/org/opensearch/geo/search/aggregations/bucket/geogrid/BaseGeoGrid.java b/.../geo/src/main/java/org/opensearch/geo/search/aggregations/bucket/geogrid/BaseGeoGrid.java
@@ -33,9 +33,7 @@
 
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.util.LongObjectPagedHashMap;
-import org.opensearch.core.common.io.stream.BaseWriteable;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.search.aggregations.InternalAggregation;
 import org.opensearch.search.aggregations.InternalAggregations;
@@ -70,15 +68,15 @@ protected BaseGeoGrid(String name, int requiredSize, List<BaseGeoGridBucket> buc
         this.buckets = buckets;
     }
 
-    protected abstract BaseWriteable.Reader<StreamInput, B> getBucketReader();
+    protected abstract Reader<B> getBucketReader();
 
     /**
      * Read from a stream.
      */
     public BaseGeoGrid(StreamInput in) throws IOException {
         super(in);
         requiredSize = readSize(in);
-        buckets = (List<BaseGeoGridBucket>) in.readList((Writeable.Reader<B>) getBucketReader());
+        buckets = (List<BaseGeoGridBucket>) in.readList(getBucketReader());
     }
 
     @Override

diff --git a/.../geo/src/main/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoHashGrid.java b/.../geo/src/main/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoHashGrid.java
@@ -76,7 +76,7 @@ protected InternalGeoHashGridBucket createBucket(long hashAsLong, long docCount,
     }
 
     @Override
-    protected Reader getBucketReader() {
+    protected Reader<InternalGeoHashGridBucket> getBucketReader() {
         return InternalGeoHashGridBucket::new;
     }
 

diff --git a/.../geo/src/main/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoTileGrid.java b/.../geo/src/main/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoTileGrid.java
@@ -76,7 +76,7 @@ protected InternalGeoTileGridBucket createBucket(long hashAsLong, long docCount,
     }
 
     @Override
-    protected Reader getBucketReader() {
+    protected Reader<InternalGeoTileGridBucket> getBucketReader() {
         return InternalGeoTileGridBucket::new;
     }
 

diff --git a/...java/org/opensearch/geo/search/aggregations/bucket/geogrid/InternalGeoHashGridBucket.java b/...java/org/opensearch/geo/search/aggregations/bucket/geogrid/InternalGeoHashGridBucket.java
@@ -33,7 +33,6 @@
 
 import org.opensearch.common.geo.GeoPoint;
 import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.core.common.io.stream.BaseStreamInput;
 import org.opensearch.geometry.utils.Geohash;
 import org.opensearch.search.aggregations.InternalAggregations;
 
@@ -52,8 +51,8 @@ class InternalGeoHashGridBucket extends BaseGeoGridBucket<InternalGeoHashGridBuc
     /**
      * Read from a stream.
      */
-    InternalGeoHashGridBucket(BaseStreamInput in) throws IOException {
-        super((StreamInput) in);
+    InternalGeoHashGridBucket(StreamInput in) throws IOException {
+        super(in);
     }
 
     @Override

diff --git a/...java/org/opensearch/geo/search/aggregations/bucket/geogrid/InternalGeoTileGridBucket.java b/...java/org/opensearch/geo/search/aggregations/bucket/geogrid/InternalGeoTileGridBucket.java
@@ -34,7 +34,6 @@
 
 import org.opensearch.common.geo.GeoPoint;
 import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.core.common.io.stream.BaseStreamInput;
 import org.opensearch.search.aggregations.InternalAggregations;
 import org.opensearch.search.aggregations.bucket.GeoTileUtils;
 
@@ -53,8 +52,8 @@ class InternalGeoTileGridBucket extends BaseGeoGridBucket<InternalGeoTileGridBuc
     /**
      * Read from a stream.
      */
-    InternalGeoTileGridBucket(BaseStreamInput in) throws IOException {
-        super((StreamInput) in);
+    InternalGeoTileGridBucket(StreamInput in) throws IOException {
+        super(in);
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/common/io/stream/StreamInput.java b/server/src/main/java/org/opensearch/common/io/stream/StreamInput.java
@@ -1165,7 +1165,7 @@ public <C extends NamedWriteable> C readOptionalNamedWriteable(Class<C> category
      * @return the list of objects
      * @throws IOException if an I/O exception occurs reading the list
      */
-    public <T> List<T> readList(final Writeable.Reader<T> reader) throws IOException {
+    public <T> List<T> readList(final BaseWriteable.Reader<StreamInput, T> reader) throws IOException {
         return readCollection(reader, ArrayList::new, Collections.emptyList());
     }
 
@@ -1207,8 +1207,11 @@ public <T> Set<T> readSet(Writeable.Reader<T> reader) throws IOException {
     /**
      * Reads a collection of objects
      */
-    private <T, C extends Collection<? super T>> C readCollection(Writeable.Reader<T> reader, IntFunction<C> constructor, C empty)
-        throws IOException {
+    private <T, C extends Collection<? super T>> C readCollection(
+        BaseWriteable.Reader<StreamInput, T> reader,
+        IntFunction<C> constructor,
+        C empty
+    ) throws IOException {
         int count = readArraySize();
         if (count == 0) {
             return empty;

diff --git a/server/src/main/java/org/opensearch/common/io/stream/StreamOutput.java b/server/src/main/java/org/opensearch/common/io/stream/StreamOutput.java
@@ -1176,7 +1176,7 @@ public void writeOptionalZoneId(@Nullable ZoneId timeZone) throws IOException {
 
     /**
      * Writes a collection to this stream. The corresponding collection can be read from a stream input using
-     * {@link StreamInput#readList(Writeable.Reader)}.
+     * {@link StreamInput#readList(BaseWriteable.Reader)}.
      *
      * @param collection the collection to write to this stream
      * @throws IOException if an I/O exception occurs writing the collection
@@ -1207,7 +1207,7 @@ public <T> void writeCollection(final Collection<T> collection, final Writer<T>
 
     /**
      * Writes a collection of a strings. The corresponding collection can be read from a stream input using
-     * {@link StreamInput#readList(Writeable.Reader)}.
+     * {@link StreamInput#readList(BaseWriteable.Reader)}.
      *
      * @param collection the collection of strings
      * @throws IOException if an I/O exception occurs writing the collection
@@ -1218,7 +1218,7 @@ public void writeStringCollection(final Collection<String> collection) throws IO
 
     /**
      * Writes an optional collection of a strings. The corresponding collection can be read from a stream input using
-     * {@link StreamInput#readList(Writeable.Reader)}.
+     * {@link StreamInput#readList(BaseWriteable.Reader)}.
      *
      * @param collection the collection of strings
      * @throws IOException if an I/O exception occurs writing the collection