From 58a4e60b820bce3aaf33a7fb47ef5e33348fd22c Mon Sep 17 00:00:00 2001 From: Marsboy02 Date: Thu, 7 Nov 2024 00:55:53 +0900 Subject: [PATCH] style: unify non-null annotation --- core/src/main/java/hudson/model/AbstractBuild.java | 7 ++++--- core/src/main/java/hudson/model/Computer.java | 4 ++-- core/src/main/java/hudson/model/JobProperty.java | 2 +- core/src/main/java/hudson/model/Label.java | 2 +- core/src/main/java/hudson/model/ParameterDefinition.java | 2 +- .../java/hudson/model/ParametersDefinitionProperty.java | 3 +-- core/src/main/java/hudson/model/Queue.java | 2 +- core/src/main/java/hudson/model/Slave.java | 2 +- .../main/java/hudson/model/StringParameterDefinition.java | 2 +- core/src/main/java/hudson/model/TimeZoneProperty.java | 3 +-- core/src/main/java/hudson/model/User.java | 5 ++--- 11 files changed, 16 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index d993d722eacb..457f1a91c5b9 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -337,9 +337,10 @@ public FilePath[] getModuleRoots() { return culprits; } - @Override @Exported - @NonNull public Set getCulprits() { + @NonNull + @Override + public Set getCulprits() { return RunWithSCM.super.getCulprits(); } @@ -348,8 +349,8 @@ public boolean shouldCalculateCulprits() { return getCulpritIds() == null; } - @Override @NonNull + @Override public Set calculateCulprits() { Set c = RunWithSCM.super.calculateCulprits(); diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index 0c525dfabe84..9dea2e367e6e 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -756,8 +756,8 @@ public String getCaption() { return Messages.Computer_Caption(nodeName); } - @Override @NonNull + @Override public String getUrl() { return "computer/" + Util.fullEncode(getName()) + "/"; } @@ -966,8 +966,8 @@ public List getAllExecutors() { * {@inheritDoc} * @since 1.607 */ - @Override @NonNull + @Override public List getDisplayExecutors() { // The size may change while we are populating, but let's start with a reasonable guess to minimize resizing List result = new ArrayList<>(executors.size() + oneOffExecutors.size()); diff --git a/core/src/main/java/hudson/model/JobProperty.java b/core/src/main/java/hudson/model/JobProperty.java index c7444de3343a..b206c2c40e39 100644 --- a/core/src/main/java/hudson/model/JobProperty.java +++ b/core/src/main/java/hudson/model/JobProperty.java @@ -174,8 +174,8 @@ public final Action getProjectAction(AbstractProject project) { return getJobAction((J) project); } - @Override @NonNull + @Override public final Collection getProjectActions(AbstractProject project) { return getJobActions((J) project); } diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java index 53c51db9cc4b..46eff9cf18b9 100644 --- a/core/src/main/java/hudson/model/Label.java +++ b/core/src/main/java/hudson/model/Label.java @@ -145,8 +145,8 @@ public final String getName() { /** * Returns a human-readable text that represents this label. */ - @Override @NonNull + @Override public String getDisplayName() { return name; } diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java index 29653c0250f4..96937dcbc120 100644 --- a/core/src/main/java/hudson/model/ParameterDefinition.java +++ b/core/src/main/java/hudson/model/ParameterDefinition.java @@ -170,8 +170,8 @@ public String getFormattedDescription() { } } - @Override @NonNull + @Override public ParameterDescriptor getDescriptor() { return (ParameterDescriptor) Jenkins.get().getDescriptorOrDie(getClass()); } diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java index a9019e5a8f1f..47d0215bfc30 100644 --- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java +++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java @@ -239,8 +239,7 @@ public ParameterDefinition getParameterDefinition(String name) { return null; } - @Extension - @Symbol("parameters") + @Extension @Symbol("parameters") public static class DescriptorImpl extends OptionalJobPropertyDescriptor { @Override public ParametersDefinitionProperty newInstance(StaplerRequest2 req, JSONObject formData) throws FormException { diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 797cba56f394..ad36eec3a7f1 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -2173,8 +2173,8 @@ public int getIdLegacy() { private final long inQueueSince; - @Override @NonNull + @Override public Task getTask() { return task; } diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java index 588dbf70b40d..f6c6382f089a 100644 --- a/core/src/main/java/hudson/model/Slave.java +++ b/core/src/main/java/hudson/model/Slave.java @@ -510,8 +510,8 @@ public byte[] readFully() throws IOException { * If there is no computer it will return a {@link hudson.Launcher.DummyLauncher}, otherwise it * will return a {@link hudson.Launcher.RemoteLauncher} instead. */ - @Override @NonNull + @Override public Launcher createLauncher(TaskListener listener) { SlaveComputer c = getComputer(); if (c == null) { diff --git a/core/src/main/java/hudson/model/StringParameterDefinition.java b/core/src/main/java/hudson/model/StringParameterDefinition.java index 160e1b1a9c0c..745181b67f66 100644 --- a/core/src/main/java/hudson/model/StringParameterDefinition.java +++ b/core/src/main/java/hudson/model/StringParameterDefinition.java @@ -134,8 +134,8 @@ public StringParameterValue getDefaultParameterValue() { @Extension @Symbol({"string", "stringParam"}) public static class DescriptorImpl extends ParameterDescriptor { - @Override @NonNull + @Override public String getDisplayName() { return Messages.StringParameterDefinition_DisplayName(); } diff --git a/core/src/main/java/hudson/model/TimeZoneProperty.java b/core/src/main/java/hudson/model/TimeZoneProperty.java index 95956026a76e..31ac79b003aa 100644 --- a/core/src/main/java/hudson/model/TimeZoneProperty.java +++ b/core/src/main/java/hudson/model/TimeZoneProperty.java @@ -52,8 +52,7 @@ public String getTimeZoneName() { return timeZoneName; } - @Extension - @Symbol("timezone") + @Extension @Symbol("timezone") public static class DescriptorImpl extends UserPropertyDescriptor { @NonNull diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java index 685a80e540a9..c4252cecd170 100644 --- a/core/src/main/java/hudson/model/User.java +++ b/core/src/main/java/hudson/model/User.java @@ -918,8 +918,8 @@ public void doRssLatest(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExce RSS.rss(req, rsp, "Jenkins:" + getDisplayName() + " (latest builds)", getUrl(), RunList.fromRuns(lastBuilds), Run.FEED_ADAPTER_LATEST); } - @Override @NonNull + @Override public ACL getACL() { ACL base = Jenkins.get().getAuthorizationStrategy().getACL(this); // always allow a non-anonymous user full control of himself. @@ -1193,8 +1193,7 @@ public static String resolve(@NonNull String idOrFullName, @NonNull Map