mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
Refactor properties bootup, remove GlobalProperties and allow ServerConfig.loadFromProperties()
This commit is contained in:
1 parent
fe65a0ccb9
commit
370267ab6f
105 files changed
+3772
-3963
No files matched your search
@@ -1,13 +1,8 @@
|
||||
package com.avaje.ebeaninternal.server.persist;
|
||||
|
||||
import com.avaje.ebean.config.GlobalProperties;
|
||||
import com.avaje.ebean.event.BeanPersistController;
|
||||
import com.avaje.ebeaninternal.api.SpiTransaction;
|
||||
import com.avaje.ebeaninternal.server.core.PersistRequestBean;
|
||||
import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql;
|
||||
import com.avaje.ebeaninternal.server.core.PersistRequestOrmUpdate;
|
||||
import com.avaje.ebeaninternal.server.core.PersistRequestUpdateSql;
|
||||
import com.avaje.ebeaninternal.server.core.PstmtBatch;
|
||||
import com.avaje.ebeaninternal.server.core.*;
|
||||
import com.avaje.ebeaninternal.server.deploy.BeanManager;
|
||||
|
||||
/**
|
||||
@@ -32,19 +27,17 @@ public final class DefaultPersistExecute implements PersistExecute {
|
||||
/**
|
||||
* Default for whether to call getGeneratedKeys after batch insert.
|
||||
*/
|
||||
private final boolean defaultBatchGenKeys;
|
||||
private final boolean defaultBatchGenKeys = true;
|
||||
|
||||
/**
|
||||
* Construct this DmlPersistExecute.
|
||||
*/
|
||||
public DefaultPersistExecute(Binder binder, PstmtBatch pstmtBatch) {
|
||||
public DefaultPersistExecute(Binder binder, PstmtBatch pstmtBatch, int defaultBatchSize) {
|
||||
|
||||
this.exeOrmUpdate = new ExeOrmUpdate(binder, pstmtBatch);
|
||||
this.exeUpdateSql = new ExeUpdateSql(binder, pstmtBatch);
|
||||
this.exeCallableSql = new ExeCallableSql(binder, pstmtBatch);
|
||||
|
||||
this.defaultBatchGenKeys = GlobalProperties.getBoolean("batch.getgeneratedkeys", true);
|
||||
this.defaultBatchSize = GlobalProperties.getInt("batch.size", 20);
|
||||
this.defaultBatchSize = defaultBatchSize;
|
||||
}
|
||||
|
||||
public BatchControl createBatchControl(SpiTransaction t) {
|
||||
|
||||
@@ -79,7 +79,7 @@ public final class DefaultPersister implements Persister {
|
||||
this.server = server;
|
||||
this.updatesDeleteMissingChildren = server.getServerConfig().isUpdatesDeleteMissingChildren();
|
||||
this.beanDescriptorManager = descMgr;
|
||||
this.persistExecute = new DefaultPersistExecute(binder, pstmtBatch);
|
||||
this.persistExecute = new DefaultPersistExecute(binder, pstmtBatch, server.getServerConfig().getPersistBatchSize());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -182,7 +182,6 @@ public final class DefaultPersister implements Persister {
|
||||
}
|
||||
|
||||
req.commitTransIfRequired();
|
||||
return;
|
||||
|
||||
} catch (RuntimeException ex) {
|
||||
req.rollbackTransIfRequired();
|
||||
@@ -469,7 +468,7 @@ public final class DefaultPersister implements Persister {
|
||||
int rows = executeSqlUpdate(deleteById, t);
|
||||
|
||||
// Delete from the persistence context so that it can't be fetched again later
|
||||
PersistenceContext persistenceContext = ((SpiTransaction)t).getPersistenceContext();
|
||||
PersistenceContext persistenceContext = t.getPersistenceContext();
|
||||
if (idList != null) {
|
||||
for (Object idValue : idList) {
|
||||
persistenceContext.deleted(descriptor.getBeanType(), idValue);
|
||||
@@ -879,7 +878,7 @@ public final class DefaultPersister implements Persister {
|
||||
Collection<?> additions = null;
|
||||
Collection<?> deletions = null;
|
||||
|
||||
boolean vanillaCollection = (value instanceof BeanCollection<?> == false);
|
||||
boolean vanillaCollection = !(value instanceof BeanCollection<?>);
|
||||
|
||||
if (vanillaCollection || deleteMissingChildren) {
|
||||
// delete all intersection rows and then treat all
|
||||
|
||||
Reference in new issue
Block a user