Update to protovalidate 0.6.1 #106
Conversation
Update protovalidate-java to support the latest rules in protovalidate 0.6.1. Add the isHostAndPort overload and apply additional fixes from protovalidate-go to the Java implementation.
| val stdOptions = options as StandardJavadocDocletOptions | ||
| stdOptions.addBooleanOption("Xwerror", true) | ||
| // Ignore warnings for generated code. | ||
| stdOptions.addBooleanOption("Xdoclint/package:-build.buf.validate,-build.buf.validate.priv", true) |
There was a problem hiding this comment.
Figured out how to ignore warnings on Javadoc for generated protoc code but still mark warnings as errors for our library code.
| null); | ||
| } | ||
|
|
||
| private static boolean hostAndPort(String value, boolean portRequired) { |
There was a problem hiding this comment.
Based off Go implementation.
| @@ -484,7 +535,7 @@ private static boolean validateEmail(String addr) { | |||
| try { | |||
| InternetAddress emailAddr = new InternetAddress(addr); | |||
| emailAddr.validate(); | |||
| if (addr.contains("<")) { | |||
| if (addr.contains("<") || !emailAddr.getAddress().equals(addr)) { | |||
There was a problem hiding this comment.
Upstream Go implementation got this fix for failing on whitespace in email addresses.
| @@ -510,7 +561,9 @@ private static boolean validateHostname(String host) { | |||
| } | |||
| String s = Ascii.toLowerCase(host.endsWith(".") ? host.substring(0, host.length() - 1) : host); | |||
| Iterable<String> parts = Splitter.on('.').split(s); | |||
| boolean allDigits = false; | |||
There was a problem hiding this comment.
Upstream Go impl also picked up additional validation for hosts to ensure the last portion isn't all numbers.
| @@ -226,16 +233,40 @@ private FieldEvaluator buildField( | |||
| FieldDescriptor fieldDescriptor, FieldConstraints fieldConstraints) | |||
| throws CompilationException { | |||
| ValueEvaluator valueEvaluatorEval = new ValueEvaluator(); | |||
| boolean ignoreDefault = | |||
There was a problem hiding this comment.
Updates here are mostly equivalent to bufbuild/protovalidate-go@v0.5.2...2268789#diff-70b43cf25409483d9785a2bea15d9d185795803e255330e6562e7dca5112663e (there are some differences in the Java vs. Go generated code).
src/main/java/build/buf/protovalidate/exceptions/ExecutionException.java
Outdated
Show resolved
Hide resolved
src/main/java/build/buf/protovalidate/exceptions/ValidationException.java
Outdated
Show resolved
Hide resolved
src/main/java/build/buf/protovalidate/internal/celext/CustomOverload.java
Outdated
Show resolved
Hide resolved
| @@ -226,16 +232,40 @@ private FieldEvaluator buildField( | |||
| FieldDescriptor fieldDescriptor, FieldConstraints fieldConstraints) | |||
| throws CompilationException { | |||
| ValueEvaluator valueEvaluatorEval = new ValueEvaluator(); | |||
| boolean ignoreDefault = | |||
| fieldDescriptor.hasPresence() && shouldIgnoreDefault(fieldConstraints); | |||
| Object zero = null; | |||
There was a problem hiding this comment.
Could use ? operator here to initialize
There was a problem hiding this comment.
Didn't make this change - mainly a style thing and I think the ternary operator can make things harder to follow. The only use of the ternary operator so far in this project is in the protoc generated code.
Update protovalidate-java to support the latest rules in protovalidate 0.6.1. Add the isHostAndPort overload and apply additional fixes from protovalidate-go to the Java implementation.