mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-13 20:12:14 +00:00
s/javax.annotation.Nonnull/edu.umd.cs.findbugs.annotations.NonNull/g
This commit is contained in:
James Nord committed
1 parent
928d40fea8
commit
819f80b12f
266 files changed
+1548
-1548
No files matched your search
@@ -106,7 +106,7 @@ import org.xml.sax.SAXException;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
|
||||
import javax.annotation.CheckForNull;
|
||||
import javax.annotation.Nonnull;
|
||||
import edu.umd.cs.findbugs.annotations.NonNull;
|
||||
import javax.servlet.ServletContext;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
@@ -210,29 +210,29 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
private enum PMConstructor {
|
||||
JENKINS {
|
||||
@Override
|
||||
@Nonnull
|
||||
PluginManager doCreate(@Nonnull Class<? extends PluginManager> klass,
|
||||
@Nonnull Jenkins jenkins) throws ReflectiveOperationException {
|
||||
@NonNull
|
||||
PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
|
||||
@NonNull Jenkins jenkins) throws ReflectiveOperationException {
|
||||
return klass.getConstructor(Jenkins.class).newInstance(jenkins);
|
||||
}
|
||||
},
|
||||
SC_FILE {
|
||||
@Override
|
||||
@Nonnull PluginManager doCreate(@Nonnull Class<? extends PluginManager> klass,
|
||||
@Nonnull Jenkins jenkins) throws ReflectiveOperationException {
|
||||
@NonNull PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
|
||||
@NonNull Jenkins jenkins) throws ReflectiveOperationException {
|
||||
return klass.getConstructor(ServletContext.class, File.class).newInstance(jenkins.servletContext, jenkins.getRootDir());
|
||||
}
|
||||
},
|
||||
FILE {
|
||||
@Override
|
||||
@Nonnull PluginManager doCreate(@Nonnull Class<? extends PluginManager> klass,
|
||||
@Nonnull Jenkins jenkins) throws ReflectiveOperationException {
|
||||
@NonNull PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
|
||||
@NonNull Jenkins jenkins) throws ReflectiveOperationException {
|
||||
return klass.getConstructor(File.class).newInstance(jenkins.getRootDir());
|
||||
}
|
||||
};
|
||||
|
||||
final @CheckForNull PluginManager create(@Nonnull Class<? extends PluginManager> klass,
|
||||
@Nonnull Jenkins jenkins) throws ReflectiveOperationException {
|
||||
final @CheckForNull PluginManager create(@NonNull Class<? extends PluginManager> klass,
|
||||
@NonNull Jenkins jenkins) throws ReflectiveOperationException {
|
||||
try {
|
||||
return doCreate(klass, jenkins);
|
||||
} catch(NoSuchMethodException e) {
|
||||
@@ -241,8 +241,8 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
}
|
||||
}
|
||||
|
||||
abstract @Nonnull PluginManager doCreate(@Nonnull Class<? extends PluginManager> klass,
|
||||
@Nonnull Jenkins jenkins) throws ReflectiveOperationException;
|
||||
abstract @NonNull PluginManager doCreate(@NonNull Class<? extends PluginManager> klass,
|
||||
@NonNull Jenkins jenkins) throws ReflectiveOperationException;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -252,7 +252,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
* @return Plugin manager to use. If no custom class is configured or in case of any error, the default
|
||||
* {@link LocalPluginManager} is returned.
|
||||
*/
|
||||
public static @Nonnull PluginManager createDefault(@Nonnull Jenkins jenkins) {
|
||||
public static @NonNull PluginManager createDefault(@NonNull Jenkins jenkins) {
|
||||
String pmClassName = SystemProperties.getString(CUSTOM_PLUGIN_MANAGER);
|
||||
if (!StringUtils.isBlank(pmClassName)) {
|
||||
LOGGER.log(FINE, String.format("Use of custom plugin manager [%s] requested.", pmClassName));
|
||||
@@ -625,13 +625,13 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
}
|
||||
}
|
||||
|
||||
protected @Nonnull Set<String> loadPluginsFromWar(@Nonnull String fromPath) {
|
||||
protected @NonNull Set<String> loadPluginsFromWar(@NonNull String fromPath) {
|
||||
return loadPluginsFromWar(fromPath, null);
|
||||
}
|
||||
|
||||
//TODO: Consider refactoring in order to avoid DMI_COLLECTION_OF_URLS
|
||||
@SuppressFBWarnings(value = "DMI_COLLECTION_OF_URLS", justification = "Plugin loading happens only once on Jenkins startup")
|
||||
protected @Nonnull Set<String> loadPluginsFromWar(@Nonnull String fromPath, @CheckForNull FilenameFilter filter) {
|
||||
protected @NonNull Set<String> loadPluginsFromWar(@NonNull String fromPath, @CheckForNull FilenameFilter filter) {
|
||||
Set<String> names = new HashSet();
|
||||
|
||||
ServletContext context = Jenkins.get().servletContext;
|
||||
@@ -820,12 +820,12 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
}
|
||||
}
|
||||
|
||||
private String normalisePluginName(@Nonnull String name) {
|
||||
private String normalisePluginName(@NonNull String name) {
|
||||
// Normalise the name by stripping off the file extension (if present)...
|
||||
return name.replace(".jpi", "").replace(".hpi", "");
|
||||
}
|
||||
|
||||
private @CheckForNull VersionNumber getPluginVersion(@Nonnull File dir, @Nonnull String pluginId) {
|
||||
private @CheckForNull VersionNumber getPluginVersion(@NonNull File dir, @NonNull String pluginId) {
|
||||
VersionNumber version = getPluginVersion(new File(dir, pluginId + ".jpi"));
|
||||
if (version == null) {
|
||||
version = getPluginVersion(new File(dir, pluginId + ".hpi"));
|
||||
@@ -833,7 +833,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
return version;
|
||||
}
|
||||
|
||||
private @CheckForNull VersionNumber getPluginVersion(@Nonnull File pluginFile) {
|
||||
private @CheckForNull VersionNumber getPluginVersion(@NonNull File pluginFile) {
|
||||
if (!pluginFile.exists()) {
|
||||
return null;
|
||||
}
|
||||
@@ -844,7 +844,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
}
|
||||
}
|
||||
|
||||
private @CheckForNull VersionNumber getPluginVersion(@Nonnull URL pluginURL) {
|
||||
private @CheckForNull VersionNumber getPluginVersion(@NonNull URL pluginURL) {
|
||||
Manifest manifest = parsePluginManifest(pluginURL);
|
||||
if (manifest == null) {
|
||||
return null;
|
||||
@@ -1103,8 +1103,8 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
* @return Input stream, which allows to retrieve manifest. This stream must be closed outside
|
||||
* @throws IOException Operation error
|
||||
*/
|
||||
@Nonnull
|
||||
/*package*/ static InputStream getBundledJpiManifestStream(@Nonnull URL url) throws IOException {
|
||||
@NonNull
|
||||
/*package*/ static InputStream getBundledJpiManifestStream(@NonNull URL url) throws IOException {
|
||||
URLConnection uc = url.openConnection();
|
||||
InputStream in = null;
|
||||
// Magic, which allows to avoid using stream generated for JarURLConnection.
|
||||
@@ -1143,8 +1143,8 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
* @return Modification date
|
||||
* @throws IOException Operation error
|
||||
*/
|
||||
@Nonnull
|
||||
/*package*/ static long getModificationDate(@Nonnull URL url) throws IOException {
|
||||
@NonNull
|
||||
/*package*/ static long getModificationDate(@NonNull URL url) throws IOException {
|
||||
URLConnection uc = url.openConnection();
|
||||
|
||||
// It prevents file descriptor leak if the URL references a file within JAR
|
||||
@@ -1493,11 +1493,11 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
* @since 2.0
|
||||
*/
|
||||
@Restricted(NoExternalUse.class)
|
||||
public List<Future<UpdateCenter.UpdateCenterJob>> install(@Nonnull Collection<String> plugins, boolean dynamicLoad) {
|
||||
public List<Future<UpdateCenter.UpdateCenterJob>> install(@NonNull Collection<String> plugins, boolean dynamicLoad) {
|
||||
return install(plugins, dynamicLoad, null);
|
||||
}
|
||||
|
||||
private List<Future<UpdateCenter.UpdateCenterJob>> install(@Nonnull Collection<String> plugins, boolean dynamicLoad, @CheckForNull UUID correlationId) {
|
||||
private List<Future<UpdateCenter.UpdateCenterJob>> install(@NonNull Collection<String> plugins, boolean dynamicLoad, @CheckForNull UUID correlationId) {
|
||||
List<Future<UpdateCenter.UpdateCenterJob>> installJobs = new ArrayList<>();
|
||||
|
||||
LOGGER.log(INFO, "Starting installation of a batch of {0} plugins plus their dependencies", plugins.size());
|
||||
@@ -1959,7 +1959,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
|
||||
* @return the list of results for every plugin and their dependent plugins.
|
||||
* @throws IOException see {@link PluginWrapper#disable()}
|
||||
*/
|
||||
public @Nonnull List<PluginWrapper.PluginDisableResult> disablePlugins(@Nonnull PluginWrapper.PluginDisableStrategy strategy, @Nonnull List<String> plugins) throws IOException {
|
||||
public @NonNull List<PluginWrapper.PluginDisableResult> disablePlugins(@NonNull PluginWrapper.PluginDisableStrategy strategy, @NonNull List<String> plugins) throws IOException {
|
||||
// Where we store the results of each plugin disablement
|
||||
List<PluginWrapper.PluginDisableResult> results = new ArrayList<>(plugins.size());
|
||||
|
||||
|
||||
Reference in new issue
Block a user