[maven-release-plugin] prepare release github-api-1.10

Add JsonOrganizations to support getting a list of my organizations.

Because Github.login is needed we fetch it during the Github.connectUsingOAuth() method.

pom.xml

@@ -7,7 +7,7 @@
   </parent>
 
   <artifactId>github-api</artifactId>
-  <version>1.9</version>
+  <version>1.10</version>
   <name>GitHub API for Java</name>
   <url>http://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>

src/main/java/org/kohsuke/github/GHOrganization.java

@@ -33,7 +33,7 @@ public class GHOrganization extends GHPerson {
         f.getSelectByName("team_id").getOptionByText(team).setSelected(true);
         f.submit(f.getButtonByCaption("Create Repository"));
 
-        return refreshRepository(name);
+        return getRepository(name);
 
 //        GHRepository r = new Poster(root).withCredential()
 //                .with("name", name).with("description", description).with("homepage", homepage)

src/main/java/org/kohsuke/github/GHPerson.java

@@ -17,43 +17,22 @@ public abstract class GHPerson {
 
     protected int public_gist_count,public_repo_count,following_count,id;
 
-    /**
-     * Repositories that this user owns.
-     */
-    private transient Map<String,GHRepository> repositories;
-
     /**
      * Gets the repositories this user owns.
      */
     public synchronized Map<String,GHRepository> getRepositories() throws IOException {
-        if (repositories==null) {
+        Map<String,GHRepository> repositories = new TreeMap<String, GHRepository>();
-            repositories = Collections.synchronizedMap(new TreeMap<String, GHRepository>());
+        for (int i=1; ; i++) {
-            for (int i=1; ; i++) {
+            Map<String, GHRepository> map = root.retrieve("/repos/show/" + login + "?page=" + i, JsonRepositories.class).wrap(root);
-                Map<String, GHRepository> map = root.retrieve("/repos/show/" + login + "?page=" + i, JsonRepositories.class).wrap(root);
+            repositories.putAll(map);
-                repositories.putAll(map);
+            if (map.isEmpty())  break;
-                if (map.isEmpty())  break;
-            }
         }
 
         return Collections.unmodifiableMap(repositories);
     }
 
-    /**
-     * Fetches the repository of the given name from GitHub, and return it.
-     */
-    protected GHRepository refreshRepository(String name) throws IOException {
-        if (repositories==null) getRepositories(); // fetch the base first
-        GHRepository r = fetchRepository(name);
-        repositories.put(name,r);
-        return r;
-    }
-
-    protected GHRepository fetchRepository(String name) throws IOException {
-        return root.retrieve("/repos/show/" + login + '/' + name, JsonRepository.class).wrap(root);
-    }
-
     public GHRepository getRepository(String name) throws IOException {
-        return getRepositories().get(name);
+        return root.retrieve("/repos/show/" + login + '/' + name, JsonRepository.class).wrap(root);
     }
 
     /**

src/main/java/org/kohsuke/github/GHRepository.java

@@ -145,6 +145,23 @@ public class GHRepository {
         return Collections.unmodifiableSet(r);
     }
 
+    /**
+     * Gets the names of the collaborators on this repository.
+     * This method deviates from the principle of this library but it works a lot faster than {@link #getCollaborators()}.
+     */
+    public Set<String> getCollaboratorNames() throws IOException {
+        Set<String> r = new HashSet<String>(root.retrieve("/repos/show/"+owner+"/"+name+"/collaborators",JsonCollaborators.class).collaborators);
+        return Collections.unmodifiableSet(r);
+    }
+
+    /**
+     * If this repository belongs to an organization, return a set of teams.
+     */
+    public Set<GHTeam> getTeams() throws IOException {
+        return Collections.unmodifiableSet(root.retrieve("/repos/show/"+owner+"/"+name+"/teams",JsonTeams.class).toSet(
+                root.getOrganization(owner)));
+    }
+
     public void addCollaborators(GHUser... users) throws IOException {
         addCollaborators(asList(users));
     }
@@ -224,7 +241,7 @@ public class GHRepository {
                 if (org.getLogin().equals(f.getInputByName("organization").getValueAttribute())) {
                     // found it
                     f.submit((HtmlButton)f.getElementsByTagName("button").get(0));
-                    return org.refreshRepository(name);
+                    return org.getRepository(name);
                 }
             } catch (ElementNotFoundException e) {
                 // continue
@@ -247,7 +264,7 @@ public class GHRepository {
                 f.submit((HtmlButton)f.getElementsByTagName("button").get(0));
 
                 // overwrite fields
-                final GHRepository r = getOwner().fetchRepository(newName);
+                final GHRepository r = getOwner().getRepository(newName);
                 for (Field fi : getClass().getDeclaredFields()) {
                     if (Modifier.isStatic(fi.getModifiers()))   continue;
                     fi.setAccessible(true);

src/main/java/org/kohsuke/github/GitHub.java

@@ -42,10 +42,13 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 
 import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.*;
 
@@ -61,6 +64,7 @@ public class GitHub {
 
     private final Map<String,GHUser> users = new HashMap<String, GHUser>();
     private final Map<String,GHOrganization> orgs = new HashMap<String, GHOrganization>();
+	private String oauthAccessToken;
 
     private GitHub(String login, String apiToken, String password) {
         this.login = login;
@@ -74,6 +78,17 @@ public class GitHub {
             encodedAuthorization = null;
     }
 
+    private GitHub (String oauthAccessToken) throws IOException {
+    	
+		this.password = null;
+		this.encodedAuthorization = null;
+		
+		this.oauthAccessToken = oauthAccessToken;
+		
+		this.login = getMyself().getLogin();
+		
+    	
+    }
     /**
      * Obtains the credential from "~/.github"
      */
@@ -97,6 +112,9 @@ public class GitHub {
         return new GitHub(login,apiToken,password);
     }
 
+    public static GitHub connectUsingOAuth (String accessToken) throws IOException {
+    	return new GitHub(accessToken);
+    }
     /**
      * Connects to GitHub anonymously.
      *
@@ -107,12 +125,20 @@ public class GitHub {
     }
 
     /*package*/ void requireCredential() {
-        if (login==null || encodedAuthorization==null)
+        if ((login==null || encodedAuthorization==null) && oauthAccessToken == null)
             throw new IllegalStateException("This operation requires a credential but none is given to the GitHub constructor");
     }
 
     /*package*/ URL getApiURL(String tailApiUrl) throws IOException {
-        return new URL("http://github.com/api/v2/json"+tailApiUrl);
+    	
+    	if (oauthAccessToken != null) {
+    		// append the access token
+    		
+    		tailApiUrl = tailApiUrl + "?access_token=" + oauthAccessToken;
+    	}
+    	
+        return new URL("https://github.com/api/v2/json"+tailApiUrl);
+        
     }
 
     /*package*/ <T> T retrieve(String tailApiUrl, Class<T> type) throws IOException {
@@ -129,10 +155,13 @@ public class GitHub {
 
     private <T> T _retrieve(String tailApiUrl, Class<T> type, String method, boolean withAuth) throws IOException {
         while (true) {// loop while API rate limit is hit
+        	
+        	
             HttpURLConnection uc = (HttpURLConnection) getApiURL(tailApiUrl).openConnection();
 
-            if (withAuth)
+            if (withAuth && this.oauthAccessToken == null)
                 uc.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
+            
             uc.setRequestMethod(method);
 
             try {
@@ -172,9 +201,18 @@ public class GitHub {
     public GHUser getUser(String login) throws IOException {
         GHUser u = users.get(login);
         if (u==null) {
+        	
+        	if (oauthAccessToken != null) {
+        		u = retrieve("/user/show",JsonUser.class).user;
+        		u.root = this;
+                users.put(u.getLogin(),u);
+        	}
+        	else {
             u = retrieve("/user/show/"+login,JsonUser.class).user;
             u.root = this;
             users.put(login,u);
+        	}
+            
         }
         return u;
     }
@@ -202,6 +240,10 @@ public class GitHub {
         return o;
     }
 
+    public Map<String, GHOrganization> getMyOrganizations() throws IOException {
+    	 return retrieveWithAuth("/organizations",JsonOrganizations.class).wrap(this);
+        
+    }
     /**
      * Gets the {@link GHUser} that represents yourself.
      */

src/main/java/org/kohsuke/github/JsonOrganizations.java

@@ -0,0 +1,44 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2010, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.kohsuke.github;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * 
+ */
+class JsonOrganizations {
+    public List<GHOrganization> organizations;
+
+    public Map<String,GHOrganization> wrap(GitHub root) {
+        Map<String,GHOrganization> map = new TreeMap<String, GHOrganization>();
+        for (GHOrganization o : organizations) {
+            o.root = root;
+            map.put(o.getLogin(),o);
+        }
+        return map;
+    }
+}

src/main/java/org/kohsuke/github/JsonTeams.java

@@ -1,7 +1,9 @@
 package org.kohsuke.github;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 /**
@@ -18,4 +20,13 @@ class JsonTeams {
         }
         return r;
     }
+
+    Set<GHTeam> toSet(GHOrganization org) {
+        Set<GHTeam> r = new HashSet<GHTeam>();
+        for (GHTeam t : teams) {
+            t.org = org;
+            r.add(t);
+        }
+        return r;
+    }
 }

src/test/java/org/kohsuke/AppTest.java

@@ -5,6 +5,7 @@ import org.kohsuke.github.GHOrganization;
 import org.kohsuke.github.GHOrganization.Permission;
 import org.kohsuke.github.GHRepository;
 import org.kohsuke.github.GHTeam;
+import org.kohsuke.github.GHUser;
 import org.kohsuke.github.GitHub;
 
 import java.io.IOException;
@@ -20,8 +21,18 @@ public class AppTest extends TestCase {
         assertFalse(GitHub.connect("totally","bogus").isCredentialValid());
     }
 
+    public void testMembership() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        Set<String> members = gitHub.getOrganization("jenkinsci").getRepository("violations-plugin").getCollaboratorNames();
+        System.out.println(members.contains("kohsuke"));
+    }
+
     public void testApp() throws IOException {
         GitHub gitHub = GitHub.connect();
+//        GHPullRequest i = gitHub.getOrganization("jenkinsci").getRepository("sandbox").getPullRequest(1);
+//        for (GHIssueComment c : i.getComments())
+//            System.out.println(c);
+//        System.out.println(i);
 
 //        gitHub.getMyself().getRepository("perforce-plugin").setEmailServiceHook("kk@kohsuke.org");