#2345 - Rename Database.getExpressionFactory() to expressionFactory with deprecation

This commit is contained in:
Rob Bygrave committed 2021-09-02 22:55:47 +12:00
1 parent 7a7dbae313
commit 4557bdfa6f
8 files changed
+16 -8

No files matched your search

@@ -345,7 +345,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
}
@Override
public ExpressionFactory getExpressionFactory() {
public ExpressionFactory expressionFactory() {
return expressionFactory;
}
@@ -1793,7 +1793,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
* We actually need to do a query because we don't know the type without the discriminator value.
*/
private T findReferenceBean(Object id, PersistenceContext pc) {
DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.getExpressionFactory());
DefaultOrmQuery<T> query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.expressionFactory());
query.setPersistenceContext(pc);
return query.setId(id).findOne();
}
@@ -229,7 +229,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
* We use target descriptor rather than target property type to support ElementCollection.
*/
public SpiQuery<T> newQuery(SpiEbeanServer server) {
return new DefaultOrmQuery<>(targetDescriptor, server, server.getExpressionFactory());
return new DefaultOrmQuery<>(targetDescriptor, server, server.expressionFactory());
}
@Override