Browse Source

Add nullability annotations to build-plugin/spring-boot-antlib

See gh-46587
pull/46775/head
Moritz Halbritter 4 months ago
parent
commit
551fee3c55
  1. 7
      build-plugin/spring-boot-antlib/src/main/java/org/springframework/boot/ant/FindMainClass.java
  2. 5
      build-plugin/spring-boot-antlib/src/main/java/org/springframework/boot/ant/ShareAntlibLoader.java
  3. 3
      build-plugin/spring-boot-antlib/src/main/java/org/springframework/boot/ant/package-info.java

7
build-plugin/spring-boot-antlib/src/main/java/org/springframework/boot/ant/FindMainClass.java

@ -23,6 +23,7 @@ import java.util.jar.JarFile;
import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task; import org.apache.tools.ant.Task;
import org.jspecify.annotations.Nullable;
import org.springframework.boot.loader.tools.MainClassFinder; import org.springframework.boot.loader.tools.MainClassFinder;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -37,11 +38,11 @@ public class FindMainClass extends Task {
private static final String SPRING_BOOT_APPLICATION_CLASS_NAME = "org.springframework.boot.autoconfigure.SpringBootApplication"; private static final String SPRING_BOOT_APPLICATION_CLASS_NAME = "org.springframework.boot.autoconfigure.SpringBootApplication";
private String mainClass; private @Nullable String mainClass;
private File classesRoot; private @Nullable File classesRoot;
private String property; private @Nullable String property;
public FindMainClass(Project project) { public FindMainClass(Project project) {
setProject(project); setProject(project);

5
build-plugin/spring-boot-antlib/src/main/java/org/springframework/boot/ant/ShareAntlibLoader.java

@ -19,6 +19,7 @@ package org.springframework.boot.ant;
import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task; import org.apache.tools.ant.Task;
import org.jspecify.annotations.Nullable;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -30,7 +31,7 @@ import org.springframework.util.StringUtils;
*/ */
public class ShareAntlibLoader extends Task { public class ShareAntlibLoader extends Task {
private String refid; private @Nullable String refid;
public ShareAntlibLoader(Project project) { public ShareAntlibLoader(Project project) {
setProject(project); setProject(project);
@ -44,7 +45,7 @@ public class ShareAntlibLoader extends Task {
getProject().addReference(this.refid, getClass().getClassLoader()); getProject().addReference(this.refid, getClass().getClassLoader());
} }
public void setRefid(String refid) { public void setRefid(@Nullable String refid) {
this.refid = refid; this.refid = refid;
} }

3
build-plugin/spring-boot-antlib/src/main/java/org/springframework/boot/ant/package-info.java

@ -17,4 +17,7 @@
/** /**
* Support for building Spring Boot applications using Ant. * Support for building Spring Boot applications using Ant.
*/ */
@NullMarked
package org.springframework.boot.ant; package org.springframework.boot.ant;
import org.jspecify.annotations.NullMarked;

Loading…
Cancel
Save