API use restricted and simplified logic in Functions

core/src/main/java/hudson/Functions.java

@@ -130,7 +130,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.GlobalConfigurationCategory;
-import jenkins.model.GlobalConfigurationCategory.Unclassified;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithChildren;
 import jenkins.model.ModelObjectWithContextMenu;
@@ -965,14 +964,8 @@ public class Functions {
             Descriptor d = c.getInstance();
             if (d.getGlobalConfigPage()==null)  continue;
 
-            if (d instanceof GlobalConfiguration) {
-                if (predicate.apply((d.getCategory()))) {
-                    r.add(new Tag(c.ordinal(), d));
-                }
-            } else {
-                if (predicate.apply(d.getCategory())) {
-                    r.add(new Tag(0, d));
-                }
+            if (predicate.apply(d.getCategory())) {
+                r.add(new Tag(c.ordinal(), d));
             }
         }
         Collections.sort(r);

core/src/main/java/jenkins/tools/GlobalToolConfiguration.java

@@ -33,6 +33,9 @@ import hudson.util.FormApply;
 import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
+
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
@@ -42,6 +45,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 @Extension(ordinal = Integer.MAX_VALUE - 220)
+@Restricted(NoExternalUse.class)
 public class GlobalToolConfiguration extends ManagementLink {
 
     @Override

core/src/main/java/jenkins/tools/ToolConfigurationCategory.java

@@ -6,7 +6,7 @@ import jenkins.model.GlobalConfigurationCategory;
 /**
  * Global configuration of tool locations and installers.
  *
- * @since TODO
+ * @since 2.0
  */
 @Extension
 public class ToolConfigurationCategory extends GlobalConfigurationCategory {