Add GiteaBuildNameProvider for 2025.07

Author: Turbocube644

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/gitea/GiteaBuildNameProvider.java

@@ -0,0 +1,6 @@
+package jetbrains.buildServer.commitPublisher.gitea;
+
+import jetbrains.buildServer.commitPublisher.BaseBuildNameProvider;
+
+public class GiteaBuildNameProvider extends BaseBuildNameProvider {
+}

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/gitea/GiteaPublisher.java

@@ -44,15 +44,18 @@ class GiteaPublisher extends HttpBasedCommitStatusPublisher<GiteaBuildStatus> {
   private static final GitRepositoryParser VCS_URL_PARSER = new GitRepositoryParser();
 
   @NotNull private final CommitStatusesCache<GiteaCommitStatus> myStatusesCache;
+  @NotNull private final GiteaBuildNameProvider myBuildNameProvider;
 
   GiteaPublisher(@NotNull CommitStatusPublisherSettings settings,
                  @NotNull SBuildType buildType, @NotNull String buildFeatureId,
                  @NotNull Map<String, String> params,
                  @NotNull CommitStatusPublisherProblems problems,
                  @NotNull WebLinks links,
-                 @NotNull CommitStatusesCache<GiteaCommitStatus> statusesCache) {
+                 @NotNull CommitStatusesCache<GiteaCommitStatus> statusesCache,
+                 @NotNull GiteaBuildNameProvider buildNameProvider) {
     super(settings, buildType, buildFeatureId, params, problems, links);
     myStatusesCache = statusesCache;
+    myBuildNameProvider = buildNameProvider;
   }
 
 
@@ -115,11 +118,6 @@ public boolean buildInterrupted(@NotNull SBuild build, @NotNull BuildRevision re
     return true;
   }
 
-  private String getBuildName(BuildPromotion promotion) {
-    SBuildType buildType = promotion.getBuildType();
-    return buildType != null ? buildType.getFullName() : promotion.getBuildTypeExternalId();
-  }
-
   @Override
   public RevisionStatus getRevisionStatus(@NotNull BuildPromotion buildPromotion, @NotNull BuildRevision revision) throws PublisherException {
     SBuildType buildType = buildPromotion.getBuildType();
@@ -164,7 +162,7 @@ RevisionStatus getRevisionStatus(@NotNull BuildPromotion buildPromotion, @Nullab
       return null;
     }
     Event event = getTriggeredEvent(commitStatus);
-    boolean isSameBuildType = StringUtil.areEqual(getBuildName(buildPromotion), commitStatus.context);
+    boolean isSameBuildType = StringUtil.areEqual(myBuildNameProvider.getBuildName(buildPromotion), commitStatus.context);
     return new RevisionStatus(event, commitStatus.description, isSameBuildType, getBuildIdFromViewUrl(commitStatus.target_url));
   }
 
@@ -221,7 +219,7 @@ private void publish(@NotNull SBuild build,
                        @NotNull BuildRevision revision,
                        @NotNull GiteaBuildStatus status,
                        @NotNull String description) throws PublisherException {
-    String buildName = getBuildName(build.getBuildPromotion());
+    String buildName = myBuildNameProvider.getBuildName(build.getBuildPromotion());
     String message = createMessage(status, buildName, revision, getViewUrl(build), description);
     publish(message, revision, LogUtil.describe(build));
     myStatusesCache.removeStatusFromCache(revision, buildName);
@@ -238,7 +236,7 @@ private void publish(@NotNull BuildPromotion buildPromotion,
       return;
     }
     String description = additionalTaskInfo.getComment();
-    String buildName = getBuildName(buildPromotion);
+    String buildName = myBuildNameProvider.getBuildName(buildPromotion);
     String message = createMessage(status, buildName, revision, url, description);
     publish(message, revision, LogUtil.describe(buildPromotion));
     myStatusesCache.removeStatusFromCache(revision, buildName);

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/gitea/GiteaSettings.java

@@ -21,6 +21,7 @@
 import jetbrains.buildServer.commitPublisher.gitea.data.GiteaCommitStatus;
 import jetbrains.buildServer.commitPublisher.gitea.data.GiteaRepoInfo;
 import jetbrains.buildServer.commitPublisher.gitea.data.GiteaUserInfo;
+import jetbrains.buildServer.commitPublisher.gitlab.GitLabBuildNameProvider;
 import jetbrains.buildServer.serverSide.*;
 import jetbrains.buildServer.util.ssl.SSLTrustStoreProvider;
 import jetbrains.buildServer.vcs.VcsRoot;
@@ -54,14 +55,17 @@ public class GiteaSettings extends BasePublisherSettings implements CommitStatus
     addAll(mySupportedEvents);
   }};
 
-  private final CommitStatusesCache<GiteaCommitStatus> myStatusesCache;
+  @NotNull private final CommitStatusesCache<GiteaCommitStatus> myStatusesCache;
+  @NotNull private final GiteaBuildNameProvider myBuildNameProvider;
 
   public GiteaSettings(@NotNull PluginDescriptor descriptor,
                        @NotNull WebLinks links,
                        @NotNull CommitStatusPublisherProblems problems,
-                       @NotNull SSLTrustStoreProvider trustStoreProvider) {
+                       @NotNull SSLTrustStoreProvider trustStoreProvider,
+                       @NotNull GiteaBuildNameProvider buildNameProvider) {
     super(descriptor, links, problems, trustStoreProvider);
     myStatusesCache = new CommitStatusesCache<>();
+    myBuildNameProvider = buildNameProvider;
   }
 
   @NotNull
@@ -85,7 +89,7 @@ public String getEditSettingsUrl() {
   @NotNull
   @Override
   public GiteaPublisher createPublisher(@NotNull SBuildType buildType, @NotNull String buildFeatureId, @NotNull Map<String, String> params) {
-    return new GiteaPublisher(this, buildType, buildFeatureId, params, myProblems, myLinks, myStatusesCache);
+    return new GiteaPublisher(this, buildType, buildFeatureId, params, myProblems, myLinks, myStatusesCache, myBuildNameProvider);
   }
 
   @Override

commit-status-publisher-server/src/main/resources/META-INF/build-server-plugin-voter.xml

@@ -43,6 +43,7 @@
   <bean class="jetbrains.buildServer.commitPublisher.gitlab.GitlabSettings"/>
   <bean class="jetbrains.buildServer.commitPublisher.gitlab.GitLabBuildNameProvider"/>
   <bean class="jetbrains.buildServer.commitPublisher.gitea.GiteaSettings"/>
+  <bean class="jetbrains.buildServer.commitPublisher.gitea.GiteaBuildNameProvider"/>
 
   <!-- github -->
   <bean class="jetbrains.buildServer.commitPublisher.github.ChangeStatusUpdater"/>

commit-status-publisher-server/src/test/java/jetbrains/buildServer/commitPublisher/gitea/GiteaBuildNameProviderTest.java

@@ -0,0 +1,27 @@
+package jetbrains.buildServer.commitPublisher.gitea;
+
+import jetbrains.buildServer.messages.Status;
+import jetbrains.buildServer.pipeline.PipelineProject;
+import jetbrains.buildServer.serverSide.SBuildType;
+import jetbrains.buildServer.serverSide.SFinishedBuild;
+import jetbrains.buildServer.serverSide.impl.BaseServerTestCase;
+import org.testng.annotations.Test;
+
+import static org.assertj.core.api.BDDAssertions.then;
+
+@Test
+public class GiteaBuildNameProviderTest extends BaseServerTestCase {
+
+  private final GiteaBuildNameProvider myProvider = new GiteaBuildNameProvider();
+
+  @Test
+  public void get_name_for_head() {
+    final String pipelineName = "Pipeline Project";
+    PipelineProject pipelineProject = myProject.createPipelineProject("extId", pipelineName, "name: name");
+    SBuildType pipelineHead = pipelineProject.getPipelineHead();
+    SFinishedBuild build = createBuild(pipelineHead, Status.NORMAL);
+    String buildName = myProvider.getBuildName(build.getBuildPromotion());
+
+    then(buildName).isEqualTo(String.format("%s / %s", myProject.getName(), pipelineName));
+  }
+}

commit-status-publisher-server/src/test/java/jetbrains/buildServer/commitPublisher/gitea/GiteaPublisherTest.java

@@ -48,6 +48,7 @@ public class GiteaPublisherTest extends HttpPublisherTest {
 
   private static final String GROUP_REPO = "group_repo";
   private final Map<String, List<GiteaCommitStatus>> myRevisionToStatuses = new HashMap<>();
+  private final GiteaBuildNameProvider myBuildNameProvider = new GiteaBuildNameProvider();
 
   public GiteaPublisherTest() {
     myExpectedRegExps.put(EventToTest.QUEUED, String.format(".*/repos/owner/project/statuses/%s.*ENTITY:.*pending.*%s.*", REVISION, DefaultStatusMessages.BUILD_QUEUED));
@@ -74,7 +75,7 @@ public void test_buildFinishedSuccessfully_server_url_with_subdir() throws Excep
     myVcsRoot.setProperties(Collections.singletonMap("url", "https://url.com/subdir/owner/project"));
     VcsRootInstance vcsRootInstance = myBuildType.getVcsRootInstanceForParent(myVcsRoot);
     myRevision = new BuildRevision(vcsRootInstance, REVISION, "", REVISION);
-    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks, new CommitStatusesCache<>());
+    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks, new CommitStatusesCache<>(), myBuildNameProvider);
     test_buildFinished_Successfully();
   }
 
@@ -85,7 +86,7 @@ public void test_buildFinishedSuccessfully_server_url_with_slash() throws Except
     myVcsRoot.setProperties(Collections.singletonMap("url", "https://url.com/subdir/owner/project"));
     VcsRootInstance vcsRootInstance = myBuildType.getVcsRootInstanceForParent(myVcsRoot);
     myRevision = new BuildRevision(vcsRootInstance, REVISION, "", REVISION);
-    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks, new CommitStatusesCache<>());
+    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks, new CommitStatusesCache<>(), myBuildNameProvider);
     test_buildFinished_Successfully();
   }
 
@@ -162,9 +163,9 @@ protected void setUp() throws Exception {
     setExpectedApiPath("/api/v1");
     setExpectedEndpointPrefix("/repos/" + OWNER + "/" + CORRECT_REPO);
     super.setUp();
-    myPublisherSettings = new GiteaSettings(new MockPluginDescriptor(), myWebLinks, myProblems, myTrustStoreProvider);
+    myPublisherSettings = new GiteaSettings(new MockPluginDescriptor(), myWebLinks, myProblems, myTrustStoreProvider, myBuildNameProvider);
     Map<String, String> params = getPublisherParams();
-    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks, new CommitStatusesCache<>());
+    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks, new CommitStatusesCache<>(), myBuildNameProvider);
     myBuildType.getProject().addParameter(new SimpleParameter("teamcity.commitStatusPublisher.publishQueuedBuildStatus", "true"));
   }