#2166 - Remove deprecated forUpdate(lockType) methods - migrate to withLock(lockType, waitType)

ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java

@@ -501,31 +501,16 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.forUpdate();
   }
 
-  @Override
-  public Query<T> forUpdate(Query.LockType lockType) {
-    return query.forUpdate(lockType);
-  }
-
   @Override
   public Query<T> forUpdateNoWait() {
     return query.forUpdateNoWait();
   }
 
-  @Override
-  public Query<T> forUpdateNoWait(Query.LockType lockType) {
-    return query.forUpdateNoWait(lockType);
-  }
-
   @Override
   public Query<T> forUpdateSkipLocked() {
     return query.forUpdateSkipLocked();
   }
 
-  @Override
-  public Query<T> forUpdateSkipLocked(Query.LockType lockType) {
-    return query.forUpdateSkipLocked(lockType);
-  }
-
   @Override
   public Query<T> select(String fetchProperties) {
     return query.select(fetchProperties);

ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java

@@ -506,31 +506,16 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.forUpdate();
   }
 
-  @Override
-  public Query<T> forUpdate(Query.LockType lockType) {
-    return exprList.forUpdate(lockType);
-  }
-
   @Override
   public Query<T> forUpdateNoWait() {
     return exprList.forUpdateNoWait();
   }
 
-  @Override
-  public Query<T> forUpdateNoWait(Query.LockType lockType) {
-    return exprList.forUpdateNoWait(lockType);
-  }
-
   @Override
   public Query<T> forUpdateSkipLocked() {
     return exprList.forUpdateSkipLocked();
   }
 
-  @Override
-  public Query<T> forUpdateSkipLocked(Query.LockType lockType) {
-    return exprList.forUpdateSkipLocked(lockType);
-  }
-
   /**
    * Path exists - for the given path in a JSON document.
    */

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java

@@ -569,21 +569,6 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
-  @Override
-  public Query<T> forUpdate(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
-  @Override
-  public Query<T> forUpdateNoWait(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
-  @Override
-  public Query<T> forUpdateSkipLocked(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   @Override
   public boolean isForUpdate() {
     return false;

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -975,21 +975,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return setForUpdateWithMode(LockWait.WAIT, LockType.DEFAULT);
   }
 
-  @Override
-  public Query<T> forUpdate(LockType lockType) {
-    return setForUpdateWithMode(LockWait.WAIT, lockType);
-  }
-
-  @Override
-  public Query<T> forUpdateNoWait(LockType lockType) {
-    return setForUpdateWithMode(LockWait.NOWAIT, lockType);
-  }
-
-  @Override
-  public Query<T> forUpdateSkipLocked(LockType lockType) {
-    return setForUpdateWithMode(LockWait.SKIPLOCKED, lockType);
-  }
-
   @Override
   public DefaultOrmQuery<T> forUpdateNoWait() {
     return setForUpdateWithMode(LockWait.NOWAIT, LockType.DEFAULT);