github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2373 - Tidy up, migrate from deprecated methods

Browse Source
This commit is contained in:
Rob Bygrave
2021-09-16 11:58:45 +12:00
parent cf95372f32
commit b262c2e19d
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+1 -1
View File
@@ -78,7 +78,7 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE
* Compile/build the sub query.
*/
protected CQuery<?> compileSubQuery(BeanQueryRequest<?> queryRequest) {
SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.getEbeanServer();
SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.database();
return ebeanServer.compileQuery(Type.SQ_EXISTS, subQuery, queryRequest.transaction());
}
ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+1 -2
View File
@@ -65,8 +65,7 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
* Compile/build the sub query.
*/
private CQuery<?> compileSubQuery(BeanQueryRequest<?> queryRequest) {
SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.getEbeanServer();
SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.database();
return ebeanServer.compileQuery(Type.SQ_IN, subQuery, queryRequest.transaction());
}
ebean-test/src/test/java/org/tests/model/controller/TestBeanFindController.java
+4 -5
View File
@@ -54,7 +54,7 @@ public class TestBeanFindController implements BeanFindController {
elementsMap.forEach((beanType, ids) -> {
final Map<Integer, FindControllerMain> idLookup = controllerLookup.get(beanType);
request.getEbeanServer().find(beanType).where()
request.database().find(beanType).where()
.idIn(ids).setMapKey("id")
.findMap().forEach((id, bean) -> idLookup.get((Integer) id).setTarget(bean));
});
@@ -69,18 +69,17 @@ public class TestBeanFindController implements BeanFindController {
Class<?> beanType = beanTypeFor(findControllerMain.getTargetTableName(), request);
if (beanType != null) {
findControllerMain.setTarget(request.getEbeanServer().find(beanType, findControllerMain.getTargetId()));
findControllerMain.setTarget(request.database().find(beanType, findControllerMain.getTargetId()));
}
return result;
}
private Class<?> beanTypeFor(String tableName, BeanQueryRequest<?> request) {
List<? extends BeanType<?>> types = request.getEbeanServer()
.getPluginApi().getBeanTypes(tableName);
List<? extends BeanType<?>> types = request.database().pluginApi().beanTypes(tableName);
for (BeanType<?> type : types) {
if (type.isInheritanceRoot()) {
return type.getBeanType();
return type.type();
}
}
return null;