Remove deprecated methods in ebean-api - SqlQuery

ebean-api/src/main/java/io/ebean/SqlQuery.java

@@ -74,18 +74,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   @Nullable
   SqlRow findOne();
 
-  /**
-   * Deprecated migrate to use {@link #mapTo(RowMapper)}
-   */
-  @Deprecated
-  <T> T findOne(RowMapper<T> mapper);
-
-  /**
-   * Deprecated migrate to use {@link #mapTo(RowMapper)}
-   */
-  @Deprecated
-  <T> List<T> findList(RowMapper<T> mapper);
-
   /**
    * Execute the query reading each row from ResultSet using the RowConsumer.
    * <p>
@@ -121,50 +109,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
    */
   Optional<SqlRow> findOneOrEmpty();
 
-  /**
-   * Deprecated - migrate to <code>.mapToScalar(attributeType).findOne()</code>.
-   * <pre>{@code
-   *
-   *    .mapToScalar(BigDecimal.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-  <T> T findSingleAttribute(Class<T> attributeType);
-
-  /**
-   * Deprecated - migrate to <code>.mapToScalar(BigDecimal.class).findOne()</code>.
-   * <pre>{@code
-   *
-   *    .mapToScalar(BigDecimal.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-  BigDecimal findSingleDecimal();
-
-  /**
-   * Deprecated - migrate to <code>.mapToScalar(Long.class).findOne()</code>.
-   * <pre>{@code
-   *
-   *    .mapToScalar(Long.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-  Long findSingleLong();
-
-  /**
-   * Deprecated - migrate to <code>.mapToScalar(Long.class).findList()</code>.
-   * <pre>{@code
-   *
-   *    .mapToScalar(Long.class)
-   *    .findList();
-   * }
-   */
-  @Deprecated
-  <T> List<T> findSingleAttributeList(Class<T> attributeType);
-
   /**
    * Set one of more positioned parameters.
    * <p>
@@ -194,12 +138,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
    */
   SqlQuery setParameters(Object... values);
 
-  /**
-   * Deprecated migrate to setParameters(Object... values)
-   */
-  @Deprecated
-  SqlQuery setParams(Object... values);
-
   /**
    * Set the next bind parameter by position.
    * <pre>{@code

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

@@ -10,7 +10,6 @@ import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlQuery;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -56,36 +55,6 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
     return server.findList(this, null);
   }
 
-  @Override
-  public BigDecimal findSingleDecimal() {
-    return server.findSingleAttribute(this, BigDecimal.class);
-  }
-
-  @Override
-  public Long findSingleLong() {
-    return server.findSingleAttribute(this, Long.class);
-  }
-
-  @Override
-  public <T> T findSingleAttribute(Class<T> cls) {
-    return server.findSingleAttribute(this, cls);
-  }
-
-  @Override
-  public <T> List<T> findSingleAttributeList(Class<T> cls) {
-    return server.findSingleAttributeList(this, cls);
-  }
-
-  @Override
-  public <T> T findOne(RowMapper<T> mapper) {
-    return server.findOneMapper(this, mapper);
-  }
-
-  @Override
-  public <T> List<T> findList(RowMapper<T> mapper) {
-    return server.findListMapper(this, mapper);
-  }
-
   @Override
   public void findEachRow(RowConsumer consumer) {
     server.findEachRow(this, consumer);
@@ -101,12 +70,6 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
     return Optional.ofNullable(findOne());
   }
 
-  @Override
-  @Deprecated
-  public DefaultRelationalQuery setParams(Object... values) {
-    return setParameters(values);
-  }
-
   @Override
   public DefaultRelationalQuery setParameters(Object... values) {
     bindParams.setNextParameters(values);
@@ -237,6 +200,14 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
     return new Mapper(mapper);
   }
 
+  private <T> T findSingleAttribute(Class<T> cls) {
+    return server.findSingleAttribute(this, cls);
+  }
+
+  private <T> List<T> findSingleAttributeList(Class<T> cls) {
+    return server.findSingleAttributeList(this, cls);
+  }
+
   private class Scalar<T> implements SqlQuery.TypeQuery<T> {
 
     private final Class<T> type;