SonarSource
diff --git a/‎src/main/java/org/kohsuke/github/GitHub.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GitHub.java
+6-3Lines changed: 6 additions & 3 deletions b/‎src/main/java/org/kohsuke/github/GitHub.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GitHub.java
+6-3Lines changed: 6 additions & 3 deletions
diff --git a/‎src/main/java/org/kohsuke/github/GitHubBuilder.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GitHubBuilder.java
+7-1Lines changed: 7 additions & 1 deletion b/‎src/main/java/org/kohsuke/github/GitHubBuilder.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GitHubBuilder.java
+7-1Lines changed: 7 additions & 1 deletion
@@ -131,13 +131,15 @@ public class GitHub {
      * @param connector
      *      HttpConnector to use. Pass null to use default connector.
      */
-    /* package */ GitHub(String apiUrl, String login, String oauthAccessToken, String password, HttpConnector connector, RateLimitHandler rateLimitHandler, AbuseLimitHandler abuseLimitHandler) throws IOException {
+    /* package */ GitHub(String apiUrl, String login, String oauthAccessToken, String applicationToken, String password, HttpConnector connector, RateLimitHandler rateLimitHandler, AbuseLimitHandler abuseLimitHandler) throws IOException {
         if (apiUrl.endsWith("/")) apiUrl = apiUrl.substring(0, apiUrl.length()-1); // normalize
         this.apiUrl = apiUrl;
         if (null != connector) this.connector = connector;
 
         if (oauthAccessToken!=null) {
-            encodedAuthorization = "token "+oauthAccessToken;
+            encodedAuthorization = "token " + oauthAccessToken;
+        } else if (applicationToken != null) {
+            encodedAuthorization = "token " + applicationToken;
         } else {
             if (password!=null) {
                 String authorization = (login + ':' + password);
@@ -153,8 +155,9 @@ public class GitHub {
         this.rateLimitHandler = rateLimitHandler;
         this.abuseLimitHandler = abuseLimitHandler;
 
-        if (login==null && encodedAuthorization!=null)
+        if (login==null && encodedAuthorization!=null && applicationToken == null) {
             login = getMyself().getLogin();
+        }
         this.login = login;
     }
 
 
@@ -26,6 +26,8 @@ public class GitHubBuilder {
     /* private */ String user;
     /* private */ String password;
     /* private */ String oauthToken;
+    /* private */ String applicationToken;
+
 
     private HttpConnector connector;
 
@@ -177,6 +179,10 @@ public GitHubBuilder withOAuthToken(String oauthToken, String user) {
         this.user = user;
         return this;
     }
+    public GitHubBuilder withApplicationToken(String applicationToken) {
+        this.applicationToken = applicationToken;
+        return this;
+    }
     public GitHubBuilder withConnector(HttpConnector connector) {
         this.connector = connector;
         return this;
@@ -204,6 +210,6 @@ public HttpURLConnection connect(URL url) throws IOException {
     }
 
     public GitHub build() throws IOException {
-        return new GitHub(endpoint, user, oauthToken, password, connector, rateLimitHandler, abuseLimitHandler);
+        return new GitHub(endpoint, user, oauthToken, applicationToken, password, connector, rateLimitHandler, abuseLimitHandler);
     }
 }