Skip to content

Commit 09f5e73

Browse files
committed
Run spotlessApply
1 parent 27f511a commit 09f5e73

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

gitlab4j-api/src/main/java/org/gitlab4j/api/DiscussionsApi.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -373,16 +373,16 @@ public Stream<Discussion> getMergeRequestDiscussionsStream(Object projectIdOrPat
373373
* @throws GitLabApiException if any exception occurs during execution
374374
*/
375375
public Discussion getMergeRequestDiscussion(Object projectIdOrPath, Long mergeRequestIid, String discussionId)
376-
throws GitLabApiException {
376+
throws GitLabApiException {
377377
Response response = get(
378-
Response.Status.OK,
379-
null,
380-
"projects",
381-
getProjectIdOrPath(projectIdOrPath),
382-
"merge_requests",
383-
mergeRequestIid,
384-
"discussions",
385-
discussionId);
378+
Response.Status.OK,
379+
null,
380+
"projects",
381+
getProjectIdOrPath(projectIdOrPath),
382+
"merge_requests",
383+
mergeRequestIid,
384+
"discussions",
385+
discussionId);
386386
return (response.readEntity(Discussion.class));
387387
}
388388

@@ -396,8 +396,8 @@ public Discussion getMergeRequestDiscussion(Object projectIdOrPath, Long mergeRe
396396
* @param discussionId the ID of the discussion
397397
* @return an Optional instance with the specified Discussion instance as a value
398398
*/
399-
public Optional<Discussion> getOptionalMergeRequestDiscussion(Object projectIdOrPath, Long mergeRequestIid, String discussionId)
400-
throws GitLabApiException {
399+
public Optional<Discussion> getOptionalMergeRequestDiscussion(
400+
Object projectIdOrPath, Long mergeRequestIid, String discussionId) throws GitLabApiException {
401401
try {
402402
return (Optional.ofNullable(getMergeRequestDiscussion(projectIdOrPath, mergeRequestIid, discussionId)));
403403
} catch (GitLabApiException glae) {

gitlab4j-api/src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
package org.gitlab4j.api;
22

3+
import static org.gitlab4j.api.JsonUtils.compareJson;
4+
import static org.junit.jupiter.api.Assertions.assertNotNull;
5+
import static org.junit.jupiter.api.Assertions.assertTrue;
6+
import static org.mockito.ArgumentMatchers.any;
7+
import static org.mockito.Mockito.when;
8+
import static org.mockito.MockitoAnnotations.openMocks;
9+
10+
import java.util.List;
11+
import java.util.Optional;
12+
import java.util.stream.Collectors;
13+
import java.util.stream.Stream;
14+
315
import jakarta.ws.rs.core.MultivaluedMap;
16+
417
import org.gitlab4j.api.models.Discussion;
518
import org.gitlab4j.models.Constants;
619
import org.junit.jupiter.api.BeforeEach;
@@ -10,18 +23,6 @@
1023
import org.mockito.Mock;
1124
import org.mockito.Mockito;
1225

13-
import java.util.List;
14-
import java.util.Optional;
15-
import java.util.stream.Collectors;
16-
import java.util.stream.Stream;
17-
18-
import static org.gitlab4j.api.JsonUtils.compareJson;
19-
import static org.junit.jupiter.api.Assertions.assertNotNull;
20-
import static org.junit.jupiter.api.Assertions.assertTrue;
21-
import static org.mockito.ArgumentMatchers.any;
22-
import static org.mockito.Mockito.when;
23-
import static org.mockito.MockitoAnnotations.openMocks;
24-
2526
public class TestMergeRequestDiscussionsApi implements Constants {
2627

2728
@Mock
@@ -38,7 +39,8 @@ public class TestMergeRequestDiscussionsApi implements Constants {
3839
@BeforeEach
3940
public void setUp() throws Exception {
4041
openMocks(this);
41-
response = new MockResponse(Discussion.class, "merge-request-discussion.json", "merge-request-discussions.json");
42+
response =
43+
new MockResponse(Discussion.class, "merge-request-discussion.json", "merge-request-discussions.json");
4244
when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
4345
when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
4446
when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class)))

0 commit comments

Comments
 (0)