From 85eedb7e88c38f0ae872f2f0a0c154162cf5c455 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed, 19 Feb 2025 16:11:24 +0000 Subject: [PATCH] Move to Item --- core/src/main/java/hudson/model/Item.java | 6 ++++++ core/src/main/java/hudson/model/Job.java | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/hudson/model/Item.java b/core/src/main/java/hudson/model/Item.java index 838f4e6f75a7..dd2fd993cb9e 100644 --- a/core/src/main/java/hudson/model/Item.java +++ b/core/src/main/java/hudson/model/Item.java @@ -39,6 +39,7 @@ import java.io.IOException; import java.util.Collection; import jenkins.model.Jenkins; +import jenkins.search.SearchGroup; import jenkins.util.SystemProperties; import jenkins.util.io.OnMaster; import org.kohsuke.stapler.StaplerRequest2; @@ -249,6 +250,11 @@ default void onCreatedFromScratch() { */ void delete() throws IOException, InterruptedException; + @Override + default SearchGroup getSearchGroup() { + return SearchGroup.get(SearchGroup.ItemSearchGroup.class); + } + PermissionGroup PERMISSIONS = new PermissionGroup(Item.class, Messages._Item_Permissions_Title()); Permission CREATE = new Permission( diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 0142c63d50ab..2392c66aee5f 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -100,7 +100,6 @@ import jenkins.model.RunIdMigrator; import jenkins.model.lazy.LazyBuildMixIn; import jenkins.scm.RunWithSCM; -import jenkins.search.SearchGroup; import jenkins.security.HexStringConfidentialKey; import jenkins.security.stapler.StaplerNotDispatchable; import jenkins.triggers.SCMTriggerItem; @@ -527,11 +526,6 @@ public String getSearchIcon() { return "symbol-status-" + this.getIconColor().getIconName(); } - @Override - public SearchGroup getSearchGroup() { - return SearchGroup.get(SearchGroup.ItemSearchGroup.class); - } - @Override protected SearchIndexBuilder makeSearchIndex() { return super.makeSearchIndex().add(new SearchIndex() {