Skip to content

Commit f4833de

Browse files
committed
house keeping
1 parent b23c433 commit f4833de

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

vaadoo-bytebuddy/src/main/java/com/github/pfichtner/vaadoo/ValidationCodeInjector.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.github.pfichtner.vaadoo.Parameters.Parameter;
5555
import com.github.pfichtner.vaadoo.fragments.Jsr380CodeFragment;
5656
import com.github.pfichtner.vaadoo.fragments.impl.NullValueException;
57+
import com.github.pfichtner.vaadoo.fragments.impl.Template;
5758

5859
import lombok.RequiredArgsConstructor;
5960
import lombok.ToString;
@@ -448,8 +449,9 @@ public void inject(MethodVisitor mv, Parameter parameter, Method sourceMethod,
448449
.represents(jakarta.validation.constraints.Pattern.class)) {
449450
EnumerationDescription[] flags = annotationDescription.getValue("flags")
450451
.resolve(EnumerationDescription[].class);
451-
mask = com.github.pfichtner.vaadoo.fragments.impl.Template.bitwiseOr(java.util.stream.Stream.of(flags)
452-
.map(EnumerationDescription::getValue).map(jakarta.validation.constraints.Pattern.Flag::valueOf)
452+
mask = Template.bitwiseOr(java.util.stream.Stream.of(flags) //
453+
.map(EnumerationDescription::getValue) //
454+
.map(jakarta.validation.constraints.Pattern.Flag::valueOf) //
453455
.toArray(jakarta.validation.constraints.Pattern.Flag[]::new));
454456
}
455457
masks.put(wrapper, mask);

vaadoo-bytebuddy/src/test/java/com/github/pfichtner/vaadoo/TestClassBuilder.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,13 @@ public static class AnnotationDefinition {
132132

133133
@Override
134134
public String toString() {
135-
return "TestClassBuilder.AnnotationDefinition(annotation=" + annotation + ", values={"
136-
+ values.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).sorted().collect(joining(", "))
137-
+ "})";
135+
return format("TestClassBuilder.AnnotationDefinition(annotation=%s, values={%s})", annotation,
136+
annoValues());
137+
}
138+
139+
private String annoValues() {
140+
return values.entrySet().stream().map(e -> format("%s=%s", e.getKey(), e.getValue())).sorted()
141+
.collect(joining(", "));
138142
}
139143

140144
public static AnnotationDefinition of(Class<? extends Annotation> annotation) {

0 commit comments

Comments
 (0)