Use ModifierOrder with type annotations near the type

adangel · adangel · commit ebdd56c17c0e · 2025-11-27T15:45:53.000+01:00
Prepares for enabling the rule ModifierOrder
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/LiveViolationRecord.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/LiveViolationRecord.java
@@ -65,8 +65,7 @@ public void setLine(int line) {
 
 
     @PersistentProperty
-    @NonNull
-    public TextRegion getRegion() {
+    public @NonNull TextRegion getRegion() {
         return region.getValue();
     }
 
@@ -82,8 +81,7 @@ public void setRegion(@NonNull TextRegion region) {
 
 
     @PersistentProperty
-    @Nullable
-    public String getMessage() {
+    public @Nullable String getMessage() {
         return message.getValue();
     }
 
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/PropertyMapModel.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/PropertyMapModel.java
@@ -72,8 +72,7 @@ public void setKnownProperties(@Nullable ObservableList<PropertyDescriptorSpec>
         });
     }
 
-    @NonNull
-    private ObservableList<PropertyDescriptorSpec> defaultToEmpty(@Nullable ObservableList<PropertyDescriptorSpec> props) {
+    private @NonNull ObservableList<PropertyDescriptorSpec> defaultToEmpty(@Nullable ObservableList<PropertyDescriptorSpec> props) {
         return props == null ? emptyObservableList() : props;
     }
 
@@ -112,8 +111,7 @@ public void setProperty(String name, String value) {
         }
     }
 
-    @NonNull
-    private Map<String, String> computeNonDefault(Map<PropertyDescriptorSpec, Var<String>> map) {
+    private @NonNull Map<String, String> computeNonDefault(Map<PropertyDescriptorSpec, Var<String>> map) {
         return map.entrySet()
                   .stream()
                   .filter(it -> !Objects.equals(it.getValue().getValue(), it.getKey().getValue()))
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/TestCollection.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/TestCollection.java
@@ -23,8 +23,7 @@ public class TestCollection implements SettingsOwner {
 
     private LiveList<LiveTestCase> stash;
     private final @Nullable ObservableRuleBuilder owner;
-    @Nullable
-    private File origin;
+    private @Nullable File origin;
 
     public TestCollection(@Nullable ObservableRuleBuilder owner, List<LiveTestCase> tests) {
         this.stash = new LiveArrayList<>(tests);
@@ -65,26 +64,23 @@ public void addTestCase(LiveTestCase testCase) {
         }
     }
 
-    @Nullable
     @PersistentProperty
-    public File getOrigin() {
+    public @Nullable File getOrigin() {
         return origin;
     }
 
     public void setOrigin(File origin) {
         this.origin = origin;
     }
 
-    @Nullable
-    public LiveTestCase getOpenTest() {
+    public @Nullable LiveTestCase getOpenTest() {
         return stash.stream().filter(it -> !it.isFrozen()).findFirst().orElse(null);
     }
 
     /**
      * Opens a test case for write access.
      */
-    @Nullable
-    public LiveTestCase export(int i) {
+    public @Nullable LiveTestCase export(int i) {
         if (0 <= i && i < stash.size()) {
             stash.forEach(LiveTestCase::freeze);
             return stash.get(i).unfreeze();
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/SimplePopups.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/SimplePopups.java
@@ -69,8 +69,7 @@ public static EventStream<?> showStickyNotification(@NonNull Node owner, AlertTy
         return showActionFeedback(owner, icon, message, offsetX, true, type.name().toLowerCase(Locale.ROOT));
     }
 
-    @Nullable
-    private static Node getIconLiteral(AlertType type) {
+    private static @Nullable Node getIconLiteral(AlertType type) {
         @Nullable String iconLit;
         switch (type) {
         case ERROR:
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/TestExportWizardController.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/TestExportWizardController.java
@@ -36,8 +36,7 @@
 public final class TestExportWizardController extends AbstractController {
 
     private final Stage myPopupStage;
-    @Nullable
-    private String originalFile;
+    private @Nullable String originalFile;
     @FXML
     private ToolbarTitledPane titledPane;
     @FXML
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/AuxLanguageRegistry.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/AuxLanguageRegistry.java
@@ -56,8 +56,7 @@ public static LanguageVersion findLanguageVersionByTerseName(String string) {
                                  : lang.getVersion(split[1]);
     }
 
-    @NonNull
-    public static LanguageVersion defaultLanguageVersion() {
+    public static @NonNull LanguageVersion defaultLanguageVersion() {
         return defaultLanguage().getDefaultVersion();
     }
 
@@ -79,8 +78,7 @@ public static PlainTextLanguage plainTextLanguage() {
         return PlainTextLanguage.getInstance();
     }
 
-    @NonNull
-    public static Language defaultLanguage() {
+    public static @NonNull Language defaultLanguage() {
         Language defaultLanguage = findLanguageByName(DEFAULT_LANGUAGE_NAME);
         return defaultLanguage != null ? defaultLanguage : plainTextLanguage();
     }
@@ -96,8 +94,7 @@ private static Map<String, LanguageVersion> getExtensionsToLanguageMap() {
         return result;
     }
 
-    @Nullable
-    public static synchronized LanguageVersion getLanguageVersionFromExtension(String filename) {
+    public static synchronized @Nullable LanguageVersion getLanguageVersionFromExtension(String filename) {
         if (extensionsToLanguage == null) {
             extensionsToLanguage = getExtensionsToLanguageMap();
         }
@@ -122,39 +119,33 @@ public static synchronized List<LanguageVersion> getSupportedLanguageVersions()
         return supportedLanguageVersions;
     }
 
-    @NonNull
-    public static LanguageVersion getLanguageVersionByName(String name) {
+    public static @NonNull LanguageVersion getLanguageVersionByName(String name) {
         return getSupportedLanguageVersions().stream()
                                              .filter(it -> it.getName().equals(name))
                                              .findFirst()
                                              .orElse(defaultLanguageVersion());
     }
 
-    @NonNull
-    public static Stream<Language> getSupportedLanguages() {
+    public static @NonNull Stream<Language> getSupportedLanguages() {
         return AUX_LANG_REGISTRY.getLanguages().stream();
     }
 
-    @NonNull
-    public static Language findLanguageByShortName(String shortName) {
+    public static @NonNull Language findLanguageByShortName(String shortName) {
         return getSupportedLanguages().filter(it -> it.getShortName().equals(shortName))
                                       .findFirst()
                                       .orElse(defaultLanguage());
     }
 
-    @Nullable
-    public static Language findLanguageByName(String n) {
+    public static @Nullable Language findLanguageByName(String n) {
         return AUX_LANG_REGISTRY.getLanguageByFullName(n);
     }
 
-    @NonNull
-    public static Language findLanguageByNameOrDefault(String n) {
+    public static @NonNull Language findLanguageByNameOrDefault(String n) {
         Language lang = findLanguageByName(n);
         return lang == null ? defaultLanguage() : lang;
     }
 
-    @Nullable
-    public static Language findLanguageByTerseName(String name) {
+    public static @Nullable Language findLanguageByTerseName(String name) {
         return AUX_LANG_REGISTRY.getLanguageById(name);
     }
 
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/XPathAutocompleteProvider.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/autocomplete/XPathAutocompleteProvider.java
@@ -114,8 +114,7 @@ public void initialiseAutoCompletion() {
     }
 
 
-    @Nullable
-    private Tuple2<Integer, String> getInsertionPointAndQuery(int searchPoint) {
+    private @Nullable Tuple2<Integer, String> getInsertionPointAndQuery(int searchPoint) {
         String input = myCodeArea.getText();
 
         int insertionPoint = getInsertionPoint(searchPoint, input);
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/beans/converters/SerializerRegistrar.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/beans/converters/SerializerRegistrar.java
@@ -219,8 +219,7 @@ public final <T> Serializer<T> getSerializer(Typed<T> typed) {
      * @return A serializer, or null if none can be found
      */
     @SuppressWarnings("unchecked")
-    @Nullable
-    public final Serializer<?> getSerializer(Type genericType) {
+    public final @Nullable Serializer<?> getSerializer(Type genericType) {
         if (converters.containsKey(genericType)) {
             return converters.get(genericType);
         }
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/HighlightLayerCodeArea.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/HighlightLayerCodeArea.java
@@ -188,8 +188,7 @@ private StyleSpans<Collection<String>> recomputePainting() {
      * parsing update.
      */
     @Override
-    @NonNull
-    protected final StyleSpans<Collection<String>> styleSyntaxHighlightChange(final @Nullable StyleSpans<Collection<String>> oldSyntax,
+    protected final @NonNull StyleSpans<Collection<String>> styleSyntaxHighlightChange(final @Nullable StyleSpans<Collection<String>> oldSyntax,
                                                                               final @Nullable StyleSpans<Collection<String>> newSyntax) {
 
         StyleSpans<Collection<String>> currentSpans = getStyleSpans(new IndexRange(0, getLength()));
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/SyntaxHighlightingCodeArea.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/SyntaxHighlightingCodeArea.java
@@ -205,8 +205,7 @@ private void setCurrentSyntaxHighlight(final @Nullable StyleSpans<Collection<Str
      * style layer in the game. Subclasses are free to override, to get a chance to
      * preserve additional style layers.
      */
-    @NonNull
-    protected StyleSpans<Collection<String>> styleSyntaxHighlightChange(final @Nullable StyleSpans<Collection<String>> oldSyntax,
+    protected @NonNull StyleSpans<Collection<String>> styleSyntaxHighlightChange(final @Nullable StyleSpans<Collection<String>> oldSyntax,
                                                                         final @Nullable StyleSpans<Collection<String>> newSyntax) {
         return newSyntax == null ? emptySpan() : newSyntax;
     }
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/NodeEditionCodeArea.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/NodeEditionCodeArea.java
@@ -247,8 +247,7 @@ public IntFunction<javafx.scene.Node> testCaseLineNumberFactory(LiveTestCase liv
         };
     }
 
-    @NonNull
-    public Label buildExpectedLabel(IntFunction<Val<Integer>> numViolationsPerLine, int idx) {
+    public @NonNull Label buildExpectedLabel(IntFunction<Val<Integer>> numViolationsPerLine, int idx) {
         Label foo = new Label();
         foo.getStyleClass().addAll("num-violations-gutter-label");
         Val<Integer> num = numViolationsPerLine.apply(idx + 1);
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PropertyCollectionView.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PropertyCollectionView.java
@@ -49,12 +49,9 @@
 public class PropertyCollectionView extends VBox implements ApplicationComponent {
 
     private static final int LIST_CELL_HEIGHT = 31;
-    @NonNull
-    private final DesignerRoot root;
-    @NonNull
-    private final ListView<PropertyDescriptorSpec> view;
-    @NonNull
-    private final PopOverWrapper<PropertyDescriptorSpec> myEditPopover;
+    private final @NonNull DesignerRoot root;
+    private final @NonNull ListView<PropertyDescriptorSpec> view;
+    private final @NonNull PopOverWrapper<PropertyDescriptorSpec> myEditPopover;
 
 
     static {
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PropertyMapView.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/PropertyMapView.java
@@ -42,10 +42,8 @@
 public class PropertyMapView extends VBox implements ApplicationComponent {
 
     private static final int LIST_CELL_HEIGHT = 24;
-    @NonNull
-    private final DesignerRoot root;
-    @NonNull
-    private final ListView<Pair<PropertyDescriptorSpec, Var<String>>> view;
+    private final @NonNull DesignerRoot root;
+    private final @NonNull ListView<Pair<PropertyDescriptorSpec, Var<String>>> view;
 
 
 
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/SearchableTreeView.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/SearchableTreeView.java
@@ -54,8 +54,7 @@ public class SearchableTreeView<T> extends TreeView<T> {
     public static final int MIN_QUERY_LENGTH = 1;
     private final TreeViewWrapper<T> myWrapper = new TreeViewWrapper<>(this);
 
-    @Nullable
-    private TextField openSearchField;
+    private @Nullable TextField openSearchField;
 
     public SearchableTreeView() {
 
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/SmartTextFieldListCell.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/SmartTextFieldListCell.java
@@ -67,8 +67,7 @@ public final void updateItem(T item, boolean empty) {
     protected abstract Var<String> extractEditable(T t);
 
 
-    @Nullable
-    protected String getPrompt() {
+    protected @Nullable String getPrompt() {
         return null;
     }
 
diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/ViolationCollectionView.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/ViolationCollectionView.java
@@ -42,10 +42,8 @@
 public class ViolationCollectionView extends VBox implements ApplicationComponent {
 
     private static final int LIST_CELL_HEIGHT = 30;
-    @NonNull
-    private final DesignerRoot root;
-    @NonNull
-    private final ListView<LiveViolationRecord> view;
+    private final @NonNull DesignerRoot root;
+    private final @NonNull ListView<LiveViolationRecord> view;
 
 
     static {

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ public void setLine(int line) {`
`65`	`65`
`66`	`66`
`67`	`67`	`@PersistentProperty`
`68`		`- @NonNull`
`69`		`- public TextRegion getRegion() {`
	`68`	`+ public @NonNull TextRegion getRegion() {`
`70`	`69`	`return region.getValue();`
`71`	`70`	`}`
`72`	`71`
`@@ -82,8 +81,7 @@ public void setRegion(@NonNull TextRegion region) {`
`82`	`81`
`83`	`82`
`84`	`83`	`@PersistentProperty`
`85`		`- @Nullable`
`86`		`- public String getMessage() {`
	`84`	`+ public @Nullable String getMessage() {`
`87`	`85`	`return message.getValue();`
`88`	`86`	`}`
`89`	`87`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,7 @@ public void setKnownProperties(@Nullable ObservableList<PropertyDescriptorSpec>`
`72`	`72`	`});`
`73`	`73`	`}`
`74`	`74`
`75`		`- @NonNull`
`76`		`- private ObservableList<PropertyDescriptorSpec> defaultToEmpty(@Nullable ObservableList<PropertyDescriptorSpec> props) {`
	`75`	`+ private @NonNull ObservableList<PropertyDescriptorSpec> defaultToEmpty(@Nullable ObservableList<PropertyDescriptorSpec> props) {`
`77`	`76`	`return props == null ? emptyObservableList() : props;`
`78`	`77`	`}`
`79`	`78`
`@@ -112,8 +111,7 @@ public void setProperty(String name, String value) {`
`112`	`111`	`}`
`113`	`112`	`}`
`114`	`113`
`115`		`- @NonNull`
`116`		`- private Map<String, String> computeNonDefault(Map<PropertyDescriptorSpec, Var<String>> map) {`
	`114`	`+ private @NonNull Map<String, String> computeNonDefault(Map<PropertyDescriptorSpec, Var<String>> map) {`
`117`	`115`	`return map.entrySet()`
`118`	`116`	`.stream()`
`119`	`117`	`.filter(it -> !Objects.equals(it.getValue().getValue(), it.getKey().getValue()))`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ public static EventStream<?> showStickyNotification(@NonNull Node owner, AlertTy`
`69`	`69`	`return showActionFeedback(owner, icon, message, offsetX, true, type.name().toLowerCase(Locale.ROOT));`
`70`	`70`	`}`
`71`	`71`
`72`		`- @Nullable`
`73`		`- private static Node getIconLiteral(AlertType type) {`
	`72`	`+ private static @Nullable Node getIconLiteral(AlertType type) {`
`74`	`73`	`@Nullable String iconLit;`
`75`	`74`	`switch (type) {`
`76`	`75`	`case ERROR:`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ public static LanguageVersion findLanguageVersionByTerseName(String string) {`
`56`	`56`	`: lang.getVersion(split[1]);`
`57`	`57`	`}`
`58`	`58`
`59`		`- @NonNull`
`60`		`- public static LanguageVersion defaultLanguageVersion() {`
	`59`	`+ public static @NonNull LanguageVersion defaultLanguageVersion() {`
`61`	`60`	`return defaultLanguage().getDefaultVersion();`
`62`	`61`	`}`
`63`	`62`
`@@ -79,8 +78,7 @@ public static PlainTextLanguage plainTextLanguage() {`
`79`	`78`	`return PlainTextLanguage.getInstance();`
`80`	`79`	`}`
`81`	`80`
`82`		`- @NonNull`
`83`		`- public static Language defaultLanguage() {`
	`81`	`+ public static @NonNull Language defaultLanguage() {`
`84`	`82`	`Language defaultLanguage = findLanguageByName(DEFAULT_LANGUAGE_NAME);`
`85`	`83`	`return defaultLanguage != null ? defaultLanguage : plainTextLanguage();`
`86`	`84`	`}`
`@@ -96,8 +94,7 @@ private static Map<String, LanguageVersion> getExtensionsToLanguageMap() {`
`96`	`94`	`return result;`
`97`	`95`	`}`
`98`	`96`
`99`		`- @Nullable`
`100`		`- public static synchronized LanguageVersion getLanguageVersionFromExtension(String filename) {`
	`97`	`+ public static synchronized @Nullable LanguageVersion getLanguageVersionFromExtension(String filename) {`
`101`	`98`	`if (extensionsToLanguage == null) {`
`102`	`99`	`extensionsToLanguage = getExtensionsToLanguageMap();`
`103`	`100`	`}`
`@@ -122,39 +119,33 @@ public static synchronized List<LanguageVersion> getSupportedLanguageVersions()`
`122`	`119`	`return supportedLanguageVersions;`
`123`	`120`	`}`
`124`	`121`
`125`		`- @NonNull`
`126`		`- public static LanguageVersion getLanguageVersionByName(String name) {`
	`122`	`+ public static @NonNull LanguageVersion getLanguageVersionByName(String name) {`
`127`	`123`	`return getSupportedLanguageVersions().stream()`
`128`	`124`	`.filter(it -> it.getName().equals(name))`
`129`	`125`	`.findFirst()`
`130`	`126`	`.orElse(defaultLanguageVersion());`
`131`	`127`	`}`
`132`	`128`
`133`		`- @NonNull`
`134`		`- public static Stream<Language> getSupportedLanguages() {`
	`129`	`+ public static @NonNull Stream<Language> getSupportedLanguages() {`
`135`	`130`	`return AUX_LANG_REGISTRY.getLanguages().stream();`
`136`	`131`	`}`
`137`	`132`
`138`		`- @NonNull`
`139`		`- public static Language findLanguageByShortName(String shortName) {`
	`133`	`+ public static @NonNull Language findLanguageByShortName(String shortName) {`
`140`	`134`	`return getSupportedLanguages().filter(it -> it.getShortName().equals(shortName))`
`141`	`135`	`.findFirst()`
`142`	`136`	`.orElse(defaultLanguage());`
`143`	`137`	`}`
`144`	`138`
`145`		`- @Nullable`
`146`		`- public static Language findLanguageByName(String n) {`
	`139`	`+ public static @Nullable Language findLanguageByName(String n) {`
`147`	`140`	`return AUX_LANG_REGISTRY.getLanguageByFullName(n);`
`148`	`141`	`}`
`149`	`142`
`150`		`- @NonNull`
`151`		`- public static Language findLanguageByNameOrDefault(String n) {`
	`143`	`+ public static @NonNull Language findLanguageByNameOrDefault(String n) {`
`152`	`144`	`Language lang = findLanguageByName(n);`
`153`	`145`	`return lang == null ? defaultLanguage() : lang;`
`154`	`146`	`}`
`155`	`147`
`156`		`- @Nullable`
`157`		`- public static Language findLanguageByTerseName(String name) {`
	`148`	`+ public static @Nullable Language findLanguageByTerseName(String name) {`
`158`	`149`	`return AUX_LANG_REGISTRY.getLanguageById(name);`
`159`	`150`	`}`
`160`	`151`
Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,7 @@ public void initialiseAutoCompletion() {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`
`117`		`- @Nullable`
`118`		`- private Tuple2<Integer, String> getInsertionPointAndQuery(int searchPoint) {`
	`117`	`+ private @Nullable Tuple2<Integer, String> getInsertionPointAndQuery(int searchPoint) {`
`119`	`118`	`String input = myCodeArea.getText();`
`120`	`119`
`121`	`120`	`int insertionPoint = getInsertionPoint(searchPoint, input);`