Skip to content

Commit 485ebea

Browse files
author
John Chadwick
committed
constraintViolationHelper -> helper
1 parent 362b5bf commit 485ebea

File tree

7 files changed

+27
-33
lines changed

7 files changed

+27
-33
lines changed

‎src/main/java/build/buf/protovalidate/internal/evaluator/AnyEvaluator.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* runtime.
3636
*/
3737
class AnyEvaluator implements Evaluator {
38-
private final ConstraintViolationHelper constraintViolationHelper;
38+
private final ConstraintViolationHelper helper;
3939
private final Descriptors.FieldDescriptor typeURLDescriptor;
4040
private final Set<String> in;
4141
private final List<String> inValue;
@@ -69,7 +69,7 @@ class AnyEvaluator implements Evaluator {
6969
Descriptors.FieldDescriptor typeURLDescriptor,
7070
List<String> in,
7171
List<String> notIn) {
72-
this.constraintViolationHelper = new ConstraintViolationHelper(valueEvaluator);
72+
this.helper = new ConstraintViolationHelper(valueEvaluator);
7373
this.typeURLDescriptor = typeURLDescriptor;
7474
this.in = stringsToSet(in);
7575
this.inValue = in;
@@ -89,9 +89,9 @@ public List<ConstraintViolation.Builder> evaluate(Value val, boolean failFast)
8989
if (!in.isEmpty() && !in.contains(typeURL)) {
9090
ConstraintViolation.Builder violation =
9191
ConstraintViolation.newBuilder()
92-
.addAllRulePathElements(constraintViolationHelper.getRulePrefixElements())
92+
.addAllRulePathElements(helper.getRulePrefixElements())
9393
.addAllRulePathElements(IN_RULE_PATH.getElementsList())
94-
.addFirstFieldPathElement(constraintViolationHelper.getFieldPathElement())
94+
.addFirstFieldPathElement(helper.getFieldPathElement())
9595
.setConstraintId("any.in")
9696
.setMessage("type URL must be in the allow list")
9797
.setFieldValue(new ConstraintViolation.FieldValue(val))
@@ -104,9 +104,9 @@ public List<ConstraintViolation.Builder> evaluate(Value val, boolean failFast)
104104
if (!notIn.isEmpty() && notIn.contains(typeURL)) {
105105
ConstraintViolation.Builder violation =
106106
ConstraintViolation.newBuilder()
107-
.addAllRulePathElements(constraintViolationHelper.getRulePrefixElements())
107+
.addAllRulePathElements(helper.getRulePrefixElements())
108108
.addAllRulePathElements(NOT_IN_RULE_PATH.getElementsList())
109-
.addFirstFieldPathElement(constraintViolationHelper.getFieldPathElement())
109+
.addFirstFieldPathElement(helper.getFieldPathElement())
110110
.setConstraintId("any.not_in")
111111
.setMessage("type URL must not be in the block list")
112112
.setFieldValue(new ConstraintViolation.FieldValue(val))

‎src/main/java/build/buf/protovalidate/internal/evaluator/CelPrograms.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
/** Evaluator that executes a {@link CompiledProgram}. */
2727
class CelPrograms implements Evaluator {
28-
private final ConstraintViolationHelper constraintViolationHelper;
28+
private final ConstraintViolationHelper helper;
2929

3030
/** A list of {@link CompiledProgram} that will be executed against the input message. */
3131
private final List<CompiledProgram> programs;
@@ -36,7 +36,7 @@ class CelPrograms implements Evaluator {
3636
* @param compiledPrograms The programs to execute.
3737
*/
3838
CelPrograms(@Nullable ValueEvaluator valueEvaluator, List<CompiledProgram> compiledPrograms) {
39-
this.constraintViolationHelper = new ConstraintViolationHelper(valueEvaluator);
39+
this.helper = new ConstraintViolationHelper(valueEvaluator);
4040
this.programs = compiledPrograms;
4141
}
4242

@@ -60,8 +60,6 @@ public List<ConstraintViolation.Builder> evaluate(Value val, boolean failFast)
6060
}
6161
}
6262
return FieldPathUtils.updatePaths(
63-
violations,
64-
constraintViolationHelper.getFieldPathElement(),
65-
constraintViolationHelper.getRulePrefixElements());
63+
violations, helper.getFieldPathElement(), helper.getRulePrefixElements());
6664
}
6765
}

‎src/main/java/build/buf/protovalidate/internal/evaluator/EmbeddedMessageEvaluator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import java.util.List;
2222

2323
class EmbeddedMessageEvaluator implements Evaluator {
24-
private final ConstraintViolationHelper constraintViolationHelper;
24+
private final ConstraintViolationHelper helper;
2525
private final MessageEvaluator messageEvaluator;
2626

2727
EmbeddedMessageEvaluator(ValueEvaluator valueEvaluator, MessageEvaluator messageEvaluator) {
28-
this.constraintViolationHelper = new ConstraintViolationHelper(valueEvaluator);
28+
this.helper = new ConstraintViolationHelper(valueEvaluator);
2929
this.messageEvaluator = messageEvaluator;
3030
}
3131

@@ -39,7 +39,7 @@ public List<ConstraintViolation.Builder> evaluate(Value val, boolean failFast)
3939
throws ExecutionException {
4040
return FieldPathUtils.updatePaths(
4141
messageEvaluator.evaluate(val, failFast),
42-
constraintViolationHelper.getFieldPathElement(),
42+
helper.getFieldPathElement(),
4343
Collections.emptyList());
4444
}
4545
}

‎src/main/java/build/buf/protovalidate/internal/evaluator/EnumEvaluator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* check is handled outside CEL as enums are completely type erased to integers.
3333
*/
3434
class EnumEvaluator implements Evaluator {
35-
private final ConstraintViolationHelper constraintViolationHelper;
35+
private final ConstraintViolationHelper helper;
3636

3737
/** Captures all the defined values for this enum */
3838
private final Set<Integer> values;
@@ -56,7 +56,7 @@ class EnumEvaluator implements Evaluator {
5656
*/
5757
EnumEvaluator(
5858
ValueEvaluator valueEvaluator, List<Descriptors.EnumValueDescriptor> valueDescriptors) {
59-
this.constraintViolationHelper = new ConstraintViolationHelper(valueEvaluator);
59+
this.helper = new ConstraintViolationHelper(valueEvaluator);
6060
if (valueDescriptors.isEmpty()) {
6161
this.values = Collections.emptySet();
6262
} else {
@@ -90,9 +90,9 @@ public List<ConstraintViolation.Builder> evaluate(Value val, boolean failFast)
9090
if (!values.contains(enumValue.getNumber())) {
9191
return Collections.singletonList(
9292
ConstraintViolation.newBuilder()
93-
.addAllRulePathElements(constraintViolationHelper.getRulePrefixElements())
93+
.addAllRulePathElements(helper.getRulePrefixElements())
9494
.addAllRulePathElements(DEFINED_ONLY_RULE_PATH.getElementsList())
95-
.addFirstFieldPathElement(constraintViolationHelper.getFieldPathElement())
95+
.addFirstFieldPathElement(helper.getFieldPathElement())
9696
.setConstraintId("enum.defined_only")
9797
.setMessage("value must be one of the defined enum values")
9898
.setFieldValue(new ConstraintViolation.FieldValue(val))

‎src/main/java/build/buf/protovalidate/internal/evaluator/FieldEvaluator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class FieldEvaluator implements Evaluator {
3636
.addElements(FieldPathUtils.fieldPathElement(REQUIRED_DESCRIPTOR))
3737
.build();
3838

39-
private final ConstraintViolationHelper constraintViolationHelper;
39+
private final ConstraintViolationHelper helper;
4040

4141
/** The {@link ValueEvaluator} to apply to the field's value */
4242
public final ValueEvaluator valueEvaluator;
@@ -65,7 +65,7 @@ class FieldEvaluator implements Evaluator {
6565
boolean ignoreEmpty,
6666
boolean ignoreDefault,
6767
@Nullable Object zero) {
68-
this.constraintViolationHelper = new ConstraintViolationHelper(valueEvaluator);
68+
this.helper = new ConstraintViolationHelper(valueEvaluator);
6969
this.valueEvaluator = valueEvaluator;
7070
this.descriptor = descriptor;
7171
this.required = required;
@@ -96,7 +96,7 @@ public List<ConstraintViolation.Builder> evaluate(Value val, boolean failFast)
9696
return Collections.singletonList(
9797
ConstraintViolation.newBuilder()
9898
.addFirstFieldPathElement(FieldPathUtils.fieldPathElement(descriptor))
99-
.addAllRulePathElements(constraintViolationHelper.getRulePrefixElements())
99+
.addAllRulePathElements(helper.getRulePrefixElements())
100100
.addAllRulePathElements(REQUIRED_RULE_PATH.getElementsList())
101101
.setConstraintId("required")
102102
.setMessage("value is required")

‎src/main/java/build/buf/protovalidate/internal/evaluator/ListEvaluator.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ class ListEvaluator implements Evaluator {
4040
.findFieldByNumber(RepeatedRules.ITEMS_FIELD_NUMBER)))
4141
.build();
4242

43-
private final ConstraintViolationHelper constraintViolationHelper;
43+
private final ConstraintViolationHelper helper;
4444

4545
/** Constraints are checked on every item of the list. */
4646
final ValueEvaluator itemConstraints;
4747

4848
/** Constructs a {@link ListEvaluator}. */
4949
ListEvaluator(ValueEvaluator valueEvaluator) {
50-
this.constraintViolationHelper = new ConstraintViolationHelper(valueEvaluator);
50+
this.helper = new ConstraintViolationHelper(valueEvaluator);
5151
this.itemConstraints = new ValueEvaluator(null, REPEATED_ITEMS_RULE_PATH);
5252
}
5353

@@ -68,11 +68,8 @@ public List<ConstraintViolation.Builder> evaluate(Value val, boolean failFast)
6868
continue;
6969
}
7070
FieldPathElement fieldPathElement =
71-
Objects.requireNonNull(constraintViolationHelper.getFieldPathElement()).toBuilder()
72-
.setIndex(i)
73-
.build();
74-
FieldPathUtils.updatePaths(
75-
violations, fieldPathElement, constraintViolationHelper.getRulePrefixElements());
71+
Objects.requireNonNull(helper.getFieldPathElement()).toBuilder().setIndex(i).build();
72+
FieldPathUtils.updatePaths(violations, fieldPathElement, helper.getRulePrefixElements());
7673
if (failFast && !violations.isEmpty()) {
7774
return violations;
7875
}

‎src/main/java/build/buf/protovalidate/internal/evaluator/MapEvaluator.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class MapEvaluator implements Evaluator {
5555
MapRules.getDescriptor().findFieldByNumber(MapRules.VALUES_FIELD_NUMBER)))
5656
.build();
5757

58-
private final ConstraintViolationHelper constraintViolationHelper;
58+
private final ConstraintViolationHelper helper;
5959

6060
/** Constraint for checking the map keys */
6161
private final ValueEvaluator keyEvaluator;
@@ -78,7 +78,7 @@ class MapEvaluator implements Evaluator {
7878
* @param valueEvaluator The value evaluator this constraint exists under.
7979
*/
8080
MapEvaluator(ValueEvaluator valueEvaluator, Descriptors.FieldDescriptor fieldDescriptor) {
81-
this.constraintViolationHelper = new ConstraintViolationHelper(valueEvaluator);
81+
this.helper = new ConstraintViolationHelper(valueEvaluator);
8282
this.keyEvaluator = new ValueEvaluator(null, MAP_KEYS_RULE_PATH);
8383
this.valueEvaluator = new ValueEvaluator(null, MAP_VALUES_RULE_PATH);
8484
this.fieldDescriptor = fieldDescriptor;
@@ -149,7 +149,7 @@ private List<ConstraintViolation.Builder> evalPairs(Value key, Value value, bool
149149
violations.addAll(valueViolations);
150150

151151
FieldPathElement.Builder fieldPathElementBuilder =
152-
Objects.requireNonNull(constraintViolationHelper.getFieldPathElement()).toBuilder();
152+
Objects.requireNonNull(helper.getFieldPathElement()).toBuilder();
153153
fieldPathElementBuilder.setKeyType(keyFieldDescriptor.getType().toProto());
154154
fieldPathElementBuilder.setValueType(valueFieldDescriptor.getType().toProto());
155155
switch (keyFieldDescriptor.getType().toProto()) {
@@ -177,7 +177,6 @@ private List<ConstraintViolation.Builder> evalPairs(Value key, Value value, bool
177177
throw new ExecutionException("Unexpected map key type");
178178
}
179179
FieldPathElement fieldPathElement = fieldPathElementBuilder.build();
180-
return FieldPathUtils.updatePaths(
181-
violations, fieldPathElement, constraintViolationHelper.getRulePrefixElements());
180+
return FieldPathUtils.updatePaths(violations, fieldPathElement, helper.getRulePrefixElements());
182181
}
183182
}

0 commit comments

Comments
 (0)