diff --git a/pom.xml b/pom.xml index c8068253c999..23ff86181014 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ org.kohsuke github-api - 1.330 + 2.0-rc.6 com.squareup.okhttp3 diff --git a/src/main/java/miner/GitHubMiner.java b/src/main/java/miner/GitHubMiner.java index 4d82a1c4becd..f24628460205 100644 --- a/src/main/java/miner/GitHubMiner.java +++ b/src/main/java/miner/GitHubMiner.java @@ -193,12 +193,12 @@ private void mineRepo(String repo, Date cutoffDate) throws IOException { while (pullRequests.hasNext()) { List nextPage = pullRequests.nextPage(); - if (PullRequestFilters.createdBefore(cutoffDate).test(nextPage.get(0))) { + if (PullRequestFilters.createdBefore(cutoffDate.toInstant()).test(nextPage.get(0))) { log.info("Checked all PRs for " + repo + " created after " + cutoffDate); break; } nextPage.stream() - .takeWhile(PullRequestFilters.createdBefore(cutoffDate).negate()) + .takeWhile(PullRequestFilters.createdBefore(cutoffDate.toInstant()).negate()) .filter(PullRequestFilters.changesOnlyDependencyVersionInPomXML) .filter(PullRequestFilters.breaksBuild) .map(BreakingUpdate::new) diff --git a/src/main/java/miner/PullRequestFilters.java b/src/main/java/miner/PullRequestFilters.java index 1547e30332c3..f56df52ba925 100644 --- a/src/main/java/miner/PullRequestFilters.java +++ b/src/main/java/miner/PullRequestFilters.java @@ -3,7 +3,7 @@ import org.kohsuke.github.*; import java.io.IOException; -import java.util.Date; +import java.time.Instant; import java.util.function.Predicate; import java.util.regex.Pattern; @@ -77,10 +77,10 @@ private PullRequestFilters() { /* Nothing to see here... */ } * @return a {@link java.util.function.Predicate} over {@link org.kohsuke.github.GHPullRequest}s returning * true if a PR was created before the given date, false otherwise. */ - public static Predicate createdBefore(Date cutoffDate) { + public static Predicate createdBefore(Instant cutoffDate) { return pr -> { try { - return pr.getCreatedAt().before(cutoffDate); + return pr.getCreatedAt().isBefore(cutoffDate); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/test/java/miner/PullRequestFiltersTest.java b/src/test/java/miner/PullRequestFiltersTest.java index 6f3383035de1..3b97e78dc072 100644 --- a/src/test/java/miner/PullRequestFiltersTest.java +++ b/src/test/java/miner/PullRequestFiltersTest.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.time.Instant; -import java.util.Date; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,7 +31,7 @@ void createdBeforeCorrectlyIdentifiesPR() throws IOException { gitHub.getRepository("iluwatar/java-design-patterns").getPullRequest(1976), gitHub.getRepository("alibaba/fastjson").getPullRequest(4233) ); - Date cutoffDate = Date.from(Instant.parse("2022-04-01T00:00:00.00Z")); + Instant cutoffDate = Instant.parse("2022-04-01T00:00:00.00Z"); assertEquals(2, prs.stream().filter(PullRequestFilters.createdBefore(cutoffDate)).count()); } }