jlengrand/github-api
1
0
Fork 0
mirror of https://github.com/jlengrand/github-api.git synced 2026-04-04 15:50:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:kohsuke/github-api

Browse Source
This commit is contained in:
Johno Crawford
2013-01-24 16:58:42 +01:00
parent 769d645237 389330df2e
commit a46c7acbd2
4 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/kohsuke/github/GitHub.java
View File

@@ -55,6 +55,8 @@ import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.*;
*/
public class GitHub {
/*package*/ final String login;
/*package*/ final String encodedAuthorization;
/*package*/ final String apiToken;
@@ -65,7 +67,7 @@ public class GitHub {
private final String apiUrl;
private GitHub(String login, String apiToken, String password) {
this ("https://api.github.com", login, apiToken, password);
this (GITHUB_URL, login, apiToken, password);
}
/**
@@ -112,7 +114,11 @@ public class GitHub {
} finally {
IOUtils.closeQuietly(in);
}
return new GitHub(props.getProperty("login"),props.getProperty("token"),props.getProperty("password"));
String oauth = props.getProperty("oauth");
if (oauth!=null)
return new GitHub(GITHUB_URL,oauth);
else
return new GitHub(props.getProperty("login"),props.getProperty("token"),props.getProperty("password"));
}
/**
@@ -164,7 +170,7 @@ public class GitHub {
if (tailApiUrl.startsWith("/")) {
if ("github.com".equals(apiUrl)) {// backward compatibility
return new URL("https://api.github.com" + tailApiUrl);
return new URL(GITHUB_URL + tailApiUrl);
} else {
return new URL(apiUrl + tailApiUrl);
}
@@ -339,4 +345,6 @@ public class GitHub {
MAPPER.setVisibilityChecker(new Std(NONE, NONE, NONE, NONE, ANY));
MAPPER.getDeserializationConfig().set(Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
}
private static final String GITHUB_URL = "https://api.github.com";
}