Skip to content

Commit b239645

Browse files
authored
[JENKINS-74898] Avoid un-necessary TransientActionFactory consults (SonarSource#306)
1 parent 6c81545 commit b239645

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

src/main/java/hudson/plugins/sonar/action/SonarBuildBadgeActionFactory.java

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
@Extension
3232
public class SonarBuildBadgeActionFactory extends TransientActionFactory<Run> {
3333

34+
@Override
35+
public Class<? extends Action> actionType() {
36+
return SonarBuildBadgeAction.class;
37+
}
38+
3439
@Override
3540
public Class<Run> type() {
3641
return Run.class;

src/main/java/hudson/plugins/sonar/action/SonarProjectActionFactory.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ public SonarProjectActionFactory() {
5151
resolver = new SQProjectResolver(new HttpClient(OkHttpClientSingleton.getInstance()));
5252
}
5353

54+
@Override
55+
public Class<? extends Action> actionType() {
56+
return ProminentProjectAction.class;
57+
}
58+
5459
@Override
5560
public Class<Job> type() {
5661
return Job.class;
@@ -66,7 +71,7 @@ public Collection<? extends Action> createFor(Job project) {
6671
Run<?, ?> lastBuild = project.getLastCompletedBuild();
6772

6873
if (lastBuild != null) {
69-
for (SonarAnalysisAction a : lastBuild.getActions(SonarAnalysisAction.class)) {
74+
for (SonarAnalysisAction a : SonarUtils.getPersistentActions(lastBuild, SonarAnalysisAction.class)) {
7075
if (a.getUrl() != null && !urls.contains(a.getUrl())) {
7176
urls.add(a.getUrl());
7277
sonarProjectActions.add(new SonarProjectIconAction(a));

src/test/java/hudson/plugins/sonar/action/SonarProjectActionFactoryTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private void mockProject(boolean markProject, SonarAnalysisAction... buildInfos)
133133
when(project.getLastCompletedBuild()).thenReturn(build);
134134

135135
if (markProject) {
136-
when(build.getActions(SonarAnalysisAction.class)).thenReturn(Arrays.asList(buildInfos));
136+
when(build.getActions()).thenReturn(Arrays.asList(buildInfos));
137137
when(project.getActions()).thenReturn(Collections.singletonList(new SonarMarkerAction()));
138138
}
139139
}

0 commit comments

Comments
 (0)