Merge pull request #742 from dam0vm3nt/dam0vm3nt-patch-1

jabby · web-flow · commit 71c42940c129 · 2021-09-06T19:30:23.000+02:00
Fix delete discussion API
diff --git a/src/main/java/org/gitlab4j/api/DiscussionsApi.java b/src/main/java/org/gitlab4j/api/DiscussionsApi.java
@@ -368,7 +368,7 @@ public Discussion resolveMergeRequestDiscussion(Object projectIdOrPath, Integer
     public void deleteMergeRequestDiscussionNote(Object projectIdOrPath, Integer mergeRequestIid,
             String discussionId, Integer noteId)  throws GitLabApiException {
         delete(Response.Status.OK, null, "projects", getProjectIdOrPath(projectIdOrPath),
-                "merge_requests", mergeRequestIid, "discussions", noteId);
+                "merge_requests", mergeRequestIid, "discussions", discussionId, "notes", noteId);
     }
 
     /**
@@ -754,4 +754,4 @@ public void deleteIssueThreadNote(Object projectIdOrPath, Integer issueIid,
         delete(Response.Status.OK, null, "projects", getProjectIdOrPath(projectIdOrPath), "issues", issueIid, "discussions", discussionId, "notes", noteId);
     }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ public Discussion resolveMergeRequestDiscussion(Object projectIdOrPath, Integer`
`368`	`368`	`public void deleteMergeRequestDiscussionNote(Object projectIdOrPath, Integer mergeRequestIid,`
`369`	`369`	`String discussionId, Integer noteId) throws GitLabApiException {`
`370`	`370`	`delete(Response.Status.OK, null, "projects", getProjectIdOrPath(projectIdOrPath),`
`371`		`- "merge_requests", mergeRequestIid, "discussions", noteId);`
	`371`	`+ "merge_requests", mergeRequestIid, "discussions", discussionId, "notes", noteId);`
`372`	`372`	`}`
`373`	`373`
`374`	`374`	`/**`
`@@ -754,4 +754,4 @@ public void deleteIssueThreadNote(Object projectIdOrPath, Integer issueIid,`
`754`	`754`	`delete(Response.Status.OK, null, "projects", getProjectIdOrPath(projectIdOrPath), "issues", issueIid, "discussions", discussionId, "notes", noteId);`
`755`	`755`	`}`
`756`	`756`
`757`		`-}`
	`757`	`+}`