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

requires authenticated API call

pom.xml

@@ -7,7 +7,7 @@
   </parent>
 
   <artifactId>github-api</artifactId>
-  <version>1.14</version>
+  <version>1.16</version>
   <name>GitHub API for Java</name>
   <url>http://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
@@ -25,6 +25,23 @@
     </site>
   </distributionManagement>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.infradna.tool</groupId>
+        <artifactId>bridge-method-injector</artifactId>
+        <version>1.2</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
@@ -54,6 +71,12 @@
       <artifactId>commons-io</artifactId>
       <version>1.4</version>
     </dependency>
+    <dependency>
+      <groupId>com.infradna.tool</groupId>
+      <artifactId>bridge-method-annotation</artifactId>
+      <version>1.4</version>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <reporting>

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

@@ -0,0 +1,28 @@
+package org.kohsuke.github;
+
+/**
+ * Hook event type.
+ *
+ * See http://developer.github.com/v3/events/types/
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public enum GHEvent {
+    COMMIT_COMMENT,
+    CREATE,
+    DELETE,
+    DOWNLOAD,
+    FOLLOW,
+    FORK,
+    FORK_APPLY,
+    GIST,
+    GOLLUM,
+    ISSUE_COMMENT,
+    ISSUES,
+    MEMBER,
+    PUBLIC,
+    PULL_REQUEST,
+    PUSH,
+    TEAM_ADD,
+    WATCH
+}

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

@@ -0,0 +1,60 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public final class GHHook {
+    /**
+     * Repository that the hook belongs to.
+     */
+    /*package*/ transient GHRepository repository;
+    
+    String created_at, updated_at, name;
+    List<String> events;
+    boolean active;
+    Map<String,String> config;
+    int id;
+    
+    /*package*/ GHHook wrap(GHRepository owner) {
+        this.repository = owner;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public EnumSet<GHEvent> getEvents() {
+        EnumSet<GHEvent> s = EnumSet.noneOf(GHEvent.class);
+        for (String e : events)
+            Enum.valueOf(GHEvent.class,e.toUpperCase(Locale.ENGLISH));
+        return s;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public Map<String, String> getConfig() {
+        return Collections.unmodifiableMap(config);
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * Deletes this hook.
+     */
+    public void delete() throws IOException {
+        new Poster(repository.root,ApiVersion.V3).withCredential()
+                .to(String.format("/repos/%s/%s/hooks/%d",repository.getOwnerName(),repository.getName(),id),null,"DELETE");
+    }
+}

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

@@ -2,16 +2,19 @@ package org.kohsuke.github;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import static org.kohsuke.github.ApiVersion.*;
+
 /**
  * @author Kohsuke Kawaguchi
  */
@@ -23,23 +26,14 @@ public class GHOrganization extends GHPerson {
      *      Newly created repository.
      */
     public GHRepository createRepository(String name, String description, String homepage, String team, boolean isPublic) throws IOException {
+        return createRepository(name,description,homepage,getTeams().get(team),isPublic);
+    }
+
+    public GHRepository createRepository(String name, String description, String homepage, GHTeam team, boolean isPublic) throws IOException {
         // such API doesn't exist, so fall back to HTML scraping
-        WebClient wc = root.createWebClient();
+        return new Poster(root,V3).withCredential()
-        HtmlPage pg = (HtmlPage)wc.getPage("https://github.com/organizations/"+login+"/repositories/new");
+                .with("name", name).with("description", description).with("homepage", homepage)
-        HtmlForm f = pg.getForms().get(1);
+                .with("public", isPublic).with("team_id",team.getId()).to("/orgs/"+login+"/repos", GHRepository.class).wrap(root);
-        f.getInputByName("repository[name]").setValueAttribute(name);
-        f.getInputByName("repository[description]").setValueAttribute(description);
-        f.getInputByName("repository[homepage]").setValueAttribute(homepage);
-        f.getSelectByName("team_id").getOptionByText(team).setSelected(true);
-        f.submit(f.getButtonByCaption("Create Repository"));
-
-        return getRepository(name);
-
-//        GHRepository r = new Poster(root).withCredential()
-//                .with("name", name).with("description", description).with("homepage", homepage)
-//                .with("public", isPublic ? 1 : 0).to(root.getApiURL("/organizations/"+login+"/repos/create"), JsonRepository.class).repository;
-//        r.root = root;
-//        return r;
     }
 
     /**
@@ -49,6 +43,54 @@ public class GHOrganization extends GHPerson {
         return root.retrieveWithAuth("/organizations/"+login+"/teams",JsonTeams.class).toMap(this);
     }
 
+    @Override
+    public GHRepository getRepository(String name) throws IOException {
+        try {
+            return root.retrieveWithAuth3("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
+        } catch (FileNotFoundException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Publicizes the membership.
+     */
+    public void publicize(GHUser u) throws IOException {
+        root.retrieveWithAuth3("/orgs/" + login + "/public_members/" + u.getLogin(), null, "PUT");
+    }
+
+    /**
+     * All the members of this organization.
+     */
+    public List<GHUser> getMembers() throws IOException {
+        return new AbstractList<GHUser>() {
+            // these are shallow objects with only some limited values filled out
+            // TODO: it's better to allow objects to fill themselves in later when missing values are requested
+            final GHUser[] shallow = root.retrieveWithAuth3("/orgs/" + login + "/members", GHUser[].class);
+
+            @Override
+            public GHUser get(int index) {
+                try {
+                    return root.getUser(shallow[index].getLogin());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
+            @Override
+            public int size() {
+                return shallow.length;
+            }
+        };
+    }
+
+    /**
+     * Conceals the membership.
+     */
+    public void conceal(GHUser u) throws IOException {
+        root.retrieveWithAuth3("/orgs/" + login + "/public_members/" + u.getLogin(), null, "DELETE");
+    }
+
     public enum Permission { ADMIN, PUSH, PULL }
 
     /**

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

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
@@ -13,9 +14,17 @@ import java.util.TreeMap;
 public abstract class GHPerson {
     /*package almost final*/ GitHub root;
 
-    protected String gravatar_id,login;
+    // common
+    protected String login,location,blog,email,name,created_at,company;
+    protected int id;
+    protected String gravatar_id; // appears in V3 as well but presumably subsumed by avatar_url?
 
-    protected int public_gist_count,public_repo_count,following_count,id;
+    // V2
+    protected int public_gist_count,public_repo_count,followers_count,following_count;
+
+    // V3
+    protected String avatar_url,html_url;
+    protected int followers,following,public_repos,public_gists;
 
     /**
      * Gets the repositories this user owns.
@@ -23,16 +32,28 @@ public abstract class GHPerson {
     public synchronized Map<String,GHRepository> getRepositories() throws IOException {
         Map<String,GHRepository> repositories = new TreeMap<String, GHRepository>();
         for (int i=1; ; i++) {
-            Map<String, GHRepository> map = root.retrieve("/repos/show/" + login + "?page=" + i, JsonRepositories.class).wrap(root);
+            GHRepository[] array = root.retrieve3("/users/" + login + "/repos?per_page=100&page=" + i, GHRepository[].class);
-            repositories.putAll(map);
+            for (GHRepository r : array) {
-            if (map.isEmpty())  break;
+                r.root = root;
+                repositories.put(r.getName(),r);
+            }
+            if (array.length==0)  break;
         }
 
         return Collections.unmodifiableMap(repositories);
     }
 
+    /**
+     *
+     * @return
+     *      null if the repository was not found
+     */
     public GHRepository getRepository(String name) throws IOException {
-        return root.retrieve("/repos/show/" + login + '/' + name, JsonRepository.class).wrap(root);
+        try {
+            return root.retrieve3("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
+        } catch (FileNotFoundException e) {
+            return null;
+        }
     }
 
     /**
@@ -42,7 +63,73 @@ public abstract class GHPerson {
         return gravatar_id;
     }
 
+    /**
+     * Gets the login ID of this user, like 'kohsuke'
+     */
     public String getLogin() {
         return login;
     }
+
+    /**
+     * Gets the human-readable name of the user, like "Kohsuke Kawaguchi"
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the company name of this user, like "Sun Microsystems, Inc."
+     */
+    public String getCompany() {
+        return company;
+    }
+
+    /**
+     * Gets the location of this user, like "Santa Clara, California"
+     */
+    public String getLocation() {
+        return location;
+    }
+
+    public String getCreatedAt() {
+        return created_at;
+    }
+
+    /**
+     * Gets the blog URL of this user.
+     */
+    public String getBlog() {
+        return blog;
+    }
+
+    /**
+     * Gets the e-mail address of the user.
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    public int getPublicGistCount() {
+        return Math.max(public_gist_count,public_gists);
+    }
+
+    public int getPublicRepoCount() {
+        return Math.max(public_repo_count,public_repos);
+    }
+
+    public int getFollowingCount() {
+        return Math.max(following_count,following);
+    }
+
+    /**
+     * What appears to be a GitHub internal unique number that identifies this user.
+     */
+    public int getId() {
+        return id;
+    }
+
+    public int getFollowersCount() {
+        return Math.max(followers_count,followers);
+    }
+
 }

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

@@ -0,0 +1,36 @@
+package org.kohsuke.github;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Set of {@link GHPerson} with helper lookup methods.
+ * 
+ * @author Kohsuke Kawaguchi
+ */
+public final class GHPersonSet<T extends GHPerson> extends HashSet<T> {
+    public GHPersonSet() {
+    }
+
+    public GHPersonSet(Collection<? extends T> c) {
+        super(c);
+    }
+
+    public GHPersonSet(int initialCapacity, float loadFactor) {
+        super(initialCapacity, loadFactor);
+    }
+
+    public GHPersonSet(int initialCapacity) {
+        super(initialCapacity);
+    }
+
+    /**
+     * Finds the item by its login.
+     */
+    public T byLogin(String login) {
+        for (T t : this)
+            if (t.getLogin().equals(login))
+                return t;
+        return null;
+    }    
+}

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

@@ -30,14 +30,15 @@ import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 
 import java.io.IOException;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.util.AbstractSet;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -45,6 +46,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
 import static java.util.Arrays.*;
@@ -59,7 +61,10 @@ import static org.kohsuke.github.ApiVersion.V3;
 public class GHRepository {
     /*package almost final*/ GitHub root;
 
-    private String description, homepage, url, name, owner;
+    private String description, homepage, name;
+    private String url; // this is the API url
+    private String html_url;    // this is the UI
+    private GHUser owner;   // not fully populated. beware.
     private boolean has_issues, has_wiki, fork, _private, has_downloads;
     private int watchers,forks,open_issues;
     private String created_at, pushed_at;
@@ -76,7 +81,7 @@ public class GHRepository {
      * URL of this repository, like 'http://github.com/kohsuke/hudson'
      */
     public String getUrl() {
-        return url;
+        return html_url;
     }
 
     public String getName() {
@@ -84,15 +89,15 @@ public class GHRepository {
     }
 
     public GHUser getOwner() throws IOException {
-        return root.getUser(owner);
+        return root.getUser(owner.login);   // because 'owner' isn't fully populated
     }
 
     public List<GHIssue> getIssues(GHIssueState state) throws IOException {
-       return root.retrieve("/issues/list/" + owner + "/" + name + "/" + state.toString().toLowerCase(), JsonIssues.class).wrap(this);
+       return root.retrieve("/issues/list/" + owner.login + "/" + name + "/" + state.toString().toLowerCase(), JsonIssues.class).wrap(this);
     }
 
     protected String getOwnerName() {
-        return owner;
+        return owner.login;
     }
 
     public boolean hasIssues() {
@@ -140,11 +145,12 @@ public class GHRepository {
      * Gets the collaborators on this repository.
      * This set always appear to include the owner.
      */
-    public Set<GHUser> getCollaborators() throws IOException {
+    @WithBridgeMethods(Set.class)
-        Set<GHUser> r = new HashSet<GHUser>();
+    public GHPersonSet<GHUser> getCollaborators() throws IOException {
-        for (String u : root.retrieve("/repos/show/"+owner+"/"+name+"/collaborators",JsonCollaborators.class).collaborators)
+        GHPersonSet<GHUser> r = new GHPersonSet<GHUser>();
+        for (String u : root.retrieve("/repos/show/"+owner.login+"/"+name+"/collaborators",JsonCollaborators.class).collaborators)
             r.add(root.getUser(u));
-        return Collections.unmodifiableSet(r);
+        return r;
     }
 
     /**
@@ -152,7 +158,7 @@ public class GHRepository {
      * 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);
+        Set<String> r = new HashSet<String>(root.retrieve("/repos/show/"+owner.login+"/"+name+"/collaborators",JsonCollaborators.class).collaborators);
         return Collections.unmodifiableSet(r);
     }
 
@@ -160,8 +166,8 @@ public class GHRepository {
      * If this repository belongs to an organization, return a set of teams.
      */
     public Set<GHTeam> getTeams() throws IOException {
-        return Collections.unmodifiableSet(root.retrieveWithAuth("/repos/show/"+owner+"/"+name+"/teams",JsonTeams.class).toSet(
+        return Collections.unmodifiableSet(root.retrieveWithAuth("/repos/show/"+owner.login+"/"+name+"/teams",JsonTeams.class).toSet(
-                root.getOrganization(owner)));
+                root.getOrganization(owner.login)));
     }
 
     public void addCollaborators(GHUser... users) throws IOException {
@@ -204,7 +210,7 @@ public class GHRepository {
      */
     public void enableIssueTracker(boolean v) throws IOException {
         new Poster(root).withCredential().with("values[has_issues]",String.valueOf(v))
-                .to("/repos/show/" + owner + "/" + name);
+                .to("/repos/show/" + owner.login + "/" + name);
     }
 
     /**
@@ -212,7 +218,7 @@ public class GHRepository {
      */
     public void enableWiki(boolean v) throws IOException {
         new Poster(root).withCredential().with("values[has_wiki]",String.valueOf(v))
-                .to("/repos/show/" + owner + "/" + name);
+                .to("/repos/show/" + owner.login + "/" + name);
     }
 
     /**
@@ -220,7 +226,7 @@ public class GHRepository {
      */
     public void delete() throws IOException {
         Poster poster = new Poster(root).withCredential();
-        String url = "/repos/delete/" + owner +"/"+name;
+        String url = "/repos/delete/" + owner.login +"/"+name;
 
         DeleteToken token = poster.to(url, DeleteToken.class);
         poster.with("delete_token",token.delete_token).to(url);
@@ -233,7 +239,7 @@ public class GHRepository {
      *      Newly forked repository that belong to you.
      */
     public GHRepository fork() throws IOException {
-        return new Poster(root).withCredential().to("/repos/fork/" + owner + "/" + name, JsonRepository.class).wrap(root);
+        return new Poster(root,V3).withCredential().to("/repos/" + owner.login + "/" + name + "/forks", GHRepository.class, "POST").wrap(root);
     }
 
     /**
@@ -243,7 +249,7 @@ public class GHRepository {
      *      Newly forked repository that belong to you.
      */
     public GHRepository forkTo(GHOrganization org) throws IOException {
-        new Poster(root, V3).withCredential().to(String.format("/repos/%s/%s/forks?org=%s",owner,name,org.getLogin()));
+        new Poster(root, V3).withCredential().to(String.format("/repos/%s/%s/forks?org=%s",owner.login,name,org.getLogin()));
         return org.getRepository(name);
     }
 
@@ -277,21 +283,73 @@ public class GHRepository {
             }
         }
 
-        throw new IllegalArgumentException("Either you don't have the privilege to rename "+owner+'/'+name+" or there's a bug in HTML scraping");
+        throw new IllegalArgumentException("Either you don't have the privilege to rename "+owner.login+'/'+name+" or there's a bug in HTML scraping");
     }
 
     /**
      * Retrieves a specified pull request.
      */
     public GHPullRequest getPullRequest(int i) throws IOException {
-        return root.retrieveWithAuth("/pulls/" + owner + '/' + name + "/" + i, JsonPullRequest.class).wrap(this);
+        return root.retrieveWithAuth("/pulls/" + owner.login + '/' + name + "/" + i, JsonPullRequest.class).wrap(this);
     }
 
     /**
      * Retrieves all the pull requests of a particular state.
      */
     public List<GHPullRequest> getPullRequests(GHIssueState state) throws IOException {
-        return root.retrieveWithAuth("/pulls/"+owner+'/'+name+"/"+state.name().toLowerCase(Locale.ENGLISH),JsonPullRequests.class).wrap(this);
+        return root.retrieveWithAuth("/pulls/"+owner.login+'/'+name+"/"+state.name().toLowerCase(Locale.ENGLISH),JsonPullRequests.class).wrap(this);
+    }
+
+    /**
+     * Retrieves the currently configured hooks.
+     */
+    public List<GHHook> getHooks() throws IOException {
+        List<GHHook> list = new ArrayList<GHHook>(Arrays.asList(
+                root.retrieveWithAuth3(String.format("/repos/%s/%s/hooks",owner.login,name),GHHook[].class)));
+        for (GHHook h : list)
+            h.wrap(this);
+        return list;
+    }
+
+    public GHHook getHook(int id) throws IOException {
+        return root.retrieveWithAuth3(String.format("/repos/%s/%s/hooks/%d",owner.login,name,id),GHHook.class).wrap(this);
+    }
+
+    /**
+     * 
+     * See https://api.github.com/hooks for possible names and their configuration scheme.
+     * TODO: produce type-safe binding
+     * 
+     * @param name
+     *      Type of the hook to be created.
+     * @param config
+     *      The configuration hash.
+     * @param events
+     *      Can be null. Types of events to hook into.
+     */
+    public GHHook createHook(String name, Map<String,String> config, Collection<GHEvent> events, boolean active) throws IOException {
+        List<String> ea = null;
+        if (events!=null) {
+            ea = new ArrayList<String>();
+            for (GHEvent e : events)
+                ea.add(e.name().toLowerCase(Locale.ENGLISH));
+        }
+
+        return new Poster(root,ApiVersion.V3)
+                .withCredential()
+                .with("name",name)
+                .with("active", active)
+                ._with("config", config)
+                ._with("events",ea)
+                .to(String.format("/repos/%s/%s/hooks",owner.login,this.name),GHHook.class).wrap(this);
+    }
+    
+    public GHHook createWebHook(URL url, Collection<GHEvent> events) throws IOException {
+        return createHook("web",Collections.singletonMap("url",url.toExternalForm()),events,true);
+    }
+
+    public GHHook createWebHook(URL url) throws IOException {
+        return createWebHook(url,null);
     }
 
 // this is no different from getPullRequests(OPEN)
@@ -303,13 +361,16 @@ public class GHRepository {
 //    }
 
     private void verifyMine() throws IOException {
-        if (!root.login.equals(owner))
+        if (!root.login.equals(owner.login))
-            throw new IOException("Operation not applicable to a repository owned by someone else: "+owner);
+            throw new IOException("Operation not applicable to a repository owned by someone else: "+owner.login);
     }
 
     /**
      * Returns a set that represents the post-commit hook URLs.
      * The returned set is live, and changes made to them are reflected to GitHub.
+     * 
+     * @deprecated 
+     *      Use {@link #getHooks()} and {@link #createHook(String, Map, Collection, boolean)}
      */
     public Set<URL> getPostCommitHooks() {
         return postCommitHooks;
@@ -321,15 +382,11 @@ public class GHRepository {
     private final Set<URL> postCommitHooks = new AbstractSet<URL>() {
         private List<URL> getPostCommitHooks() {
             try {
-                verifyMine();
-
-                HtmlForm f = getForm();
-
                 List<URL> r = new ArrayList<URL>();
-                for (HtmlInput i : f.getInputsByName("urls[]")) {
+                for (GHHook h : getHooks()) {
-                    String v = i.getValueAttribute();
+                    if (h.getName().equals("web")) {
-                    if (v.length()==0)  continue;
+                        r.add(new URL(h.getConfig().get("url")));
-                    r.add(new URL(v));
+                    }
                 }
                 return r;
             } catch (IOException e) {
@@ -350,22 +407,7 @@ public class GHRepository {
         @Override
         public boolean add(URL url) {
             try {
-                String u = url.toExternalForm();
+                createWebHook(url);
-
-                verifyMine();
-
-                HtmlForm f = getForm();
-
-                List<HtmlInput> controls = f.getInputsByName("urls[]");
-                for (HtmlInput i : controls) {
-                    String v = i.getValueAttribute();
-                    if (v.length()==0)  continue;
-                    if (v.equals(u))
-                        return false;   // already there
-                }
-
-                controls.get(controls.size()-1).setValueAttribute(u);
-                f.submit(null);
                 return true;
             } catch (IOException e) {
                 throw new GHException("Failed to update post-commit hooks",e);
@@ -373,43 +415,30 @@ public class GHRepository {
         }
 
         @Override
-        public boolean remove(Object o) {
+        public boolean remove(Object url) {
             try {
-                String u = ((URL)o).toExternalForm();
+                String _url = ((URL)url).toExternalForm();
-
+                for (GHHook h : getHooks()) {
-                verifyMine();
+                    if (h.getName().equals("web") && h.getConfig().get("url").equals(_url)) {
-
+                        h.delete();
-                HtmlForm f = getForm();
-
-                List<HtmlInput> controls = f.getInputsByName("urls[]");
-                for (HtmlInput i : controls) {
-                    String v = i.getValueAttribute();
-                    if (v.length()==0)  continue;
-                    if (v.equals(u)) {
-                        i.setValueAttribute("");
-                        f.submit(null);
                         return true;
                     }
                 }
-
                 return false;
             } catch (IOException e) {
                 throw new GHException("Failed to update post-commit hooks",e);
             }
         }
-
-        private HtmlForm getForm() throws IOException {
-            WebClient wc = root.createWebClient();
-            HtmlPage pg = (HtmlPage)wc.getPage(getUrl()+"/admin");
-            HtmlForm f = (HtmlForm) pg.getElementById("new_service");
-            return f;
-        }
     };
 
+    /*package*/ GHRepository wrap(GitHub root) {
+        this.root = root;
+        return this;
+    }
 
     @Override
     public String toString() {
-        return "Repository:"+owner+":"+name;
+        return "Repository:"+owner.login+":"+name;
     }
 
     @Override
@@ -421,7 +450,7 @@ public class GHRepository {
     public boolean equals(Object obj) {
         if (obj instanceof GHRepository) {
             GHRepository that = (GHRepository) obj;
-            return this.owner.equals(that.owner)
+            return this.owner.login.equals(that.owner.login)
                 && this.name.equals(that.name);
         }
         return false;

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

@@ -35,7 +35,7 @@ public class GHTeam {
     }
 
     public Map<String,GHRepository> getRepositories() throws IOException {
-        return org.root.retrieveWithAuth(api("/repositories"),JsonRepositories.class).wrap(org.root);
+        return org.root.retrieveWithAuth3(api("/repos"),JsonRepositories.class).wrap(org.root);
     }
 
     /**

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

@@ -23,7 +23,12 @@
  */
 package org.kohsuke.github;
 
+import com.infradna.tool.bridge_method_injector.BridgeMethodsAdded;
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -32,77 +37,6 @@ import java.util.Set;
  * @author Kohsuke Kawaguchi
  */
 public class GHUser extends GHPerson {
-    private String name,company,location,created_at,blog,email;
-    private int followers_count;
-
-    /**
-     * Gets the human-readable name of the user, like "Kohsuke Kawaguchi"
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the company name of this user, like "Sun Microsystems, Inc."
-     */
-    public String getCompany() {
-        return company;
-    }
-
-    /**
-     * Gets the location of this user, like "Santa Clara, California"
-     */
-    public String getLocation() {
-        return location;
-    }
-
-    public String getCreatedAt() {
-        return created_at;
-    }
-
-    /**
-     * Gets the blog URL of this user.
-     */
-    public String getBlog() {
-        return blog;
-    }
-
-    /**
-     * Gets the login ID of this user, like 'kohsuke'
-     */
-    public String getLogin() {
-        return login;
-    }
-
-    /**
-     * Gets the e-mail address of the user.
-     */
-    public String getEmail() {
-        return email;
-    }
-
-    public int getPublicGistCount() {
-        return public_gist_count;
-    }
-
-    public int getPublicRepoCount() {
-        return public_repo_count;
-    }
-
-    public int getFollowingCount() {
-        return following_count;
-    }
-
-    /**
-     * What appears to be a GitHub internal unique number that identifies this user.
-     */
-    public int getId() {
-        return id;
-    }
-
-    public int getFollowersCount() {
-        return followers_count;
-    }
 
     /**
      * Follow this user.
@@ -121,17 +55,33 @@ public class GHUser extends GHPerson {
     /**
      * Lists the users that this user is following
      */
-    public Set<GHUser> getFollows() throws IOException {
+    @WithBridgeMethods(Set.class)
+    public GHPersonSet<GHUser> getFollows() throws IOException {
         return root.retrieve("/user/show/"+login+"/following",JsonUsers.class).toSet(root);
     }
 
     /**
      * Lists the users who are following this user.
      */
-    public Set<GHUser> getFollowers() throws IOException {
+    @WithBridgeMethods(Set.class)
+    public GHPersonSet<GHUser> getFollowers() throws IOException {
         return root.retrieve("/user/show/"+login+"/followers",JsonUsers.class).toSet(root);
     }
 
+    /**
+     * Gets the organization that this user belongs to publicly.
+     */
+    @WithBridgeMethods(Set.class)
+    public GHPersonSet<GHOrganization> getOrganizations() throws IOException {
+        GHPersonSet<GHOrganization> orgs = new GHPersonSet<GHOrganization>();
+        Set<String> names = new HashSet<String>();
+        for (GHOrganization o : root.retrieve3("/users/"+login+"/orgs",GHOrganization[].class)) {
+            if (names.add(o.getLogin()))    // I've seen some duplicates in the data
+                orgs.add(root.getOrganization(o.getLogin()));
+        }
+        return orgs;
+    }
+
     @Override
     public String toString() {
         return "User:"+login;

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

@@ -34,7 +34,9 @@ import sun.misc.BASE64Encoder;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.InterruptedIOException;
 import java.net.HttpURLConnection;
@@ -42,15 +44,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.*;
+import static org.kohsuke.github.ApiVersion.*;
 
 /**
  * Root of the GitHub API.
@@ -65,7 +65,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;
+	/*package*/ String oauthAccessToken;
 
     private GitHub(String login, String apiToken, String password) {
         this.login = login;
@@ -134,34 +134,50 @@ public class GitHub {
     /*package*/ URL getApiURL(ApiVersion v, String tailApiUrl) throws IOException {
     	if (oauthAccessToken != null) {
     		// append the access token
-    		tailApiUrl = tailApiUrl + "?access_token=" + oauthAccessToken;
+    		tailApiUrl = tailApiUrl +  (tailApiUrl.indexOf('?')>=0 ?'&':'?') + "access_token=" + oauthAccessToken;
     	}
     	
         return new URL(v.url+tailApiUrl);
     }
 
     /*package*/ <T> T retrieve(String tailApiUrl, Class<T> type) throws IOException {
-        return _retrieve(tailApiUrl, type, "GET", false);
+        return _retrieve(tailApiUrl, type, "GET", false, V2);
+    }
+
+    /*package*/ <T> T retrieve3(String tailApiUrl, Class<T> type) throws IOException {
+        return _retrieve(tailApiUrl, type, "GET", false, V3);
     }
 
     /*package*/ <T> T retrieveWithAuth(String tailApiUrl, Class<T> type) throws IOException {
         return retrieveWithAuth(tailApiUrl,type,"GET");
     }
 
-    /*package*/ <T> T retrieveWithAuth(String tailApiUrl, Class<T> type, String method) throws IOException {
+    /*package*/ <T> T retrieveWithAuth3(String tailApiUrl, Class<T> type) throws IOException {
-        return _retrieve(tailApiUrl, type, method, true);
+        return _retrieve(tailApiUrl, type, "GET", true, V3);
     }
 
-    private <T> T _retrieve(String tailApiUrl, Class<T> type, String method, boolean withAuth) throws IOException {
+    /*package*/ <T> T retrieveWithAuth(String tailApiUrl, Class<T> type, String method) throws IOException {
+        return _retrieve(tailApiUrl, type, method, true, V2);
+    }
+
+    /*package*/ <T> T retrieveWithAuth3(String tailApiUrl, Class<T> type, String method) throws IOException {
+        return _retrieve(tailApiUrl, type, method, true, V3);
+    }
+
+    private <T> T _retrieve(String tailApiUrl, Class<T> type, String method, boolean withAuth, ApiVersion v) throws IOException {
         while (true) {// loop while API rate limit is hit
         	
-        	
+            HttpURLConnection uc = (HttpURLConnection) getApiURL(v,tailApiUrl).openConnection();
-            HttpURLConnection uc = (HttpURLConnection) getApiURL(ApiVersion.V2,tailApiUrl).openConnection();
 
             if (withAuth && this.oauthAccessToken == null)
                 uc.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
             
             uc.setRequestMethod(method);
+            if (method.equals("PUT")) {
+                uc.setDoOutput(true);
+                uc.setRequestProperty("Content-Length","0");
+                uc.getOutputStream().close();
+            }
 
             try {
                 InputStreamReader r = new InputStreamReader(uc.getInputStream(), "UTF-8");
@@ -191,30 +207,54 @@ public class GitHub {
             }
         }
         
-        throw (IOException)new IOException(IOUtils.toString(uc.getErrorStream(),"UTF-8")).initCause(e);
+        if (e instanceof FileNotFoundException)
+            throw e;    // pass through 404 Not Found to allow the caller to handle it intelligently
+
+        InputStream es = uc.getErrorStream();
+        if (es!=null)
+            throw (IOException)new IOException(IOUtils.toString(es,"UTF-8")).initCause(e);
+        else
+            throw e;
     }
 
     /**
-     * Obtains the object that represents the named user.
+	 * Gets the {@link GHUser} that represents yourself.
-     */
+	 */
-    public GHUser getUser(String login) throws IOException {
+	public GHUser getMyself() throws IOException {
-        GHUser u = users.get(login);
+		requireCredential();
-        if (u==null) {
+
-        	
+		if (oauthAccessToken != null) {
-        	if (oauthAccessToken != null) {
+            GHUser u = retrieveWithAuth("/user/show", JsonUser.class).user;
-        		u = retrieve("/user/show",JsonUser.class).user;
+			
-        		u.root = this;
+			u.root = this;
-                users.put(u.getLogin(),u);
+			users.put(u.getLogin(), u);
-        	}
+			
-        	else {
+			return u;
-            u = retrieve("/user/show/"+login,JsonUser.class).user;
+		} else {
-            u.root = this;
+			return getUser(login);
-            users.put(login,u);
+		}
-        	}
+	}
-            
+
-        }
+	/**
-        return u;
+	 * Obtains the object that represents the named user.
-    }
+	 */
+	public GHUser getUser(String login) throws IOException {
+		GHUser u = users.get(login);
+		if (u == null) {
+
+			if (oauthAccessToken != null) {
+				u = retrieve("/user/show/" + login, 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;
+	}
 
     /**
      * Interns the given {@link GHUser}.
@@ -243,14 +283,7 @@ public class GitHub {
     	 return retrieveWithAuth("/organizations",JsonOrganizations.class).wrap(this);
         
     }
-    /**
+    
-     * Gets the {@link GHUser} that represents yourself.
-     */
-    public GHUser getMyself() throws IOException {
-        requireCredential();
-        return getUser(login);
-    }
-
     /**
      * Creates a new repository.
      *
@@ -258,9 +291,9 @@ public class GitHub {
      *      Newly created repository.
      */
     public GHRepository createRepository(String name, String description, String homepage, boolean isPublic) throws IOException {
-        return new Poster(this).withCredential()
+        return new Poster(this,V3).withCredential()
                 .with("name", name).with("description", description).with("homepage", homepage)
-                .with("public", isPublic ? 1 : 0).to("/repos/create", JsonRepository.class).wrap(this);
+                .with("public", isPublic ? 1 : 0).to("/user/repos", GHRepository.class,"POST").wrap(this);
     }
 
     /**

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

@@ -1,36 +0,0 @@
-/*
- * 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;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonRepository {
-    public GHRepository repository;
-
-    public GHRepository wrap(GitHub root) {
-        repository.root = root;
-        return repository;
-    }
-}

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

@@ -34,8 +34,8 @@ import java.util.Set;
 class JsonUsers {
     public List<String> users;
 
-    public Set<GHUser> toSet(GitHub root) throws IOException {
+    public GHPersonSet<GHUser> toSet(GitHub root) throws IOException {
-        Set<GHUser> r = new HashSet<GHUser>();
+        GHPersonSet<GHUser> r = new GHPersonSet<GHUser>();
         for (String u : users)
             r.add(root.getUser(u));
         return r;

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

@@ -24,6 +24,9 @@
 package org.kohsuke.github;
 
 import org.apache.commons.io.IOUtils;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.impl.WriterBasedGenerator;
+import org.codehaus.jackson.node.ObjectNode;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -33,7 +36,9 @@ import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.kohsuke.github.GitHub.*;
 
@@ -43,11 +48,25 @@ import static org.kohsuke.github.GitHub.*;
  */
 class Poster {
     private final GitHub root;
-    private final List<String> args = new ArrayList<String>();
+    private final List<Entry> args = new ArrayList<Entry>();
     private boolean authenticate;
 
     private final ApiVersion v;
 
+    private static class Entry {
+        String key;
+        Object value;
+
+        private Entry(String key, Object value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        public String toFormArg() throws UnsupportedEncodingException {
+            return URLEncoder.encode(key,"UTF-8")+'='+URLEncoder.encode(value.toString(),"UTF-8");
+        }
+    }
+
     Poster(GitHub root, ApiVersion v) {
         this.root = root;
         this.v = v;
@@ -64,16 +83,20 @@ class Poster {
     }
 
     public Poster with(String key, int value) {
-        return with(key,String.valueOf(value));
+        return _with(key, value);
+    }
+
+    public Poster with(String key, boolean value) {
+        return _with(key, value);
     }
 
     public Poster with(String key, String value) {
+        return _with(key, value);
+    }
+
+    public Poster _with(String key, Object value) {
         if (value!=null) {
-            try {
+            args.add(new Entry(key,value));
-                args.add(URLEncoder.encode(key,"UTF-8")+'='+URLEncoder.encode(value,"UTF-8"));
-            } catch (UnsupportedEncodingException e) {
-                throw new Error(e); // impossible
-            }
         }
         return this;
     }
@@ -102,9 +125,13 @@ class Poster {
             uc.setRequestProperty("Content-type","application/x-www-form-urlencoded");
             if (authenticate) {
                 if (v==ApiVersion.V3) {
-                    if (root.password==null)
+                    if (root.oauthAccessToken!=null) {
-                        throw new IllegalArgumentException("V3 API doesn't support API token");
+                        uc.setRequestProperty("Authorization", "token " + root.oauthAccessToken);
-                    uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
+                    } else {
+                        if (root.password==null)
+                            throw new IllegalArgumentException("V3 API doesn't support API token");
+                        uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
+                    }
                 } else {
                     uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
                 }
@@ -112,23 +139,31 @@ class Poster {
             uc.setRequestMethod(method);
 
 
-            StringBuilder body = new StringBuilder();
+            if (v==ApiVersion.V2) {
-            for (String e : args) {
+                StringBuilder body = new StringBuilder();
-                if (body.length()>0)    body.append('&');
+                for (Entry e : args) {
-                body.append(e);
+                    if (body.length()>0)    body.append('&');
-            }
+                    body.append(e.toFormArg());
+                }
 
-            OutputStreamWriter o = new OutputStreamWriter(uc.getOutputStream(), "UTF-8");
+                OutputStreamWriter o = new OutputStreamWriter(uc.getOutputStream(), "UTF-8");
-            o.write(body.toString());
+                o.write(body.toString());
-            o.close();
+                o.close();
+            } else {
+                Map json = new HashMap();
+                for (Entry e : args) {
+                    json.put(e.key, e.value);
+                }
+                MAPPER.writeValue(uc.getOutputStream(),json);
+            }
 
             try {
                 InputStreamReader r = new InputStreamReader(uc.getInputStream(), "UTF-8");
+                String data = IOUtils.toString(r);
                 if (type==null) {
-                    String data = IOUtils.toString(r);
                     return null;
                 }
-                return MAPPER.readValue(r,type);
+                return MAPPER.readValue(data,type);
             } catch (IOException e) {
                 root.handleApiError(e,uc);
             }

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

@@ -1,12 +1,11 @@
 package org.kohsuke;
 
 import junit.framework.TestCase;
+import org.kohsuke.github.GHHook;
 import org.kohsuke.github.GHOrganization;
 import org.kohsuke.github.GHOrganization.Permission;
-import org.kohsuke.github.GHPullRequest;
 import org.kohsuke.github.GHRepository;
 import org.kohsuke.github.GHTeam;
-import org.kohsuke.github.GHUser;
 import org.kohsuke.github.GitHub;
 
 import java.io.IOException;
@@ -38,10 +37,29 @@ public class AppTest extends TestCase {
         Set<String> members = gitHub.getOrganization("jenkinsci").getRepository("violations-plugin").getCollaboratorNames();
         System.out.println(members.contains("kohsuke"));
     }
+    
+    public void testMemberOrgs() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        Set<GHOrganization> o = gitHub.getUser("kohsuke").getOrganizations();
+        System.out.println(o);
+    }
+
+    public void tryHook() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        GHRepository r = gitHub.getMyself().getRepository("test2");
+        GHHook hook = r.createWebHook(new URL("http://www.google.com/"));
+        System.out.println(hook);
+
+        for (GHHook h : r.getHooks())
+            h.delete();
+    }
 
     public void testApp() throws IOException {
         GitHub gitHub = GitHub.connect();
 
+//        GHRepository r = gitHub.connect().getOrganization("jenkinsci").createRepository("kktest4", "Kohsuke's test", "http://kohsuke.org/", "Everyone", true);
+//        r.fork();
+
 //        tryDisablingIssueTrackers(gitHub);
 
 //        tryDisablingWiki(gitHub);
@@ -129,10 +147,13 @@ public class AppTest extends TestCase {
         System.out.println(hooks);
     }
 
-    private void testOrganization(GitHub gitHub) throws IOException {
+    public void testOrganization() throws IOException {
-        GHOrganization labs = gitHub.getOrganization("HudsonLabs");
+        GitHub gitHub = GitHub.connect();
-        GHTeam t = labs.getTeams().get("Core Developers");
+        GHOrganization j = gitHub.getOrganization("jenkinsci");
+        GHTeam t = j.getTeams().get("Core Developers");
 
-        t.add(labs.getRepository("xyz"));
+        assertNotNull(j.getRepository("jenkins"));
+
+//        t.add(labs.getRepository("xyz"));
     }
 }