Replace wildcard type parameter where possible

apache · Apr 5, 2023 · 4a7bd95 · 4a7bd95
1 parent cc63a09
commit 4a7bd95
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/accord-core/src/main/java/accord/primitives/AbstractKeys.java b/accord-core/src/main/java/accord/primitives/AbstractKeys.java
@@ -35,7 +35,7 @@
 
 @SuppressWarnings("rawtypes")
 // TODO (desired, efficiency): check that foldl call-sites are inlined and optimised by HotSpot
-public abstract class AbstractKeys<K extends RoutableKey, KS extends Routables<K, ?>> implements Iterable<K>, Routables<K, KS>
+public abstract class AbstractKeys<K extends RoutableKey, KS extends Routables<K, KS>> implements Iterable<K>, Routables<K, KS>
 {
     final K[] keys;
 

diff --git a/accord-core/src/main/java/accord/primitives/AbstractRanges.java b/accord-core/src/main/java/accord/primitives/AbstractRanges.java
@@ -33,7 +33,7 @@
 import static accord.utils.SortedArrays.Search.FAST;
 import static accord.utils.SortedArrays.swapHighLow32b;
 
-public abstract class AbstractRanges<RS extends Routables<Range, ?>> implements Iterable<Range>, Routables<Range, RS>
+public abstract class AbstractRanges<RS extends Routables<Range, RS>> implements Iterable<Range>, Routables<Range, RS>
 {
     static final Range[] NO_RANGES = new Range[0];
 

diff --git a/accord-core/src/main/java/accord/primitives/AbstractUnseekableKeys.java b/accord-core/src/main/java/accord/primitives/AbstractUnseekableKeys.java
@@ -23,7 +23,7 @@
 import java.util.Arrays;
 
 // TODO: do we need this class?
-public abstract class AbstractUnseekableKeys<KS extends Unseekables<RoutingKey, ?>> extends AbstractKeys<RoutingKey, KS> implements Iterable<RoutingKey>, Unseekables<RoutingKey, KS>
+public abstract class AbstractUnseekableKeys<KS extends Unseekables<RoutingKey, KS>> extends AbstractKeys<RoutingKey, KS> implements Iterable<RoutingKey>, Unseekables<RoutingKey, KS>
 {
     AbstractUnseekableKeys(RoutingKey[] keys)
     {

diff --git a/accord-core/src/main/java/accord/primitives/Routables.java b/accord-core/src/main/java/accord/primitives/Routables.java
@@ -24,18 +24,15 @@
 import accord.utils.IndexedFoldToLong;
 import accord.utils.IndexedRangeFoldToLong;
 import accord.utils.SortedArrays;
-import net.nicoulaj.compilecommand.annotations.Inline;
 
-import java.util.function.BiFunction;
-import java.util.function.Function;
+import net.nicoulaj.compilecommand.annotations.Inline;
 
-import static accord.primitives.Routables.Slice.Overlapping;
 import static accord.utils.SortedArrays.Search.FLOOR;
 
 /**
  * A collection of either Seekable or Unseekable
  */
-public interface Routables<K extends Routable, U extends Routables<K, ?>> extends Iterable<K>
+public interface Routables<K extends Routable, U extends Routables<K, U>> extends Iterable<K>
 {
     enum Slice
     {

diff --git a/accord-core/src/main/java/accord/primitives/Seekables.java b/accord-core/src/main/java/accord/primitives/Seekables.java
@@ -25,7 +25,7 @@
 /**
  * Either a Route or a collection of Routable
  */
-public interface Seekables<K extends Seekable, U extends Seekables<K, ?>> extends Routables<K, U>
+public interface Seekables<K extends Seekable, U extends Seekables<K, U>> extends Routables<K, U>
 {
     @Override
     default U slice(Ranges ranges) { return slice(ranges, Overlapping); }

diff --git a/accord-core/src/main/java/accord/primitives/Unseekables.java b/accord-core/src/main/java/accord/primitives/Unseekables.java
@@ -23,7 +23,7 @@
 /**
  * Either a Route or a simple collection of keys or ranges
  */
-public interface Unseekables<K extends Unseekable, U extends Unseekables<K, ?>> extends Iterable<K>, Routables<K, U>
+public interface Unseekables<K extends Unseekable, U extends Unseekables<K, U>> extends Iterable<K>, Routables<K, U>
 {
     enum UnseekablesKind
     {