Fix covariance / contravariance in Matchers and Repository

immutables · Jun 11, 2019 · 9597f62 · 9597f62
1 parent 87ab2a3
commit 9597f62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/criteria/common/src/org/immutables/criteria/matcher/ObjectMatcher.java b/criteria/common/src/org/immutables/criteria/matcher/ObjectMatcher.java
@@ -60,12 +60,12 @@ default R isNotIn(V v1, V v2, V ... rest) {
     return isNotIn(values);
   }
 
-  default R isIn(Iterable<? super V> values) {
+  default R isIn(Iterable<? extends V> values) {
     Objects.requireNonNull(values, "values");
     return Matchers.extract(this).<R>factory1().create1(e -> Expressions.call(Operators.IN, e, Expressions.constant(ImmutableList.copyOf(values))));
   }
 
-  default R isNotIn(Iterable<? super V> values) {
+  default R isNotIn(Iterable<? extends V> values) {
     Objects.requireNonNull(values, "values");
     return Matchers.extract(this).<R>factory1().create1(e -> Expressions.call(Operators.NOT_IN, e, Expressions.constant(ImmutableList.copyOf(values))));
   }

diff --git a/value-processor/src/org/immutables/value/processor/CriteriaRepository.generator b/value-processor/src/org/immutables/value/processor/CriteriaRepository.generator
@@ -86,7 +86,7 @@ Repository.Readable<[type.name]>
   /**
    * Find all [type.name](s) given their ids {@code [a.name]}
    */
-  public Repository.Reader<[type.name]> findById(Iterable<? super [a.type]> [a.name]s) {
+  public Repository.Reader<[type.name]> findById(Iterable<? extends [a.type]> [a.name]s) {
     return find([type.name]Criteria.create().[a.name].isIn([a.name]s));
   }
 [/if]