Skip to content

Commit 955b519

Browse files
committed
Remove hardcoded strings
1 parent 6ce3380 commit 955b519

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

src/main/java/org/mybatis/dynamic/sql/common/AbstractBooleanExpressionDSL.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ private void addSubCriteria(String connector, List<AndOrCriteriaGroup> criteria)
145145
.build());
146146
}
147147

148-
protected void setInitialCriterion(SqlCriterion initialCriterion, String errorMessage) {
148+
protected void setInitialCriterion(SqlCriterion initialCriterion, StatementType statementType) {
149149
if (this.initialCriterion != null) {
150-
throw new InvalidSqlException(Messages.getString(errorMessage)); //$NON-NLS-1$
150+
throw new InvalidSqlException(Messages.getString(statementType.messageNumber())); //$NON-NLS-1$
151151
}
152152

153153
this.initialCriterion = initialCriterion;
@@ -159,4 +159,19 @@ protected SqlCriterion getInitialCriterion() {
159159
}
160160

161161
protected abstract T getThis();
162+
163+
public enum StatementType {
164+
WHERE("ERROR.32"), //$NON-NLS-1$
165+
HAVING("ERROR.31"); //$NON-NLS-1$
166+
167+
private final String messageNumber;
168+
169+
public String messageNumber() {
170+
return messageNumber;
171+
}
172+
173+
StatementType(String messageNumber) {
174+
this.messageNumber = messageNumber;
175+
}
176+
}
162177
}

src/main/java/org/mybatis/dynamic/sql/select/AbstractHavingFinisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
public abstract class AbstractHavingFinisher<T extends AbstractHavingFinisher<T>>
2222
extends AbstractBooleanExpressionDSL<T> {
2323
void initialize(SqlCriterion sqlCriterion) {
24-
setInitialCriterion(sqlCriterion, "ERROR.31"); //$NON-NLS-1$
24+
setInitialCriterion(sqlCriterion, StatementType.HAVING);
2525
}
2626

2727
protected HavingModel buildModel() {

src/main/java/org/mybatis/dynamic/sql/where/AbstractWhereFinisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public abstract class AbstractWhereFinisher<T extends AbstractWhereFinisher<T>>
2828
private final StatementConfiguration statementConfiguration;
2929

3030
void initialize(SqlCriterion sqlCriterion) {
31-
setInitialCriterion(sqlCriterion, "ERROR.32"); //$NON-NLS-1$
31+
setInitialCriterion(sqlCriterion, StatementType.WHERE);
3232
}
3333

3434
protected AbstractWhereFinisher(StatementConfiguration statementConfiguration) {

0 commit comments

Comments
 (0)