Skip to content

Commit a6993ba

Browse files
committed
Refactor inspection error messages for DAO and SQL validations
1 parent 9bbb64f commit a6993ba

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationDaoParamResult.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ open class ValidationDaoParamResult(
4141
holder.registerProblem(
4242
identify,
4343
MessageBundle.message(
44-
"inspector.invalid.dao.parameter",
44+
"inspection.invalid.dao.parameter",
4545
daoName,
4646
identify.text ?: "",
4747
),

src/main/kotlin/org/domaframework/doma/intellij/common/sql/validator/result/ValidationPropertyResult.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ValidationPropertyResult(
4646
holder.registerProblem(
4747
identify,
4848
MessageBundle.message(
49-
"inspector.invalid.class.property",
49+
"inspection.invalid.sql.property",
5050
parentName,
5151
identify.text ?: "",
5252
),

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/inspector/DaoMethodVariableInspector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class DaoMethodVariableInspector : AbstractBaseJavaLocalInspectionTool() {
9393
MessageBundle.message("inspection.invalid.dao.duplicate")
9494
} else {
9595
MessageBundle.message(
96-
"inspection.dao.method.variable.error",
96+
"inspection.invalid.dao.paramUse",
9797
param.name,
9898
)
9999
}

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/inspector/SqlFileExistInspector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class SqlFileExistInspector : AbstractBaseJavaLocalInspectionTool() {
6868
if (psiDaoMethod.sqlFile == null) {
6969
problemHolder.registerProblem(
7070
identifier,
71-
MessageBundle.message("inspection.sql.not.exist.error"),
71+
MessageBundle.message("inspection.invalid.dao.notExistSql"),
7272
ProblemHighlightType.ERROR,
7373
GenerateSQLFileQuickFixFactory.createSql(psiDaoMethod),
7474
)

src/main/resources/messages/DomaToolsBundle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
jump.to.sql.tooltip.title=Open SQL file
22
jump.to.dao.tooltip.title=Jump to Dao method definition
33
generate.sql.quickfix.title=Create SQL file
4-
inspection.sql.not.exist.error=SQL file does not exist
5-
inspector.invalid.class.property=The field or method [{1}] does not exist in the class [{0}]
6-
inspection.dao.method.variable.error=There are unused parameters in the SQL [{0}]
7-
inspector.invalid.dao.parameter=The bind variable [{1}] does not exist in the Dao method [{0}]
84
config.enable.sql.format=Enable SQL Format
5+
inspection.invalid.dao.notExistSql=SQL file does not exist
6+
inspection.invalid.sql.property=The field or method [{1}] does not exist in the class [{0}]
7+
inspection.invalid.dao.paramUse=There are unused parameters in the SQL [{0}]
8+
inspection.invalid.dao.parameter=The bind variable [{1}] does not exist in the Dao method [{0}]
99
inspection.invalid.sql.topType=Can't get type of first element
1010
inspection.invalid.sql.staticProperty=[{0}] is not a public or static property in the class [{1}]
1111
inspection.invalid.sql.testdata=Bind variables must be followed by test data

src/main/resources/messages/DomaToolsBundle_ja.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
jump.to.sql.tooltip.title=SQL\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
22
jump.to.dao.tooltip.title=Dao\u30E1\u30BD\u30C3\u30C9\u5B9A\u7FA9\u306B\u9077\u79FB\u3059\u308B
33
generate.sql.quickfix.title=SQL\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210
4-
inspection.sql.not.exist.error=SQL\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
5-
inspector.invalid.class.property=\u30AF\u30E9\u30B9[{0}]\u306B\u5B58\u5728\u3057\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059:[{1}]
6-
inspection.dao.method.variable.error=SQL\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u306A\u3044\u5F15\u6570\u304C\u3042\u308A\u307E\u3059:[{0}]
7-
inspector.invalid.dao.parameter=Dao\u30E1\u30BD\u30C3\u30C9[{0}]\u306B\u5B58\u5728\u3057\u306A\u3044\u30D0\u30A4\u30F3\u30C9\u5909\u6570\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059:[{1}]
84
config.enable.sql.format=SQL\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u6709\u52B9\u5316
5+
inspection.invalid.dao.notExistSql=SQL\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
6+
inspection.invalid.sql.property=\u30AF\u30E9\u30B9[{0}]\u306B\u5B58\u5728\u3057\u306A\u3044\u30D5\u30A3\u30FC\u30EB\u30C9\u3001\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059:[{1}]
7+
inspection.invalid.dao.paramUse=SQL\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u306A\u3044\u5F15\u6570\u304C\u3042\u308A\u307E\u3059:[{0}]
8+
inspection.invalid.dao.parameter=Dao\u30E1\u30BD\u30C3\u30C9[{0}]\u306B\u5B58\u5728\u3057\u306A\u3044\u30D0\u30A4\u30F3\u30C9\u5909\u6570\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059:[{1}]
99
inspection.invalid.sql.topType=\u6700\u521D\u306E\u8981\u7D20\u306E\u578B\u304C\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
1010
inspection.invalid.sql.staticProperty=[{0}]\u0020\u306F\u30AF\u30E9\u30B9\u0020[{1}]\u0020\u306E\u0020\u0070\u0075\u0062\u006C\u0069\u0063\u0020\u307E\u305F\u0020\u0073\u0074\u0061\u0074\u0069\u0063\u0020\u30D7\u30ED\u30D1\u30C6\u30A3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
1111
inspection.invalid.sql.testdata=\u30D0\u30A4\u30F3\u30C9\u5909\u6570\u306E\u5F8C\u308D\u306B\u306F\u30C6\u30B9\u30C8\u30C7\u30FC\u30BF\u304C\u5FC5\u8981\u3067\u3059

0 commit comments

Comments
 (0)