From a499e0fb9c83700715478d52d8037ff421d1765f Mon Sep 17 00:00:00 2001 From: Gautier de Saint Martin Lacaze Date: Mon, 14 Jun 2021 15:40:10 +0200 Subject: [PATCH] Remove unnecessary Memberships class from the project --- src/main/java/org/gitlab4j/api/UserApi.java | 4 ++-- src/main/java/org/gitlab4j/api/models/Memberships.java | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 src/main/java/org/gitlab4j/api/models/Memberships.java diff --git a/src/main/java/org/gitlab4j/api/UserApi.java b/src/main/java/org/gitlab4j/api/UserApi.java index b312d396..28f614d3 100644 --- a/src/main/java/org/gitlab4j/api/UserApi.java +++ b/src/main/java/org/gitlab4j/api/UserApi.java @@ -17,7 +17,6 @@ import org.gitlab4j.api.models.Email; import org.gitlab4j.api.models.ImpersonationToken; import org.gitlab4j.api.models.ImpersonationToken.Scope; import org.gitlab4j.api.models.Membership; -import org.gitlab4j.api.models.Memberships; import org.gitlab4j.api.models.SshKey; import org.gitlab4j.api.models.User; import org.gitlab4j.api.utils.EmailChecker; @@ -513,6 +512,7 @@ public class UserApi extends AbstractApi { * @throws GitLabApiException if any exception occurs * @deprecated Will be removed in version 5.0, replaced by {@link #createUser(User, CharSequence, boolean)} */ + @Deprecated public User createUser(User user, CharSequence password, Integer projectsLimit) throws GitLabApiException { Form formData = userToForm(user, projectsLimit, password, null, true); Response response = post(Response.Status.CREATED, formData, "users"); @@ -1227,7 +1227,7 @@ public class UserApi extends AbstractApi { public List getMemberships(Integer userId) throws GitLabApiException { GitLabApiForm formData = new GitLabApiForm(); Response response = get(Response.Status.OK, formData.asMap(), "users", userId, "memberships"); - return (response.readEntity(Memberships.class)); + return (response.readEntity(new GenericType>() {})); } } diff --git a/src/main/java/org/gitlab4j/api/models/Memberships.java b/src/main/java/org/gitlab4j/api/models/Memberships.java deleted file mode 100644 index beb9ec55..00000000 --- a/src/main/java/org/gitlab4j/api/models/Memberships.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.gitlab4j.api.models; - -import java.util.ArrayList; - -public class Memberships extends ArrayList { - private static final long serialVersionUID = 1L; -} -- GitLab