Merge pull request #43 from Tapadoo/unique-issues-but-boring-java

Unique issues but boring java

Author: jasonconnery

CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 2023.1
+* changing version scheme, attempting a quick fix for repeated issues
+
+# 4.5.0
+* changing plugin name from slackNotifier to tpSlackNotifier incase it's causing conflicts with official one
+
 # 4.4.1
 * Added support for teamcity configuration parameter "system.SLACK_IGNORE_COMMIT_MESSAGE" to allow user to ignore adding commits to slack message.
 

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'java'
 
 
 sourceCompatibility = 1.8
-version = '4.4.1'
+version = '2023.1'
 println("##teamcity[buildNumber '$version']")
 
 configurations {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Sat Feb 24 18:44:46 GMT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -20,11 +20,13 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
 
+
 /**
  * Created by jasonconnery on 02/03/2014.
  */
@@ -273,7 +275,18 @@ else if( projectSettings != null && projectSettings.getChannel() != null && proj
             {
 
                 //We do!
-                Collection<Issue> issues = build.getRelatedIssues();
+                ArrayList<Issue> issues = new ArrayList<Issue>();
+
+                // Filter the isseues by id - NOTE: I tried fancier language features , but I had issues with syntax, sdk, and compiling
+                // so it was quicker to write a traditional, inefficient nested loop than it was to improve my java
+                for (Issue issue : build.getRelatedIssues()) {
+                    for (Issue existingIssue : issues) {
+                        if (existingIssue.getId().equalsIgnoreCase(issue.getId())) {
+                            break;
+                        }
+                    }   
+                    issues.add(issue);
+                }
 
                 StringBuilder issueIds = new StringBuilder();
                 StringBuilder clickableIssueIds = new StringBuilder();

src/main/java/com/tapadoo/slacknotifier/SlackServerAdapter.java

@@ -2,9 +2,9 @@
 <teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:shemas-jetbrains-com:teamcity-plugin-v1-xml">
     <info>
-        <name>slackNotifier</name> <!-- the name of plugin used in teamcity -->
-        <display-name>Slack Notifier</display-name>
-        <version>4.4.1</version>
+        <name>tpSlackNotifier</name> <!-- the name of plugin used in teamcity -->
+        <display-name>Tapadoo Slack Notifier</display-name>
+        <version>2023.1</version>
         <description>Post build success notifications to Slack</description>
         <vendor>
             <name>Tapadoo</name>