Merge branch 'master' into migrate_to_junit5_test_2

Author: strangelookingnerd

core/src/main/java/hudson/PluginManager.java

@@ -1557,6 +1557,10 @@ public HttpResponse doPluginsSearch(@QueryParameter String query, @QueryParamete
                         releaseTimestamp.put("displayValue", Messages.PluginManager_ago(Functions.getTimeSpanString(plugin.releaseTimestamp)));
                         jsonObject.put("releaseTimestamp", releaseTimestamp);
                     }
+                    if (plugin.healthScore != null) {
+                        jsonObject.put("healthScore", plugin.healthScore);
+                        jsonObject.put("healthScoreClass", plugin.healthScoreClass);
+                    }
                     return jsonObject;
                 })
                 .collect(toList());

core/src/main/java/hudson/PluginWrapper.java

@@ -222,6 +222,8 @@ public boolean hasDerivedDependencyErrors() {
      */
     private static Set<String> CORE_ONLY_DEPENDANT = Set.of("jenkins-core");
 
+    private Integer healthScore;
+
     /**
      * Set the list of components that depend on this plugin.
      * @param dependents The list of components that depend on this plugin.
@@ -423,6 +425,32 @@ public void injectJarsToClasspath(File... jars) throws Exception {
 
     }
 
+    @Restricted(NoExternalUse.class) // Jelly use only
+    public Integer getHealthScore() {
+        if (this.healthScore == null) {
+            this.healthScore = getInfoFromAllSites().stream()
+                    .filter(Objects::nonNull)
+                    .filter(p -> p.healthScore != null)
+                    .findFirst()
+                    .map(plugin -> plugin.healthScore)
+                    .orElse(null);
+        }
+        return this.healthScore;
+    }
+
+    @Restricted(NoExternalUse.class)
+    public static String getHealthScoreClassForScore(int score) {
+        if (score > 80) return "top";
+        if (score > 60) return "middle";
+        return "bottom";
+    }
+
+    @Restricted(NoExternalUse.class) // Jelly use only
+    public String getHealthScoreClass() {
+        if (this.healthScore == null) return null;
+        return getHealthScoreClassForScore(this.healthScore);
+    }
+
     @ExportedBean
     public static final class Dependency {
         @Exported

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

@@ -97,7 +97,6 @@
 import jenkins.model.ModelObjectWithChildren;
 import jenkins.model.PeepholePermalink;
 import jenkins.model.ProjectNamingStrategy;
-import jenkins.model.RunIdMigrator;
 import jenkins.model.lazy.LazyBuildMixIn;
 import jenkins.scm.RunWithSCM;
 import jenkins.security.HexStringConfidentialKey;
@@ -192,10 +191,6 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
     // this should have been DescribableList but now it's too late
     protected CopyOnWriteList<JobProperty<? super JobT>> properties = new CopyOnWriteList<>();
 
-    @Restricted(NoExternalUse.class)
-    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Preserve API compatibility")
-    public transient RunIdMigrator runIdMigrator;
-
     protected Job(ItemGroup parent, String name) {
         super(parent, name);
     }
@@ -206,20 +201,19 @@ public synchronized void save() throws IOException {
         holdOffBuildUntilSave = holdOffBuildUntilUserSave;
     }
 
-    @Override public void onCreatedFromScratch() {
-        super.onCreatedFromScratch();
-        runIdMigrator = new RunIdMigrator();
-        runIdMigrator.created(getBuildDir());
-    }
-
     @Override
     public void onLoad(ItemGroup<? extends Item> parent, String name)
             throws IOException {
         super.onLoad(parent, name);
 
-        File buildDir = getBuildDir();
-        runIdMigrator = new RunIdMigrator();
-        runIdMigrator.migrate(buildDir, Jenkins.get().getRootDir());
+        // see https://github.com/jenkinsci/jenkins/pull/10456#issuecomment-2748112449
+        // This code can be deleted after several Jenkins releases,
+        // when it is likely that everyone is running a version equal or higher to this version.
+        var buildDirPath = getBuildDir().toPath();
+        if (Files.deleteIfExists(buildDirPath.resolve("legacyIds"))) {
+            LOGGER.info("Deleting legacyIds file in " + buildDirPath + ". See https://issues.jenkins"
+                        + ".io/browse/JENKINS-75465 for more information.");
+        }
 
         TextFile f = getNextBuildNumberFile();
         if (f.exists()) {

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

@@ -45,10 +45,8 @@
 import java.util.SortedMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import jenkins.model.RunIdMigrator;
 import jenkins.model.lazy.AbstractLazyLoadRunMap;
 import jenkins.model.lazy.BuildReference;
-import jenkins.model.lazy.LazyBuildMixIn;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -72,10 +70,6 @@ public final class RunMap<R extends Run<?, R>> extends AbstractLazyLoadRunMap<R>
 
     private Constructor<R> cons;
 
-    /** Normally overwritten by {@link LazyBuildMixIn#onLoad} or {@link LazyBuildMixIn#onCreatedFromScratch}, in turn created during {@link Job#onLoad}. */
-    @Restricted(NoExternalUse.class)
-    public RunIdMigrator runIdMigrator = new RunIdMigrator();
-
     // TODO: before first complete build
     // patch up next/previous build link
 
@@ -156,7 +150,6 @@ public void remove() {
     @Override
     public boolean removeValue(R run) {
         run.dropLinks();
-        runIdMigrator.delete(dir, run.getId());
         return super.removeValue(run);
     }
 
@@ -227,14 +220,13 @@ public R put(R r) {
         return super._put(r);
     }
 
+    @CheckForNull
     @Override public R getById(String id) {
-        int n;
         try {
-            n = Integer.parseInt(id);
-        } catch (NumberFormatException x) {
-            n = runIdMigrator.findNumber(id);
+            return getByNumber(Integer.parseInt(id));
+        } catch (NumberFormatException e) { // see https://issues.jenkins.io/browse/JENKINS-75476
+            return null;
         }
-        return getByNumber(n);
     }
 
     /**

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

@@ -765,6 +765,20 @@ public String getDefaultBaseUrl() {
         return result;
     }
 
+    @Restricted(NoExternalUse.class)
+    public boolean isHealthScoresAvailable() {
+        for (UpdateSite site : sites) {
+            final Data data = site.getData();
+            if (data == null) {
+                continue;
+            }
+            if (data.healthScoresAvailable) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private boolean checkMinVersion(@CheckForNull Plugin p, @CheckForNull VersionNumber minVersion) {
         return p != null
                 && (minVersion == null || !minVersion.isNewerThan(new VersionNumber(p.version)));

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

@@ -611,6 +611,9 @@ public final class Data {
          */
         public final String connectionCheckUrl;
 
+        @Restricted(NoExternalUse.class)
+        public final boolean healthScoresAvailable;
+
         Data(JSONObject o) {
             this.sourceId = Util.intern((String) o.get("id"));
             JSONObject c = o.optJSONObject("core");
@@ -649,6 +652,8 @@ public final class Data {
                 }
             }
 
+            boolean healthScoresAvailable = false;
+
             for (Map.Entry<String, JSONObject> e : (Set<Map.Entry<String, JSONObject>>) o.getJSONObject("plugins").entrySet()) {
                 Plugin p = new Plugin(sourceId, e.getValue());
                 // JENKINS-33308 - include implied dependencies for older plugins that may need them
@@ -662,6 +667,10 @@ public final class Data {
                 }
                 plugins.put(Util.intern(e.getKey()), p);
 
+                if (p.healthScore != null) {
+                    healthScoresAvailable = true;
+                }
+
                 // compatibility with update sites that have no separate 'deprecated' top-level entry.
                 // Also do this even if there are deprecations to potentially allow limiting the top-level entry to overridden URLs.
                 if (p.hasCategory("deprecated")) {
@@ -671,6 +680,8 @@ public final class Data {
                 }
             }
 
+            this.healthScoresAvailable = healthScoresAvailable;
+
             connectionCheckUrl = (String) o.get("connectionCheckUrl");
         }
 
@@ -1256,6 +1267,12 @@ public final class Plugin extends Entry {
         @Restricted(NoExternalUse.class)
         public IssueTracker[] issueTrackers;
 
+        @Restricted(NoExternalUse.class)
+        public final Integer healthScore;
+
+        @Restricted(NoExternalUse.class)
+        public final String healthScoreClass;
+
         @DataBoundConstructor
         public Plugin(String sourceId, JSONObject o) {
             super(sourceId, o, UpdateSite.this.url);
@@ -1292,6 +1309,12 @@ public Plugin(String sourceId, JSONObject o) {
             int optionalDepCount = (int) ja.stream().filter(IS_DEP_PREDICATE.and(IS_NOT_OPTIONAL.negate())).count();
             dependencies = getPresizedMutableMap(depCount);
             optionalDependencies = getPresizedMutableMap(optionalDepCount);
+            this.healthScore = o.has("health") ? o.getInt("health") : null;
+            if (healthScore != null) {
+                this.healthScoreClass = PluginWrapper.getHealthScoreClassForScore(healthScore);
+            } else {
+                this.healthScoreClass = null;
+            }
 
             for (Object jo : o.getJSONArray("dependencies")) {
                 JSONObject depObj = (JSONObject) jo;