diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0b0d422b..605928fe 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,6 +21,6 @@ jobs: with: java-version: '11' distribution: 'adopt' - cache: maven +# cache: maven - name: Build with Maven run: mvn -B package --file azd/pom.xml -DskipTests diff --git a/CHANGELOG.md b/CHANGELOG.md index 5af8e9d0..7f48811a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +# 6.0.3 + +- Fixes issues: + - Issue: [Can't get pipeline approvals when using DeploymentsRequestBuilder #84](https://github.com/hkarthik7/azure-devops-java-sdk/issues/84) + - Issue: [Wrong Api version in AzDServiceClient v6.0.2 #85](https://github.com/hkarthik7/azure-devops-java-sdk/issues/85) + # 6.0.2 - Added support for Test suites, results, points, cases and history APIs. diff --git a/README.md b/README.md index ce1045f2..fde9a0f1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://dev.azure.com/harishkarthic/azure-devops-java-sdk/_apis/build/status/hkarthik7.azure-devops-java-sdk?branchName=main)](https://dev.azure.com/harishkarthic/azure-devops-java-sdk/_build/latest?definitionId=8&branchName=main) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/hkarthik7/azure-devops-java-sdk/blob/main/LICENSE) [![Documentation Status](https://readthedocs.org/projects/azure-devops-java-sdk-docs/badge/?version=latest)](https://azure-devops-java-sdk-docs.readthedocs.io/en/latest/?badge=latest) -[![Maven Central](https://img.shields.io/maven-central/v/io.github.hkarthik7/azd.svg)](https://search.maven.org/artifact/io.github.hkarthik7/azd/6.0.2/jar) +[![Maven Central](https://img.shields.io/maven-central/v/io.github.hkarthik7/azd.svg)](https://search.maven.org/artifact/io.github.hkarthik7/azd/6.0.3/jar) **azd** library provides a convenient way to manage and interact with **Azure DevOps Services** REST API with ease. This SDK offers a set of APIs and utilities with declarative syntax and provide functionalities to the significant services. @@ -33,7 +33,7 @@ To download the library and use it in your project, just add below in your pom.x io.github.hkarthik7 azd - 6.0.2 + 6.0.3 ``` @@ -43,7 +43,7 @@ To download the library and use it in your project, just add below in your pom.x io.github.hkarthik7 azd - 6.0.2 + 6.0.3 javadoc ``` @@ -54,7 +54,7 @@ To download the library and use it in your project, just add below in your pom.x io.github.hkarthik7 azd - 6.0.2 + 6.0.3 sources ``` diff --git a/azd/pom.xml b/azd/pom.xml index 20480632..1cbcbad3 100644 --- a/azd/pom.xml +++ b/azd/pom.xml @@ -6,7 +6,7 @@ io.github.hkarthik7 azd - 6.0.2 + 6.0.3 jar azd diff --git a/azd/src/main/java/org/azd/build/artifacts/ArtifactsRequestBuilder.java b/azd/src/main/java/org/azd/build/artifacts/ArtifactsRequestBuilder.java index 0e83ee88..cc857cc0 100644 --- a/azd/src/main/java/org/azd/build/artifacts/ArtifactsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/artifacts/ArtifactsRequestBuilder.java @@ -5,6 +5,7 @@ import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.BuildArtifact; import org.azd.build.types.BuildArtifacts; +import org.azd.common.ApiVersion; import org.azd.enums.CustomHeader; import org.azd.exceptions.AzDException; import org.azd.http.ClientRequest; @@ -24,7 +25,7 @@ public class ArtifactsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ArtifactsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "1db06c96-014e-44e1-ac91-90b2d4b3e984"); + super(organizationUrl, accessTokenCredential, "build", "1db06c96-014e-44e1-ac91-90b2d4b3e984", ApiVersion.BUILD_ARTIFACTS); } /** diff --git a/azd/src/main/java/org/azd/build/attachments/AttachmentsRequestBuilder.java b/azd/src/main/java/org/azd/build/attachments/AttachmentsRequestBuilder.java index fe15259e..e0968411 100644 --- a/azd/src/main/java/org/azd/build/attachments/AttachmentsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/attachments/AttachmentsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.Attachments; +import org.azd.common.ApiVersion; import org.azd.enums.CustomHeader; import org.azd.exceptions.AzDException; @@ -47,6 +48,7 @@ public CompletableFuture getAsync(Consumer at .serviceEndpoint("type", params.type) .serviceEndpoint("name", params.attachmentName) .header(CustomHeader.STREAM_ACCEPT) + .apiVersion(ApiVersion.BUILD_ATTACHMENTS) .build() .executeStreamAsync(); } @@ -65,6 +67,7 @@ public CompletableFuture listAsync(int buildId, String type) throws .location("f2192269-89fa-4f94-baf6-8fb128c55159") .serviceEndpoint("buildId", buildId) .serviceEndpoint("type", type) + .apiVersion(ApiVersion.BUILD_ATTACHMENTS) .build() .executeAsync(Attachments.class); } @@ -91,6 +94,7 @@ public InputStream get(Consumer attachmentParameters) thro .serviceEndpoint("type", params.type) .serviceEndpoint("name", params.attachmentName) .header(CustomHeader.STREAM_ACCEPT) + .apiVersion(ApiVersion.BUILD_ATTACHMENTS) .build() .executeStream(); } @@ -109,6 +113,7 @@ public Attachments list(int buildId, String type) throws AzDException { .location("f2192269-89fa-4f94-baf6-8fb128c55159") .serviceEndpoint("buildId", buildId) .serviceEndpoint("type", type) + .apiVersion(ApiVersion.BUILD_ATTACHMENTS) .build() .execute(Attachments.class); } diff --git a/azd/src/main/java/org/azd/build/authorizedresources/AuthorizedResourcesRequestBuilder.java b/azd/src/main/java/org/azd/build/authorizedresources/AuthorizedResourcesRequestBuilder.java index 032252a5..2c63e1d5 100644 --- a/azd/src/main/java/org/azd/build/authorizedresources/AuthorizedResourcesRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/authorizedresources/AuthorizedResourcesRequestBuilder.java @@ -5,6 +5,7 @@ import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.DefinitionResourceReference; import org.azd.build.types.DefinitionResourceReferences; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import java.util.List; @@ -22,7 +23,7 @@ public class AuthorizedResourcesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public AuthorizedResourcesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "398c85bc-81aa-4822-947c-a194a05f0fef"); + super(organizationUrl, accessTokenCredential, "build", "398c85bc-81aa-4822-947c-a194a05f0fef", ApiVersion.BUILD_AUTHORIZED_RESOURCES); } /** diff --git a/azd/src/main/java/org/azd/build/builds/BuildLogsRequestBuilder.java b/azd/src/main/java/org/azd/build/builds/BuildLogsRequestBuilder.java index 650cc8c5..89d0358d 100644 --- a/azd/src/main/java/org/azd/build/builds/BuildLogsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/builds/BuildLogsRequestBuilder.java @@ -4,6 +4,7 @@ import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.BuildLogs; +import org.azd.common.ApiVersion; import org.azd.enums.CustomHeader; import org.azd.exceptions.AzDException; @@ -22,7 +23,7 @@ public class BuildLogsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public BuildLogsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "35a80daf-7f30-45fc-86e8-6b813d9c90df"); + super(organizationUrl, accessTokenCredential, "build", "35a80daf-7f30-45fc-86e8-6b813d9c90df", ApiVersion.BUILD_LOGS); } /** diff --git a/azd/src/main/java/org/azd/build/builds/BuildWorkItemsRequestBuilder.java b/azd/src/main/java/org/azd/build/builds/BuildWorkItemsRequestBuilder.java index 437191cc..ab1c87be 100644 --- a/azd/src/main/java/org/azd/build/builds/BuildWorkItemsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/builds/BuildWorkItemsRequestBuilder.java @@ -4,6 +4,7 @@ import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.BuildWorkItems; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import java.util.List; @@ -21,7 +22,7 @@ public class BuildWorkItemsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public BuildWorkItemsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "5a21f5d2-5642-47e4-a0bd-1356e6731bee"); + super(organizationUrl, accessTokenCredential, "build", "5a21f5d2-5642-47e4-a0bd-1356e6731bee", ApiVersion.BUILD_WORK_ITEMS); } /** diff --git a/azd/src/main/java/org/azd/build/builds/BuildsRequestBuilder.java b/azd/src/main/java/org/azd/build/builds/BuildsRequestBuilder.java index 7fce5c51..02651037 100644 --- a/azd/src/main/java/org/azd/build/builds/BuildsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/builds/BuildsRequestBuilder.java @@ -25,7 +25,7 @@ public class BuildsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public BuildsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "0cd358e1-9217-4d94-8269-1c1ee6f93dcf"); + super(organizationUrl, accessTokenCredential, "build", "0cd358e1-9217-4d94-8269-1c1ee6f93dcf", ApiVersion.BUILD); } diff --git a/azd/src/main/java/org/azd/build/controllers/ControllersRequestBuilder.java b/azd/src/main/java/org/azd/build/controllers/ControllersRequestBuilder.java index 24e372b8..f7d4d39b 100644 --- a/azd/src/main/java/org/azd/build/controllers/ControllersRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/controllers/ControllersRequestBuilder.java @@ -4,6 +4,7 @@ import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.BuildController; import org.azd.build.types.BuildControllers; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import java.util.concurrent.CompletableFuture; @@ -19,7 +20,7 @@ public class ControllersRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ControllersRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "fcac1932-2ee1-437f-9b6f-7f696be858f6"); + super(organizationUrl, accessTokenCredential, "build", "fcac1932-2ee1-437f-9b6f-7f696be858f6", ApiVersion.BUILD_CONTROLLERS); } /** diff --git a/azd/src/main/java/org/azd/build/definitions/DefinitionsRequestBuilder.java b/azd/src/main/java/org/azd/build/definitions/DefinitionsRequestBuilder.java index 2ad422e0..f11c58ba 100644 --- a/azd/src/main/java/org/azd/build/definitions/DefinitionsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/definitions/DefinitionsRequestBuilder.java @@ -6,6 +6,7 @@ import org.azd.build.types.BuildDefinition; import org.azd.build.types.BuildDefinitionRevisions; import org.azd.build.types.BuildDefinitions; +import org.azd.common.ApiVersion; import org.azd.enums.DefinitionQueryOrder; import org.azd.exceptions.AzDException; @@ -23,7 +24,7 @@ public class DefinitionsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public DefinitionsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "dbeaf647-6167-421a-bda9-c9327b25e2e6"); + super(organizationUrl, accessTokenCredential, "build", "dbeaf647-6167-421a-bda9-c9327b25e2e6", ApiVersion.BUILD_DEFINITIONS); } /** @@ -98,6 +99,7 @@ public CompletableFuture getRevisionsAsync(int definit return builder() .serviceEndpoint("definitionId", definitionId) .location("7c116775-52e5-453e-8c5d-914d9762d8c4") + .apiVersion(ApiVersion.BUILD_DEFINITION_REVISIONS) .build() .executeAsync(BuildDefinitionRevisions.class); } @@ -239,6 +241,7 @@ public BuildDefinitionRevisions getRevisions(int definitionId) throws AzDExcepti return builder() .serviceEndpoint("definitionId", definitionId) .location("7c116775-52e5-453e-8c5d-914d9762d8c4") + .apiVersion(ApiVersion.BUILD_DEFINITION_REVISIONS) .build() .execute(BuildDefinitionRevisions.class); } diff --git a/azd/src/main/java/org/azd/build/folders/FoldersRequestBuilder.java b/azd/src/main/java/org/azd/build/folders/FoldersRequestBuilder.java index 18c2e682..4ab0c705 100644 --- a/azd/src/main/java/org/azd/build/folders/FoldersRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/folders/FoldersRequestBuilder.java @@ -4,6 +4,7 @@ import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.Folder; import org.azd.build.types.Folders; +import org.azd.common.ApiVersion; import org.azd.enums.FolderQueryOrder; import org.azd.exceptions.AzDException; import org.azd.helpers.URLHelper; @@ -21,7 +22,7 @@ public class FoldersRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public FoldersRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "a906531b-d2da-4f55-bda7-f3e676cc50d9"); + super(organizationUrl, accessTokenCredential, "build", "a906531b-d2da-4f55-bda7-f3e676cc50d9", ApiVersion.BUILD_FOLDER); } /** diff --git a/azd/src/main/java/org/azd/build/sourceproviders/SourceProvidersRequestBuilder.java b/azd/src/main/java/org/azd/build/sourceproviders/SourceProvidersRequestBuilder.java index 9770ce26..1497704c 100644 --- a/azd/src/main/java/org/azd/build/sourceproviders/SourceProvidersRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/sourceproviders/SourceProvidersRequestBuilder.java @@ -4,6 +4,7 @@ import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.*; +import org.azd.common.ApiVersion; import org.azd.enums.SourceProviderResultSet; import org.azd.exceptions.AzDException; @@ -22,7 +23,7 @@ public class SourceProvidersRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public SourceProvidersRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build"); + super(organizationUrl, accessTokenCredential, "build", null, ApiVersion.BUILD_SOURCE_PROVIDERS); } /** diff --git a/azd/src/main/java/org/azd/build/stages/StagesRequestBuilder.java b/azd/src/main/java/org/azd/build/stages/StagesRequestBuilder.java index 2dbc0af0..636aae7f 100644 --- a/azd/src/main/java/org/azd/build/stages/StagesRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/stages/StagesRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.StageUpdateType; import org.azd.exceptions.AzDException; @@ -20,7 +21,7 @@ public class StagesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public StagesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "b8aac6c9-744b-46e1-88fc-3550969f9313"); + super(organizationUrl, accessTokenCredential, "build", "b8aac6c9-744b-46e1-88fc-3550969f9313", ApiVersion.BUILD_STAGE); } /** diff --git a/azd/src/main/java/org/azd/build/tags/BuildDefinitionTagsRequestBuilder.java b/azd/src/main/java/org/azd/build/tags/BuildDefinitionTagsRequestBuilder.java index dd61c9cf..25b19dcf 100644 --- a/azd/src/main/java/org/azd/build/tags/BuildDefinitionTagsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/tags/BuildDefinitionTagsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.BuildTags; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import java.util.List; @@ -20,7 +21,7 @@ public class BuildDefinitionTagsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public BuildDefinitionTagsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "cb894432-134a-4d31-a839-83beceaace4b"); + super(organizationUrl, accessTokenCredential, "build", "cb894432-134a-4d31-a839-83beceaace4b", ApiVersion.BUILD_TAGS); } /** diff --git a/azd/src/main/java/org/azd/build/tags/BuildTagsRequestBuilder.java b/azd/src/main/java/org/azd/build/tags/BuildTagsRequestBuilder.java index 61835eb5..4b12ee04 100644 --- a/azd/src/main/java/org/azd/build/tags/BuildTagsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/tags/BuildTagsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.BuildTags; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import java.util.List; @@ -20,7 +21,7 @@ public class BuildTagsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public BuildTagsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "6e6114b2-8161-44c8-8f6c-c5505782427f"); + super(organizationUrl, accessTokenCredential, "build", "6e6114b2-8161-44c8-8f6c-c5505782427f", ApiVersion.BUILD_TAGS); } /** diff --git a/azd/src/main/java/org/azd/build/tags/TagsRequestBuilder.java b/azd/src/main/java/org/azd/build/tags/TagsRequestBuilder.java index 3b1ce052..522c956f 100644 --- a/azd/src/main/java/org/azd/build/tags/TagsRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/tags/TagsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.BuildTags; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import java.util.concurrent.CompletableFuture; @@ -18,7 +19,7 @@ public class TagsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public TagsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "d84ac5c6-edc7-43d5-adc9-1b34be5dea09"); + super(organizationUrl, accessTokenCredential, "build", "d84ac5c6-edc7-43d5-adc9-1b34be5dea09", ApiVersion.BUILD_TAGS); } diff --git a/azd/src/main/java/org/azd/build/yaml/YamlRequestBuilder.java b/azd/src/main/java/org/azd/build/yaml/YamlRequestBuilder.java index f359daa0..3c698f80 100644 --- a/azd/src/main/java/org/azd/build/yaml/YamlRequestBuilder.java +++ b/azd/src/main/java/org/azd/build/yaml/YamlRequestBuilder.java @@ -4,6 +4,7 @@ import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; import org.azd.build.types.YamlBuild; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import java.util.concurrent.CompletableFuture; @@ -20,7 +21,7 @@ public class YamlRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public YamlRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "build", "7c3df3a1-7e51-4150-8cf7-540347f8697f"); + super(organizationUrl, accessTokenCredential, "build", "7c3df3a1-7e51-4150-8cf7-540347f8697f", ApiVersion.BUILD_YAML); } /** diff --git a/azd/src/main/java/org/azd/common/ApiVersion.java b/azd/src/main/java/org/azd/common/ApiVersion.java index 74db5fa0..5fce3b08 100644 --- a/azd/src/main/java/org/azd/common/ApiVersion.java +++ b/azd/src/main/java/org/azd/common/ApiVersion.java @@ -21,7 +21,7 @@ public abstract class ApiVersion { public static final String BUILD_SOURCE_PROVIDERS = "7.2-preview.1"; public static final String CORE = "7.2-preview.1"; public static final String DISTRIBUTED_TASK = "7.2-preview.1"; - public static final String EXTENSION_MANAGEMENT = "7.2-preview.1"; + public static final String EXTENSION_MANAGEMENT = "7.2-preview.2"; public static final String FEATURE_MANAGEMENT = "7.2-preview.1"; public static final String POLICY = "7.2-preview.1"; public static final String PROJECT = "7.2-preview.4"; @@ -30,28 +30,39 @@ public abstract class ApiVersion { public static final String PROJECT_TEAMS_MEMBERS = "7.2-preview.2"; public static final String PIPELINES = "7.2-preview.1"; public static final String FEEDS = "7.2-preview.1"; - public static final String GIT = "7.2-preview.1"; - public static final String GIT_PUSH = "7.2-preview.2"; + public static final String GIT = "7.2-preview.2"; + public static final String GIT_WORK_ITEMS = "7.2-preview.1"; + public static final String GIT_RECYCLE_BIN_REPOSITORIES = "7.2-preview.1"; + public static final String GIT_PULL_REQUEST_LABELS = "7.2-preview.1"; + public static final String GIT_ITEMS = "7.2-preview.1"; + public static final String GIT_FORK = "7.2-preview.1"; + public static final String GIT_COMMIT_CHANGES = "7.2-preview.1"; + public static final String GIT_BLOBS = "7.2-preview.1"; + public static final String GIT_ANNOTATED_TAGS = "7.2-preview.1"; + public static final String GIT_PULL_REQUEST_REVIEWERS = "7.2-preview.1"; + public static final String GIT_PUSH = "7.2-preview.3"; public static final String GRAPH = "7.2-preview.1"; public static final String MEMBERSHIP_ENTITLEMENT_MANAGEMENT = "7.2-preview.1"; + public static final String MEMBERSHIP_ENTITLEMENT_MANAGEMENT_MEMBERS = "7.2-preview.2"; public static final String PROFILE = "7.2-preview.3"; - public static final String USER_ENTITLEMENTS = "7.2-preview.3"; + public static final String USER_ENTITLEMENTS = "7.2-preview.5"; + public static final String USER_ENTITLEMENT_SUMMARY = "7.2-preview.2"; public static final String RELEASE = "7.2-preview.3"; public static final String RELEASE_LOGS = "7.2-preview.2"; public static final String RELEASE_FOLDERS = "7.2-preview.2"; - public static final String RELEASES = "7.2-preview.8"; + public static final String RELEASES = "7.2-preview.9"; public static final String RELEASE_GATES = "7.2-preview.1"; - public static final String RELEASE_ENVIRONMENT = "7.2-preview.7"; + public static final String RELEASE_ENVIRONMENT = "7.2-preview.8"; public static final String RELEASE_DEFINITION = "7.2-preview.4"; public static final String RELEASE_DEPLOYMENTS = "7.2-preview.2"; public static final String RELEASE_DEFINITION_HISTORY = "7.2-preview.1"; - public static final String RELEASE_MANUAL_INTERVENTION = "7.2-preview.1"; - public static final String SEARCH_MEMBER_ENTITLEMENTS = "7.2-preview.2"; + public static final String RELEASE_MANUAL_INTERVENTION = "7.2-preview.2"; + public static final String SEARCH_MEMBER_ENTITLEMENTS = "7.2-preview.3"; public static final String IDENTITY = "7.2-preview.1"; public static final String SECURITY = "7.2-preview.1"; public static final String SERVICE_ENDPOINTS = "7.2-preview.4"; public static final String SERVICE_HOOKS = "7.2-preview.1"; - public static final String TEST_ATTACHMENTS = "7.2"; + public static final String TEST_ATTACHMENTS = "7.2-preview.1"; public static final String TEST_RUNS = "7.2-preview.3"; public static final String TEST_ITERATIONS = "7.2-preview.3"; public static final String TEST_CODE_COVERAGE = "7.2-preview.1"; @@ -68,12 +79,18 @@ public abstract class ApiVersion { public static final String WORK = "7.2-preview.1"; public static final String WORK_CAPACITY = "7.2-preview.3"; public static final String WORK_ITEM_MIGRATE = "7.2-preview.1"; + public static final String WORK_ITEM_TAGS = "7.2-preview.1"; public static final String WORK_ITEM_TRACKING = "7.2-preview.3"; public static final String WIT_QUERY_BATCH = "7.2-preview.1"; public static final String WIT_WIQL = "7.2-preview.2"; public static final String WIT_RECYCLE_BIN = "7.2-preview.2"; public static final String WORK_ITEM_TYPES = "7.2-preview.2"; - public static final String WORK_ITEM_ATTACHMENT = "7.2-preview.3"; + public static final String WORK_ITEM_TYPES_FIELD = "7.2-preview.3"; + public static final String WORK_ITEM_QUERIES = "7.2-preview.2"; + public static final String WORK_ITEM_QUERIES_BATCH = "7.2-preview.1"; + public static final String WORK_ITEM_WIQL = "7.2-preview.2"; + public static final String WORK_ITEM_CLASSIFICATION_NODES = "7.2-preview.2"; + public static final String WORK_ITEM_ATTACHMENT = "7.2-preview.4"; public static final String MAVEN = "7.2-preview.1"; public static final String UPACK = "7.2-preview.1"; } diff --git a/azd/src/main/java/org/azd/core/processes/ProcessesRequestBuilder.java b/azd/src/main/java/org/azd/core/processes/ProcessesRequestBuilder.java index 27918325..a828b6e8 100644 --- a/azd/src/main/java/org/azd/core/processes/ProcessesRequestBuilder.java +++ b/azd/src/main/java/org/azd/core/processes/ProcessesRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.core.types.Process; import org.azd.core.types.Processes; import org.azd.exceptions.AzDException; @@ -19,7 +20,7 @@ public class ProcessesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ProcessesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "core", "93878975-88c5-4e6a-8abb-7ddd77a8a7d8"); + super(organizationUrl, accessTokenCredential, "core", "93878975-88c5-4e6a-8abb-7ddd77a8a7d8", ApiVersion.CORE); } /** diff --git a/azd/src/main/java/org/azd/core/projects/ProjectsRequestBuilder.java b/azd/src/main/java/org/azd/core/projects/ProjectsRequestBuilder.java index c93a02e9..dd381e81 100644 --- a/azd/src/main/java/org/azd/core/projects/ProjectsRequestBuilder.java +++ b/azd/src/main/java/org/azd/core/projects/ProjectsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.core.types.OperationReference; import org.azd.core.types.Project; import org.azd.core.types.ProjectCreationParameters; @@ -27,7 +28,7 @@ public class ProjectsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ProjectsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "core", "603fe2ac-9723-48b9-88ad-09305aa6c6e1"); + super(organizationUrl, accessTokenCredential, "core", "603fe2ac-9723-48b9-88ad-09305aa6c6e1", ApiVersion.PROJECT); } diff --git a/azd/src/main/java/org/azd/core/projects/PropertiesRequestBuilder.java b/azd/src/main/java/org/azd/core/projects/PropertiesRequestBuilder.java index ed1cf13e..faf29972 100644 --- a/azd/src/main/java/org/azd/core/projects/PropertiesRequestBuilder.java +++ b/azd/src/main/java/org/azd/core/projects/PropertiesRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.common.types.JsonPatchDocument; import org.azd.core.types.ProjectProperties; import org.azd.enums.CustomHeader; @@ -21,7 +22,7 @@ public class PropertiesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public PropertiesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "core", "4976a71a-4487-49aa-8aab-a1eda469037a"); + super(organizationUrl, accessTokenCredential, "core", "4976a71a-4487-49aa-8aab-a1eda469037a", ApiVersion.PROJECT_PROPERTIES); } /** diff --git a/azd/src/main/java/org/azd/core/teams/TeamsMembersRequestBuilder.java b/azd/src/main/java/org/azd/core/teams/TeamsMembersRequestBuilder.java index 5513f26d..927876c3 100644 --- a/azd/src/main/java/org/azd/core/teams/TeamsMembersRequestBuilder.java +++ b/azd/src/main/java/org/azd/core/teams/TeamsMembersRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.core.types.TeamMembers; import org.azd.exceptions.AzDException; @@ -20,7 +21,7 @@ public class TeamsMembersRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public TeamsMembersRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "core", "294c494c-2600-4d7e-b76c-3dd50c3c95be"); + super(organizationUrl, accessTokenCredential, "core", "294c494c-2600-4d7e-b76c-3dd50c3c95be", ApiVersion.PROJECT_TEAMS_MEMBERS); } /** diff --git a/azd/src/main/java/org/azd/core/teams/TeamsRequestBuilder.java b/azd/src/main/java/org/azd/core/teams/TeamsRequestBuilder.java index aca3df23..e145cbf8 100644 --- a/azd/src/main/java/org/azd/core/teams/TeamsRequestBuilder.java +++ b/azd/src/main/java/org/azd/core/teams/TeamsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.core.types.WebApiTeam; import org.azd.core.types.WebApiTeams; import org.azd.exceptions.AzDException; @@ -19,7 +20,7 @@ public class TeamsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public TeamsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "core", "d30a3dd1-f8ba-442a-b86a-bd0c0c383e59"); + super(organizationUrl, accessTokenCredential, "core", "d30a3dd1-f8ba-442a-b86a-bd0c0c383e59", ApiVersion.PROJECT_TEAMS); } diff --git a/azd/src/main/java/org/azd/distributedtask/agents/AgentsRequestBuilder.java b/azd/src/main/java/org/azd/distributedtask/agents/AgentsRequestBuilder.java index b7676616..9c29376d 100644 --- a/azd/src/main/java/org/azd/distributedtask/agents/AgentsRequestBuilder.java +++ b/azd/src/main/java/org/azd/distributedtask/agents/AgentsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.distributedtask.types.TaskAgent; import org.azd.distributedtask.types.TaskAgents; import org.azd.exceptions.AzDException; @@ -21,7 +22,7 @@ public class AgentsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public AgentsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "distributedtask", "e298ef32-5878-4cab-993c-043836571f42"); + super(organizationUrl, accessTokenCredential, "distributedtask", "e298ef32-5878-4cab-993c-043836571f42", ApiVersion.DISTRIBUTED_TASK); } /** diff --git a/azd/src/main/java/org/azd/distributedtask/deploymentgroups/DeploymentGroupsRequestBuilder.java b/azd/src/main/java/org/azd/distributedtask/deploymentgroups/DeploymentGroupsRequestBuilder.java index c5526887..2f17f03f 100644 --- a/azd/src/main/java/org/azd/distributedtask/deploymentgroups/DeploymentGroupsRequestBuilder.java +++ b/azd/src/main/java/org/azd/distributedtask/deploymentgroups/DeploymentGroupsRequestBuilder.java @@ -5,6 +5,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.distributedtask.types.DeploymentGroup; import org.azd.distributedtask.types.DeploymentGroups; import org.azd.enums.DeploymentGroupActionFilter; @@ -26,7 +27,7 @@ public class DeploymentGroupsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public DeploymentGroupsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "distributedtask", "083c4d89-ab35-45af-aa11-7cf66895c53e"); + super(organizationUrl, accessTokenCredential, "distributedtask", "083c4d89-ab35-45af-aa11-7cf66895c53e", ApiVersion.DISTRIBUTED_TASK); } /** diff --git a/azd/src/main/java/org/azd/distributedtask/environments/EnvironmentsRequestBuilder.java b/azd/src/main/java/org/azd/distributedtask/environments/EnvironmentsRequestBuilder.java index 78b45f43..99ff5ae1 100644 --- a/azd/src/main/java/org/azd/distributedtask/environments/EnvironmentsRequestBuilder.java +++ b/azd/src/main/java/org/azd/distributedtask/environments/EnvironmentsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.distributedtask.types.EnvironmentInstance; import org.azd.distributedtask.types.EnvironmentInstances; import org.azd.enums.EnvironmentExpands; @@ -23,7 +24,7 @@ public class EnvironmentsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public EnvironmentsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "distributedtask", "8572b1fc-2482-47fa-8f74-7e3ed53ee54b"); + super(organizationUrl, accessTokenCredential, "distributedtask", "8572b1fc-2482-47fa-8f74-7e3ed53ee54b", ApiVersion.DISTRIBUTED_TASK); } /** diff --git a/azd/src/main/java/org/azd/distributedtask/variablegroups/VariableGroupsRequestBuilder.java b/azd/src/main/java/org/azd/distributedtask/variablegroups/VariableGroupsRequestBuilder.java index 1fd8c126..6a931036 100644 --- a/azd/src/main/java/org/azd/distributedtask/variablegroups/VariableGroupsRequestBuilder.java +++ b/azd/src/main/java/org/azd/distributedtask/variablegroups/VariableGroupsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.distributedtask.types.VariableGroup; import org.azd.distributedtask.types.VariableGroupLibrary; import org.azd.distributedtask.types.VariableGroupProjectReference; @@ -29,7 +30,7 @@ public class VariableGroupsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public VariableGroupsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "distributedtask", "ef5b7057-ffc3-4c77-bbad-c10b4a4abcc7"); + super(organizationUrl, accessTokenCredential, "distributedtask", "ef5b7057-ffc3-4c77-bbad-c10b4a4abcc7", ApiVersion.VARIABLE_GROUPS); } /** diff --git a/azd/src/main/java/org/azd/extensionmanagement/ExtensionManagementRequestBuilder.java b/azd/src/main/java/org/azd/extensionmanagement/ExtensionManagementRequestBuilder.java index 9bca0738..2c0db0bc 100644 --- a/azd/src/main/java/org/azd/extensionmanagement/ExtensionManagementRequestBuilder.java +++ b/azd/src/main/java/org/azd/extensionmanagement/ExtensionManagementRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import org.azd.extensionmanagement.types.*; import org.azd.helpers.URLHelper; @@ -23,7 +24,7 @@ public class ExtensionManagementRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ExtensionManagementRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "extensionmanagement", "fb0da285-f23e-4b56-8b53-3ef5f9f6de66"); + super(organizationUrl, accessTokenCredential, "extensionmanagement", "fb0da285-f23e-4b56-8b53-3ef5f9f6de66", ApiVersion.EXTENSION_MANAGEMENT); } /** diff --git a/azd/src/main/java/org/azd/git/GitApi.java b/azd/src/main/java/org/azd/git/GitApi.java index daad69f4..dc411c62 100644 --- a/azd/src/main/java/org/azd/git/GitApi.java +++ b/azd/src/main/java/org/azd/git/GitApi.java @@ -90,7 +90,7 @@ public Void deleteRepository(String repositoryId) throws AzDException { public Void deleteRepositoryFromRecycleBin(String repositoryId) throws AzDException { try { String r = send(RequestMethod.DELETE, CONNECTION, GIT, CONNECTION.getProject(), - AREA + "/recycleBin/repositories", repositoryId, null, ApiVersion.GIT, null, null, null); + AREA + "/recycleBin/repositories", repositoryId, null, ApiVersion.GIT_RECYCLE_BIN_REPOSITORIES, null, null, null); if (!r.isEmpty()) MAPPER.mapJsonResponse(r, Map.class); } catch (AzDException e) { throw e; @@ -107,7 +107,7 @@ public Void deleteRepositoryFromRecycleBin(String repositoryId) throws AzDExcept @Override public GitDeletedRepositories getDeletedRepositories() throws AzDException { String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA, null, "deletedrepositories", - ApiVersion.GIT, null, null, null); + ApiVersion.GIT_RECYCLE_BIN_REPOSITORIES, null, null, null); return MAPPER.mapJsonResponse(r, GitDeletedRepositories.class); } @@ -121,7 +121,8 @@ public GitDeletedRepositories getDeletedRepositories() throws AzDException { @Override public GitDeletedRepositories getRecycleBinRepositories() throws AzDException { String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA, null, - "recycleBin/repositories", ApiVersion.GIT, null, null, null); + "recycleBin/repositories", ApiVersion.GIT_RECYCLE_BIN_REPOSITORIES + , null, null, null); return MAPPER.mapJsonResponse(r, GitDeletedRepositories.class); } @@ -226,7 +227,7 @@ public GitRepository restoreRepositoryFromRecycleBin(String repositoryId, boolea }}; String r = send(RequestMethod.PATCH, CONNECTION, GIT, CONNECTION.getProject(), - AREA + "/recycleBin/repositories", repositoryId, null, ApiVersion.GIT, null, h, null); + AREA + "/recycleBin/repositories", repositoryId, null, ApiVersion.GIT_RECYCLE_BIN_REPOSITORIES, null, h, null); return MAPPER.mapJsonResponse(r, GitRepository.class); } @@ -745,7 +746,7 @@ public GitRef updateBranchLock(String repositoryName, String branchName, boolean @Override public ResourceRefs getPullRequestWorkItems(int pullRequestId, String repositoryName) throws AzDException { String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, "pullRequests/" + pullRequestId + "/workitems", ApiVersion.GIT, null, null, null); + repositoryName, "pullRequests/" + pullRequestId + "/workitems", ApiVersion.GIT_WORK_ITEMS, null, null, null); return MAPPER.mapJsonResponse(r, ResourceRefs.class); } @@ -768,7 +769,7 @@ public WebApiTagDefinition createPullRequestLabel(String repositoryName, int pul }}; String r = send(RequestMethod.POST, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, "pullrequests/" + pullRequestId + "/labels", ApiVersion.GIT, null, b, CustomHeader.JSON_CONTENT_TYPE); + repositoryName, "pullrequests/" + pullRequestId + "/labels", ApiVersion.GIT_PULL_REQUEST_LABELS, null, b, CustomHeader.JSON_CONTENT_TYPE); return MAPPER.mapJsonResponse(r, WebApiTagDefinition.class); } @@ -786,7 +787,7 @@ public Void deletePullRequestLabel(String repositoryName, int pullRequestId, Str try { String resource = "pullrequests/" + pullRequestId + "/labels/" + labelName; String r = send(RequestMethod.DELETE, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, resource, ApiVersion.GIT, null, null, null); + repositoryName, resource, ApiVersion.GIT_PULL_REQUEST_LABELS, null, null, null); if (!r.isEmpty()) MAPPER.mapJsonResponse(r, Map.class); } catch (AzDException e) { throw e; @@ -808,7 +809,7 @@ public WebApiTagDefinition getPullRequestLabel(String repositoryName, int pullRe throws AzDException { String resource = "pullrequests/" + pullRequestId + "/labels/" + labelName; String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, resource, ApiVersion.GIT, null, null, null); + repositoryName, resource, ApiVersion.GIT_PULL_REQUEST_LABELS, null, null, null); return MAPPER.mapJsonResponse(r, WebApiTagDefinition.class); } @@ -825,7 +826,7 @@ public WebApiTagDefinition getPullRequestLabel(String repositoryName, int pullRe public WebApiTagDefinitions getPullRequestLabels(String repositoryName, int pullRequestId) throws AzDException { String resource = "pullrequests/" + pullRequestId + "/labels"; String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, resource, ApiVersion.GIT, null, null, null); + repositoryName, resource, ApiVersion.GIT_PULL_REQUEST_LABELS, null, null, null); return MAPPER.mapJsonResponse(r, WebApiTagDefinitions.class); } @@ -853,7 +854,7 @@ public IdentityRefWithVote createPullRequestReviewer(int pullRequestId, String r String id = repositoryName + "/pullrequests/" + pullRequestId + "/reviewers/" + reviewerId; String r = send(RequestMethod.PUT, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", id, null, - ApiVersion.GIT, null, b, CustomHeader.JSON_CONTENT_TYPE); + ApiVersion.GIT_PULL_REQUEST_REVIEWERS, null, b, CustomHeader.JSON_CONTENT_TYPE); return MAPPER.mapJsonResponse(r, IdentityRefWithVote.class); } @@ -873,7 +874,7 @@ public Void deletePullRequestReviewer(int pullRequestId, String repositoryName, String id = repositoryName + "/pullrequests/" + pullRequestId + "/reviewers/" + reviewerId; String r = send(RequestMethod.DELETE, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", id, - null, ApiVersion.GIT, null, null, null); + null, ApiVersion.GIT_PULL_REQUEST_REVIEWERS, null, null, null); if (!r.isEmpty()) MAPPER.mapJsonResponse(r, Map.class); } catch (AzDException e) { throw e; @@ -896,7 +897,7 @@ public IdentityRefWithVote getPullRequestReviewer(int pullRequestId, String repo String id = repositoryName + "/pullrequests/" + pullRequestId + "/reviewers/" + reviewerId; String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", id, null, - ApiVersion.GIT, null, null, null); + ApiVersion.GIT_PULL_REQUEST_REVIEWERS, null, null, null); return MAPPER.mapJsonResponse(r, IdentityRefWithVote.class); } @@ -914,7 +915,7 @@ public PullRequestReviewers getPullRequestReviewers(int pullRequestId, String re String id = repositoryName + "/pullrequests/" + pullRequestId + "/reviewers"; String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", id, null, - ApiVersion.GIT, null, null, null); + ApiVersion.GIT_PULL_REQUEST_REVIEWERS, null, null, null); return MAPPER.mapJsonResponse(r, PullRequestReviewers.class); } @@ -941,7 +942,7 @@ public IdentityRefWithVote updatePullRequestReviewer(int pullRequestId, String r String id = repositoryName + "/pullrequests/" + pullRequestId + "/reviewers/" + reviewerId; String r = send(RequestMethod.PATCH, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", id, null, - ApiVersion.GIT, null, b, CustomHeader.JSON_CONTENT_TYPE); + ApiVersion.GIT_PULL_REQUEST_REVIEWERS, null, b, CustomHeader.JSON_CONTENT_TYPE); return MAPPER.mapJsonResponse(r, IdentityRefWithVote.class); } @@ -968,7 +969,7 @@ public GitAnnotatedTag createAnnotatedTag(String repositoryName, String tagName, }}; String r = send(RequestMethod.POST, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, "annotatedtags", ApiVersion.GIT, null, b, CustomHeader.JSON_CONTENT_TYPE); + repositoryName, "annotatedtags", ApiVersion.GIT_ANNOTATED_TAGS, null, b, CustomHeader.JSON_CONTENT_TYPE); return MAPPER.mapJsonResponse(r, GitAnnotatedTag.class); } @@ -984,7 +985,7 @@ public GitAnnotatedTag createAnnotatedTag(String repositoryName, String tagName, @Override public GitAnnotatedTag getAnnotatedTag(String repositoryName, String objectId) throws AzDException { String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, "annotatedtags/" + objectId, ApiVersion.GIT, null, null, null); + repositoryName, "annotatedtags/" + objectId, ApiVersion.GIT_ANNOTATED_TAGS, null, null, null); return MAPPER.mapJsonResponse(r, GitAnnotatedTag.class); } @@ -1037,7 +1038,7 @@ public GitCommit getCommit(String repositoryName, String commitId, int changeCou @Override public GitCommitChanges getChanges(String repositoryName, String commitId) throws AzDException { String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, "commits/" + commitId + "/changes", ApiVersion.GIT, null, null, null); + repositoryName, "commits/" + commitId + "/changes", ApiVersion.GIT_COMMIT_CHANGES, null, null, null); return MAPPER.mapJsonResponse(r, GitCommitChanges.class); } @@ -1060,7 +1061,7 @@ public GitCommitChanges getChanges(String repositoryName, String commitId, int t }}; String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryName, "commits/" + commitId + "/changes", ApiVersion.GIT, q, null, null); + repositoryName, "commits/" + commitId + "/changes", ApiVersion.GIT_COMMIT_CHANGES, q, null, null); return MAPPER.mapJsonResponse(r, GitCommitChanges.class); } @@ -1398,7 +1399,7 @@ public GitRefUpdateResult deleteTag(String repositoryName, String tagName) throw public GitBlobRef getBlob(String repositoryId, String sha1) throws AzDException { String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryId, "blobs/" + sha1, ApiVersion.GIT, null, null, null); + repositoryId, "blobs/" + sha1, ApiVersion.GIT_BLOBS, null, null, null); return MAPPER.mapJsonResponse(r, GitBlobRef.class); } @@ -1422,7 +1423,7 @@ public GitBlobRef getBlob(String repositoryId, String sha1, String fileName, boo }}; String r = send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryId, "blobs/" + sha1, ApiVersion.GIT, q, null, null); + repositoryId, "blobs/" + sha1, ApiVersion.GIT_BLOBS, q, null, null); return MAPPER.mapJsonResponse(r, GitBlobRef.class); } @@ -1448,7 +1449,7 @@ public String getBlobContent(String repositoryId, String sha1, boolean download, }}; return send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryId, "blobs/" + sha1, ApiVersion.GIT, q, null, null); + repositoryId, "blobs/" + sha1, ApiVersion.GIT_BLOBS, q, null, null); } /** @@ -1472,7 +1473,7 @@ public InputStream getBlobContentAsZip(String repositoryId, String sha1, boolean }}; return send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryId, "blobs/" + sha1, ApiVersion.GIT, q, null, null, false); + repositoryId, "blobs/" + sha1, ApiVersion.GIT_BLOBS, q, null, null, false); } /** @@ -1496,7 +1497,7 @@ public InputStream getBlobContentAsStream(String repositoryId, String sha1, bool }}; return send(RequestMethod.GET, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryId, "blobs/" + sha1, ApiVersion.GIT, q, null, null, false); + repositoryId, "blobs/" + sha1, ApiVersion.GIT_BLOBS, q, null, null, false); } /** @@ -1508,7 +1509,7 @@ public InputStream getBlobContentAsStream(String repositoryId, String sha1, bool @Override public InputStream getBlobsZip(String repositoryId, List sha1) throws AzDException { return send(null, RequestMethod.POST, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryId, "blobs", ApiVersion.GIT, null, + repositoryId, "blobs", ApiVersion.GIT_BLOBS, null, HttpRequest.BodyPublishers.ofString(MAPPER.convertToString(sha1)), HttpResponse.BodyHandlers.ofInputStream(), Map.of("Stream_Zip", CustomHeader.STREAM_ZIP_ACCEPT, "Content_Type", CustomHeader.JSON_CONTENT_TYPE), @@ -1527,7 +1528,7 @@ public InputStream getBlobsZip(String repositoryId, List sha1) throws Az @Override public InputStream getBlobsZip(String repositoryId, String fileName, List sha1) throws AzDException { return send(null, RequestMethod.POST, CONNECTION, GIT, CONNECTION.getProject(), AREA + "/repositories", - repositoryId, "blobs", ApiVersion.GIT, Map.of("filename", fileName), + repositoryId, "blobs", ApiVersion.GIT_BLOBS, Map.of("filename", fileName), HttpRequest.BodyPublishers.ofString(MAPPER.convertToString(sha1)), HttpResponse.BodyHandlers.ofInputStream(), Map.of("Stream_Zip", CustomHeader.STREAM_ZIP_ACCEPT, "Content_Type", CustomHeader.JSON_CONTENT_TYPE), @@ -1546,7 +1547,7 @@ public InputStream getBlobsZip(String repositoryId, String fileName, List getChangesAsync(String repositoryId, .location("5bf884f5-3e07-42e9-afb8-1b872267bf16") .serviceEndpoint("repositoryId", repositoryId) .serviceEndpoint("commitId", commitId) + .apiVersion(ApiVersion.GIT_COMMIT_CHANGES) .build() .executeAsync(GitCommitChanges.class); } @@ -95,6 +96,7 @@ public CompletableFuture getChangesAsync(String repositoryId, .serviceEndpoint("repositoryId", repositoryId) .serviceEndpoint("commitId", commitId) .query(RequestConfiguration::new, requestConfiguration, q -> q.queryParameters) + .apiVersion(ApiVersion.GIT_COMMIT_CHANGES) .build() .executeAsync(GitCommitChanges.class); } @@ -234,6 +236,7 @@ public GitCommitChanges getChanges(String repositoryId, String commitId) throws .location("5bf884f5-3e07-42e9-afb8-1b872267bf16") .serviceEndpoint("repositoryId", repositoryId) .serviceEndpoint("commitId", commitId) + .apiVersion(ApiVersion.GIT_COMMIT_CHANGES) .build() .execute(GitCommitChanges.class); } @@ -255,6 +258,7 @@ public GitCommitChanges getChanges(String repositoryId, String commitId, .serviceEndpoint("repositoryId", repositoryId) .serviceEndpoint("commitId", commitId) .query(RequestConfiguration::new, requestConfiguration, q -> q.queryParameters) + .apiVersion(ApiVersion.GIT_COMMIT_CHANGES) .build() .execute(GitCommitChanges.class); } diff --git a/azd/src/main/java/org/azd/git/forks/ForksRequestBuilder.java b/azd/src/main/java/org/azd/git/forks/ForksRequestBuilder.java index 7c2a7fbb..cd7fd41a 100644 --- a/azd/src/main/java/org/azd/git/forks/ForksRequestBuilder.java +++ b/azd/src/main/java/org/azd/git/forks/ForksRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import org.azd.git.types.GitForkSyncRequest; import org.azd.git.types.GitForkSyncRequestParameters; @@ -23,7 +24,7 @@ public class ForksRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ForksRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "git", "1703f858-b9d1-46af-ab62-483e9e1055b5"); + super(organizationUrl, accessTokenCredential, "git", "1703f858-b9d1-46af-ab62-483e9e1055b5", ApiVersion.GIT_FORK); } /** diff --git a/azd/src/main/java/org/azd/git/items/ItemsRequestBuilder.java b/azd/src/main/java/org/azd/git/items/ItemsRequestBuilder.java index f5f0c9e1..c2a3e0ed 100644 --- a/azd/src/main/java/org/azd/git/items/ItemsRequestBuilder.java +++ b/azd/src/main/java/org/azd/git/items/ItemsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.CustomHeader; import org.azd.enums.GitVersionOptions; import org.azd.enums.GitVersionType; @@ -28,7 +29,7 @@ public class ItemsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ItemsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "git", "fb93c0db-47ed-4a31-8c20-47552878fb44"); + super(organizationUrl, accessTokenCredential, "git", "fb93c0db-47ed-4a31-8c20-47552878fb44", ApiVersion.GIT_ITEMS); } /** diff --git a/azd/src/main/java/org/azd/git/pullrequest/PullRequestLabelsRequestBuilder.java b/azd/src/main/java/org/azd/git/pullrequest/PullRequestLabelsRequestBuilder.java index d6016731..834d784e 100644 --- a/azd/src/main/java/org/azd/git/pullrequest/PullRequestLabelsRequestBuilder.java +++ b/azd/src/main/java/org/azd/git/pullrequest/PullRequestLabelsRequestBuilder.java @@ -2,6 +2,7 @@ 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.WebApiTagDefinition; import org.azd.git.types.WebApiTagDefinitions; @@ -20,7 +21,7 @@ public class PullRequestLabelsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public PullRequestLabelsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "git", "f22387e3-984e-4c52-9c6d-fbb8f14c812d"); + super(organizationUrl, accessTokenCredential, "git", "f22387e3-984e-4c52-9c6d-fbb8f14c812d", ApiVersion.GIT_PULL_REQUEST_LABELS); } /** diff --git a/azd/src/main/java/org/azd/git/pullrequest/PullRequestReviewersRequestBuilder.java b/azd/src/main/java/org/azd/git/pullrequest/PullRequestReviewersRequestBuilder.java index f8c5dae0..d52d099d 100644 --- a/azd/src/main/java/org/azd/git/pullrequest/PullRequestReviewersRequestBuilder.java +++ b/azd/src/main/java/org/azd/git/pullrequest/PullRequestReviewersRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.common.types.Author; import org.azd.exceptions.AzDException; import org.azd.git.types.IdentityRefWithVote; @@ -21,7 +22,7 @@ public class PullRequestReviewersRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public PullRequestReviewersRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "git", "4b6702c7-aa35-4b89-9c96-b9abf6d3e540"); + super(organizationUrl, accessTokenCredential, "git", "4b6702c7-aa35-4b89-9c96-b9abf6d3e540", ApiVersion.GIT_PULL_REQUEST_REVIEWERS); } /** diff --git a/azd/src/main/java/org/azd/git/pullrequest/PullRequestWorkItemsRequestBuilder.java b/azd/src/main/java/org/azd/git/pullrequest/PullRequestWorkItemsRequestBuilder.java index 21b8fe19..5108202d 100644 --- a/azd/src/main/java/org/azd/git/pullrequest/PullRequestWorkItemsRequestBuilder.java +++ b/azd/src/main/java/org/azd/git/pullrequest/PullRequestWorkItemsRequestBuilder.java @@ -19,7 +19,7 @@ public class PullRequestWorkItemsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public PullRequestWorkItemsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "git", "0a637fcc-5370-4ce8-b0e8-98091f5f9482", ApiVersion.GIT); + super(organizationUrl, accessTokenCredential, "git", "0a637fcc-5370-4ce8-b0e8-98091f5f9482", ApiVersion.GIT_WORK_ITEMS); } /** diff --git a/azd/src/main/java/org/azd/git/repositories/RecycleBinRepositoriesRequestBuilder.java b/azd/src/main/java/org/azd/git/repositories/RecycleBinRepositoriesRequestBuilder.java index 304f6001..4129157b 100644 --- a/azd/src/main/java/org/azd/git/repositories/RecycleBinRepositoriesRequestBuilder.java +++ b/azd/src/main/java/org/azd/git/repositories/RecycleBinRepositoriesRequestBuilder.java @@ -2,6 +2,7 @@ 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.GitDeletedRepositories; import org.azd.git.types.GitRepository; @@ -20,7 +21,7 @@ public class RecycleBinRepositoriesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public RecycleBinRepositoriesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "git", "a663da97-81db-4eb3-8b83-287670f63073"); + super(organizationUrl, accessTokenCredential, "git", "a663da97-81db-4eb3-8b83-287670f63073", ApiVersion.GIT_RECYCLE_BIN_REPOSITORIES); } /** diff --git a/azd/src/main/java/org/azd/git/repositories/RepositoriesRequestBuilder.java b/azd/src/main/java/org/azd/git/repositories/RepositoriesRequestBuilder.java index bd749ff6..a22e1a71 100644 --- a/azd/src/main/java/org/azd/git/repositories/RepositoriesRequestBuilder.java +++ b/azd/src/main/java/org/azd/git/repositories/RepositoriesRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import org.azd.git.types.GitDeletedRepositories; import org.azd.git.types.GitRepository; @@ -23,7 +24,7 @@ public class RepositoriesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public RepositoriesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "git", "225f7195-f9c7-4d14-ab28-a83f7ff77e1f"); + super(organizationUrl, accessTokenCredential, "git", "225f7195-f9c7-4d14-ab28-a83f7ff77e1f", ApiVersion.GIT); } @@ -90,6 +91,7 @@ public CompletableFuture deleteAsync(String repositoryId) throws AzDExcept public CompletableFuture listDeletedAsync() throws AzDException { return builder() .location("2b6869c4-cb25-42b5-b7a3-0d3e6be0a11a") + .apiVersion(ApiVersion.GIT_RECYCLE_BIN_REPOSITORIES) .build() .executeAsync(GitDeletedRepositories.class); } @@ -219,6 +221,7 @@ public Void delete(String repositoryId) throws AzDException { public GitDeletedRepositories listDeleted() throws AzDException { return builder() .location("2b6869c4-cb25-42b5-b7a3-0d3e6be0a11a") + .apiVersion(ApiVersion.GIT_RECYCLE_BIN_REPOSITORIES) .build() .execute(GitDeletedRepositories.class); } diff --git a/azd/src/main/java/org/azd/graph/descriptors/DescriptorsRequestBuilder.java b/azd/src/main/java/org/azd/graph/descriptors/DescriptorsRequestBuilder.java index 3cd05785..d14d197d 100644 --- a/azd/src/main/java/org/azd/graph/descriptors/DescriptorsRequestBuilder.java +++ b/azd/src/main/java/org/azd/graph/descriptors/DescriptorsRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import org.azd.graph.types.GraphDescriptor; @@ -18,7 +19,7 @@ public class DescriptorsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public DescriptorsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "graph", "048aee0a-7072-4cde-ab73-7af77b1e0b4e"); + super(organizationUrl, accessTokenCredential, "graph", "048aee0a-7072-4cde-ab73-7af77b1e0b4e", ApiVersion.GRAPH); } /** diff --git a/azd/src/main/java/org/azd/locations/LocationsBaseRequestBuilder.java b/azd/src/main/java/org/azd/locations/LocationsBaseRequestBuilder.java index 050a30e7..e47624b3 100644 --- a/azd/src/main/java/org/azd/locations/LocationsBaseRequestBuilder.java +++ b/azd/src/main/java/org/azd/locations/LocationsBaseRequestBuilder.java @@ -11,27 +11,54 @@ import java.util.concurrent.CompletableFuture; +/** + * Represents Api locations and helper functions. + */ public class LocationsBaseRequestBuilder extends BaseRequestBuilder { private final String organizationUrl; + /** + * Default constructor + * @param organizationUrl Organisation URL. + * @param accessTokenCredential Access token credential object. + */ public LocationsBaseRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { super(organizationUrl, accessTokenCredential); this.organizationUrl = organizationUrl; } + /** + * Returns the resource area request builder. + * @return ResourceAreaRequestBuilder {@link ResourceAreaRequestBuilder} + */ public ResourceAreaRequestBuilder resourceArea() { return new ResourceAreaRequestBuilder(organizationUrl, accessTokenCredential); } + /** + * Get the url for given resource id. + * @param resourceId Pass the resource id. E.g., ResourceId.BUILD + * @return Location URL for specific Api. + */ public String getUrl(String resourceId) { return LookUpService.getInstance(accessTokenCredential) .locationUrl(organizationUrl, resourceId); } + /** + * Get the url for given resource id. + * @param resourceId Pass the resource id. E.g., ResourceId.BUILD + * @return Location URL for specific Api. + */ public CompletableFuture getUrlAsync(String resourceId) { return CompletableFuture.completedFuture(getUrl(resourceId)); } + /** + * Get connection data for current USER. + * @return ConnectionData object {@link ConnectionData} + * @throws AzDException Default Api exception handler. + */ public CompletableFuture getConnectionDataAsync() throws AzDException { var uri = UrlBuilder.fromBaseUrl(organizationUrl) .appendPath(Constants.APIS_RELATIVE_PATH) @@ -43,6 +70,11 @@ public CompletableFuture getConnectionDataAsync() throws AzDExce .executeAsync(ConnectionData.class); } + /** + * Get connection data for current USER. + * @return ConnectionData object {@link ConnectionData} + * @throws AzDException Default Api exception handler. + */ public ConnectionData getConnectionData() throws AzDException { var uri = UrlBuilder.fromBaseUrl(organizationUrl) .appendPath(Constants.APIS_RELATIVE_PATH) diff --git a/azd/src/main/java/org/azd/locations/ResourceAreaRequestBuilder.java b/azd/src/main/java/org/azd/locations/ResourceAreaRequestBuilder.java index 131d7cb5..83f6ee84 100644 --- a/azd/src/main/java/org/azd/locations/ResourceAreaRequestBuilder.java +++ b/azd/src/main/java/org/azd/locations/ResourceAreaRequestBuilder.java @@ -8,20 +8,38 @@ import java.util.concurrent.CompletableFuture; +/** + * Represents the resource areas of the Api. + */ public class ResourceAreaRequestBuilder extends BaseRequestBuilder { private final String organizationUrl; + /** + * Default constructor. + * @param organizationUrl Pass the organisation URL. + * @param accessTokenCredential Access token credential object. + */ public ResourceAreaRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { super(organizationUrl, accessTokenCredential); this.organizationUrl = organizationUrl; } + /** + * Returns all publicly available resources areas. + * @return ResourceAreas object {@link ResourceAreas} + * @throws AzDException Default Api exception handler. + */ public CompletableFuture listAsync() throws AzDException { return CompletableFuture.completedFuture( LookUpService.getInstance(accessTokenCredential) .resourceAreas(organizationUrl)); } + /** + * Returns all publicly available resources areas. + * @return ResourceAreas object {@link ResourceAreas} + * @throws AzDException Default Api exception handler. + */ public ResourceAreas list() throws AzDException { return LookUpService.getInstance(accessTokenCredential) .resourceAreas(organizationUrl); diff --git a/azd/src/main/java/org/azd/memberentitlementmanagement/groupentitlements/GroupEntitlementsRequestBuilder.java b/azd/src/main/java/org/azd/memberentitlementmanagement/groupentitlements/GroupEntitlementsRequestBuilder.java index 3b2a7252..cc3ac7cd 100644 --- a/azd/src/main/java/org/azd/memberentitlementmanagement/groupentitlements/GroupEntitlementsRequestBuilder.java +++ b/azd/src/main/java/org/azd/memberentitlementmanagement/groupentitlements/GroupEntitlementsRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.common.types.JsonPatchDocument; import org.azd.enums.CustomHeader; import org.azd.enums.RuleOption; @@ -23,7 +24,8 @@ public class GroupEntitlementsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public GroupEntitlementsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "memberEntitlementManagement", "2280bffa-58a2-49da-822e-0764a1bb44f7"); + super(organizationUrl, accessTokenCredential, "memberEntitlementManagement", "2280bffa-58a2-49da-822e-0764a1bb44f7", + ApiVersion.MEMBERSHIP_ENTITLEMENT_MANAGEMENT); } /** diff --git a/azd/src/main/java/org/azd/memberentitlementmanagement/members/MembersRequestBuilder.java b/azd/src/main/java/org/azd/memberentitlementmanagement/members/MembersRequestBuilder.java index 68944325..70b7936e 100644 --- a/azd/src/main/java/org/azd/memberentitlementmanagement/members/MembersRequestBuilder.java +++ b/azd/src/main/java/org/azd/memberentitlementmanagement/members/MembersRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import org.azd.memberentitlementmanagement.types.PagedGraphMemberList; @@ -20,7 +21,8 @@ public class MembersRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public MembersRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "memberEntitlementManagement", "45a36e53-5286-4518-aa72-2d29f7acc5d8"); + super(organizationUrl, accessTokenCredential, "memberEntitlementManagement", "45a36e53-5286-4518-aa72-2d29f7acc5d8", + ApiVersion.MEMBERSHIP_ENTITLEMENT_MANAGEMENT_MEMBERS); } /** diff --git a/azd/src/main/java/org/azd/memberentitlementmanagement/userentitlementsummary/UserEntitlementSummaryRequestBuilder.java b/azd/src/main/java/org/azd/memberentitlementmanagement/userentitlementsummary/UserEntitlementSummaryRequestBuilder.java index bb4c820a..f7e705ac 100644 --- a/azd/src/main/java/org/azd/memberentitlementmanagement/userentitlementsummary/UserEntitlementSummaryRequestBuilder.java +++ b/azd/src/main/java/org/azd/memberentitlementmanagement/userentitlementsummary/UserEntitlementSummaryRequestBuilder.java @@ -21,7 +21,7 @@ public class UserEntitlementSummaryRequestBuilder extends BaseRequestBuilder { */ public UserEntitlementSummaryRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { super(organizationUrl, accessTokenCredential, "memberEntitlementManagement", "5ae55b13-c9dd-49d1-957e-6e76c152e3d9", - ApiVersion.MEMBERSHIP_ENTITLEMENT_MANAGEMENT); + ApiVersion.USER_ENTITLEMENT_SUMMARY); } /** diff --git a/azd/src/main/java/org/azd/pipelines/artifacts/ArtifactsRequestBuilder.java b/azd/src/main/java/org/azd/pipelines/artifacts/ArtifactsRequestBuilder.java index af0564e9..5d8f684a 100644 --- a/azd/src/main/java/org/azd/pipelines/artifacts/ArtifactsRequestBuilder.java +++ b/azd/src/main/java/org/azd/pipelines/artifacts/ArtifactsRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.GetArtifactExpandOptions; import org.azd.exceptions.AzDException; import org.azd.pipelines.types.PipelinesArtifact; @@ -21,7 +22,7 @@ public class ArtifactsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ArtifactsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "pipelines", "85023071-bd5e-4438-89b0-2a5bf362a19d"); + super(organizationUrl, accessTokenCredential, "pipelines", "85023071-bd5e-4438-89b0-2a5bf362a19d", ApiVersion.PIPELINES); } /** diff --git a/azd/src/main/java/org/azd/pipelines/logs/LogsRequestBuilder.java b/azd/src/main/java/org/azd/pipelines/logs/LogsRequestBuilder.java index 6239b44f..dd09e48a 100644 --- a/azd/src/main/java/org/azd/pipelines/logs/LogsRequestBuilder.java +++ b/azd/src/main/java/org/azd/pipelines/logs/LogsRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.GetLogExpandOptions; import org.azd.exceptions.AzDException; import org.azd.pipelines.types.LogCollection; @@ -20,7 +21,7 @@ public class LogsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public LogsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "pipelines", "fb1b6d27-3957-43d5-a14b-a2d70403e545"); + super(organizationUrl, accessTokenCredential, "pipelines", "fb1b6d27-3957-43d5-a14b-a2d70403e545", ApiVersion.PIPELINES); } /** diff --git a/azd/src/main/java/org/azd/pipelines/pipelines/PipelinesRequestBuilder.java b/azd/src/main/java/org/azd/pipelines/pipelines/PipelinesRequestBuilder.java index b475292a..4ff25b55 100644 --- a/azd/src/main/java/org/azd/pipelines/pipelines/PipelinesRequestBuilder.java +++ b/azd/src/main/java/org/azd/pipelines/pipelines/PipelinesRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import org.azd.pipelines.types.CreatePipelineParameters; import org.azd.pipelines.types.Pipeline; @@ -22,7 +23,7 @@ public class PipelinesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public PipelinesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "pipelines", "28e1305e-2afe-47bf-abaf-cbb0e6a91988"); + super(organizationUrl, accessTokenCredential, "pipelines", "28e1305e-2afe-47bf-abaf-cbb0e6a91988", ApiVersion.PIPELINES); } /** diff --git a/azd/src/main/java/org/azd/release/releases/ReleaseTaskLogRequestBuilder.java b/azd/src/main/java/org/azd/release/releases/ReleaseTaskLogRequestBuilder.java index 55c45d72..7d873480 100644 --- a/azd/src/main/java/org/azd/release/releases/ReleaseTaskLogRequestBuilder.java +++ b/azd/src/main/java/org/azd/release/releases/ReleaseTaskLogRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.CustomHeader; import org.azd.exceptions.AzDException; @@ -43,6 +44,7 @@ public CompletableFuture getAsync(Consumer uriParameters) .serviceEndpoint("releaseDeployPhaseId", pathParams.releaseDeployPhaseId) .serviceEndpoint("taskId", pathParams.taskId) .header(CustomHeader.TEXT_CONTENT) + .apiVersion(ApiVersion.RELEASE_LOGS) .build() .executeStringAsync(); } @@ -69,6 +71,7 @@ public CompletableFuture getAsync(Consumer uriParameters, .serviceEndpoint("taskId", pathParams.taskId) .query(RequestConfiguration::new, requestConfiguration, q -> q.queryParameters) .header(CustomHeader.TEXT_CONTENT) + .apiVersion(ApiVersion.RELEASE_LOGS) .build() .executeStringAsync(); } @@ -92,6 +95,7 @@ public String get(Consumer uriParameters) throws AzDException { .serviceEndpoint("releaseDeployPhaseId", pathParams.releaseDeployPhaseId) .serviceEndpoint("taskId", pathParams.taskId) .header(CustomHeader.TEXT_CONTENT) + .apiVersion(ApiVersion.RELEASE_LOGS) .build() .executeString(); } @@ -118,6 +122,7 @@ public String get(Consumer uriParameters, .serviceEndpoint("taskId", pathParams.taskId) .query(RequestConfiguration::new, requestConfiguration, q -> q.queryParameters) .header(CustomHeader.TEXT_CONTENT) + .apiVersion(ApiVersion.RELEASE_LOGS) .build() .executeString(); } diff --git a/azd/src/main/java/org/azd/test/attachments/RunAttachmentRequestBuilder.java b/azd/src/main/java/org/azd/test/attachments/RunAttachmentRequestBuilder.java index 9573a60a..98e566c7 100644 --- a/azd/src/main/java/org/azd/test/attachments/RunAttachmentRequestBuilder.java +++ b/azd/src/main/java/org/azd/test/attachments/RunAttachmentRequestBuilder.java @@ -23,7 +23,7 @@ public class RunAttachmentRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public RunAttachmentRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "test", "4f004af4-a507-489c-9b13-cb62060beb11", ApiVersion.TEST_RUNS); + super(organizationUrl, accessTokenCredential, "test", "4f004af4-a507-489c-9b13-cb62060beb11", ApiVersion.TEST_ATTACHMENTS); } /** diff --git a/azd/src/main/java/org/azd/wiki/pagemoves/PageMovesRequestBuilder.java b/azd/src/main/java/org/azd/wiki/pagemoves/PageMovesRequestBuilder.java index ba7dbbff..8fb8761c 100644 --- a/azd/src/main/java/org/azd/wiki/pagemoves/PageMovesRequestBuilder.java +++ b/azd/src/main/java/org/azd/wiki/pagemoves/PageMovesRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.GitVersionOptions; import org.azd.enums.GitVersionType; import org.azd.exceptions.AzDException; @@ -24,7 +25,7 @@ public class PageMovesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public PageMovesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "wiki", "e37bbe71-cbae-49e5-9a4e-949143b9d910"); + super(organizationUrl, accessTokenCredential, "wiki", "e37bbe71-cbae-49e5-9a4e-949143b9d910", ApiVersion.WIKI_PAGES); } /** diff --git a/azd/src/main/java/org/azd/wiki/pagesbatch/PagesBatchRequestBuilder.java b/azd/src/main/java/org/azd/wiki/pagesbatch/PagesBatchRequestBuilder.java index e7a5b7c3..8b91ad31 100644 --- a/azd/src/main/java/org/azd/wiki/pagesbatch/PagesBatchRequestBuilder.java +++ b/azd/src/main/java/org/azd/wiki/pagesbatch/PagesBatchRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.GitVersionOptions; import org.azd.enums.GitVersionType; import org.azd.exceptions.AzDException; @@ -22,7 +23,7 @@ public class PagesBatchRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public PagesBatchRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "wiki", "71323c46-2592-4398-8771-ced73dd87207"); + super(organizationUrl, accessTokenCredential, "wiki", "71323c46-2592-4398-8771-ced73dd87207", ApiVersion.WIKI_PAGES); } /** diff --git a/azd/src/main/java/org/azd/workitemtracking/classificationnodes/ClassificationNodesRequestBuilder.java b/azd/src/main/java/org/azd/workitemtracking/classificationnodes/ClassificationNodesRequestBuilder.java index 181bb7e3..8626cba7 100644 --- a/azd/src/main/java/org/azd/workitemtracking/classificationnodes/ClassificationNodesRequestBuilder.java +++ b/azd/src/main/java/org/azd/workitemtracking/classificationnodes/ClassificationNodesRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.ClassificationNodesErrorPolicy; import org.azd.enums.TreeStructureGroup; import org.azd.exceptions.AzDException; @@ -23,7 +24,7 @@ public class ClassificationNodesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public ClassificationNodesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "wit", "5a172953-1b41-49d3-840a-33f79c3ce89f"); + super(organizationUrl, accessTokenCredential, "wit", "5a172953-1b41-49d3-840a-33f79c3ce89f", ApiVersion.WORK_ITEM_CLASSIFICATION_NODES); } /** diff --git a/azd/src/main/java/org/azd/workitemtracking/queries/QueriesRequestBuilder.java b/azd/src/main/java/org/azd/workitemtracking/queries/QueriesRequestBuilder.java index 15e5c444..d2a6e4d5 100644 --- a/azd/src/main/java/org/azd/workitemtracking/queries/QueriesRequestBuilder.java +++ b/azd/src/main/java/org/azd/workitemtracking/queries/QueriesRequestBuilder.java @@ -3,6 +3,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.abstractions.QueryParameter; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.QueryExpand; import org.azd.exceptions.AzDException; import org.azd.helpers.URLHelper; @@ -25,7 +26,7 @@ public class QueriesRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public QueriesRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "wit", "a67d190c-c41f-424b-814d-0e906f659301"); + super(organizationUrl, accessTokenCredential, "wit", "a67d190c-c41f-424b-814d-0e906f659301", ApiVersion.WORK_ITEM_QUERIES); } /** @@ -120,6 +121,7 @@ public CompletableFuture getBatchAsync(QueryBatchGetRequest return builder() .location("549816f9-09b0-4e75-9e81-01fbfcd07426") .POST(queryBatchGetRequest) + .apiVersion(ApiVersion.WORK_ITEM_QUERIES_BATCH) .build() .executeAsync(QueryHierarchyItems.class); } @@ -295,6 +297,7 @@ public QueryHierarchyItems getBatch(QueryBatchGetRequest queryBatchGetRequest) t return builder() .location("549816f9-09b0-4e75-9e81-01fbfcd07426") .POST(queryBatchGetRequest) + .apiVersion(ApiVersion.WORK_ITEM_QUERIES_BATCH) .build() .execute(QueryHierarchyItems.class); } diff --git a/azd/src/main/java/org/azd/workitemtracking/tags/WorkItemTagsRequestBuilder.java b/azd/src/main/java/org/azd/workitemtracking/tags/WorkItemTagsRequestBuilder.java index 9d9d0dcc..3e7c259f 100644 --- a/azd/src/main/java/org/azd/workitemtracking/tags/WorkItemTagsRequestBuilder.java +++ b/azd/src/main/java/org/azd/workitemtracking/tags/WorkItemTagsRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.exceptions.AzDException; import org.azd.workitemtracking.types.WorkItemTagDefinition; import org.azd.workitemtracking.types.WorkItemTagDefinitions; @@ -19,7 +20,7 @@ public class WorkItemTagsRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public WorkItemTagsRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "wit", "bc15bc60-e7a8-43cb-ab01-2106be3983a1"); + super(organizationUrl, accessTokenCredential, "wit", "bc15bc60-e7a8-43cb-ab01-2106be3983a1", ApiVersion.WORK_ITEM_TAGS); } /** diff --git a/azd/src/main/java/org/azd/workitemtracking/wiql/WiqlRequestBuilder.java b/azd/src/main/java/org/azd/workitemtracking/wiql/WiqlRequestBuilder.java index ff03e123..75238eb4 100644 --- a/azd/src/main/java/org/azd/workitemtracking/wiql/WiqlRequestBuilder.java +++ b/azd/src/main/java/org/azd/workitemtracking/wiql/WiqlRequestBuilder.java @@ -23,7 +23,7 @@ public class WiqlRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public WiqlRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "wit"); + super(organizationUrl, accessTokenCredential, "wit", ApiVersion.WORK_ITEM_WIQL); } /** diff --git a/azd/src/main/java/org/azd/workitemtracking/workitemtypesfield/WorkItemTypesFieldRequestBuilder.java b/azd/src/main/java/org/azd/workitemtracking/workitemtypesfield/WorkItemTypesFieldRequestBuilder.java index e4b7e449..00d28605 100644 --- a/azd/src/main/java/org/azd/workitemtracking/workitemtypesfield/WorkItemTypesFieldRequestBuilder.java +++ b/azd/src/main/java/org/azd/workitemtracking/workitemtypesfield/WorkItemTypesFieldRequestBuilder.java @@ -2,6 +2,7 @@ import org.azd.abstractions.BaseRequestBuilder; import org.azd.authentication.AccessTokenCredential; +import org.azd.common.ApiVersion; import org.azd.enums.WorkItemTypeFieldsExpandLevel; import org.azd.exceptions.AzDException; import org.azd.helpers.URLHelper; @@ -21,7 +22,7 @@ public class WorkItemTypesFieldRequestBuilder extends BaseRequestBuilder { * @param accessTokenCredential Access token credential object. */ public WorkItemTypesFieldRequestBuilder(String organizationUrl, AccessTokenCredential accessTokenCredential) { - super(organizationUrl, accessTokenCredential, "wit", "bd293ce5-3d25-4192-8e67-e8092e879efb"); + super(organizationUrl, accessTokenCredential, "wit", "bd293ce5-3d25-4192-8e67-e8092e879efb", ApiVersion.WORK_ITEM_TYPES_FIELD); } /** diff --git a/azd/src/test/java/org/azd/legacy/MemberEntitlementManagementApiTest.java b/azd/src/test/java/org/azd/legacy/MemberEntitlementManagementApiTest.java index c912a15b..f264fd2b 100644 --- a/azd/src/test/java/org/azd/legacy/MemberEntitlementManagementApiTest.java +++ b/azd/src/test/java/org/azd/legacy/MemberEntitlementManagementApiTest.java @@ -62,7 +62,7 @@ public void shouldGetUsersEntitlements() throws AzDException { @Test public void shouldUpdateUsersEntitlement() throws AzDException { - var userId = mem.getUserEntitlements().getMembers().stream() + var userId = mem.getUserEntitlements().getUsers().stream() .filter(x -> x.getUser().getDisplayName().equals("test@xmail.com")) .findFirst().get().getId(); diff --git a/azd/src/test/java/org/azd/unittests/MemberEntitlementManagementRequestBuilderTest.java b/azd/src/test/java/org/azd/unittests/MemberEntitlementManagementRequestBuilderTest.java index ac097fcd..cfd44156 100644 --- a/azd/src/test/java/org/azd/unittests/MemberEntitlementManagementRequestBuilderTest.java +++ b/azd/src/test/java/org/azd/unittests/MemberEntitlementManagementRequestBuilderTest.java @@ -93,7 +93,7 @@ public void shouldGetUsersEntitlements() throws AzDException { @Test public void shouldUpdateUsersEntitlement() throws AzDException { - var userId = mem.userEntitlements().search().getMembers().stream() + var userId = mem.userEntitlements().search().getUsers().stream() .filter(x -> x.getUser().getDisplayName().equals("test@xmail.com")) .findFirst().get().getId(); diff --git a/examples/MemberEntitlementManagement.md b/examples/MemberEntitlementManagement.md index c8b62a3a..f927dd15 100644 --- a/examples/MemberEntitlementManagement.md +++ b/examples/MemberEntitlementManagement.md @@ -72,7 +72,7 @@ public class Main { .memberEntitlementManagement() .userEntitlements() .search() - .getMembers() + .getUsers() .stream() .findFirst() .get()