Skip to content

Commit 6d85b73

Browse files
committed
Don't format @NullMarked and @NullUnmarked
Fixes gh-446
1 parent 8ba5651 commit 6d85b73

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

spring-javaformat/spring-javaformat-formatter-tests/src/test/resources/expected/nullable.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package example;
22

33
import org.jspecify.annotations.Nullable;
4+
import org.jspecify.annotations.NullMarked;
5+
import org.jspecify.annotations.NullUnmarked;
46

57
/**
68
* Nullable.
@@ -26,4 +28,10 @@ public interface ExampleNullables {
2628
return args;
2729
}
2830

31+
@NullMarked
32+
void withNullMarked(String str);
33+
34+
@NullUnmarked
35+
void withNullUnmarked(String str);
36+
2937
}

spring-javaformat/spring-javaformat-formatter-tests/src/test/resources/source/nullable.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package example;
22

33
import org.jspecify.annotations.Nullable;
4+
import org.jspecify.annotations.NullMarked;
5+
import org.jspecify.annotations.NullUnmarked;
46

57
/**
68
* Nullable.
@@ -24,4 +26,10 @@ public interface ExampleNullables {
2426
return args;
2527
}
2628

29+
@NullMarked
30+
void withNullMarked(String str);
31+
32+
@NullUnmarked
33+
void withNullUnmarked(String str);
34+
2735
}

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk17/eclipse/JSpecifyPreparator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ public class JSpecifyPreparator implements Preparator {
4242

4343
private static final String PACKAGE_NAME = "org.jspecify.annotations";
4444

45-
private static final Set<String> ANNOTATION_NAMES = new HashSet<>(
46-
Arrays.asList("NonNull", "Nullable", "NullMarked", "NullUnmarked"));
45+
private static final Set<String> ANNOTATION_NAMES = new HashSet<>(Arrays.asList("NonNull", "Nullable"));
4746

4847
private static final Set<String> FULLY_QUALIFIED_ANNOTATION_NAMES = ANNOTATION_NAMES.stream()
4948
.map((annotationName) -> PACKAGE_NAME + "." + annotationName)

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/jdk8/eclipse/JSpecifyPreparator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ public class JSpecifyPreparator implements Preparator {
4242

4343
private static final String PACKAGE_NAME = "org.jspecify.annotations";
4444

45-
private static final Set<String> ANNOTATION_NAMES = new HashSet<>(
46-
Arrays.asList("NonNull", "Nullable", "NullMarked", "NullUnmarked"));
45+
private static final Set<String> ANNOTATION_NAMES = new HashSet<>(Arrays.asList("NonNull", "Nullable"));
4746

4847
private static final Set<String> FULLY_QUALIFIED_ANNOTATION_NAMES = ANNOTATION_NAMES.stream()
4948
.map((annotationName) -> PACKAGE_NAME + "." + annotationName)

0 commit comments

Comments
 (0)