github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#2719] Change various method(Collection<SortField<?>>) into

Browse Source 
method(Collection<? extends SortField<?>>)
This commit is contained in:
Lukas Eder 2013-08-30 13:56:45 +02:00
parent 9675da7d2b
commit fceabb80ce
23 changed files with 214 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jOOQ/src/main/java/org/jooq/AggregateFunction.java
View File

@ -53,17 +53,17 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.CUBRID;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.ORACLE;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SQLSERVER;
import static org.jooq.SQLDialect.SYBASE;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import static org.jooq.SQLDialect.CUBRID;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.ORACLE;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SQLSERVER;
import static org.jooq.SQLDialect.SYBASE;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
/**
* An aggregate function is a special field that is usually used in a
@ -148,7 +148,7 @@ public interface AggregateFunction<T> extends Field<T>, WindowOverStep<T> {
name = "KEEP DENSE_RANK FIRST ORDER BY",
args = "SortField+"
)
WindowBeforeOverStep<T> keepDenseRankFirstOrderBy(Collection<SortField<?>> fields);
WindowBeforeOverStep<T> keepDenseRankFirstOrderBy(Collection<? extends SortField<?>> fields);
/**
* Restrict this aggregate function to <code>FIRST</code> values
@ -199,5 +199,5 @@ public interface AggregateFunction<T> extends Field<T>, WindowOverStep<T> {
name = "KEEP DENSE_RANK LAST ORDER BY",
args = "SortField+"
)
WindowBeforeOverStep<T> keepDenseRankLastOrderBy(Collection<SortField<?>> fields);
WindowBeforeOverStep<T> keepDenseRankLastOrderBy(Collection<? extends SortField<?>> fields);
}

4
jOOQ/src/main/java/org/jooq/ConditionProvider.java
View File

@ -83,7 +83,7 @@ public interface ConditionProvider {
* @param conditions The condition
*/
@Support
void addConditions(Collection<Condition> conditions);
void addConditions(Collection<? extends Condition> conditions);
/**
* Adds new conditions to the query, connecting them to existing
@ -101,6 +101,6 @@ public interface ConditionProvider {
* @param conditions The condition
*/
@Support
void addConditions(Operator operator, Collection<Condition> conditions);
void addConditions(Operator operator, Collection<? extends Condition> conditions);
}

4
jOOQ/src/main/java/org/jooq/DeleteQuery.java
View File

@ -81,7 +81,7 @@ public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete
*/
@Override
@Support
void addConditions(Collection<Condition> conditions);
void addConditions(Collection<? extends Condition> conditions);
/**
* {@inheritDoc}
@ -95,6 +95,6 @@ public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete
*/
@Override
@Support
void addConditions(Operator operator, Collection<Condition> conditions);
void addConditions(Operator operator, Collection<? extends Condition> conditions);
}

12
jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
View File

@ -53,11 +53,11 @@
*/
package org.jooq;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import org.jooq.impl.DSL;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import org.jooq.impl.DSL;
/**
* This type is used for the {@link Delete}'s DSL API.
@ -93,7 +93,7 @@ public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R> {
name = "WHERE",
args = "Condition+"
)
DeleteConditionStep<R> where(Collection<Condition> conditions);
DeleteConditionStep<R> where(Collection<? extends Condition> conditions);
/**
* Add conditions to the query.

34
jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java
View File

@ -53,22 +53,22 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.CUBRID;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
import static org.jooq.SQLDialect.MARIADB;
import static org.jooq.SQLDialect.MYSQL;
import static org.jooq.SQLDialect.ORACLE11G;
import static org.jooq.SQLDialect.ORACLE12C;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SYBASE;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import org.jooq.impl.DSL;
import static org.jooq.SQLDialect.CUBRID;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
import static org.jooq.SQLDialect.MARIADB;
import static org.jooq.SQLDialect.MYSQL;
import static org.jooq.SQLDialect.ORACLE11G;
import static org.jooq.SQLDialect.ORACLE12C;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SYBASE;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import org.jooq.impl.DSL;
/**
@ -108,5 +108,5 @@ public interface GroupConcatOrderByStep extends GroupConcatSeparatorStep {
name = "ORDER BY",
args = "SortField+"
)
GroupConcatSeparatorStep orderBy(Collection<SortField<?>> fields);
GroupConcatSeparatorStep orderBy(Collection<? extends SortField<?>> fields);
}

16
jOOQ/src/main/java/org/jooq/OrderedAggregateFunction.java
View File

@ -53,13 +53,13 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.ORACLE11G;
import static org.jooq.SQLDialect.ORACLE12C;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import static org.jooq.SQLDialect.ORACLE11G;
import static org.jooq.SQLDialect.ORACLE12C;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
/**
* An ordered aggregate function.
@ -121,5 +121,5 @@ public interface OrderedAggregateFunction<T> {
args = "SortField+",
to = "OrderedAggregateFunction"
)
AggregateFunction<T> withinGroupOrderBy(Collection<SortField<?>> fields);
AggregateFunction<T> withinGroupOrderBy(Collection<? extends SortField<?>> fields);
}

30
jOOQ/src/main/java/org/jooq/SelectForUpdateOfStep.java
View File

@ -53,20 +53,20 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.DERBY;
import static org.jooq.SQLDialect.FIREBIRD;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
import static org.jooq.SQLDialect.INGRES;
import static org.jooq.SQLDialect.ORACLE;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SYBASE;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.DERBY;
import static org.jooq.SQLDialect.FIREBIRD;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
import static org.jooq.SQLDialect.INGRES;
import static org.jooq.SQLDialect.ORACLE;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SYBASE;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
/**
* This type is used for the {@link Select}'s DSL API when selecting generic
@ -139,7 +139,7 @@ public interface SelectForUpdateOfStep<R extends Record> extends SelectForUpdate
name = "OF",
args = "Field+"
)
SelectForUpdateWaitStep<R> of(Collection<Field<?>> fields);
SelectForUpdateWaitStep<R> of(Collection<? extends Field<?>> fields);
/**
* Add an <code>OF</code> clause to the <code>FOR UPDATE</code> clause at

2
jOOQ/src/main/java/org/jooq/SelectHavingStep.java
View File

@ -122,7 +122,7 @@ public interface SelectHavingStep<R extends Record> extends SelectOrderByStep<R>
name = "HAVING",
args = "Condition+"
)
SelectHavingConditionStep<R> having(Collection<Condition> conditions);
SelectHavingConditionStep<R> having(Collection<? extends Condition> conditions);
/**
* Add a <code>HAVING</code> clause to the query.

4
jOOQ/src/main/java/org/jooq/SelectOrderByStep.java
View File

@ -134,7 +134,7 @@ public interface SelectOrderByStep<R extends Record> extends SelectLimitStep<R>
name = "ORDER BY",
args = "SortField+"
)
SelectLimitStep<R> orderBy(Collection<SortField<?>> fields);
SelectLimitStep<R> orderBy(Collection<? extends SortField<?>> fields);
/**
* Add an <code>ORDER BY</code> clause to the query
@ -192,7 +192,7 @@ public interface SelectOrderByStep<R extends Record> extends SelectLimitStep<R>
name = "ORDER SIBLINGS BY",
args = "SortField+"
)
SelectLimitStep<R> orderSiblingsBy(Collection<SortField<?>> fields);
SelectLimitStep<R> orderSiblingsBy(Collection<? extends SortField<?>> fields);
/**
* Add an <code>ORDER SIBLINGS BY</code> clause to the query

10
jOOQ/src/main/java/org/jooq/SelectQuery.java
View File

@ -257,7 +257,7 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
* @param conditions The condition
*/
@Support
void addHaving(Collection<Condition> conditions);
void addHaving(Collection<? extends Condition> conditions);
/**
* Adds new conditions to the having clause of query, connecting them to
@ -279,7 +279,7 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
* @param conditions The condition
*/
@Support
void addHaving(Operator operator, Collection<Condition> conditions);
void addHaving(Operator operator, Collection<? extends Condition> conditions);
/**
* Add an Oracle-style hint to the select clause.
@ -380,7 +380,7 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
*/
@Override
@Support
void addConditions(Collection<Condition> conditions);
void addConditions(Collection<? extends Condition> conditions);
/**
* {@inheritDoc}
@ -394,7 +394,7 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
*/
@Override
@Support
void addConditions(Operator operator, Collection<Condition> conditions);
void addConditions(Operator operator, Collection<? extends Condition> conditions);
/**
* Adds ordering fields, ordering by the default sort order
@ -418,7 +418,7 @@ public interface SelectQuery<R extends Record> extends Select<R>, ConditionProvi
* @param fields The ordering fields
*/
@Support
void addOrderBy(Collection<SortField<?>> fields);
void addOrderBy(Collection<? extends SortField<?>> fields);
/**
* Adds ordering fields

2
jOOQ/src/main/java/org/jooq/SelectWhereStep.java
View File

@ -122,7 +122,7 @@ public interface SelectWhereStep<R extends Record> extends SelectConnectByStep<R
name = "WHERE",
args = "Condition+"
)
SelectConditionStep<R> where(Collection<Condition> conditions);
SelectConditionStep<R> where(Collection<? extends Condition> conditions);
/**
* Add a <code>WHERE</code> clause to the query.

4
jOOQ/src/main/java/org/jooq/UpdateQuery.java
View File

@ -403,7 +403,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
*/
@Override
@Support
void addConditions(Collection<Condition> conditions);
void addConditions(Collection<? extends Condition> conditions);
/**
* {@inheritDoc}
@ -417,7 +417,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
*/
@Override
@Support
void addConditions(Operator operator, Collection<Condition> conditions);
void addConditions(Operator operator, Collection<? extends Condition> conditions);
// ------------------------------------------------------------------------
// XXX: Methods for the UPDATE .. RETURNING syntax

12
jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
View File

@ -53,11 +53,11 @@
*/
package org.jooq;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import org.jooq.impl.DSL;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import org.jooq.impl.DSL;
/**
* This type is used for the {@link Update}'s DSL API.
@ -95,7 +95,7 @@ public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R>, U
name = "WHERE",
args = "Condition+"
)
UpdateConditionStep<R> where(Collection<Condition> conditions);
UpdateConditionStep<R> where(Collection<? extends Condition> conditions);
/**
* Add conditions to the query

24
jOOQ/src/main/java/org/jooq/WindowOrderByStep.java
View File

@ -53,17 +53,17 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.CUBRID;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.ORACLE;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SQLSERVER;
import static org.jooq.SQLDialect.SYBASE;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
import static org.jooq.SQLDialect.CUBRID;
import static org.jooq.SQLDialect.DB2;
import static org.jooq.SQLDialect.ORACLE;
import static org.jooq.SQLDialect.POSTGRES;
import static org.jooq.SQLDialect.SQLSERVER;
import static org.jooq.SQLDialect.SYBASE;
import java.util.Collection;
import org.jooq.api.annotation.State;
import org.jooq.api.annotation.Transition;
/**
* This type is used for the window function DSL API.
@ -112,5 +112,5 @@ public interface WindowOrderByStep<T> extends WindowFinalStep<T> {
name = "ORDER BY",
args = "SortField+"
)
WindowRowsStep<T> orderBy(Collection<SortField<?>> fields);
WindowRowsStep<T> orderBy(Collection<? extends SortField<?>> fields);
}

4
jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java
View File

@ -101,7 +101,7 @@ class ConditionProviderImpl extends AbstractQueryPart implements ConditionProvid
}
@Override
public final void addConditions(Collection<Condition> conditions) {
public final void addConditions(Collection<? extends Condition> conditions) {
addConditions(Operator.AND, conditions);
}
@ -111,7 +111,7 @@ class ConditionProviderImpl extends AbstractQueryPart implements ConditionProvid
}
@Override
public final void addConditions(Operator operator, Collection<Condition> conditions) {
public final void addConditions(Operator operator, Collection<? extends Condition> conditions) {
if (!conditions.isEmpty()) {
Condition c;

34
jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
View File

@ -53,22 +53,22 @@
*/
package org.jooq.impl;
import static org.jooq.impl.DSL.condition;
import static org.jooq.impl.DSL.exists;
import static org.jooq.impl.DSL.notExists;
import java.util.Collection;
import org.jooq.Condition;
import org.jooq.Configuration;
import org.jooq.DeleteConditionStep;
import org.jooq.DeleteWhereStep;
import org.jooq.Field;
import org.jooq.Operator;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.Select;
import org.jooq.Table;
import static org.jooq.impl.DSL.condition;
import static org.jooq.impl.DSL.exists;
import static org.jooq.impl.DSL.notExists;
import java.util.Collection;
import org.jooq.Condition;
import org.jooq.Configuration;
import org.jooq.DeleteConditionStep;
import org.jooq.DeleteWhereStep;
import org.jooq.Field;
import org.jooq.Operator;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.Select;
import org.jooq.Table;
/**
* @author Lukas Eder
@ -97,7 +97,7 @@ class DeleteImpl<R extends Record>
}
@Override
public final DeleteImpl<R> where(Collection<Condition> conditions) {
public final DeleteImpl<R> where(Collection<? extends Condition> conditions) {
getDelegate().addConditions(conditions);
return this;
}

4
jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
View File

@ -101,7 +101,7 @@ class DeleteQueryImpl<R extends Record> extends AbstractQuery implements DeleteQ
}
@Override
public final void addConditions(Collection<Condition> conditions) {
public final void addConditions(Collection<? extends Condition> conditions) {
condition.addConditions(conditions);
}
@ -116,7 +116,7 @@ class DeleteQueryImpl<R extends Record> extends AbstractQuery implements DeleteQ
}
@Override
public final void addConditions(Operator operator, Collection<Condition> conditions) {
public final void addConditions(Operator operator, Collection<? extends Condition> conditions) {
condition.addConditions(operator, conditions);
}

8
jOOQ/src/main/java/org/jooq/impl/Function.java
View File

@ -513,7 +513,7 @@ class Function<T> extends AbstractField<T> implements
}
@Override
public final AggregateFunction<T> withinGroupOrderBy(Collection<SortField<?>> fields) {
public final AggregateFunction<T> withinGroupOrderBy(Collection<? extends SortField<?>> fields) {
withinGroupOrderBy.addAll(fields);
return this;
}
@ -531,7 +531,7 @@ class Function<T> extends AbstractField<T> implements
}
@Override
public final WindowBeforeOverStep<T> keepDenseRankFirstOrderBy(Collection<SortField<?>> fields) {
public final WindowBeforeOverStep<T> keepDenseRankFirstOrderBy(Collection<? extends SortField<?>> fields) {
first = true;
keepDenseRankOrderBy.addAll(fields);
return this;
@ -549,7 +549,7 @@ class Function<T> extends AbstractField<T> implements
}
@Override
public final WindowBeforeOverStep<T> keepDenseRankLastOrderBy(Collection<SortField<?>> fields) {
public final WindowBeforeOverStep<T> keepDenseRankLastOrderBy(Collection<? extends SortField<?>> fields) {
keepDenseRankOrderBy.addAll(fields);
return this;
}
@ -600,7 +600,7 @@ class Function<T> extends AbstractField<T> implements
}
@Override
public final WindowRowsStep<T> orderBy(Collection<SortField<?>> fields) {
public final WindowRowsStep<T> orderBy(Collection<? extends SortField<?>> fields) {
orderBy.addAll(fields);
return this;
}

32
jOOQ/src/main/java/org/jooq/impl/GroupConcat.java
View File

@ -53,19 +53,19 @@
*/
package org.jooq.impl;
import static org.jooq.impl.DSL.inline;
import java.util.Arrays;
import java.util.Collection;
import org.jooq.AggregateFunction;
import org.jooq.Configuration;
import org.jooq.Field;
import org.jooq.GroupConcatOrderByStep;
import org.jooq.GroupConcatSeparatorStep;
import org.jooq.SortField;
import org.jooq.WindowBeforeOverStep;
import org.jooq.WindowPartitionByStep;
import static org.jooq.impl.DSL.inline;
import java.util.Arrays;
import java.util.Collection;
import org.jooq.AggregateFunction;
import org.jooq.Configuration;
import org.jooq.Field;
import org.jooq.GroupConcatOrderByStep;
import org.jooq.GroupConcatSeparatorStep;
import org.jooq.SortField;
import org.jooq.WindowBeforeOverStep;
import org.jooq.WindowPartitionByStep;
/**
* @author Lukas Eder
@ -120,7 +120,7 @@ class GroupConcat extends AbstractFunction<String> implements GroupConcatOrderBy
}
@Override
public final WindowBeforeOverStep<String> keepDenseRankFirstOrderBy(Collection<SortField<?>> fields) {
public final WindowBeforeOverStep<String> keepDenseRankFirstOrderBy(Collection<? extends SortField<?>> fields) {
throw new UnsupportedOperationException("KEEP() not supported on GROUP_CONCAT aggregate function");
}
@ -135,7 +135,7 @@ class GroupConcat extends AbstractFunction<String> implements GroupConcatOrderBy
}
@Override
public final WindowBeforeOverStep<String> keepDenseRankLastOrderBy(Collection<SortField<?>> fields) {
public final WindowBeforeOverStep<String> keepDenseRankLastOrderBy(Collection<? extends SortField<?>> fields) {
throw new UnsupportedOperationException("KEEP() not supported on GROUP_CONCAT aggregate function");
}
@ -163,7 +163,7 @@ class GroupConcat extends AbstractFunction<String> implements GroupConcatOrderBy
}
@Override
public final GroupConcatSeparatorStep orderBy(Collection<SortField<?>> fields) {
public final GroupConcatSeparatorStep orderBy(Collection<? extends SortField<?>> fields) {
orderBy.addAll(fields);
return this;
}

10
jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
View File

@ -244,7 +244,7 @@ class SelectImpl<R extends Record> extends AbstractDelegatingQuery<Select<R>> im
}
@Override
public final SelectImpl<R> where(Collection<Condition> conditions) {
public final SelectImpl<R> where(Collection<? extends Condition> conditions) {
conditionStep = ConditionStep.WHERE;
getQuery().addConditions(conditions);
return this;
@ -506,7 +506,7 @@ class SelectImpl<R extends Record> extends AbstractDelegatingQuery<Select<R>> im
}
@Override
public final SelectImpl<R> orderBy(Collection<SortField<?>> fields) {
public final SelectImpl<R> orderBy(Collection<? extends SortField<?>> fields) {
getQuery().addOrderBy(fields);
return this;
}
@ -532,7 +532,7 @@ class SelectImpl<R extends Record> extends AbstractDelegatingQuery<Select<R>> im
}
@Override
public final SelectImpl<R> orderSiblingsBy(Collection<SortField<?>> fields) {
public final SelectImpl<R> orderSiblingsBy(Collection<? extends SortField<?>> fields) {
getQuery().addOrderBy(fields);
getQuery().setOrderBySiblings(true);
return this;
@ -622,7 +622,7 @@ class SelectImpl<R extends Record> extends AbstractDelegatingQuery<Select<R>> im
}
@Override
public final SelectImpl<R> of(Collection<Field<?>> fields) {
public final SelectImpl<R> of(Collection<? extends Field<?>> fields) {
getQuery().setForUpdateOf(fields);
return this;
}
@ -685,7 +685,7 @@ class SelectImpl<R extends Record> extends AbstractDelegatingQuery<Select<R>> im
}
@Override
public final SelectImpl<R> having(Collection<Condition> conditions) {
public final SelectImpl<R> having(Collection<? extends Condition> conditions) {
conditionStep = ConditionStep.HAVING;
getQuery().addHaving(conditions);
return this;

10
jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
View File

@ -941,7 +941,7 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
}
@Override
public final void addOrderBy(Collection<SortField<?>> fields) {
public final void addOrderBy(Collection<? extends SortField<?>> fields) {
getOrderBy().addAll(fields);
}
@ -977,7 +977,7 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
}
@Override
public final void addConditions(Collection<Condition> conditions) {
public final void addConditions(Collection<? extends Condition> conditions) {
condition.addConditions(conditions);
}
@ -987,7 +987,7 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
}
@Override
public final void addConditions(Operator operator, Collection<Condition> conditions) {
public final void addConditions(Operator operator, Collection<? extends Condition> conditions) {
condition.addConditions(operator, conditions);
}
@ -1057,7 +1057,7 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
}
@Override
public final void addHaving(Collection<Condition> conditions) {
public final void addHaving(Collection<? extends Condition> conditions) {
getHaving().addConditions(conditions);
}
@ -1067,7 +1067,7 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
}
@Override
public final void addHaving(Operator operator, Collection<Condition> conditions) {
public final void addHaving(Operator operator, Collection<? extends Condition> conditions) {
getHaving().addConditions(operator, conditions);
}

138
jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
View File

@ -53,74 +53,74 @@
*/
package org.jooq.impl;
import static org.jooq.impl.DSL.condition;
import static org.jooq.impl.DSL.exists;
import static org.jooq.impl.DSL.notExists;
import java.util.Collection;
import java.util.Map;
import javax.annotation.Generated;
import org.jooq.Condition;
import org.jooq.Configuration;
import org.jooq.Field;
import org.jooq.Operator;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.Record1;
import org.jooq.Record10;
import org.jooq.Record11;
import org.jooq.Record12;
import org.jooq.Record13;
import org.jooq.Record14;
import org.jooq.Record15;
import org.jooq.Record16;
import org.jooq.Record17;
import org.jooq.Record18;
import org.jooq.Record19;
import org.jooq.Record2;
import org.jooq.Record20;
import org.jooq.Record21;
import org.jooq.Record22;
import org.jooq.Record3;
import org.jooq.Record4;
import org.jooq.Record5;
import org.jooq.Record6;
import org.jooq.Record7;
import org.jooq.Record8;
import org.jooq.Record9;
import org.jooq.Result;
import org.jooq.Row1;
import org.jooq.Row10;
import org.jooq.Row11;
import org.jooq.Row12;
import org.jooq.Row13;
import org.jooq.Row14;
import org.jooq.Row15;
import org.jooq.Row16;
import org.jooq.Row17;
import org.jooq.Row18;
import org.jooq.Row19;
import org.jooq.Row2;
import org.jooq.Row20;
import org.jooq.Row21;
import org.jooq.Row22;
import org.jooq.Row3;
import org.jooq.Row4;
import org.jooq.Row5;
import org.jooq.Row6;
import org.jooq.Row7;
import org.jooq.Row8;
import org.jooq.Row9;
import org.jooq.Select;
import org.jooq.Table;
import org.jooq.UpdateConditionStep;
import org.jooq.UpdateQuery;
import org.jooq.UpdateResultStep;
import org.jooq.UpdateSetFirstStep;
import org.jooq.UpdateSetMoreStep;
import org.jooq.UpdateWhereStep;
import static org.jooq.impl.DSL.condition;
import static org.jooq.impl.DSL.exists;
import static org.jooq.impl.DSL.notExists;
import java.util.Collection;
import java.util.Map;
import javax.annotation.Generated;
import org.jooq.Condition;
import org.jooq.Configuration;
import org.jooq.Field;
import org.jooq.Operator;
import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.Record1;
import org.jooq.Record10;
import org.jooq.Record11;
import org.jooq.Record12;
import org.jooq.Record13;
import org.jooq.Record14;
import org.jooq.Record15;
import org.jooq.Record16;
import org.jooq.Record17;
import org.jooq.Record18;
import org.jooq.Record19;
import org.jooq.Record2;
import org.jooq.Record20;
import org.jooq.Record21;
import org.jooq.Record22;
import org.jooq.Record3;
import org.jooq.Record4;
import org.jooq.Record5;
import org.jooq.Record6;
import org.jooq.Record7;
import org.jooq.Record8;
import org.jooq.Record9;
import org.jooq.Result;
import org.jooq.Row1;
import org.jooq.Row10;
import org.jooq.Row11;
import org.jooq.Row12;
import org.jooq.Row13;
import org.jooq.Row14;
import org.jooq.Row15;
import org.jooq.Row16;
import org.jooq.Row17;
import org.jooq.Row18;
import org.jooq.Row19;
import org.jooq.Row2;
import org.jooq.Row20;
import org.jooq.Row21;
import org.jooq.Row22;
import org.jooq.Row3;
import org.jooq.Row4;
import org.jooq.Row5;
import org.jooq.Row6;
import org.jooq.Row7;
import org.jooq.Row8;
import org.jooq.Row9;
import org.jooq.Select;
import org.jooq.Table;
import org.jooq.UpdateConditionStep;
import org.jooq.UpdateQuery;
import org.jooq.UpdateResultStep;
import org.jooq.UpdateSetFirstStep;
import org.jooq.UpdateSetMoreStep;
import org.jooq.UpdateWhereStep;
/**
* A wrapper for an {@link UpdateQuery}
@ -492,7 +492,7 @@ final class UpdateImpl<R extends Record>
}
@Override
public final UpdateImpl<R> where(Collection<Condition> conditions) {
public final UpdateImpl<R> where(Collection<? extends Condition> conditions) {
getDelegate().addConditions(conditions);
return this;
}

4
jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
View File

@ -447,7 +447,7 @@ class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements
}
@Override
public final void addConditions(Collection<Condition> conditions) {
public final void addConditions(Collection<? extends Condition> conditions) {
condition.addConditions(conditions);
}
@ -462,7 +462,7 @@ class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements
}
@Override
public final void addConditions(Operator operator, Collection<Condition> conditions) {
public final void addConditions(Operator operator, Collection<? extends Condition> conditions) {
condition.addConditions(operator, conditions);
}