Merge branch 'main' of https://github.com/hkarthik7/azure-devops-java-sdk

Author: hkarthik7

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 6.0.4
+- Added support for Pull Request Iterations in **GitApi**.
+
 # 6.1.3
 
 - Added support for Pipeline permissions.

azd/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.hkarthik7</groupId>
     <artifactId>azd</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <packaging>jar</packaging>
 
     <name>azd</name>

azd/src/main/java/org/azd/abstractions/serializer/VersionControlChangeTypeDeserializer.java

@@ -0,0 +1,30 @@
+package org.azd.abstractions.serializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.azd.enums.VersionControlChangeType;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VersionControlChangeTypeDeserializer extends JsonDeserializer<List<VersionControlChangeType>> {
+
+    @Override
+    public List<VersionControlChangeType> deserialize(JsonParser p, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        String text = p.getText();
+        String[] parts = text.split(",");
+        List<VersionControlChangeType> types = new ArrayList<>();
+        for (String part : parts) {
+            try {
+                types.add(VersionControlChangeType.valueOf(part.trim().toUpperCase().replace(" ", "_")));
+            } catch (IllegalArgumentException e) {
+                // Unknown type, skip or log
+            }
+        }
+        return types;
+    }
+}

azd/src/main/java/org/azd/enums/VersionControlChangeType.java

@@ -7,10 +7,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * None
  **/
+@JsonFormat(shape = JsonFormat.Shape.STRING)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public enum VersionControlChangeType {
     @JsonProperty("add")

azd/src/main/java/org/azd/git/pullrequest/PullRequestBaseRequestBuilder.java

@@ -53,5 +53,14 @@ public PullRequestReviewersRequestBuilder reviewers() {
     public PullRequestStatusRequestBuilder statuses() {
         return new PullRequestStatusRequestBuilder(organizationUrl, accessTokenCredential);
     }
+
+    /**
+     * Provides functionality to manage Pull request iterations Api.
+     *
+     * @return PullRequestIterationsBuilder {@link PullRequestIterationsBuilder}
+     */
+    public PullRequestIterationsBuilder iterations() {
+        return new PullRequestIterationsBuilder(organizationUrl, accessTokenCredential);
+    }
 }
 

azd/src/main/java/org/azd/git/pullrequest/PullRequestIterationsBuilder.java

@@ -0,0 +1,51 @@
+package org.azd.git.pullrequest;
+
+import org.azd.abstractions.BaseRequestBuilder;
+import org.azd.authentication.AccessTokenCredential;
+import org.azd.common.ApiVersion;
+import org.azd.exceptions.AzDException;
+import org.azd.git.types.GitPullRequestIteration;
+import org.azd.git.types.GitPullRequestIterations;
+
+import java.util.concurrent.CompletableFuture;
+
+public class PullRequestIterationsBuilder extends BaseRequestBuilder {
+
+    public PullRequestIterationsBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) {
+        super(organizationUrl, accessTokenCredential, "git", "4e080c62-fa21-4fbc-8fef-2a10a2b38049", ApiVersion.GIT);
+    }
+
+    public CompletableFuture<GitPullRequestIteration> getAsync(String repositoryId, int pullRequestId, int iterationId) throws AzDException {
+        return builder()
+                .serviceEndpoint("repositoryId", repositoryId)
+                .serviceEndpoint("pullRequestId", pullRequestId)
+                .serviceEndpoint("iterationId", iterationId)
+                .build()
+                .executeAsync(GitPullRequestIteration.class);
+    }
+
+    public CompletableFuture<GitPullRequestIterations> listAsync(String repositoryId, int pullRequestId) throws AzDException {
+        return builder()
+                .serviceEndpoint("repositoryId", repositoryId)
+                .serviceEndpoint("pullRequestId", pullRequestId)
+                .build()
+                .executeAsync(GitPullRequestIterations.class);
+    }
+
+    public GitPullRequestIteration get(String repositoryId, int pullRequestId, int iterationId) throws AzDException {
+        return builder()
+                .serviceEndpoint("repositoryId", repositoryId)
+                .serviceEndpoint("pullRequestId", pullRequestId)
+                .serviceEndpoint("iterationId", iterationId)
+                .build()
+                .execute(GitPullRequestIteration.class);
+    }
+
+    public GitPullRequestIterations list(String repositoryId, int pullRequestId) throws AzDException {
+        return builder()
+                .serviceEndpoint("repositoryId", repositoryId)
+                .serviceEndpoint("pullRequestId", pullRequestId)
+                .build()
+                .execute(GitPullRequestIterations.class);
+    }
+}

azd/src/main/java/org/azd/git/types/GitChange.java

@@ -7,9 +7,13 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.azd.abstractions.serializer.SerializableEntity;
+import org.azd.abstractions.serializer.VersionControlChangeTypeDeserializer;
 import org.azd.enums.VersionControlChangeType;
 
+import java.util.List;
+
 /**
  * None
  **/
@@ -24,7 +28,8 @@ public class GitChange extends SerializableEntity {
      * The type of change that was made to the item.
      **/
     @JsonProperty("changeType")
-    private VersionControlChangeType changeType;
+    @JsonDeserialize(using = VersionControlChangeTypeDeserializer.class)
+    private List<VersionControlChangeType> changeType;
     /**
      * Current version.
      **/
@@ -64,12 +69,12 @@ public void setChangeId(Integer changeId) {
         this.changeId = changeId;
     }
 
-    public VersionControlChangeType getChangeType() {
+    public List<VersionControlChangeType> getChangeType() {
         return changeType;
     }
 
-    public void setChangeType(VersionControlChangeType changeType) {
-        this.changeType = changeType;
+    public void setChangeType(List<VersionControlChangeType> changeType) {
+        this.changeType = List.copyOf(changeType);
     }
 
     public GitItem getItem() {

azd/src/main/java/org/azd/git/types/GitPullRequestChange.java

@@ -0,0 +1,34 @@
+package org.azd.git.types;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.azd.abstractions.serializer.SerializableEntity;
+import org.azd.enums.VersionControlChangeType;
+
+public class GitPullRequestChange extends SerializableEntity {
+    @JsonProperty("changeId")
+    public int changeId;
+
+    @JsonProperty("changeTrackingId")
+    public int changeTrackingId;
+
+    @JsonProperty("changeType")
+    public VersionControlChangeType changeType;
+
+    @JsonProperty("item")
+    public String item;
+
+    @JsonProperty("newContent")
+    public ItemContent newContent;
+
+    @JsonProperty("newContentTemplate")
+    public GitTemplate newContentTemplate;
+
+    @JsonProperty("originalPath")
+    public String originalPath;
+
+    @JsonProperty("sourceServerItem")
+    public String sourceServerItem;
+
+    @JsonProperty("url")
+    public String url;
+}