replaced findUnique by "default" method in interfaces. (#1124)

This commit is contained in:
Roland Praml
2017-09-12 23:20:04 +12:00
committed by Rob Bygrave
parent 7e8ed72b7b
commit b8e1dffca2
11 changed files with 15 additions and 50 deletions
+6 -2
View File
@@ -1097,7 +1097,9 @@ public interface EbeanServer {
*/
@Deprecated
@Nullable
<T> T findUnique(Query<T> query, Transaction transaction);
default <T> T findUnique(Query<T> query, Transaction transaction) {
return findOne(query, transaction);
}
/**
* Execute as a delete query deleting the 'root level' beans that match the predicates
@@ -1190,7 +1192,9 @@ public interface EbeanServer {
*/
@Deprecated
@Nullable
SqlRow findUnique(SqlQuery query, Transaction transaction);
default SqlRow findUnique(SqlQuery query, Transaction transaction) {
return findOne(query, transaction);
}
/**
* Either Insert or Update the bean depending on its state.
+3 -1
View File
@@ -283,7 +283,9 @@ public interface ExpressionList<T> {
*/
@Deprecated
@Nullable
T findUnique();
default T findUnique() {
return findOne();
}
/**
* Execute find row count query in a background thread.
+3 -1
View File
@@ -871,7 +871,9 @@ public interface Query<T> {
*/
@Deprecated
@Nullable
T findUnique();
default T findUnique() {
return findOne();
}
/**
* Return versions of a @History entity bean.
+3 -1
View File
@@ -82,7 +82,9 @@ public interface SqlQuery extends Serializable {
* Deprecated - please migrate to findOne().
*/
@Deprecated
SqlRow findUnique();
default SqlRow findUnique() {
return findOne();
}
/**
* The same as bind for named parameters.
@@ -1197,11 +1197,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
}
}
@Override
public <T> T findUnique(Query<T> query, Transaction transaction) {
return findOne(query, transaction);
}
@Override
public <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction) {
return Optional.ofNullable(findOne(query, transaction));
@@ -1528,11 +1523,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
}
}
@Override
public SqlRow findUnique(SqlQuery query, Transaction t) {
return findOne(query, t);
}
@Override
public SqlRow findOne(SqlQuery query, Transaction t) {
@@ -407,11 +407,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return query.findOneOrEmpty();
}
@Override
public T findUnique() {
return query.findOne();
}
@Override
public ExpressionList<T> filterMany(String prop) {
return query.filterMany(prop);
@@ -81,11 +81,6 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
return rootQuery.findSet();
}
@Override
public T findUnique() {
return rootQuery.findOne();
}
@Override
public ExpressionList<T> having() {
throw new PersistenceException(notAllowedMessage);
@@ -404,11 +404,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
return exprList.findOneOrEmpty();
}
@Override
public T findUnique() {
return exprList.findOne();
}
@Override
public Query<T> forUpdate() {
return exprList.forUpdate();
@@ -1265,11 +1265,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
return server.findOneOrEmpty(this, null);
}
@Override
public T findUnique() {
return findOne();
}
@Override
public FutureIds<T> findFutureIds() {
return server.findFutureIds(this, null);
@@ -72,11 +72,6 @@ public class DefaultRelationalQuery implements SpiSqlQuery {
return Optional.ofNullable(findOne());
}
@Override
public SqlRow findUnique() {
return findOne();
}
@Override
public DefaultRelationalQuery setParameter(int position, Object value) {
bindParams.setParameter(position, value);