From 31bfff4dfda10f127c6ee004b95fef623971f491 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Tue, 14 Mar 2023 13:55:50 +0100 Subject: [PATCH] Javadoc fixes --- src/main/java/org/gitlab4j/api/MergeRequestApi.java | 12 ++++++------ src/test/java/org/gitlab4j/api/HelperUtils.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/MergeRequestApi.java b/src/main/java/org/gitlab4j/api/MergeRequestApi.java index 72c013623..1790fd341 100644 --- a/src/main/java/org/gitlab4j/api/MergeRequestApi.java +++ b/src/main/java/org/gitlab4j/api/MergeRequestApi.java @@ -739,9 +739,9 @@ public MergeRequest acceptMergeRequest(Object projectIdOrPath, Long mergeRequest * * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance * @param mergeRequestIid the internal ID of the merge request - * @param mergeCommitMessage, custom merge commit message, optional - * @param shouldRemoveSourceBranch, if true removes the source branch, optional - * @param mergeWhenPipelineSucceeds, if true the MR is merged when the pipeline, optional + * @param mergeCommitMessage custom merge commit message, optional + * @param shouldRemoveSourceBranch if true removes the source branch, optional + * @param mergeWhenPipelineSucceeds if true the MR is merged when the pipeline, optional * @return the merged merge request * @throws GitLabApiException if any exception occurs */ @@ -767,9 +767,9 @@ public MergeRequest acceptMergeRequest(Object projectIdOrPath, Long mergeRequest * * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance * @param mergeRequestIid the internal ID of the merge request - * @param mergeCommitMessage, custom merge commit message, optional - * @param shouldRemoveSourceBranch, if true removes the source branch, optional - * @param mergeWhenPipelineSucceeds, if true the MR is merged when the pipeline, optional + * @param mergeCommitMessage custom merge commit message, optional + * @param shouldRemoveSourceBranch if true removes the source branch, optional + * @param mergeWhenPipelineSucceeds if true the MR is merged when the pipeline, optional * @param sha if present, then this SHA must match the HEAD of the source branch, otherwise the merge will fail, optional * @return the merged merge request * @throws GitLabApiException if any exception occurs diff --git a/src/test/java/org/gitlab4j/api/HelperUtils.java b/src/test/java/org/gitlab4j/api/HelperUtils.java index f8d1b6055..54b8cefbe 100644 --- a/src/test/java/org/gitlab4j/api/HelperUtils.java +++ b/src/test/java/org/gitlab4j/api/HelperUtils.java @@ -87,7 +87,7 @@ public static final String getProperty(String key, String defaultValue) { * Set a named property, this will amend and overwrite properties read from the test-gitlab4j.properties file. * * @param key the key of the property to get - * @return the named property from the test-gitlab4j.properties file + * @param value the value of the property to get */ public static final void setProperty(String key, String value) { if (value == null) {