8000 Add possibility to use previous versions of rest api by yaggg · Pull Request #333 · timols/java-gitlab-api · GitHub
[go: up one dir, main page]
Skip to content

Add possibility to use previous versions of rest api #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timols merged 3 commits into from
Mar 13, 2019
Merged

Add possibility to use previous versions of rest api #333

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fb90f5
Add possibility to change gitlab rest api namespace
Dec 19, 2018
ae72205
Fix indent.
Dec 19, 2018
60058ea
Convert API namespace to instance field
Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions src/main/java/org/gitlab/api/GitlabAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public class GitlabAPI {

public static final ObjectMapper MAPPER = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

private static final String API_NAMESPACE = "/api/v4";

private static final String DEFAULT_API_NAMESPACE = "/api/v4";
private static final String PARAM_SUDO = "sudo";
private static final String PARAM_MAX_ITEMS_PER_PAGE = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).toString();

Expand All @@ -45,23 +46,29 @@ public class GitlabAPI {
private final String apiToken;
private final TokenType tokenType;
private AuthMethod authMethod;
private final String apiNamespace;
private boolean ignoreCertificateErrors = false;
private Proxy proxy;
private int defaultTimeout = 0;
private int readTimeout = defaultTimeout;
private int connectionTimeout = defaultTimeout;
private String userAgent = GitlabAPI.class.getCanonicalName() + "/" + System.getProperty("java.version");

private GitlabAPI(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method) {
private GitlabAPI(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method, String apiNamespace) {
this.hostUrl = hostUrl.endsWith("/") ? hostUrl.replaceAll("/$", "") : hostUrl;
this.apiToken = apiToken;
this.tokenType = tokenType;
this.authMethod = method;
this.apiNamespace = apiNamespace;
}

private GitlabAPI(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method) {
this(hostUrl, apiToken, tokenType, method, DEFAULT_API_NAMESPACE);
}

public static GitlabSession connect(String hostUrl, String username, String password) throws IOException {
String tailUrl = GitlabSession.URL;
GitlabAPI api = connect(hostUrl, null, null, null);
GitlabAPI api = connect(hostUrl, null, null, (AuthMethod) null);
return api.dispatch().with("login", username).with("password", password)
.to(tailUrl, GitlabSession.class);
}
Expand All @@ -78,6 +85,14 @@ public static GitlabAPI connect(String hostUrl, String apiToken, TokenType token
return new GitlabAPI(hostUrl, apiToken, tokenType, method);
}

public static GitlabAPI connect(String hostUrl, String apiToken, TokenType tokenType, String apiNamespace) {
return new GitlabAPI(hostUrl, apiToken, tokenType, AuthMethod.HEADER, apiNamespace);
}

public static GitlabAPI connect(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method, String apiNamespace) {
return new GitlabAPI(hostUrl, apiToken, tokenType, method, apiNamespace);
}

public GitlabAPI ignoreCertificateErrors(boolean ignoreCertificateErrors) {
this.ignoreCertificateErrors = ignoreCertificateErrors;
return this;
Expand Down Expand Up @@ -159,7 +174,7 @@ public URL getAPIUrl(String tailAPIUrl) throws IOException {
if (!tailAPIUrl.startsWith("/")) {
tailAPIUrl = "/" + tailAPIUrl;
}
return new URL(hostUrl + API_NAMESPACE + tailAPIUrl);
return new URL(hostUrl + apiNamespace + tailAPIUrl);
}

public URL getUrl(String tailAPIUrl) throws IOException {
Expand Down Expand Up @@ -377,7 +392,7 @@ public GitlabSSHKey createSSHKey(Integer targetUserId, String title, String key)

return dispatch().to(tailUrl, GitlabSSHKey.class);
}

/**
* Create a new ssh key for the authenticated user.
*
Expand Down Expand Up @@ -632,7 +647,7 @@ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAc

return dispatch().to(tailUrl, GitlabGroup.class);
}

/**
* Creates a Group
*
Expand Down
0