Unify @NonNull and @Override annotation position

core/src/main/java/hudson/model/AbstractBuild.java

@@ -337,9 +337,10 @@ public FilePath[] getModuleRoots() {
         return culprits;
     }
 
-    @Override
     @Exported
-    @NonNull public Set<User> getCulprits() {
+    @NonNull
+    @Override
+    public Set<User> getCulprits() {
         return RunWithSCM.super.getCulprits();
     }
 
@@ -348,8 +349,8 @@ public boolean shouldCalculateCulprits() {
         return getCulpritIds() == null;
     }
 
-    @Override
     @NonNull
+    @Override
     public Set<User> calculateCulprits() {
         Set<User> c = RunWithSCM.super.calculateCulprits();
 

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<Executor> getAllExecutors() {
      * {@inheritDoc}
      * @since 1.607
      */
-    @Override
     @NonNull
+    @Override
     public List<IDisplayExecutor> getDisplayExecutors() {
         // The size may change while we are populating, but let's start with a reasonable guess to minimize resizing
         List<IDisplayExecutor> result = new ArrayList<>(executors.size() + oneOffExecutors.size());

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<? extends Action> getProjectActions(AbstractProject<?, ?> project) {
         return getJobActions((J) project);
     }

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;
     }

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());
     }

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 {

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;
         }

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) {

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();
         }

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

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<String,
     /**
      * Resolve user ID from full name
      */
-    @Extension
-    @Symbol("fullName")
+    @Extension @Symbol("fullName")
     public static class FullNameIdResolver extends CanonicalIdResolver {
 
         @Override