Skip to content

Commit f13b816

Browse files
author
yevhenii-nadtochii
committed
Avoid Generator prefix
1 parent 61238c6 commit f13b816

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

java/src/main/kotlin/io/spine/validation/java/JavaValidationRenderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class JavaValidationRenderer : JavaRenderer() {
4949
}
5050

5151
val generators = listOf(
52-
RequiredGenerator(querying = this, typeSystem)
52+
RequiredOption(querying = this, typeSystem)
5353
)
5454

5555
select(CompilationMessage::class.java).all()

java/src/main/kotlin/io/spine/validation/java/MessageValidationCode.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,21 +197,23 @@ internal class MessageValidationCode(
197197
addLast(psiMethod)
198198
}
199199

200-
private fun validateMethodBody(rules: List<CodeBlock>, generated: List<LocalCodeBlock>): String {
200+
private fun validateMethodBody(
201+
rules: List<CodeBlock>,
202+
generated: List<LocalCodeBlock>
203+
): String {
201204
if (rules.isEmpty() && generated.isEmpty()) {
202205
return """
203206
|// This message does not have any validation constraints.
204207
|return java.util.Optional.empty();
205208
""".trimMargin()
206209
}
207-
208210
return """
209211
|var $violations = new java.util.ArrayList<io.spine.validate.ConstraintViolation>();
210212
|
211213
|/* Rule-based constraints. */
212214
|${rules.formatRules()}
213215
|
214-
|/* Standalone constraints. */
216+
|/* Standalone generated constraints. */
215217
|${generated.formatGenerated()}
216218
|
217219
|if (!$violations.isEmpty()) {

java/src/main/kotlin/io/spine/validation/java/RequiredOption.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import io.spine.protodata.java.call
4242
import io.spine.protodata.java.field
4343
import io.spine.protodata.java.mapExpression
4444
import io.spine.protodata.java.newBuilder
45-
import io.spine.protodata.java.packToAny
4645
import io.spine.protodata.type.TypeSystem
4746
import io.spine.server.query.Querying
4847
import io.spine.server.query.select
@@ -58,7 +57,7 @@ import io.spine.validation.java.ErrorPlaceholder.PARENT_TYPE
5857
import io.spine.validation.java.protodata.CodeBlock
5958
import io.spine.validation.protodata.toBuilder
6059

61-
internal class RequiredGenerator(
60+
internal class RequiredOption(
6261
private val querying: Querying,
6362
typeSystem: TypeSystem
6463
) : MessageStateValidation {

0 commit comments

Comments
 (0)