#1144 - Refactor internals - move generated property setting into PersistRequestBean

This commit is contained in:
rob bygrave committed 2017-10-03 00:30:34 +13:00
1 parent f2179fca2d
commit daf3d97266
18 files changed
+213 -266

No files matched your search

@@ -92,7 +92,7 @@ public final class DeleteMeta {
}
boolean publish = request.isPublish();
switch (request.determineConcurrencyMode()) {
switch (request.getConcurrencyMode()) {
case NONE:
return publish ? sqlNone : sqlDraftNone;
@@ -100,7 +100,7 @@ public final class DeleteMeta {
return publish ? sqlVersion : sqlDraftVersion;
default:
throw new RuntimeException("Invalid mode " + request.determineConcurrencyMode());
throw new RuntimeException("Invalid mode " + request.getConcurrencyMode());
}
}
@@ -77,7 +77,7 @@ public class MetaFactory {
DeleteMeta createDelete(BeanDescriptor<?> desc) {
BindableId id = idFact.createId(desc);
Bindable version = versionFact.create(desc);
Bindable version = versionFact.createForDelete(desc);
Bindable tenantId = versionFact.createTenantId(desc);
return new DeleteMeta(emptyStringAsNull, desc, id, version, tenantId);
@@ -93,9 +93,7 @@ public final class UpdateMeta {
return getDynamicUpdatePlan(request);
}
// 'full bean' update...
ConcurrencyMode mode = request.determineConcurrencyMode();
switch (mode) {
switch (request.getConcurrencyMode()) {
case NONE:
return modeNoneUpdatePlan;
@@ -103,7 +101,7 @@ public final class UpdateMeta {
return modeVersionUpdatePlan;
default:
throw new RuntimeException("Invalid mode " + mode);
throw new RuntimeException("Invalid mode " + request.getConcurrencyMode());
}
}
@@ -125,7 +123,7 @@ public final class UpdateMeta {
set.addToUpdate(persistRequest, list);
BindableList bindableList = new BindableList(list);
ConcurrencyMode mode = persistRequest.determineConcurrencyMode();
ConcurrencyMode mode = persistRequest.getConcurrencyMode();
// build the SQL for this update statement
String sql = genSql(mode, bindableList, persistRequest.getUpdateTable());
@@ -1,37 +0,0 @@
package io.ebeaninternal.server.persist.dmlbind;
import io.ebean.bean.EntityBean;
import io.ebeaninternal.server.core.PersistRequestBean;
import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
import java.sql.SQLException;
import java.util.List;
/**
* Bindable for generated ManyToOne - likely 'who created'.
*/
class BindableAssocOneGeneratedInsert extends BindableAssocOne {
private final GeneratedProperty generatedProperty;
BindableAssocOneGeneratedInsert(BeanPropertyAssocOne<?> assocOne) {
super(assocOne);
this.generatedProperty = assocOne.getGeneratedProperty();
}
@Override
public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
throw new RuntimeException("never called");
}
@Override
public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
Object objectValue = generatedProperty.getInsertValue(assocOne, bean, request.now());
EntityBean generatedValue = castToEntityBean(objectValue);
assocOne.setValue(bean, generatedValue);
registerDeferred(request, bean, generatedValue);
}
}
@@ -1,39 +0,0 @@
package io.ebeaninternal.server.persist.dmlbind;
import io.ebean.bean.EntityBean;
import io.ebeaninternal.server.core.PersistRequestBean;
import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
import java.sql.SQLException;
import java.util.List;
/**
* Bindable for generated ManyToOne - likely 'who modified'.
*/
class BindableAssocOneGeneratedUpdate extends BindableAssocOne {
private final GeneratedProperty generatedProperty;
BindableAssocOneGeneratedUpdate(BeanPropertyAssocOne<?> assocOne) {
super(assocOne);
this.generatedProperty = assocOne.getGeneratedProperty();
}
@Override
public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
if (generatedProperty.includeInAllUpdates() || request.isAddToUpdate(assocOne)) {
list.add(this);
}
}
@Override
public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
Object objectValue = generatedProperty.getUpdateValue(assocOne, bean, request.now());
EntityBean generatedValue = castToEntityBean(objectValue);
assocOne.setValueChanged(bean, generatedValue);
registerDeferred(request, bean, generatedValue);
}
}
@@ -1,47 +0,0 @@
package io.ebeaninternal.server.persist.dmlbind;
import io.ebean.bean.EntityBean;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
import java.sql.SQLException;
/**
* Bindable for insert on a property with a GeneratedProperty.
* <p>
* This is typically a 'insert timestamp', 'update timestamp' or 'counter'.
* </p>
*/
public class BindablePropertyInsertGenerated extends BindableProperty {
private final GeneratedProperty gen;
public BindablePropertyInsertGenerated(BeanProperty prop, GeneratedProperty gen) {
super(prop);
this.gen = gen;
}
@Override
public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
Object value = gen.getInsertValue(prop, bean, request.now());
// generated value should be the correct type
if (bean != null) {
// support PropertyChangeSupport
//prop.setValueIntercept(bean, value);
prop.setValue(bean, value);
}
request.bind(value, prop);
}
/**
* Always bind on Insert SET.
*/
@Override
public void dmlAppend(GenerateDmlRequest request) {
request.appendColumn(prop.getDbColumn());
}
}
@@ -1,64 +0,0 @@
package io.ebeaninternal.server.persist.dmlbind;
import io.ebean.bean.EntityBean;
import io.ebeaninternal.server.core.PersistRequestBean;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
import java.sql.SQLException;
import java.util.List;
/**
* Bindable for update on a property with a GeneratedProperty.
* <p>
* This is typically a 'update timestamp' or 'counter'.
* </p>
*/
public class BindablePropertyUpdateGenerated extends BindableProperty {
private final GeneratedProperty gen;
public BindablePropertyUpdateGenerated(BeanProperty prop, GeneratedProperty gen) {
super(prop);
this.gen = gen;
}
/**
* Add BindablePropertyUpdateGenerated if the property is loaded.
*/
@Override
public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
if (gen.includeInAllUpdates() || request.isLoadedProperty(prop)) {
list.add(this);
}
}
@Override
public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
Object value = gen.getUpdateValue(prop, bean, request.now());
// generated value should be the correct type
request.bind(value, prop);
if (prop.isVersion()) {
if (request.getPersistRequest().isLoadedProperty(prop)) {
// set to the bean after the where clause has been generated
request.registerGeneratedVersion(value);
}
} else {
// @WhenModified set without invoking interception
prop.setValueChanged(bean, value);
}
}
/**
* Always bind on Insert SET.
*/
@Override
public void dmlAppend(GenerateDmlRequest request) {
request.appendColumn(prop.getDbColumn());
}
}
@@ -0,0 +1,54 @@
package io.ebeaninternal.server.persist.dmlbind;
import io.ebean.bean.EntityBean;
import io.ebeaninternal.server.core.PersistRequestBean;
import io.ebeaninternal.server.deploy.BeanProperty;
import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
import java.sql.SQLException;
import java.util.List;
/**
* Bindable for a Version BeanProperty. Obtains value from 'old values'.
*/
public class BindablePropertyVersion implements Bindable {
protected final BeanProperty prop;
public BindablePropertyVersion(BeanProperty prop) {
this.prop = prop;
}
@Override
public String toString() {
return prop.toString();
}
@Override
public boolean isDraftOnly() {
return prop.isDraftOnly();
}
@Override
public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
if (request.isAddToUpdate(prop)) {
list.add(this);
}
}
@Override
public void dmlAppend(GenerateDmlRequest request) {
request.appendColumn(prop.getDbColumn());
}
/**
* Normal binding of a property value from the bean.
*/
@Override
public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
// get prior version value from 'old values'
Object value = bean._ebean_getIntercept().getOrigValue(prop.getPropertyIndex());
request.bind(value, prop);
}
}
@@ -35,24 +35,7 @@ public class FactoryAssocOnes {
}
break;
}
if (one.getGeneratedProperty() == null) {
list.add(new BindableAssocOne(one));
} else {
// typically generated 'who' created/modified properties
switch (mode) {
case INSERT:
if (one.getGeneratedProperty().includeInInsert()) {
list.add(new BindableAssocOneGeneratedInsert(one));
}
break;
case UPDATE:
if (one.getGeneratedProperty().includeInUpdate()) {
// A 'Who Created property' is never updated
list.add(new BindableAssocOneGeneratedUpdate(one));
}
break;
}
}
list.add(new BindableAssocOne(one));
}
}
}
@@ -40,26 +40,6 @@ public class FactoryProperty {
}
}
GeneratedProperty gen = prop.getGeneratedProperty();
if (gen != null) {
if (DmlMode.INSERT.equals(mode)) {
if (gen.includeInInsert()) {
return new BindablePropertyInsertGenerated(prop, gen);
} else {
return null;
}
}
if (DmlMode.UPDATE.equals(mode)) {
if (gen.includeInUpdate()) {
return new BindablePropertyUpdateGenerated(prop, gen);
} else {
// An 'Insert Timestamp' is never updated
return null;
}
}
}
return prop.isDbEncrypted() ? new BindableEncryptedProperty(prop, bindEncryptDataFirst) : new BindableProperty(prop);
}
}
@@ -17,6 +17,15 @@ public class FactoryVersion {
*/
public Bindable create(BeanDescriptor<?> desc) {
BeanProperty versionProperty = desc.getVersionProperty();
return (versionProperty == null) ? null : new BindablePropertyVersion(versionProperty);
}
/**
* Create a Bindable for the version property(s) for a bean type.
*/
public Bindable createForDelete(BeanDescriptor<?> desc) {
BeanProperty versionProperty = desc.getVersionProperty();
return (versionProperty == null) ? null : new BindableProperty(versionProperty);
}