Unverified Commit f9213edf authored by Gautier de Saint Martin Lacaze's avatar Gautier de Saint Martin Lacaze Committed by GitHub
Browse files

Merge pull request #717 from gitlab4j/pr-698-follow-up

Remove unnecessary Memberships class from the project
parents a611729e a499e0fb
...@@ -17,7 +17,6 @@ import org.gitlab4j.api.models.Email; ...@@ -17,7 +17,6 @@ import org.gitlab4j.api.models.Email;
import org.gitlab4j.api.models.ImpersonationToken; import org.gitlab4j.api.models.ImpersonationToken;
import org.gitlab4j.api.models.ImpersonationToken.Scope; import org.gitlab4j.api.models.ImpersonationToken.Scope;
import org.gitlab4j.api.models.Membership; import org.gitlab4j.api.models.Membership;
import org.gitlab4j.api.models.Memberships;
import org.gitlab4j.api.models.SshKey; import org.gitlab4j.api.models.SshKey;
import org.gitlab4j.api.models.User; import org.gitlab4j.api.models.User;
import org.gitlab4j.api.utils.EmailChecker; import org.gitlab4j.api.utils.EmailChecker;
...@@ -513,6 +512,7 @@ public class UserApi extends AbstractApi { ...@@ -513,6 +512,7 @@ public class UserApi extends AbstractApi {
* @throws GitLabApiException if any exception occurs * @throws GitLabApiException if any exception occurs
* @deprecated Will be removed in version 5.0, replaced by {@link #createUser(User, CharSequence, boolean)} * @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 { public User createUser(User user, CharSequence password, Integer projectsLimit) throws GitLabApiException {
Form formData = userToForm(user, projectsLimit, password, null, true); Form formData = userToForm(user, projectsLimit, password, null, true);
Response response = post(Response.Status.CREATED, formData, "users"); Response response = post(Response.Status.CREATED, formData, "users");
...@@ -1227,7 +1227,7 @@ public class UserApi extends AbstractApi { ...@@ -1227,7 +1227,7 @@ public class UserApi extends AbstractApi {
public List<Membership> getMemberships(Integer userId) throws GitLabApiException { public List<Membership> getMemberships(Integer userId) throws GitLabApiException {
GitLabApiForm formData = new GitLabApiForm(); GitLabApiForm formData = new GitLabApiForm();
Response response = get(Response.Status.OK, formData.asMap(), "users", userId, "memberships"); Response response = get(Response.Status.OK, formData.asMap(), "users", userId, "memberships");
return (response.readEntity(Memberships.class)); return (response.readEntity(new GenericType<List<Membership>>() {}));
} }
} }
package org.gitlab4j.api.models;
import java.util.ArrayList;
public class Memberships extends ArrayList<Membership> {
private static final long serialVersionUID = 1L;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment