Cleanup based on review

Author: timja

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

@@ -386,7 +386,7 @@ public enum Permission {
      * @throws IOException
      *             the io exception
      * @deprecated https://developer.github.com/v3/teams/#create-team deprecates permission field use
-     *             {@link #createTeam(String, Collection)}
+     *             {@link #createTeam(String)}
      */
     @Deprecated
     public GHTeam createTeam(String name, Permission p, Collection<GHRepository> repositories) throws IOException {
@@ -412,7 +412,7 @@ public GHTeam createTeam(String name, Permission p, Collection<GHRepository> rep
      * @throws IOException
      *             the io exception
      * @deprecated https://developer.github.com/v3/teams/#create-team deprecates permission field use
-     *             {@link #createTeam(String, GHRepository...)}
+     *             {@link #createTeam(String)}
      */
     @Deprecated
     public GHTeam createTeam(String name, Permission p, GHRepository... repositories) throws IOException {
@@ -429,7 +429,9 @@ public GHTeam createTeam(String name, Permission p, GHRepository... repositories
      * @return the gh team
      * @throws IOException
      *             the io exception
+     * @deprecated Use {@link #createTeam(String)} that uses a builder pattern to let you control every aspect.
      */
+    @Deprecated
     public GHTeam createTeam(String name, Collection<GHRepository> repositories) throws IOException {
         Requester post = root.createRequest().method("POST").with("name", name);
         List<String> repo_names = new ArrayList<String>();
@@ -450,7 +452,9 @@ public GHTeam createTeam(String name, Collection<GHRepository> repositories) thr
      * @return the gh team
      * @throws IOException
      *             the io exception
+     * @deprecated Use {@link #createTeam(String)} that uses a builder pattern to let you control every aspect.
      */
+    @Deprecated
     public GHTeam createTeam(String name, GHRepository... repositories) throws IOException {
         return createTeam(name, Arrays.asList(repositories));
     }
@@ -459,15 +463,15 @@ public GHTeam createTeam(String name, GHRepository... repositories) throws IOExc
      * Starts a builder that creates a new team.
      *
      * <p>
-     * You use the returned builder to set various properties, then call {@link GHCreateTeamBuilder#create()} to finally
+     * You use the returned builder to set various properties, then call {@link GHTeamBuilder#create()} to finally
      * create a team.
      *
      * @param name
      *            the name
      * @return the gh create repository builder
      */
-    public GHCreateTeamBuilder createTeam(String name) {
-        return new GHCreateTeamBuilder(root, "/orgs/" + login + "/teams", name);
+    public GHTeamBuilder createTeam(String name) {
+        return new GHTeamBuilder(root, login, name);
     }
 
     /**

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

@@ -126,14 +126,14 @@ public void setDescription(String description) throws IOException {
     }
 
     /**
-     * Sets privacy.
+     * Updates the team's privacy setting.
      *
      * @param privacy
      *            the privacy
      * @throws IOException
      *             the io exception
      */
-    public void setPrivacy(Privacy privacy) throws IOException {
+    public void updatePrivacy(Privacy privacy) throws IOException {
         root.createRequest().method("PATCH").with("privacy", privacy).withUrlPath(api("")).send();
     }
 

src/main/java/org/kohsuke/github/GHCreateTeamBuilder.java renamed to src/main/java/org/kohsuke/github/GHTeamBuilder.java

@@ -5,16 +5,18 @@
 
 /**
  * Creates a team.
+ *
+ * https://developer.github.com/v3/teams/#parameters
  */
-public class GHCreateTeamBuilder {
+public class GHTeamBuilder {
 
     private final GitHub root;
     protected final Requester builder;
-    private final String apiUrlTail;
+    private final String orgName;
 
-    public GHCreateTeamBuilder(GitHub root, String apiUrlTail, String name) {
+    public GHTeamBuilder(GitHub root, String orgName, String name) {
         this.root = root;
-        this.apiUrlTail = apiUrlTail;
+        this.orgName = orgName;
         this.builder = root.createRequest();
         this.builder.with("name", name);
     }
@@ -26,7 +28,7 @@ public GHCreateTeamBuilder(GitHub root, String apiUrlTail, String name) {
      *            description of team
      * @return a builder to continue with building
      */
-    public GHCreateTeamBuilder description(String description) {
+    public GHTeamBuilder description(String description) {
         this.builder.with("description", description);
         return this;
     }
@@ -38,7 +40,7 @@ public GHCreateTeamBuilder description(String description) {
      *            maintainers of team
      * @return a builder to continue with building
      */
-    public GHCreateTeamBuilder maintainers(List<String> maintainers) {
+    public GHTeamBuilder maintainers(List<String> maintainers) {
         this.builder.with("maintainers", maintainers);
         return this;
     }
@@ -50,7 +52,7 @@ public GHCreateTeamBuilder maintainers(List<String> maintainers) {
      *            repoNames to add team to
      * @return a builder to continue with building
      */
-    public GHCreateTeamBuilder repoNames(List<String> repoNames) {
+    public GHTeamBuilder repoNames(List<String> repoNames) {
         this.builder.with("repo_names", repoNames);
         return this;
     }
@@ -62,7 +64,7 @@ public GHCreateTeamBuilder repoNames(List<String> repoNames) {
      *            privacy of team
      * @return a builder to continue with building
      */
-    public GHCreateTeamBuilder privacy(GHTeam.Privacy privacy) {
+    public GHTeamBuilder privacy(GHTeam.Privacy privacy) {
         this.builder.with("privacy", privacy);
         return this;
     }
@@ -74,7 +76,7 @@ public GHCreateTeamBuilder privacy(GHTeam.Privacy privacy) {
      *            parentTeamId of team
      * @return a builder to continue with building
      */
-    public GHCreateTeamBuilder parentTeamId(int parentTeamId) {
+    public GHTeamBuilder parentTeamId(int parentTeamId) {
         this.builder.with("parent_team_id", parentTeamId);
         return this;
     }
@@ -87,6 +89,6 @@ public GHCreateTeamBuilder parentTeamId(int parentTeamId) {
      *             if team cannot be created
      */
     public GHTeam create() throws IOException {
-        return builder.method("POST").withUrlPath(apiUrlTail).fetch(GHTeam.class).wrapUp(root);
+        return builder.method("POST").withUrlPath("/orgs/" + orgName + "/teams").fetch(GHTeam.class).wrapUp(root);
     }
 }

src/test/java/org/kohsuke/github/GHTeamTest.java

@@ -32,13 +32,13 @@ public void testSetDescription() throws IOException {
     }
 
     @Test
-    public void testSetPrivacy() throws IOException {
+    public void testUpdatePrivacy() throws IOException {
         String teamSlug = "dummy-team";
         Privacy privacy = Privacy.CLOSED;
 
         // Set the privacy.
         GHTeam team = gitHub.getOrganization(GITHUB_API_TEST_ORG).getTeamBySlug(teamSlug);
-        team.setPrivacy(privacy);
+        team.updatePrivacy(privacy);
 
         // Check that it was set correctly.
         team = gitHub.getOrganization(GITHUB_API_TEST_ORG).getTeamBySlug(teamSlug);
@@ -47,7 +47,7 @@ public void testSetPrivacy() throws IOException {
         privacy = Privacy.SECRET;
 
         // Set the privacy.
-        team.setPrivacy(privacy);
+        team.updatePrivacy(privacy);
 
         // Check that it was set correctly.
         team = gitHub.getOrganization(GITHUB_API_TEST_ORG).getTeamBySlug(teamSlug);