Skip to content

Commit 9123d25

Browse files
committed
Violation: Rename getProto -> toProto
1 parent 456273e commit 9123d25

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

src/main/java/build/buf/protovalidate/ValidationResult.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,13 @@ public String toString() {
7272
builder.append("Validation error:");
7373
for (Violation violation : violations) {
7474
builder.append("\n - ");
75-
if (!violation.getProto().getFieldPath().isEmpty()) {
76-
builder.append(violation.getProto().getFieldPath());
75+
if (!violation.toProto().getFieldPath().isEmpty()) {
76+
builder.append(violation.toProto().getFieldPath());
7777
builder.append(": ");
7878
}
7979
builder.append(
8080
String.format(
81-
"%s [%s]",
82-
violation.getProto().getMessage(), violation.getProto().getConstraintId()));
81+
"%s [%s]", violation.toProto().getMessage(), violation.toProto().getConstraintId()));
8382
}
8483
return builder.toString();
8584
}
@@ -92,7 +91,7 @@ public String toString() {
9291
public build.buf.validate.Violations toProto() {
9392
List<build.buf.validate.Violation> protoViolations = new ArrayList<>();
9493
for (Violation violation : violations) {
95-
protoViolations.add(violation.getProto());
94+
protoViolations.add(violation.toProto());
9695
}
9796
return Violations.newBuilder().addAllViolations(protoViolations).build();
9897
}

src/main/java/build/buf/protovalidate/Violation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private Violation(
100100
*
101101
* @return The protobuf violation data.
102102
*/
103-
public build.buf.validate.Violation getProto() {
103+
public build.buf.validate.Violation toProto() {
104104
return proto;
105105
}
106106

src/main/java/build/buf/protovalidate/internal/errors/FieldPathUtils.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,20 @@ public static List<Violation> prependFieldPaths(
4141
// special case that makes it significantly simpler to handle reverse-constructing paths with
4242
// maps and repeated fields.
4343
if (skipSubscript
44-
&& violation.getProto().getField().getElementsCount() > 0
45-
&& violation.getProto().getField().getElements(0).getSubscriptCase()
44+
&& violation.toProto().getField().getElementsCount() > 0
45+
&& violation.toProto().getField().getElements(0).getSubscriptCase()
4646
!= FieldPathElement.SubscriptCase.SUBSCRIPT_NOT_SET) {
4747
result.add(violation);
4848
continue;
4949
}
5050
result.add(
5151
violation.toBuilder()
5252
.setProto(
53-
violation.getProto().toBuilder()
53+
violation.toProto().toBuilder()
5454
.setField(
5555
FieldPath.newBuilder()
5656
.addElements(element)
57-
.addAllElements(violation.getProto().getField().getElementsList())
57+
.addAllElements(violation.toProto().getField().getElementsList())
5858
.build())
5959
.build())
6060
.build());
@@ -76,11 +76,11 @@ public static List<Violation> prependRulePaths(
7676
result.add(
7777
violation.toBuilder()
7878
.setProto(
79-
violation.getProto().toBuilder()
79+
violation.toProto().toBuilder()
8080
.setRule(
8181
FieldPath.newBuilder()
8282
.addAllElements(elements)
83-
.addAllElements(violation.getProto().getRule().getElementsList())
83+
.addAllElements(violation.toProto().getRule().getElementsList())
8484
.build())
8585
.build())
8686
.build());
@@ -97,12 +97,12 @@ public static List<Violation> prependRulePaths(
9797
public static List<Violation> calculateFieldPathStrings(List<Violation> violations) {
9898
List<Violation> result = new ArrayList<>();
9999
for (Violation violation : violations) {
100-
if (violation.getProto().getField().getElementsCount() > 0) {
100+
if (violation.toProto().getField().getElementsCount() > 0) {
101101
result.add(
102102
violation.toBuilder()
103103
.setProto(
104-
violation.getProto().toBuilder()
105-
.setFieldPath(fieldPathString(violation.getProto().getField()))
104+
violation.toProto().toBuilder()
105+
.setFieldPath(fieldPathString(violation.toProto().getField()))
106106
.build())
107107
.build());
108108
} else {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private List<Violation> evalPairs(Value key, Value value, boolean failFast)
198198
.map(
199199
violation ->
200200
violation.toBuilder()
201-
.setProto(violation.getProto().toBuilder().setForKey(true).build())
201+
.setProto(violation.toProto().toBuilder().setForKey(true).build())
202202
.build())
203203
.collect(Collectors.toList());
204204
final List<Violation> valueViolations;

0 commit comments

Comments
 (0)