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

#1747 - Refactor DeleteMeta and UpdateMeta to extract common appendWhere() code

Browse Source
This commit is contained in:
rob bygrave
2019-07-02 23:25:05 +12:00
parent 576eb01187
commit 8c8f2b95da
3 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/persist/dml/BaseMeta.java
+34
View File
@@ -0,0 +1,34 @@
package io.ebeaninternal.server.persist.dml;
import io.ebeaninternal.api.ConcurrencyMode;
import io.ebeaninternal.server.persist.dmlbind.Bindable;
import io.ebeaninternal.server.persist.dmlbind.BindableId;
class BaseMeta {
final BindableId id;
final Bindable version;
final Bindable tenantId;
BaseMeta(BindableId id, Bindable version, Bindable tenantId) {
this.id = id;
this.version = version;
this.tenantId = tenantId;
}
String appendWhere(GenerateDmlRequest request, ConcurrencyMode conMode) {
request.setWhereIdMode();
id.dmlAppend(request);
if (tenantId != null) {
tenantId.dmlAppend(request);
}
if (ConcurrencyMode.VERSION == conMode) {
if (version != null) {
version.dmlAppend(request);
}
}
return request.toString();
}
}
src/main/java/io/ebeaninternal/server/persist/dml/DeleteMeta.java
+3 -22
View File
@@ -13,21 +13,15 @@ import java.sql.SQLException;
* Meta data for delete handler. The meta data is for a particular bean type. It
* is considered immutable and is thread safe.
*/
final class DeleteMeta {
final class DeleteMeta extends BaseMeta {
private final String sqlVersion;
private final String sqlNone;
private final String sqlDraftVersion;
private final String sqlDraftNone;
private final BindableId id;
private final Bindable version;
private final Bindable tenantId;
DeleteMeta(BeanDescriptor<?> desc, BindableId id, Bindable version, Bindable tenantId) {
this.id = id;
this.version = version;
this.tenantId = tenantId;
super(id, version, tenantId);
String tableName = desc.getBaseTable();
this.sqlNone = genSql(ConcurrencyMode.NONE, tableName);
@@ -87,20 +81,7 @@ final class DeleteMeta {
GenerateDmlRequest request = new GenerateDmlRequest();
request.append("delete from ").append(table);
request.append(" where ");
request.setWhereIdMode();
id.dmlAppend(request);
if (tenantId != null) {
tenantId.dmlAppend(request);
}
if (ConcurrencyMode.VERSION == conMode) {
if (version != null) {
version.dmlAppend(request);
}
}
return request.toString();
return appendWhere(request, conMode);
}
}
src/main/java/io/ebeaninternal/server/persist/dml/UpdateMeta.java
+3 -23
View File
@@ -17,25 +17,18 @@ import java.util.List;
* Meta data for update handler. The meta data is for a particular bean type. It
* is considered immutable and is thread safe.
*/
final class UpdateMeta {
final class UpdateMeta extends BaseMeta {
private final BindableList set;
private final BindableId id;
private final Bindable version;
private final Bindable tenantId;
private final UpdatePlan modeNoneUpdatePlan;
private final UpdatePlan modeVersionUpdatePlan;
UpdateMeta(BeanDescriptor<?> desc, BindableList set, BindableId id, Bindable version, Bindable tenantId) {
super(id, version, tenantId);
this.set = set;
this.id = id;
this.version = version;
this.tenantId = tenantId;
String sqlNone = genSql(ConcurrencyMode.NONE, set, desc.getBaseTable());
String sqlVersion = genSql(ConcurrencyMode.VERSION, set, desc.getBaseTable());
this.modeNoneUpdatePlan = new UpdatePlan(ConcurrencyMode.NONE, sqlNone, set);
this.modeVersionUpdatePlan = new UpdatePlan(ConcurrencyMode.VERSION, sqlVersion, set);
}
@@ -115,7 +108,6 @@ final class UpdateMeta {
GenerateDmlRequest request = new GenerateDmlRequest();
request.append("update ").append(tableName).append(" set ");
request.setUpdateSetMode();
bindableList.dmlAppend(request);
@@ -126,19 +118,7 @@ final class UpdateMeta {
}
request.append(" where ");
request.setWhereIdMode();
id.dmlAppend(request);
if (tenantId != null) {
tenantId.dmlAppend(request);
}
if (ConcurrencyMode.VERSION == conMode) {
if (version != null) {
version.dmlAppend(request);
}
}
return request.toString();
return appendWhere(request, conMode);
}
}