Skip to content

Commit 467d27a

Browse files
authored
Fix @NullMarked Static (#324)
1 parent 2ecb57d commit 467d27a

File tree

2 files changed

+26
-1
lines changed
  • validator-generator/src

2 files changed

+26
-1
lines changed

validator-generator/src/main/java/io/avaje/validation/generator/TypeReader.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ private void readField(Element element, List<FieldReader> localFields) {
108108
element = mixInField;
109109
}
110110

111-
if (includeField(element) || Util.isNonNullable(element)) {
111+
if (includeField(element)
112+
|| !element.getModifiers().contains(Modifier.STATIC)
113+
&& Util.isNonNullable(element)) {
112114
seenFields.add(element.toString());
113115
var reader = new FieldReader(element, genericTypeParams);
114116
if (reader.hasConstraints() || ValidPrism.isPresent(element)) {
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package io.avaje.validation.generator.models.valid;
2+
3+
import java.util.Set;
4+
5+
import org.jspecify.annotations.NullMarked;
6+
7+
import io.avaje.validation.constraints.NotBlank;
8+
import io.avaje.validation.constraints.Size;
9+
import jakarta.validation.Valid;
10+
11+
@Valid
12+
@NullMarked
13+
public record Insect(@NotBlank @Size(min = 1, max = 50) String name) {
14+
private static final Set<String> FLYING = Set.of("Fly", "Butterfly");
15+
private static final Set<String> WALKING = Set.of("Ant", "Stick insect");
16+
17+
public Set<String> associated() {
18+
if (FLYING.contains(name)) {
19+
return FLYING;
20+
}
21+
return WALKING;
22+
}
23+
}

0 commit comments

Comments
 (0)