Merge branch 'master' into issue_444_unset_milestone

Author: bitwiseman

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.kohsuke</groupId>
   <artifactId>github-api</artifactId>
-  <version>1.109-SNAPSHOT</version>
+  <version>1.110-SNAPSHOT</version>
   <name>GitHub API for Java</name>
   <url>https://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
@@ -572,6 +572,10 @@
       </properties>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
@@ -621,6 +625,18 @@
   </profiles>
   <reporting>
     <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <!-- select non-aggregate reports -->
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>

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

@@ -79,6 +79,18 @@ public GHCreateRepositoryBuilder issues(boolean enabled) {
         return this;
     }
 
+    /**
+     * Enables projects
+     *
+     * @param enabled
+     *            true if enabled
+     * @return a builder to continue with building
+     */
+    public GHCreateRepositoryBuilder projects(boolean enabled) {
+        this.builder.with("has_projects", enabled);
+        return this;
+    }
+
     /**
      * Enables wiki
      *

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

@@ -76,7 +76,7 @@ public class GHRepository extends GHObject {
 
     private String git_url, ssh_url, clone_url, svn_url, mirror_url;
     private GHUser owner; // not fully populated. beware.
-    private boolean has_issues, has_wiki, fork, has_downloads, has_pages, archived;
+    private boolean has_issues, has_wiki, fork, has_downloads, has_pages, archived, has_projects;
 
     private boolean allow_squash_merge;
     private boolean allow_merge_commit;
@@ -547,6 +547,15 @@ public boolean hasIssues() {
         return has_issues;
     }
 
+    /**
+     * Has projects boolean.
+     *
+     * @return the boolean
+     */
+    public boolean hasProjects() {
+        return has_projects;
+    }
+
     /**
      * Has wiki boolean.
      *
@@ -988,6 +997,18 @@ public void enableIssueTracker(boolean v) throws IOException {
         edit("has_issues", String.valueOf(v));
     }
 
+    /**
+     * Enables or disables projects for this repository.
+     *
+     * @param v
+     *            the v
+     * @throws IOException
+     *             the io exception
+     */
+    public void enableProjects(boolean v) throws IOException {
+        edit("has_projects", String.valueOf(v));
+    }
+
     /**
      * Enables or disables Wiki for this repository.
      *

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

@@ -40,13 +40,40 @@ public void testRepoCRUD() throws Exception {
                 "a test repository",
                 "http://github-api.kohsuke.org/",
                 true);
+
         assertThat(r.hasIssues(), is(true));
+        assertThat(r.hasWiki(), is(true));
+        assertThat(r.hasDownloads(), is(true));
+        assertThat(r.hasProjects(), is(true));
 
         r.enableIssueTracker(false);
         r.enableDownloads(false);
         r.enableWiki(false);
+        r.enableProjects(false);
+
         r.renameTo(targetName);
-        getUser().getRepository(targetName).delete();
+
+        // local instance remains unchanged
+        assertThat(r.getName(), equalTo("github-api-test-rename"));
+        assertThat(r.hasIssues(), is(true));
+        assertThat(r.hasWiki(), is(true));
+        assertThat(r.hasDownloads(), is(true));
+        assertThat(r.hasProjects(), is(true));
+
+        r = gitHub.getMyself().getRepository(targetName);
+
+        // values are updated
+        assertThat(r.hasIssues(), is(false));
+        assertThat(r.hasWiki(), is(false));
+        assertThat(r.hasDownloads(), is(false));
+        assertThat(r.getName(), equalTo(targetName));
+
+        // ISSUE: #765
+        // From what I can tell this is a bug in GithHub.
+        // updating `has_projects` doesn't seem to do anything
+        assertThat(r.hasProjects(), is(true));
+
+        r.delete();
     }
 
     @Test
@@ -58,14 +85,12 @@ public void testRepositoryWithAutoInitializationCRUD() throws Exception {
                 .homepage("http://github-api.kohsuke.org/")
                 .autoInit(true)
                 .create();
-        r.enableIssueTracker(false);
-        r.enableDownloads(false);
-        r.enableWiki(false);
         if (mockGitHub.isUseProxy()) {
             Thread.sleep(3000);
         }
         assertNotNull(r.getReadme());
-        getUser().getRepository(name).delete();
+
+        r.delete();
     }
 
     private void cleanupUserRepository(final String name) throws IOException {

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

@@ -74,15 +74,15 @@ public void testGitHubRateLimit() throws Exception {
         GHRateLimit headerRateLimit = rateLimit;
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // ratelimit() uses headerRateLimit if available and headerRateLimit is not expired
         assertThat(gitHub.rateLimit(), equalTo(headerRateLimit));
 
         assertThat(mockGitHub.getRequestCount(), equalTo(1));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // Always requests new info
         rateLimit = gitHub.getRateLimit();
@@ -96,7 +96,7 @@ public void testGitHubRateLimit() throws Exception {
         previousLimit = rateLimit;
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // Always requests new info
         rateLimit = gitHub.getRateLimit();
@@ -200,7 +200,7 @@ public void testGitHubEnterpriseDoesNotHaveRateLimit() throws Exception {
         Date lastReset = new Date(System.currentTimeMillis() / 1000L);
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // -------------------------------------------------------------
         // Before any queries, rate limit starts as null but may be requested
@@ -224,7 +224,7 @@ public void testGitHubEnterpriseDoesNotHaveRateLimit() throws Exception {
         assertThat(mockGitHub.getRequestCount(), equalTo(1));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // -------------------------------------------------------------
         // First call to /user gets response without rate limit information
@@ -244,7 +244,7 @@ public void testGitHubEnterpriseDoesNotHaveRateLimit() throws Exception {
         assertThat(mockGitHub.getRequestCount(), equalTo(3));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // Always requests new info
         rateLimit = gitHub.getRateLimit();
@@ -256,13 +256,13 @@ public void testGitHubEnterpriseDoesNotHaveRateLimit() throws Exception {
         assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(1));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // last is still null, because it actually means lastHeaderRateLimit
         assertThat(gitHub.lastRateLimit(), CoreMatchers.nullValue());
 
         // ratelimit() tries not to make additional requests, uses queried rate limit since header not available
-        Thread.sleep(1000);
+        Thread.sleep(1500);
         assertThat(gitHub.rateLimit(), sameInstance(rateLimit));
 
         // -------------------------------------------------------------
@@ -283,15 +283,15 @@ public void testGitHubEnterpriseDoesNotHaveRateLimit() throws Exception {
         GHRateLimit headerRateLimit = rateLimit;
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // ratelimit() uses headerRateLimit if available and headerRateLimit is not expired
         assertThat(gitHub.rateLimit(), sameInstance(headerRateLimit));
 
         assertThat(mockGitHub.getRequestCount(), equalTo(5));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // Always requests new info
         rateLimit = gitHub.getRateLimit();
@@ -308,7 +308,7 @@ public void testGitHubEnterpriseDoesNotHaveRateLimit() throws Exception {
         assertThat(mockGitHub.getRequestCount(), equalTo(6));
 
         // Wait for the header
-        Thread.sleep(1000);
+        Thread.sleep(1500);
     }
 
     @Test
@@ -361,7 +361,7 @@ private void executeExpirationTest() throws Exception {
         GHRateLimit headerRateLimit = null;
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // -------------------------------------------------------------
         // /user gets response with rate limit information
@@ -380,7 +380,7 @@ private void executeExpirationTest() throws Exception {
                 sameInstance(headerRateLimit));
 
         // Nothing changes still valid
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         assertThat("rateLimit() selects header instance when not expired, does not ask server",
                 gitHub.rateLimit(),
@@ -392,7 +392,7 @@ private void executeExpirationTest() throws Exception {
         assertThat(mockGitHub.getRequestCount(), equalTo(1));
 
         // This time, rateLimit() should find an expired record and get a new one.
-        Thread.sleep(3000);
+        Thread.sleep(2500);
 
         assertThat("Header instance has expired", gitHub.lastRateLimit().isExpired(), is(true));
 

src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b1b91949.json renamed to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-3.json

@@ -1,6 +1,6 @@
 {
-  "id": 212446528,
-  "node_id": "MDEwOlJlcG9zaXRvcnkyMTI0NDY1Mjg=",
+  "id": 251751384,
+  "node_id": "MDEwOlJlcG9zaXRvcnkyNTE3NTEzODQ=",
   "name": "github-api-test-rename",
   "full_name": "bitwiseman/github-api-test-rename",
   "private": false,
@@ -64,9 +64,9 @@
   "labels_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/labels{/name}",
   "releases_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/releases{/id}",
   "deployments_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/deployments",
-  "created_at": "2019-10-02T21:40:00Z",
-  "updated_at": "2019-10-02T21:40:01Z",
-  "pushed_at": "2019-10-02T21:40:01Z",
+  "created_at": "2020-03-31T21:52:44Z",
+  "updated_at": "2020-03-31T21:52:45Z",
+  "pushed_at": "2020-03-31T21:52:45Z",
   "git_url": "git://github.com/bitwiseman/github-api-test-rename.git",
   "ssh_url": "[email protected]:bitwiseman/github-api-test-rename.git",
   "clone_url": "https://github.com/bitwiseman/github-api-test-rename.git",
@@ -99,6 +99,7 @@
   "allow_squash_merge": true,
   "allow_merge_commit": true,
   "allow_rebase_merge": true,
+  "delete_branch_on_merge": false,
   "network_count": 0,
   "subscribers_count": 1
 }

src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-39714670.json renamed to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-4.json

@@ -1,6 +1,6 @@
 {
-  "id": 212446528,
-  "node_id": "MDEwOlJlcG9zaXRvcnkyMTI0NDY1Mjg=",
+  "id": 251751384,
+  "node_id": "MDEwOlJlcG9zaXRvcnkyNTE3NTEzODQ=",
   "name": "github-api-test-rename",
   "full_name": "bitwiseman/github-api-test-rename",
   "private": false,
@@ -64,9 +64,9 @@
   "labels_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/labels{/name}",
   "releases_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/releases{/id}",
   "deployments_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/deployments",
-  "created_at": "2019-10-02T21:40:00Z",
-  "updated_at": "2019-10-02T21:40:01Z",
-  "pushed_at": "2019-10-02T21:40:01Z",
+  "created_at": "2020-03-31T21:52:44Z",
+  "updated_at": "2020-03-31T21:52:46Z",
+  "pushed_at": "2020-03-31T21:52:45Z",
   "git_url": "git://github.com/bitwiseman/github-api-test-rename.git",
   "ssh_url": "[email protected]:bitwiseman/github-api-test-rename.git",
   "clone_url": "https://github.com/bitwiseman/github-api-test-rename.git",
@@ -99,6 +99,7 @@
   "allow_squash_merge": true,
   "allow_merge_commit": true,
   "allow_rebase_merge": true,
+  "delete_branch_on_merge": false,
   "network_count": 0,
   "subscribers_count": 1
 }

src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-b0c1117a.json renamed to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/repos_bitwiseman_github-api-test-rename-5.json

@@ -1,6 +1,6 @@
 {
-  "id": 212446528,
-  "node_id": "MDEwOlJlcG9zaXRvcnkyMTI0NDY1Mjg=",
+  "id": 251751384,
+  "node_id": "MDEwOlJlcG9zaXRvcnkyNTE3NTEzODQ=",
   "name": "github-api-test-rename",
   "full_name": "bitwiseman/github-api-test-rename",
   "private": false,
@@ -64,9 +64,9 @@
   "labels_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/labels{/name}",
   "releases_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/releases{/id}",
   "deployments_url": "https://api.github.com/repos/bitwiseman/github-api-test-rename/deployments",
-  "created_at": "2019-10-02T21:40:00Z",
-  "updated_at": "2019-10-02T21:40:02Z",
-  "pushed_at": "2019-10-02T21:40:01Z",
+  "created_at": "2020-03-31T21:52:44Z",
+  "updated_at": "2020-03-31T21:52:46Z",
+  "pushed_at": "2020-03-31T21:52:45Z",
   "git_url": "git://github.com/bitwiseman/github-api-test-rename.git",
   "ssh_url": "[email protected]:bitwiseman/github-api-test-rename.git",
   "clone_url": "https://github.com/bitwiseman/github-api-test-rename.git",
@@ -99,6 +99,7 @@
   "allow_squash_merge": true,
   "allow_merge_commit": true,
   "allow_rebase_merge": true,
+  "delete_branch_on_merge": false,
   "network_count": 0,
   "subscribers_count": 1
 }