From fc3b6d2c2eba2d6c4292be34ee15dc13351fac15 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 23 Mar 2015 02:23:44 +0300 Subject: [PATCH 1/3] [CID-107535] Missing call to superclass Similar to other events --- src/main/java/org/kohsuke/github/GHEventPayload.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/kohsuke/github/GHEventPayload.java b/src/main/java/org/kohsuke/github/GHEventPayload.java index 4e718a2dc6..cd248c80ec 100644 --- a/src/main/java/org/kohsuke/github/GHEventPayload.java +++ b/src/main/java/org/kohsuke/github/GHEventPayload.java @@ -165,6 +165,7 @@ public GHRepository getRepository() { @Override void wrapUp(GitHub root) { + super.wrapUp(root); if (repository!=null) repository.wrap(root); } From f1f96713a48e6562998f2b318bb4f43a57b61a01 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 23 Mar 2015 02:35:55 +0300 Subject: [PATCH 2/3] [CID-107552] Unintended regular expression regex_expected: The . character(s) in the pattern ".md" can match any character, because calls to replaceAll treat the pattern as a regular expression, which might be unexpected. --- src/test/java/org/kohsuke/github/AppTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/kohsuke/github/AppTest.java b/src/test/java/org/kohsuke/github/AppTest.java index b5d7c517a7..8e7fe8972a 100755 --- a/src/test/java/org/kohsuke/github/AppTest.java +++ b/src/test/java/org/kohsuke/github/AppTest.java @@ -673,8 +673,8 @@ public void testReadme() throws IOException { public void testTrees() throws IOException { GHTree masterTree = gitHub.getRepository("kohsuke/github-api").getTree("master"); boolean foundReadme = false; - for(GHTreeEntry e : masterTree.getTree()){ - if("readme".equalsIgnoreCase(e.getPath().replaceAll(".md", ""))){ + for(GHTreeEntry e : masterTree.getTree()){ + if("readme".equalsIgnoreCase(e.getPath().replaceAll("\\.md", ""))){ foundReadme = true; break; } From 9ebc9c08678a0ae03d2960469d1c1c85cbf3b2d2 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Mon, 23 Mar 2015 21:14:42 +0300 Subject: [PATCH 3/3] Use FAIL rate-limit handler for tests Should avoid possible Thread.sleep() for tests execution. --- .../java/org/kohsuke/github/AbstractGitHubApiTestBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/kohsuke/github/AbstractGitHubApiTestBase.java b/src/test/java/org/kohsuke/github/AbstractGitHubApiTestBase.java index a4311429d7..f1753481e7 100644 --- a/src/test/java/org/kohsuke/github/AbstractGitHubApiTestBase.java +++ b/src/test/java/org/kohsuke/github/AbstractGitHubApiTestBase.java @@ -19,9 +19,9 @@ public void setUp() throws Exception { if (f.exists()) { // use the non-standard credential preferentially, so that developers of this library do not have // to clutter their event stream. - gitHub = GitHubBuilder.fromPropertyFile(f.getPath()).build(); + gitHub = GitHubBuilder.fromPropertyFile(f.getPath()).withRateLimitHandler(RateLimitHandler.FAIL).build(); } else { - gitHub = GitHub.connect(); + gitHub = GitHubBuilder.fromCredentials().withRateLimitHandler(RateLimitHandler.FAIL).build(); } }