Skip to content

Commit db5479c

Browse files
committed
Polishing
1 parent 80751ca commit db5479c

File tree

3 files changed

+9
-24
lines changed

3 files changed

+9
-24
lines changed

src/main/java/org/mybatis/dynamic/sql/SqlColumn.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.mybatis.dynamic.sql.util.FragmentAndParameters;
2626
import org.mybatis.dynamic.sql.util.StringUtilities;
2727

28-
public class SqlColumn<T> implements BindableColumn<T>, SortSpecification, SqlColumnBuilders {
28+
public class SqlColumn<T> implements BindableColumn<T>, SortSpecification {
2929

3030
protected final String name;
3131
protected final SqlTable table;
@@ -146,29 +146,24 @@ public Optional<RenderingStrategy> renderingStrategy() {
146146
return Optional.ofNullable(renderingStrategy);
147147
}
148148

149-
@Override
150149
public <S> SqlColumn<S> withTypeHandler(String typeHandler) {
151150
return cast(copyBuilder().withTypeHandler(typeHandler).build());
152151
}
153152

154-
@Override
155153
public <S> SqlColumn<S> withRenderingStrategy(RenderingStrategy renderingStrategy) {
156154
return cast(copyBuilder().withRenderingStrategy(renderingStrategy).build());
157155
}
158156

159-
@Override
160157
@SuppressWarnings("unchecked")
161158
public <S> SqlColumn<S> withParameterTypeConverter(ParameterTypeConverter<S, ?> parameterTypeConverter) {
162159
return cast(copyBuilder().withParameterTypeConverter((ParameterTypeConverter<T, ?>) parameterTypeConverter).build());
163160
}
164161

165-
@Override
166162
@SuppressWarnings("unchecked")
167163
public <S> SqlColumn<S> withJavaType(Class<S> javaType) {
168164
return cast(copyBuilder().withJavaType((Class<T>) javaType).build());
169165
}
170166

171-
@Override
172167
public <S> SqlColumn<S> withJavaProperty(String javaProperty) {
173168
return cast(copyBuilder().withJavaProperty(javaProperty).build());
174169
}

src/main/java/org/mybatis/dynamic/sql/SqlColumnBuilders.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/test/java/examples/simple/PersonDynamicSqlSupport.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
public final class PersonDynamicSqlSupport {
2525
public static final Person person = new Person();
26-
public static final SqlColumn<Integer> id = person.id;
26+
public static final PrimaryKeyColumn<Integer> id = person.id;
2727
public static final SqlColumn<String> firstName = person.firstName;
2828
public static final SqlColumn<LastName> lastName = person.lastName;
2929
public static final SqlColumn<Date> birthDate = person.birthDate;
@@ -32,7 +32,13 @@ public final class PersonDynamicSqlSupport {
3232
public static final SqlColumn<Integer> addressId = person.addressId;
3333

3434
public static final class Person extends SqlTable {
35-
public final SqlColumn<Integer> id = column("id", JDBCType.INTEGER).withJavaProperty("id");
35+
public final PrimaryKeyColumn<Integer> id = new PrimaryKeyColumn.Builder<Integer>()
36+
.withTable(this)
37+
.withName("id")
38+
.withJdbcType(JDBCType.INTEGER)
39+
.withJavaProperty("id")
40+
.isPrimaryKeyColumn(true)
41+
.build();
3642
public final SqlColumn<String> firstName = column("first_name", JDBCType.VARCHAR)
3743
.withJavaProperty("firstName");
3844
public final SqlColumn<LastName> lastName =

0 commit comments

Comments
 (0)