Merge pull request #89 from TrimbleSolutionsCorporation/try-v8

support bitbucket 8

Author: jmecosta

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.trimble.tekla</groupId>
     <artifactId>TeamCityTriggerHook</artifactId>
-    <version>4.11.4</version>
+    <version>5.0.0</version>
 
     <organization>
         <name>Tekla</name>
@@ -128,7 +128,6 @@
                             <instanceId>bitbucket</instanceId>
                             <version>${bitbucket.version}</version>
                             <dataVersion>${bitbucket.data.version}</dataVersion>
-                            <enableFastdev>false</enableFastdev>
                             <enableDevToolbox>false</enableDevToolbox>
                             <enableQuickReload>true</enableQuickReload>
                             <dataHome>${bitbucket.home}</dataHome>
@@ -160,12 +159,13 @@
     </build>
 
     <properties>
-        <bitbucket.data.version>7.4.0</bitbucket.data.version>
-        <bitbucket.version>7.4.0</bitbucket.version>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+        <bitbucket.data.version>8.7.0</bitbucket.data.version>
+        <bitbucket.version>8.7.0</bitbucket.version>
         <quick.reload.version>2.0.0</quick.reload.version>
-        <amps.version>6.3.13</amps.version>
+        <amps.version>8.0.0</amps.version>
         <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
-        <atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
+        <atlassian.spring.scanner.version>2.2.2</atlassian.spring.scanner.version>
         <!-- This key is used to keep the consistency between the key in atlassian-plugin.xml and the key to generate bundle. -->
         <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
 

public

@@ -0,0 +1,86 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+EncZ
+=/56f
+-----END PGP PUBLIC KEY BLOCK-----

src/main/java/com/trimble/tekla/StringCommandOutputHandler.java

@@ -6,7 +6,36 @@
 package com.trimble.tekla;
 
 import com.atlassian.bitbucket.scm.CommandOutputHandler;
-import com.atlassian.utils.process.StringOutputHandler;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 
-public class StringCommandOutputHandler extends StringOutputHandler implements CommandOutputHandler<String> {
-}
+public class StringCommandOutputHandler implements CommandOutputHandler<String> {
+    private StringBuilder output = new StringBuilder();
+
+    @Override
+    public String getOutput() {
+        // Return the accumulated output
+        return output.toString();
+    }
+
+    @Override
+    public void setWatchdog(com.atlassian.bitbucket.scm.Watchdog wtchdg) {        
+    }
+
+    @Override
+    public void process(InputStream in) {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                // Process each line of the command output
+                // Do something with the output line, such as storing it in a variable
+                output.append(line).append("\n");
+            }
+        } catch (IOException e) {
+            // Handle any exceptions that occur during reading
+            e.printStackTrace();
+        }
+    }    
+}

src/main/java/com/trimble/tekla/TeamcityTriggerHook.java

@@ -25,6 +25,7 @@
 import com.atlassian.bitbucket.repository.Repository;
 import com.atlassian.bitbucket.repository.StandardRefType;
 import com.atlassian.bitbucket.scm.git.GitScm;
+import com.atlassian.bitbucket.scm.git.command.GitScmCommandBuilder;
 import com.atlassian.bitbucket.setting.Settings;
 import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 import com.trimble.tekla.helpers.ChangesetService;
@@ -41,16 +42,14 @@
  */
 public class TeamcityTriggerHook implements PostRepositoryHook<RepositoryHookRequest> {
   private final TeamcityConnector connector;
-  private final GitScm gitScm;
   private final CommitService scmService;
   private final TeamcityConnectionSettings connectionSettings;
+  
 
   @Inject
   public TeamcityTriggerHook(
-          @ComponentImport final GitScm gitScm,
           @ComponentImport final CommitService scmService,
           final TeamcityConnectionSettings connectionSettings) {
-    this.gitScm = gitScm;
     this.scmService = scmService;
     this.connectionSettings = connectionSettings;
     this.connector = new TeamcityConnector(new HttpConnector());
@@ -156,41 +155,7 @@ public void postUpdate(
    * @return true if specified {@link RefChange change} is a branch and last commit on it belongs to multiple branches
    */
   private boolean isEmptyBranch(final PostRepositoryHookContext context, final String timeStamp, final Repository repository, final RefChange change) {
-    boolean isEmptyBranch = false;
-    
-    final String fromChange = change.getFromHash();
-    if ("0000000000000000000000000000000000000000".equals(fromChange) && StandardRefType.BRANCH == change.getRef().getType()) {
-      try {
-        isEmptyBranch = runExternalGitCommandToDetectBranchData(context, timeStamp, repository, change, isEmptyBranch, fromChange);  
-      } catch (com.atlassian.bitbucket.ServerException e) {
-        // lets assume in all cases that the branch is not empty to avoid loosing triggers
-      }      
-    }
-
-    return isEmptyBranch;
-  }
-
-  private boolean runExternalGitCommandToDetectBranchData(final PostRepositoryHookContext context, final String timeStamp,
-      final Repository repository, final RefChange change, boolean isEmptyBranch, final String fromChange) {
-    final String result = this.gitScm.getCommandBuilderFactory().builder(repository)
-            .command("branch")
-            .argument("--contains")
-            .argument(change.getToHash())
-            .build(new StringCommandOutputHandler())              
-            .call();
-
-    TeamcityLogger.logMessage(context, repository.getName(),  "" + timeStamp + " git branch: --contains " + change.getToHash());
-    TeamcityLogger.logMessage(context, repository.getName(), "" + timeStamp + " git result: '" + result + "'");
-
-    final String[] branches = result.trim().split("\n");
-
-    if (branches.length > 1) {
-      TeamcityLogger.logMessage(context, repository.getName(), "" + timeStamp + " No commits in branch: " + change.getRef().getId());
-      TeamcityLogger.logMessage(context, repository.getName(), "" + timeStamp + " From Hash: " + fromChange);
-      TeamcityLogger.logMessage(context, repository.getName(), "" + timeStamp + " RefChange Type: " + change.getType());
-      isEmptyBranch = true;
-    }
-    
+    boolean isEmptyBranch = false;   
     return isEmptyBranch;
   }
 

src/main/java/com/trimble/tekla/teamcity/TeamcityConnector.java

@@ -126,7 +126,7 @@ public Boolean IsInQueue(TeamcityConfiguration conf, String buildConfig, String
     } 
 
     public String TestTeamcityConnection(TeamcityConfiguration conf, Settings settings, String repoName) {
-      String restpoint = "/app/rest/builds?locator=lookupLimit:1";
+      String restpoint = "/app/rest/server";
 
       try
       {

src/main/resources/helpers/pb-pr-trigger.js

@@ -32,7 +32,6 @@ define("teamcity/manual-build-pullrequest", [
 
   function buttonPluginFactory(pluginAPI, context) {
     var pullRequest = context.pullRequest;
-    console.log("buttonPluginFactory loaded");
 
     var hookUrl =
       getResourceUrl(context, "getHookEnabled") + "?prid=" + pullRequest.id;

src/main/resources/public/index.js

@@ -1,4 +1,3 @@
-console.log("issueCreation Loaded");
 
 var disableTrigger = false;
 var dialogLoaded = true;
@@ -45,7 +44,6 @@ function GetBuildInformation(buildId, htmlId, callback) {
     contentType: "application/json",
     dataType: "json",
     success: function (result) {
-      console.log(result);
       callback(result, htmlId);
     },
     error: function (result) {
@@ -703,5 +701,3 @@ $(document).ready(function () {
   dialogLoaded = true;
   ReloadData();
 });
-
-console.log("index.js script loaded");

src/main/resources/static/connection-tab.js

@@ -4,10 +4,9 @@
 require([
     'jquery',
     'bitbucket/util/events',
-    'bitbucket/util/navbuilder'
-], function ($, events, navBuilder) {
-    var testUrlNavBuilder = navBuilder.rest('teamcity').currentRepo().addPathComponents('testconnection');
-
+    'bitbucket/util/navbuilder',
+    'bitbucket/util/state'
+], function ($, events, navBuilder, pageState) {       
     /**
      * Trigger on dialog reload event "com.trimble.tekla.teamcity.hook.init"
      */
@@ -18,8 +17,17 @@ require([
         var $testTeamCityConnectionButton = $('#testTeamCityConnection');
         var $isDebugEnabled = $('#isDebugEnabled');
         var $testStatusDiv = $testTeamCityConnectionButton.next();
-        console.log("validate settings");
-
+        
+        var selectedProjectKey = pageState.getRepository()["project"]["key"];
+        var selectedRepositorySlug = pageState.getRepository()["slug"];
+                    
+        var testUrlNavBuilder = navBuilder.rest('teamcity')
+                .addPathComponents("projects")
+                .addPathComponents(selectedProjectKey)
+                .addPathComponents("repos")
+                .addPathComponents(selectedRepositorySlug)
+                .addPathComponents('testconnection');
+        
         /**
          * Connection validation button handler
          */
@@ -32,7 +40,7 @@ require([
                 password : $teamCityPasswordField.val(),
                 debugon : $isDebugEnabled[0].checked
             }).build();
-
+        
             $.ajax({
                 url : testUrl
             }).done(function(data) {

src/main/resources/static/hook-configuration-dialog.js

@@ -4,7 +4,6 @@
 require([
     'bitbucket/util/events'
 ], function (events) {
-
     /**
      * Trigger on dialog reload event "com.trimble.tekla.teamcity.hook.init"
      */

src/main/resources/static/repository-triggers-tab.js

@@ -32,7 +32,6 @@ require([
          * Initializes repository triggers table controller
          */
         init : function(triggers, errors) {
-            console.log("startup Config");
             if (triggers) {
                 this._triggers = JSON.parse(triggers);
             } else {
@@ -349,6 +348,7 @@ require([
      * Trigger on dialog reload event "com.trimble.tekla.teamcity.hook.init"
      */
     events.on('com.trimble.tekla.teamcity.hook.init', function() {
+        
         var $repositoryTriggersJson = $('#repositoryTriggersJson');
         Object.defineProperty($repositoryTriggersJson[0], 'value', {
             get : function() {