Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy IdBinderEmbedded final fields, StringBuilder sizes and reuse code #3157

Merged
merged 1 commit into from
Aug 14, 2023
Merged

Tidy IdBinderEmbedded final fields, StringBuilder sizes and reuse code #3157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 42 additions & 55 deletions ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public boolean isIdInExpandedForm() {
}

private String idInExpanded() {
StringBuilder sb = new StringBuilder(30);
final StringBuilder sb = new StringBuilder(30);
sb.append("(");
for (int i = 0; i < props.length; i++) {
if (i > 0) {
Expand All @@ -69,7 +69,7 @@ private String idInExpanded() {
}

private String idInCompressed() {
StringBuilder sb = new StringBuilder(20).append("(");
final StringBuilder sb = new StringBuilder(props.length * 2 + 2).append("(");
for (int i = 0; i < props.length; i++) {
if (i > 0) {
sb.append(",");
Expand All @@ -85,27 +85,6 @@ public BeanProperty getBeanProperty() {
return embIdProperty;
}

@Override
public String getOrderBy(String pathPrefix, boolean ascending) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < props.length; i++) {
if (i > 0) {
sb.append(", ");
}
if (pathPrefix != null) {
sb.append(pathPrefix).append(".");
}
if (!idClass) {
sb.append(embIdProperty.name()).append(".");
}
sb.append(props[i].name());
if (!ascending) {
sb.append(" desc");
}
}
return sb.toString();
}

public BeanDescriptor<?> getIdBeanDescriptor() {
return idDesc;
}
Expand Down Expand Up @@ -142,15 +121,26 @@ public boolean isComplexId() {

@Override
public String getDefaultOrderBy() {
StringBuilder sb = new StringBuilder();
return getOrderBy(null, true);
}

@Override
public String getOrderBy(String pathPrefix, boolean ascending) {
final StringBuilder sb = new StringBuilder(100);
for (int i = 0; i < props.length; i++) {
if (i > 0) {
sb.append(", ");
}
if (pathPrefix != null) {
sb.append(pathPrefix).append(".");
}
if (!idClass) {
sb.append(embIdProperty.name()).append(".");
}
sb.append(props[i].name());
if (!ascending) {
sb.append(" desc");
}
}
return sb.toString();
}
Expand All @@ -167,7 +157,7 @@ public String getIdInValueExprDelete(int size) {
if (!idInExpandedForm) {
return getIdInValueExpr(false, size);
}
StringBuilder sb = new StringBuilder();
final StringBuilder sb = new StringBuilder(80);
sb.append("(");
for (int j = 0; j < size; j++) {
if (j > 0) {
Expand All @@ -191,7 +181,7 @@ public String getIdInValueExpr(boolean not, int size) {
if (size <= 0) {
throw new IndexOutOfBoundsException("The size must be at least 1");
}
StringBuilder sb = new StringBuilder();
final StringBuilder sb = new StringBuilder(80);
if (not) {
sb.append(" not");
}
Expand All @@ -215,19 +205,15 @@ public String getIdInValueExpr(boolean not, int size) {

@Override
public Object[] getIdValues(EntityBean bean) {
Object val = embIdProperty.getValue(bean);
Object[] bindValues = new Object[props.length];
for (int i = 0; i < props.length; i++) {
bindValues[i] = props[i].getValue((EntityBean) val);
}
return bindValues;
return getBindValues(embIdProperty.getValue(bean));
}

@Override
public Object[] getBindValues(Object value) {
Object[] bindValues = new Object[props.length];
final EntityBean bean = (EntityBean) value;
final Object[] bindValues = new Object[props.length];
for (int i = 0; i < props.length; i++) {
bindValues[i] = props[i].getValue((EntityBean) value);
bindValues[i] = props[i].getValue(bean);
}
return bindValues;
}
Expand All @@ -237,8 +223,8 @@ public Object[] getBindValues(Object value) {
*/
@Override
public Object getIdForJson(EntityBean bean) {
EntityBean ebValue = (EntityBean) embIdProperty.getValue(bean);
Map<String, Object> map = new LinkedHashMap<>();
final EntityBean ebValue = (EntityBean) embIdProperty.getValue(bean);
final Map<String, Object> map = new LinkedHashMap<>();
for (BeanProperty prop : props) {
map.put(prop.name(), prop.getValue(ebValue));
}
Expand All @@ -251,8 +237,8 @@ public Object getIdForJson(EntityBean bean) {
@Override
@SuppressWarnings("unchecked")
public Object convertIdFromJson(Object value) {
Map<String, Object> map = (Map<String, Object>) value;
EntityBean idValue = idDesc.createEntityBean();
final Map<String, Object> map = (Map<String, Object>) value;
final EntityBean idValue = idDesc.createEntityBean();
for (BeanProperty prop : props) {
prop.setValue(idValue, map.get(prop.name()));
}
Expand All @@ -261,17 +247,17 @@ public Object convertIdFromJson(Object value) {

@Override
public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
final EntityBean bean = (EntityBean) value;
for (BeanProperty prop : props) {
Object embFieldValue = prop.getValue((EntityBean) value);
sqlUpdate.setParameter(embFieldValue);
sqlUpdate.setParameter(prop.getValue(bean));
}
}

@Override
public void bindId(DataBind dataBind, Object value) throws SQLException {
final EntityBean bean = (EntityBean) value;
for (BeanProperty prop : props) {
Object embFieldValue = prop.getValue((EntityBean) value);
prop.bind(dataBind, embFieldValue);
prop.bind(dataBind, prop.getValue(bean));
}
}

Expand All @@ -285,18 +271,19 @@ public void addIdInBindValues(DefaultSqlUpdate sqlUpdate, Collection<?> values)
@Override
public void addIdInBindValues(SpiExpressionRequest request, Collection<?> values) {
for (Object value : values) {
final EntityBean bean = (EntityBean) value;
for (BeanProperty prop : props) {
request.addBindValue(prop.getValue((EntityBean) value));
request.addBindValue(prop.getValue(bean));
}
}
}

@Override
public Object readData(DataInput dataInput) throws IOException {
EntityBean embId = idDesc.createEntityBean();
final EntityBean embId = idDesc.createEntityBean();
boolean notNull = true;
for (BeanProperty prop : props) {
Object value = prop.readData(dataInput);
final Object value = prop.readData(dataInput);
prop.setValue(embId, value);
if (value == null) {
notNull = false;
Expand All @@ -307,9 +294,9 @@ public Object readData(DataInput dataInput) throws IOException {

@Override
public void writeData(DataOutput dataOutput, Object idValue) throws IOException {
final EntityBean bean = (EntityBean) idValue;
for (BeanProperty prop : props) {
Object embFieldValue = prop.getValue((EntityBean) idValue);
prop.writeData(dataOutput, embFieldValue);
prop.writeData(dataOutput, prop.getValue(bean));
}
}

Expand All @@ -322,10 +309,10 @@ public void loadIgnore(DbReadContext ctx) {

@Override
public Object read(DbReadContext ctx) throws SQLException {
EntityBean embId = idDesc.createEntityBean();
final EntityBean embId = idDesc.createEntityBean();
boolean nullValue = true;
for (BeanProperty prop : props) {
Object value = prop.read(ctx);
final Object value = prop.read(ctx);
if (value != null) {
prop.setValue(embId, value);
nullValue = false;
Expand Down Expand Up @@ -354,7 +341,7 @@ public void appendSelect(DbSqlContext ctx, boolean subQuery) {

@Override
public String getAssocIdInExpr(String prefix) {
StringBuilder sb = new StringBuilder();
final StringBuilder sb = new StringBuilder(80);
sb.append("(");
for (int i = 0; i < props.length; i++) {
if (i > 0) {
Expand All @@ -371,7 +358,7 @@ public String getAssocIdInExpr(String prefix) {

@Override
public String getAssocOneIdExpr(String prefix, String operator) {
StringBuilder sb = new StringBuilder();
final StringBuilder sb = new StringBuilder(100);
for (int i = 0; i < props.length; i++) {
if (i > 0) {
sb.append(" and ");
Expand All @@ -389,7 +376,7 @@ public String getAssocOneIdExpr(String prefix, String operator) {

@Override
public String getBindIdSql(String baseTableAlias) {
StringBuilder sb = new StringBuilder();
final StringBuilder sb = new StringBuilder(80);
for (int i = 0; i < props.length; i++) {
if (i > 0) {
sb.append(" and ");
Expand All @@ -407,7 +394,7 @@ public String getBindIdInSql(String baseTableAlias) {
if (idInExpandedForm) {
return "";
}
StringBuilder sb = new StringBuilder();
final StringBuilder sb = new StringBuilder(80);
sb.append("(");
for (int i = 0; i < props.length; i++) {
if (i > 0) {
Expand Down Expand Up @@ -447,8 +434,8 @@ public Object convertSetId(Object idValue, EntityBean bean) {

@Override
public String cacheKey(Object value) {
EntityBean bean = (EntityBean)value;
StringBuilder sb = new StringBuilder();
final EntityBean bean = (EntityBean)value;
final StringBuilder sb = new StringBuilder(80);
for (BeanProperty prop : props) {
Object val = prop.getValue(bean);
if (val != null) {
Expand Down