Skip to content

Commit 0eff2ba

Browse files
jminijmini
committed
Merge remote-tracking branch 'origin/main' into 6.x
# Conflicts: # src/main/java/org/gitlab4j/api/BoardsApi.java # src/main/java/org/gitlab4j/api/CommitsApi.java # src/main/java/org/gitlab4j/api/Constants.java # src/main/java/org/gitlab4j/api/DeployTokensApi.java # src/main/java/org/gitlab4j/api/EnvironmentsApi.java # src/main/java/org/gitlab4j/api/GitLabApiClient.java # src/main/java/org/gitlab4j/api/GitLabApiException.java # src/main/java/org/gitlab4j/api/GitLabApiForm.java # src/main/java/org/gitlab4j/api/GitLabCiYamlApi.java # src/main/java/org/gitlab4j/api/HealthCheckApi.java # src/main/java/org/gitlab4j/api/HookManager.java # src/main/java/org/gitlab4j/api/IssuesApi.java # src/main/java/org/gitlab4j/api/JobApi.java # src/main/java/org/gitlab4j/api/KeysApi.java # src/main/java/org/gitlab4j/api/LabelsApi.java # src/main/java/org/gitlab4j/api/MarkdownApi.java # src/main/java/org/gitlab4j/api/MergeRequestApi.java # src/main/java/org/gitlab4j/api/MetadataApi.java # src/main/java/org/gitlab4j/api/Pager.java # src/main/java/org/gitlab4j/api/PersonalAccessTokenApi.java # src/main/java/org/gitlab4j/api/ProjectApi.java # src/main/java/org/gitlab4j/api/ProtectedBranchesApi.java # src/main/java/org/gitlab4j/api/ReleaseLinksApi.java # src/main/java/org/gitlab4j/api/RepositoryFileApi.java # src/main/java/org/gitlab4j/api/SearchApi.java # src/main/java/org/gitlab4j/api/ServicesApi.java # src/main/java/org/gitlab4j/api/TopicsApi.java # src/main/java/org/gitlab4j/api/models/EpicIssue.java # src/main/java/org/gitlab4j/api/models/GpgKey.java # src/main/java/org/gitlab4j/api/models/Link.java # src/main/java/org/gitlab4j/api/models/PackageFile.java # src/main/java/org/gitlab4j/api/models/ProjectAccessToken.java # src/main/java/org/gitlab4j/api/models/ProjectFilter.java # src/main/java/org/gitlab4j/api/models/ProjectSharedGroup.java # src/main/java/org/gitlab4j/api/models/User.java # src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java # src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java # src/main/java/org/gitlab4j/api/utils/FileUtils.java # src/main/java/org/gitlab4j/api/utils/HttpRequestUtils.java # src/main/java/org/gitlab4j/api/utils/MaskingLoggingFilter.java # src/main/java/org/gitlab4j/api/utils/Oauth2LoginStreamingOutput.java # src/main/java/org/gitlab4j/api/utils/UrlEncoder.java # src/main/java/org/gitlab4j/api/webhook/BuildEvent.java # src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java # src/main/java/org/gitlab4j/api/webhook/IssueEvent.java # src/main/java/org/gitlab4j/api/webhook/JobEvent.java # src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java # src/main/java/org/gitlab4j/api/webhook/NoteEvent.java # src/main/java/org/gitlab4j/api/webhook/PipelineEvent.java # src/main/java/org/gitlab4j/api/webhook/WebHookManager.java # src/main/java/org/gitlab4j/api/webhook/WikiPageEvent.java # src/test/java/org/gitlab4j/api/MockResponse.java # src/test/java/org/gitlab4j/api/MockServletInputStream.java # src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java # src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java # src/test/java/org/gitlab4j/api/TestExternalStatusCheckApi.java # src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java # src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java # src/test/java/org/gitlab4j/api/TestReleaseLinksApi.java # src/test/java/org/gitlab4j/api/TestRepositoryFileApi.java # src/test/java/org/gitlab4j/api/TestRepositorySubmodulesApi.java # src/test/java/org/gitlab4j/api/TestSearchApi.java # src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java # src/test/java/org/gitlab4j/api/TestStreams.java # src/test/java/org/gitlab4j/api/TestTopicsApi.java
2 parents 2d06703 + 6e5e2e6 commit 0eff2ba

File tree

373 files changed

+27113
-21913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

373 files changed

+27113
-21913
lines changed

‎build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
plugins {
33
id 'java-library'
4+
id 'com.diffplug.spotless' version '6.25.0'
45
id 'signing'
56
id 'maven-publish'
67
id 'de.marcphilipp.nexus-publish' version '0.4.0'
@@ -54,6 +55,14 @@ repositories {
5455
mavenCentral()
5556
}
5657

58+
spotless {
59+
java {
60+
palantirJavaFormat()
61+
importOrder 'java', 'javax', 'jakarta', 'org', 'com', ''
62+
removeUnusedImports()
63+
}
64+
}
65+
5766
nexusPublishing {
5867
repositories {
5968
sonatype {

‎src/main/java/org/gitlab4j/api/AbstractApi.java

Lines changed: 90 additions & 43 deletions
Large diffs are not rendered by default.

‎src/main/java/org/gitlab4j/api/ApplicationSettingsApi.java

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import jakarta.ws.rs.core.Response;
77

8-
import org.gitlab4j.api.models.Setting;
98
import org.gitlab4j.api.models.ApplicationSettings;
9+
import org.gitlab4j.api.models.Setting;
1010
import org.gitlab4j.api.utils.ISO8601;
1111

1212
import com.fasterxml.jackson.databind.JsonNode;
@@ -53,7 +53,7 @@ public ApplicationSettings updateApplicationSettings(ApplicationSettings appSett
5353
}
5454

5555
final GitLabApiForm form = new GitLabApiForm();
56-
appSettings.getSettings().forEach((s, v) -> form.withParam(s, v));
56+
appSettings.getSettings().forEach((s, v) -> form.withParam(s, v));
5757
Response response = put(Response.Status.OK, form.asMap(), "application", "settings");
5858
JsonNode root = response.readEntity(JsonNode.class);
5959
return (parseApplicationSettings(root));
@@ -116,40 +116,42 @@ public static final ApplicationSettings parseApplicationSettings(JsonNode root)
116116

117117
String fieldName = fieldNames.next();
118118
switch (fieldName) {
119-
case "id":
120-
appSettings.setId(root.path(fieldName).asLong());
121-
break;
122-
123-
case "created_at":
124-
try {
125-
String value = root.path(fieldName).asText();
126-
appSettings.setCreatedAt(ISO8601.toDate(value));
127-
} catch (ParseException pe) {
128-
throw new GitLabApiException(pe);
129-
}
130-
break;
131-
132-
case "updated_at":
133-
try {
134-
String value = root.path(fieldName).asText();
135-
appSettings.setUpdatedAt(ISO8601.toDate(value));
136-
} catch (ParseException pe) {
137-
throw new GitLabApiException(pe);
138-
}
139-
break;
140-
141-
default:
142-
143-
Setting setting = Setting.forValue(fieldName);
144-
if (setting != null) {
145-
appSettings.addSetting(setting, root.path(fieldName));
146-
} else {
147-
GitLabApi.getLogger().warning(String.format("Unknown setting: %s, type: %s",
148-
fieldName, root.path(fieldName).getClass().getSimpleName()));
149-
appSettings.addSetting(fieldName, root.path(fieldName));
150-
}
151-
152-
break;
119+
case "id":
120+
appSettings.setId(root.path(fieldName).asLong());
121+
break;
122+
123+
case "created_at":
124+
try {
125+
String value = root.path(fieldName).asText();
126+
appSettings.setCreatedAt(ISO8601.toDate(value));
127+
} catch (ParseException pe) {
128+
throw new GitLabApiException(pe);
129+
}
130+
break;
131+
132+
case "updated_at":
133+
try {
134+
String value = root.path(fieldName).asText();
135+
appSettings.setUpdatedAt(ISO8601.toDate(value));
136+
} catch (ParseException pe) {
137+
throw new GitLabApiException(pe);
138+
}
139+
break;
140+
141+
default:
142+
Setting setting = Setting.forValue(fieldName);
143+
if (setting != null) {
144+
appSettings.addSetting(setting, root.path(fieldName));
145+
} else {
146+
GitLabApi.getLogger()
147+
.warning(String.format(
148+
"Unknown setting: %s, type: %s",
149+
fieldName,
150+
root.path(fieldName).getClass().getSimpleName()));
151+
appSettings.addSetting(fieldName, root.path(fieldName));
152+
}
153+
154+
break;
153155
}
154156
}
155157

‎src/main/java/org/gitlab4j/api/ApplicationsApi.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public List<Application> getApplications() throws GitLabApiException {
4343
* @throws GitLabApiException if any exception occurs
4444
*/
4545
public List<Application> getApplications(int page, int perPage) throws GitLabApiException {
46-
Response response = get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "applications");
46+
Response response =
47+
get(jakarta.ws.rs.core.Response.Status.OK, getPageQueryParams(page, perPage), "applications");
4748
return (response.readEntity(new GenericType<List<Application>>() {}));
4849
}
4950

@@ -83,7 +84,8 @@ public Stream<Application> getApplicationsStream() throws GitLabApiException {
8384
* @return the created Application instance
8485
* @throws GitLabApiException if any exception occurs
8586
*/
86-
public Application createApplication(String name, String redirectUri, ApplicationScope[] scopes) throws GitLabApiException {
87+
public Application createApplication(String name, String redirectUri, ApplicationScope[] scopes)
88+
throws GitLabApiException {
8789

8890
if (scopes == null || scopes.length == 0) {
8991
throw new GitLabApiException("scopes cannot be null or empty");
@@ -103,7 +105,8 @@ public Application createApplication(String name, String redirectUri, Applicatio
103105
* @return the created Application instance
104106
* @throws GitLabApiException if any exception occurs
105107
*/
106-
public Application createApplication(String name, String redirectUri, List<ApplicationScope> scopes) throws GitLabApiException {
108+
public Application createApplication(String name, String redirectUri, List<ApplicationScope> scopes)
109+
throws GitLabApiException {
107110

108111
if (scopes == null || scopes.isEmpty()) {
109112
throw new GitLabApiException("scopes cannot be null or empty");
@@ -113,7 +116,7 @@ public Application createApplication(String name, String redirectUri, List<Appli
113116
GitLabApiForm formData = new GitLabApiForm()
114117
.withParam("name", name, true)
115118
.withParam("redirect_uri", redirectUri, true)
116-
.withParam("scopes", scopesString, true);
119+
.withParam("scopes", scopesString, true);
117120
Response response = post(Response.Status.CREATED, formData, "applications");
118121
return (response.readEntity(Application.class));
119122
}

‎src/main/java/org/gitlab4j/api/AuditEventApi.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ public AuditEventApi(GitLabApi gitLabApi) {
3232
* @return a List of group Audit events
3333
* @throws GitLabApiException if any exception occurs
3434
*/
35-
public List<AuditEvent> getAuditEvents(Date created_after, Date created_before, String entityType, Long entityId) throws GitLabApiException {
36-
return (getAuditEvents(created_after, created_before, entityType, entityId, getDefaultPerPage()).all());
35+
public List<AuditEvent> getAuditEvents(Date created_after, Date created_before, String entityType, Long entityId)
36+
throws GitLabApiException {
37+
return (getAuditEvents(created_after, created_before, entityType, entityId, getDefaultPerPage())
38+
.all());
3739
}
3840

3941
/**
@@ -49,7 +51,9 @@ public List<AuditEvent> getAuditEvents(Date created_after, Date created_before,
4951
* @return a Pager of group Audit events
5052
* @throws GitLabApiException if any exception occurs
5153
*/
52-
public Pager<AuditEvent> getAuditEvents(Date created_after, Date created_before, String entityType, Long entityId, int itemsPerPage) throws GitLabApiException {
54+
public Pager<AuditEvent> getAuditEvents(
55+
Date created_after, Date created_before, String entityType, Long entityId, int itemsPerPage)
56+
throws GitLabApiException {
5357
Form form = new GitLabApiForm()
5458
.withParam("created_before", ISO8601.toString(created_before, false))
5559
.withParam("created_after", ISO8601.toString(created_after, false))
@@ -70,7 +74,8 @@ public Pager<AuditEvent> getAuditEvents(Date created_after, Date created_before,
7074
* @return a Stream of group Audit events
7175
* @throws GitLabApiException if any exception occurs
7276
*/
73-
public Stream<AuditEvent> getAuditEventsStream(Date created_after, Date created_before, String entityType, Long entityId) throws GitLabApiException {
77+
public Stream<AuditEvent> getAuditEventsStream(
78+
Date created_after, Date created_before, String entityType, Long entityId) throws GitLabApiException {
7479
return (getAuditEvents(created_after, created_before, entityType, entityId, getDefaultPerPage()).stream());
7580
}
7681

0 commit comments

Comments
 (0)