Skip to content

Commit 6511641

Browse files
jeffgbutlerjeffgbutler
committed
Manage internal error numbers with an enum
1 parent 9d7bc0b commit 6511641

File tree

8 files changed

+64
-16
lines changed

8 files changed

+64
-16
lines changed

‎src/main/java/org/mybatis/dynamic/sql/select/render/FetchFirstPagingModelRenderer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2222
import org.mybatis.dynamic.sql.select.PagingModel;
2323
import org.mybatis.dynamic.sql.util.FragmentAndParameters;
24+
import org.mybatis.dynamic.sql.util.InternalError;
2425
import org.mybatis.dynamic.sql.util.Messages;
2526

2627
public class FetchFirstPagingModelRenderer {
@@ -49,7 +50,8 @@ private FragmentAndParameters renderWithOffset(Long offset) {
4950

5051
private FragmentAndParameters renderFetchFirstRowsOnly() {
5152
return pagingModel.fetchFirstRows().map(this::renderFetchFirstRowsOnly)
52-
.orElseThrow(() -> new InvalidSqlException(Messages.getInternalErrorString(13)));
53+
.orElseThrow(() ->
54+
new InvalidSqlException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_13)));
5355
}
5456

5557
private FragmentAndParameters renderFetchFirstRowsOnly(Long fetchFirstRows) {

‎src/main/java/org/mybatis/dynamic/sql/util/GeneralInsertMappingVisitor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
public abstract class GeneralInsertMappingVisitor<R> implements ColumnMappingVisitor<R> {
1919
@Override
2020
public final R visit(SelectMapping mapping) {
21-
throw new UnsupportedOperationException(Messages.getInternalErrorString(1));
21+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_1));
2222
}
2323

2424
@Override
2525
public final R visit(PropertyMapping mapping) {
26-
throw new UnsupportedOperationException(Messages.getInternalErrorString(2));
26+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_2));
2727
}
2828

2929
@Override
3030
public final R visit(PropertyWhenPresentMapping mapping) {
31-
throw new UnsupportedOperationException(Messages.getInternalErrorString(3));
31+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_3));
3232
}
3333

3434
@Override
3535
public final R visit(ColumnToColumnMapping columnMapping) {
36-
throw new UnsupportedOperationException(Messages.getInternalErrorString(4));
36+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_4));
3737
}
3838
}

‎src/main/java/org/mybatis/dynamic/sql/util/InsertMappingVisitor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
public abstract class InsertMappingVisitor<R> implements ColumnMappingVisitor<R> {
1919
@Override
2020
public final <T> R visit(ValueMapping<T> mapping) {
21-
throw new UnsupportedOperationException(Messages.getInternalErrorString(5));
21+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_5));
2222
}
2323

2424
@Override
2525
public final <T> R visit(ValueOrNullMapping<T> mapping) {
26-
throw new UnsupportedOperationException(Messages.getInternalErrorString(6));
26+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_6));
2727
}
2828

2929
@Override
3030
public final <T> R visit(ValueWhenPresentMapping<T> mapping) {
31-
throw new UnsupportedOperationException(Messages.getInternalErrorString(7));
31+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_7));
3232
}
3333

3434
@Override
3535
public final R visit(SelectMapping mapping) {
36-
throw new UnsupportedOperationException(Messages.getInternalErrorString(8));
36+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_8));
3737
}
3838

3939
@Override
4040
public final R visit(ColumnToColumnMapping columnMapping) {
41-
throw new UnsupportedOperationException(Messages.getInternalErrorString(9));
41+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_9));
4242
}
4343
}

‎src/main/java/org/mybatis/dynamic/sql/util/InternalError.java

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* Copyright 2016-2023 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.mybatis.dynamic.sql.util;
17+
18+
/**
19+
* Enum for managing internal error numbers.
20+
*/
21+
public enum InternalError {
22+
INTERNAL_ERROR_1(1),
23+
INTERNAL_ERROR_2(2),
24+
INTERNAL_ERROR_3(3),
25+
INTERNAL_ERROR_4(4),
26+
INTERNAL_ERROR_5(5),
27+
INTERNAL_ERROR_6(6),
28+
INTERNAL_ERROR_7(7),
29+
INTERNAL_ERROR_8(8),
30+
INTERNAL_ERROR_9(9),
31+
INTERNAL_ERROR_10(10),
32+
INTERNAL_ERROR_11(11),
33+
INTERNAL_ERROR_12(12),
34+
INTERNAL_ERROR_13(13);
35+
36+
private final int number;
37+
38+
InternalError(int number) {
39+
this.number = number;
40+
}
41+
42+
public int getNumber() {
43+
return number;
44+
}
45+
}

‎src/main/java/org/mybatis/dynamic/sql/util/Messages.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static String getString(String key, String p1, String p2, String p3) {
3737
return MessageFormat.format(getString(key), p1, p2, p3);
3838
}
3939

40-
public static String getInternalErrorString(int internalErrorNumber) {
41-
return MessageFormat.format(getString("INTERNAL.ERROR"), internalErrorNumber); //$NON-NLS-1$
40+
public static String getInternalErrorString(InternalError internalError) {
41+
return MessageFormat.format(getString("INTERNAL.ERROR"), internalError.getNumber()); //$NON-NLS-1$
4242
}
4343
}

‎src/main/java/org/mybatis/dynamic/sql/util/MultiRowInsertMappingVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
public abstract class MultiRowInsertMappingVisitor<R> extends InsertMappingVisitor<R> {
1919
@Override
2020
public final R visit(PropertyWhenPresentMapping mapping) {
21-
throw new UnsupportedOperationException(Messages.getInternalErrorString(12));
21+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_12));
2222
}
2323
}

‎src/main/java/org/mybatis/dynamic/sql/util/UpdateMappingVisitor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
public abstract class UpdateMappingVisitor<R> implements ColumnMappingVisitor<R> {
1919
@Override
2020
public final R visit(PropertyMapping mapping) {
21-
throw new UnsupportedOperationException(Messages.getInternalErrorString(10));
21+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_10));
2222
}
2323

2424
@Override
2525
public final R visit(PropertyWhenPresentMapping mapping) {
26-
throw new UnsupportedOperationException(Messages.getInternalErrorString(11));
26+
throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_11));
2727
}
2828
}

‎src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.mybatis.dynamic.sql.select.join.JoinType;
4545
import org.mybatis.dynamic.sql.select.render.PagingModelRenderer;
4646
import org.mybatis.dynamic.sql.update.UpdateModel;
47+
import org.mybatis.dynamic.sql.util.InternalError;
4748
import org.mybatis.dynamic.sql.util.Messages;
4849

4950
class InvalidSQLTest {
@@ -241,7 +242,7 @@ void testInvalidPagingModel() {
241242

242243
assertThatExceptionOfType(InvalidSqlException.class)
243244
.isThrownBy(renderer::render)
244-
.withMessage(Messages.getInternalErrorString(13));
245+
.withMessage(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_13));
245246
}
246247

247248

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy