update gitea integration for 2022.04

Author: Turbocube644

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

@@ -38,15 +38,12 @@ class GiteaPublisher extends HttpBasedCommitStatusPublisher {
   private final Gson myGson = new Gson();
   private static final GitRepositoryParser VCS_URL_PARSER = new GitRepositoryParser();
 
-  private final WebLinks myLinks;
-
   GiteaPublisher(@NotNull CommitStatusPublisherSettings settings,
                  @NotNull SBuildType buildType, @NotNull String buildFeatureId,
-                 @NotNull WebLinks links,
                  @NotNull Map<String, String> params,
-                 @NotNull CommitStatusPublisherProblems problems) {
-    super(settings, buildType, buildFeatureId, params, problems);
-    myLinks = links;
+                 @NotNull CommitStatusPublisherProblems problems,
+                 @NotNull WebLinks links) {
+    super(settings, buildType, buildFeatureId, params, problems, links);
   }
 
 
@@ -71,7 +68,8 @@ public boolean buildQueued(@NotNull BuildPromotion buildPromotion, @NotNull Buil
 
   @Override
   public boolean buildRemovedFromQueue(@NotNull BuildPromotion buildPromotion, @NotNull BuildRevision revision, @NotNull AdditionalTaskInfo additionalTaskInfo) throws PublisherException {
-    publish(buildPromotion, revision, GiteaBuildStatus.PENDING, additionalTaskInfo);
+    GiteaBuildStatus targetStatus = additionalTaskInfo.isPromotionReplaced() ? GiteaBuildStatus.PENDING : GiteaBuildStatus.WARNING;
+    publish(buildPromotion, revision, targetStatus, additionalTaskInfo);
     return true;
   }
 
@@ -199,7 +197,9 @@ private void publish(@NotNull SBuild build,
                        @NotNull BuildRevision revision,
                        @NotNull GiteaBuildStatus status,
                        @NotNull String description) throws PublisherException {
-    String message = createMessage(status, build.getBuildTypeName(), revision, myLinks.getViewResultsUrl(build), description);
+    SBuildType buildType = build.getBuildType();
+    String buildName = buildType != null ? buildType.getFullName() : build.getBuildTypeExternalId();
+    String message = createMessage(status, buildName, revision, getViewUrl(build), description);
     publish(message, revision, LogUtil.describe(build));
   }
 
@@ -208,24 +208,13 @@ private void publish(@NotNull BuildPromotion buildPromotion,
                        @NotNull GiteaBuildStatus status,
                        @NotNull AdditionalTaskInfo additionalTaskInfo) throws PublisherException {
     String url = getViewUrl(buildPromotion);
-    String description = additionalTaskInfo.compileQueueRelatedMessage();
-    String message = createMessage(status, buildPromotion.getBuildType().getName(), revision, url, description);
+    String description = additionalTaskInfo.getComment();
+    SBuildType buildType = buildPromotion.getBuildType();
+    String buildName = buildType != null ? buildType.getFullName() : buildPromotion.getBuildTypeExternalId();
+    String message = createMessage(status, buildName, revision, url, description);
     publish(message, revision, LogUtil.describe(buildPromotion));
   }
 
-  private String getViewUrl(BuildPromotion buildPromotion) {
-    SBuild build = buildPromotion.getAssociatedBuild();
-    if (build != null) {
-      return myLinks.getViewResultsUrl(build);
-    }
-    SQueuedBuild queuedBuild = buildPromotion.getQueuedBuild();
-    if (queuedBuild != null) {
-      return myLinks.getQueuedBuildUrl(queuedBuild);
-    }
-    return buildPromotion.getBuildType() != null ? myLinks.getConfigurationHomePageUrl(buildPromotion.getBuildType()) :
-                                                   myLinks.getRootUrlByProjectExternalId(buildPromotion.getProjectExternalId());
-  }
-
   private void publish(@NotNull String message,
                        @NotNull BuildRevision revision,
                        @NotNull String buildDescription) throws PublisherException {
@@ -274,7 +263,7 @@ private String createMessage(@NotNull GiteaBuildStatus status,
                                @NotNull String url,
                                @NotNull String description) {
 
-    final Map<String, String> data = new LinkedHashMap<String, String>();
+    final Map<String, String> data = new LinkedHashMap<>();
     data.put("state", status.getName());
     data.put("context", name);
     data.put("description", description);

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

@@ -80,7 +80,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, myLinks, params, myProblems);
+    return new GiteaPublisher(this, buildType, buildFeatureId, params, myProblems, myLinks);
   }
 
   @Override
@@ -147,7 +147,7 @@ public String describeParameters(@NotNull Map<String, String> params) {
 
   @Nullable
   @Override
-  public PropertiesProcessor getParametersProcessor() {
+  public PropertiesProcessor getParametersProcessor(@NotNull BuildTypeIdentity buildTypeOrTemplate) {
     return new PropertiesProcessor() {
       public Collection<InvalidProperty> process(Map<String, String> params) {
         List<InvalidProperty> errors = new ArrayList<InvalidProperty>();

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

@@ -52,7 +52,7 @@ public class GiteaPublisherTest extends HttpPublisherTest {
 
   public GiteaPublisherTest() {
     myExpectedRegExps.put(EventToTest.QUEUED, String.format(".*/repos/owner/project/statuses/%s.*ENTITY:.*pending.*%s.*", REVISION, DefaultStatusMessages.BUILD_QUEUED));
-    myExpectedRegExps.put(EventToTest.REMOVED, String.format(".*/repos/owner/project/statuses/%s.*ENTITY:.*pending.*%s by %s.*%s.*", REVISION, DefaultStatusMessages.BUILD_REMOVED_FROM_QUEUE, USER.toLowerCase(), COMMENT));
+    myExpectedRegExps.put(EventToTest.REMOVED, String.format(".*/repos/owner/project/statuses/%s.*ENTITY:.*warning.*%s\".*", REVISION, DefaultStatusMessages.BUILD_REMOVED_FROM_QUEUE));
     myExpectedRegExps.put(EventToTest.STARTED, String.format(".*/repos/owner/project/statuses/%s.*ENTITY:.*pending.*%s.*", REVISION, DefaultStatusMessages.BUILD_STARTED));
     myExpectedRegExps.put(EventToTest.FINISHED, String.format(".*/repos/owner/project/statuses/%s.*ENTITY:.*success.*Success.*", REVISION));
     myExpectedRegExps.put(EventToTest.FAILED, String.format(".*/repos/owner/project/statuses/%s.*ENTITY:.*failure.*Failure.*", REVISION));
@@ -75,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, myWebLinks, params, myProblems);
+    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks);
     test_buildFinished_Successfully();
   }
 
@@ -86,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, myWebLinks, params, myProblems);
+    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks);
     test_buildFinished_Successfully();
   }
 
@@ -157,7 +157,7 @@ protected void setUp() throws Exception {
     super.setUp();
     myPublisherSettings = new GiteaSettings(new MockPluginDescriptor(), myWebLinks, myProblems, myTrustStoreProvider);
     Map<String, String> params = getPublisherParams();
-    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, myWebLinks, params, myProblems);
+    myPublisher = new GiteaPublisher(myPublisherSettings, myBuildType, FEATURE_ID, params, myProblems, myWebLinks);
     myBuildType.getProject().addParameter(new SimpleParameter("teamcity.commitStatusPublisher.publishQueuedBuildStatus", "true"));
   }