From bbf045dbf1e05f465aa2e836de72a59b2e94e578 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 12 Dec 2010 21:17:08 -0800 Subject: [PATCH] bug fix --- src/main/java/org/kohsuke/github/GHPerson.java | 1 + src/main/java/org/kohsuke/github/GHTeam.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java index 959453d3c..69db48772 100644 --- a/src/main/java/org/kohsuke/github/GHPerson.java +++ b/src/main/java/org/kohsuke/github/GHPerson.java @@ -44,6 +44,7 @@ public abstract class GHPerson { * 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 = root.retrieve("/repos/show/" + login + '/' + name, JsonRepository.class).wrap(root); repositories.put(name,r); return r; diff --git a/src/main/java/org/kohsuke/github/GHTeam.java b/src/main/java/org/kohsuke/github/GHTeam.java index 40c24d4b0..51f8b4a99 100644 --- a/src/main/java/org/kohsuke/github/GHTeam.java +++ b/src/main/java/org/kohsuke/github/GHTeam.java @@ -1,7 +1,6 @@ package org.kohsuke.github; import java.io.IOException; -import java.net.URL; import java.util.Set; /** @@ -31,28 +30,32 @@ public class GHTeam { * Retrieves the current members. */ public Set getMembers() throws IOException { - return org.root.retrieveWithAuth("/members",JsonUsersWithDetails.class).toSet(org.root); + return org.root.retrieveWithAuth(api("/members"),JsonUsersWithDetails.class).toSet(org.root); } /** * Adds a member to the team. */ public void add(GHUser u) throws IOException { - org.root.retrieveWithAuth("/members?name="+u.getLogin(),null, "POST"); + org.root.retrieveWithAuth(api("/members?name="+u.getLogin()),null, "POST"); } /** * Removes a member to the team. */ public void remove(GHUser u) throws IOException { - org.root.retrieveWithAuth("/members?name="+u.getLogin(),null, "DELETE"); + org.root.retrieveWithAuth(api("/members?name="+u.getLogin()),null, "DELETE"); } public void add(GHRepository r) throws IOException { - org.root.retrieveWithAuth("/repositories?name="+r.getOwnerName()+'/'+r.getName(),null, "POST"); + org.root.retrieveWithAuth(api("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "POST"); } public void remove(GHRepository r) throws IOException { - org.root.retrieveWithAuth("/repositories?name="+r.getOwnerName()+'/'+r.getName(),null, "DELETE"); + org.root.retrieveWithAuth(api("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "DELETE"); + } + + private String api(String tail) { + return "/teams/"+id+tail; } }