Skip to content

Commit 997a11b

Browse files
committed
Remove copy/paste code
1 parent bc17552 commit 997a11b

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertRenderingUtilities.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717

1818
import static org.mybatis.dynamic.sql.util.StringUtilities.spaceBefore;
1919

20+
import org.mybatis.dynamic.sql.SqlColumn;
2021
import org.mybatis.dynamic.sql.SqlTable;
22+
import org.mybatis.dynamic.sql.exception.InvalidSqlException;
23+
import org.mybatis.dynamic.sql.util.Messages;
2124

2225
public class InsertRenderingUtilities {
2326
private InsertRenderingUtilities() {}
@@ -33,4 +36,10 @@ public static String calculateInsertStatement(SqlTable table, FieldAndValueColle
3336
public static String calculateInsertStatementStart(SqlTable table) {
3437
return "insert into " + table.tableName(); //$NON-NLS-1$
3538
}
39+
40+
public static String getMappedPropertyName(SqlColumn<?> column) {
41+
return column.javaProperty().orElseThrow(() ->
42+
new InvalidSqlException(Messages
43+
.getString("ERROR.50", column.name()))); //$NON-NLS-1$
44+
}
3645
}

src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowValuePhraseVisitor.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
package org.mybatis.dynamic.sql.insert.render;
1717

1818
import org.mybatis.dynamic.sql.SqlColumn;
19-
import org.mybatis.dynamic.sql.exception.InvalidSqlException;
2019
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2120
import org.mybatis.dynamic.sql.util.ConstantMapping;
2221
import org.mybatis.dynamic.sql.util.MappedColumnMapping;
23-
import org.mybatis.dynamic.sql.util.Messages;
2422
import org.mybatis.dynamic.sql.util.MultiRowInsertMappingVisitor;
2523
import org.mybatis.dynamic.sql.util.NullMapping;
2624
import org.mybatis.dynamic.sql.util.PropertyMapping;
@@ -77,17 +75,11 @@ public FieldAndValueAndParameters visit(MappedColumnMapping mapping) {
7775
return FieldAndValueAndParameters.withFieldName(mapping.columnName())
7876
.withValuePhrase(calculateJdbcPlaceholder(
7977
mapping.column(),
80-
getMappedPropertyName(mapping.column()))
78+
InsertRenderingUtilities.getMappedPropertyName(mapping.column()))
8179
)
8280
.build();
8381
}
8482

85-
private String getMappedPropertyName(SqlColumn<?> column) {
86-
return column.javaProperty().orElseThrow(() ->
87-
new InvalidSqlException(Messages
88-
.getString("ERROR.50", column.name()))); //$NON-NLS-1$
89-
}
90-
9183
private String calculateJdbcPlaceholder(SqlColumn<?> column) {
9284
return column.renderingStrategy().orElse(renderingStrategy).getRecordBasedInsertBinding(column, prefix);
9385
}

src/main/java/org/mybatis/dynamic/sql/insert/render/ValuePhraseVisitor.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@
1818
import java.util.Optional;
1919

2020
import org.mybatis.dynamic.sql.SqlColumn;
21-
import org.mybatis.dynamic.sql.exception.InvalidSqlException;
2221
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2322
import org.mybatis.dynamic.sql.util.ConstantMapping;
2423
import org.mybatis.dynamic.sql.util.InsertMappingVisitor;
2524
import org.mybatis.dynamic.sql.util.MappedColumnMapping;
2625
import org.mybatis.dynamic.sql.util.MappedColumnWhenPresentMapping;
27-
import org.mybatis.dynamic.sql.util.Messages;
2826
import org.mybatis.dynamic.sql.util.NullMapping;
2927
import org.mybatis.dynamic.sql.util.PropertyMapping;
3028
import org.mybatis.dynamic.sql.util.PropertyWhenPresentMapping;
@@ -89,7 +87,7 @@ public Optional<FieldAndValueAndParameters> visit(MappedColumnMapping mapping) {
8987
return FieldAndValueAndParameters.withFieldName(mapping.columnName())
9088
.withValuePhrase(calculateJdbcPlaceholder(
9189
mapping.column(),
92-
getMappedPropertyName(mapping.column()))
90+
InsertRenderingUtilities.getMappedPropertyName(mapping.column()))
9391
)
9492
.buildOptional();
9593
}
@@ -103,12 +101,6 @@ public Optional<FieldAndValueAndParameters> visit(MappedColumnWhenPresentMapping
103101
}
104102
}
105103

106-
private String getMappedPropertyName(SqlColumn<?> column) {
107-
return column.javaProperty().orElseThrow(() ->
108-
new InvalidSqlException(Messages
109-
.getString("ERROR.50", column.name()))); //$NON-NLS-1$
110-
}
111-
112104
private String calculateJdbcPlaceholder(SqlColumn<?> column) {
113105
return column.renderingStrategy().orElse(renderingStrategy)
114106
.getRecordBasedInsertBinding(column, "row"); //$NON-NLS-1$

0 commit comments

Comments
 (0)