fix critical parsing of json objects crashing in last version of bitb…

…ucket
TrimbleSolutionsCorporation · Oct 24, 2023 · f2c292c · f2c292c
1 parent 47a631a
commit f2c292c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.trimble.tekla</groupId>
     <artifactId>TeamCityTriggerHook</artifactId>
-    <version>5.0.0</version>
+    <version>5.0.1</version>
 
     <organization>
         <name>Tekla</name>

diff --git a/src/main/java/com/trimble/tekla/TeamcityPullrequestEventListener.java b/src/main/java/com/trimble/tekla/TeamcityPullrequestEventListener.java
@@ -24,7 +24,6 @@
 import com.atlassian.bitbucket.pull.PullRequestService;
 import com.atlassian.bitbucket.repository.Repository;
 import com.atlassian.bitbucket.setting.Settings;
-import com.atlassian.bitbucket.user.ApplicationUser;
 import com.atlassian.event.api.EventListener;
 import com.trimble.tekla.helpers.ChangesetService;
 import com.trimble.tekla.pojo.Trigger;
@@ -188,9 +187,9 @@ private void TriggerBuildFromPullRequest(final PullRequest pr, Boolean UpdatedRe
                 true);
 
         final JSONObject obj = new JSONObject(buildData);
-        final String count = obj.getString("count");
+        final Integer count = obj.getInt("count");
 
-        if (count.equals("0") || !buildConfig.isCancelRunningBuilds()) {
+        if (count == 0 || !buildConfig.isCancelRunningBuilds()) {
           this.connector.QueueBuild(
                   conf,
                   buildConfig.getBranchConfig(),
@@ -205,7 +204,7 @@ private void TriggerBuildFromPullRequest(final PullRequest pr, Boolean UpdatedRe
           final JSONArray builds = obj.getJSONArray("build");
           for (int i = 0; i < builds.length(); i++) {
             final String buildState = builds.getJSONObject(i).getString("state");
-            final String id = builds.getJSONObject(i).getString("id");
+            final String id = Integer.toString(builds.getJSONObject(i).getInt("id"));
             if (buildState.equals("running")) {
               this.connector.ReQueueBuild(conf, id, settings.get(), false, repo.getName());
             } else if (buildState.equals("queued")) {

diff --git a/src/main/java/com/trimble/tekla/TeamcityTriggerHook.java b/src/main/java/com/trimble/tekla/TeamcityTriggerHook.java
@@ -243,17 +243,18 @@ private void QueueBuild(
         // check if build is running
         final String buildData = this.connector.GetBuildsForBranch(conf, branch, buildIdIn, settings, repoName, true);
 
+        TeamcityLogger.logMessage(context, repoName, "Build Data Retrieved: " + buildData);
         try {       
           final JSONObject obj = new JSONObject(buildData);
-          final String count = obj.getString("count");
+          final Integer count = obj.getInt("count");
 
-          if (count.equals("0") || !cancelRunningBuilds) {
+          if (count == 0 || !cancelRunningBuilds) {
             this.connector.QueueBuild(conf, branch, buildIdIn, comment, isDefault, settings, repoName, null);
           } else {
             final JSONArray builds = obj.getJSONArray("build");
             for (int i = 0; i < builds.length(); i++) {
               final String buildState = builds.getJSONObject(i).getString("state");
-              final String id = builds.getJSONObject(i).getString("id");
+              final String id = Integer.toString(builds.getJSONObject(i).getInt("id"));
               if (buildState.equals("running")) {
                 this.connector.ReQueueBuild(conf, id, settings, false, repoName);
               } else if (buildState.equals("queued")) {

diff --git a/src/main/java/com/trimble/tekla/teamcity/TeamcityConnector.java b/src/main/java/com/trimble/tekla/teamcity/TeamcityConnector.java
@@ -100,7 +100,7 @@ public List<TeamcityQueuedElement> GetQueuedAndRunningBuilds(TeamcityConfigurati
                 }
 
                 String buildType = queued.getString("buildTypeId");
-                String id = queued.getString("id");
+                final String id = Integer.toString(queued.getInt("id"));
                 String webUrl = queued.getString("webUrl");
                 TeamcityQueuedElement queuedElement = new TeamcityQueuedElement();
                 queuedElement.setBranch(branchName);