Skip to content

Commit c326191

Browse files
author
yevhenii-nadtochii
committed
Rename the variables
1 parent 2d61872 commit c326191

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

model/src/main/kotlin/io/spine/validation/bound/MaxOption.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ internal class MaxPolicy : Policy<FieldOptionDiscovered>() {
7373
val fieldType = checkFieldType(field, file, MAX)
7474

7575
val option = event.option.unpack<MaxOption>()
76-
val metadata = NumericOptionMetadata(MAX, field, fieldType, file, typeSystem)
77-
val kotlinBound = metadata.checkNumericBound(option.value, option.exclusive)
76+
val optionMetadata = NumericOptionMetadata(MAX, field, fieldType, file, typeSystem)
77+
val kotlinBound = optionMetadata.checkNumericBound(option.value, option.exclusive)
7878

7979
val message = option.errorMsg.ifEmpty { option.descriptorForType.defaultMessage }
8080
message.checkPlaceholders(SUPPORTED_PLACEHOLDERS, field, file, RANGE)

model/src/main/kotlin/io/spine/validation/bound/MinOption.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ internal class MinPolicy : Policy<FieldOptionDiscovered>() {
7373
val fieldType = checkFieldType(field, file, MIN)
7474

7575
val option = event.option.unpack<MinOption>()
76-
val metadata = NumericOptionMetadata(MIN, field, fieldType, file, typeSystem)
77-
val kotlinBound = metadata.checkNumericBound(option.value, option.exclusive)
76+
val optionMetadata = NumericOptionMetadata(MIN, field, fieldType, file, typeSystem)
77+
val kotlinBound = optionMetadata.checkNumericBound(option.value, option.exclusive)
7878

7979
val message = option.errorMsg.ifEmpty { option.descriptorForType.defaultMessage }
8080
message.checkPlaceholders(SUPPORTED_PLACEHOLDERS, field, file, RANGE)

model/src/main/kotlin/io/spine/validation/bound/RangeOption.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,17 @@ internal class RangePolicy : Policy<FieldOptionDiscovered>() {
109109
val fieldType = checkFieldType(field, file, RANGE)
110110

111111
val option = event.option.unpack<RangeOption>()
112-
val metadata = RangeOptionMetadata(option.value, field, fieldType, file, typeSystem)
113-
val delimiter = metadata.checkDelimiter()
112+
val optionMetadata = RangeOptionMetadata(option.value, field, fieldType, file, typeSystem)
113+
val delimiter = optionMetadata.checkDelimiter()
114114

115-
val (left, right) = metadata.range.split(delimiter)
116-
val (lowerExclusive, upperExclusive) = metadata.checkBrackets(left, right)
117-
val lower = metadata.checkNumericBound(left.substring(1), lowerExclusive)
118-
val upper = metadata.checkNumericBound(right.dropLast(1), upperExclusive)
115+
val (left, right) = optionMetadata.range.split(delimiter)
116+
val (lowerExclusive, upperExclusive) = optionMetadata.checkBrackets(left, right)
117+
val lower = optionMetadata.checkNumericBound(left.substring(1), lowerExclusive)
118+
val upper = optionMetadata.checkNumericBound(right.dropLast(1), upperExclusive)
119119

120120
// Check `lower < upper` only if both bounds are numbers.
121121
if (lower.value !is FieldPath && upper.value !is FieldPath) {
122-
metadata.checkRelation(lower, upper)
122+
optionMetadata.checkRelation(lower, upper)
123123
}
124124

125125
val message = option.errorMsg.ifEmpty { option.descriptorForType.defaultMessage }
@@ -129,7 +129,7 @@ internal class RangePolicy : Policy<FieldOptionDiscovered>() {
129129
id = field.ref
130130
subject = field
131131
errorMessage = message
132-
this.range = metadata.range
132+
this.range = optionMetadata.range
133133
lowerBound = lower.toProto()
134134
upperBound = upper.toProto()
135135
this.file = file

0 commit comments

Comments
 (0)