Skip to content

Bugfixing incomplete PRs #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DirkMahler merged 3 commits into from
Mar 20, 2025
Merged

Bugfixing incomplete PRs #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68eb65b
Bump versions
ascheman Mar 20, 2025
7ea8bf7
Retrieve all PRs on all branches
ascheman Mar 20, 2025
8dc7eff
Drop the Lombok version as the parent manages this
ascheman Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jqassistant.plugin</groupId>
<artifactId>parent</artifactId>
<version>2.4.0-M3</version>
<version>2.6.0</version>
</parent>

<artifactId>jqassistant-github-plugin</artifactId>
Expand Down Expand Up @@ -67,21 +67,20 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.8.3</version>
<version>1.19.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.2</version>
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.kohsuke/github-api -->
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>1.314</version>
<version>1.326</version>
</dependency>

<!-- Test dependencies -->
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jqassistant/plugin/github/scanner/GraphBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GitHubRepository scanRepository(GHRepository ghRepository, String branch) throws

// branch dependent
importBranch(ghRepository, gitHubRepository, branch);
importPullRequests(ghRepository, gitHubRepository, branch); // first import PRs, because they'll also be returned when fetching issues
importPullRequests(ghRepository, gitHubRepository); // first import PRs, because they'll also be returned when fetching issues

// branch independent
importMilestones(ghRepository, gitHubRepository);
Expand All @@ -61,9 +61,9 @@ private void importBranch(GHRepository repository, GitHubRepository gitHubReposi
}
}

private void importPullRequests(GHRepository repository, GitHubRepository gitHubRepository, String branch) {
private void importPullRequests(GHRepository repository, GitHubRepository gitHubRepository) {
List<GitHubPullRequest> pullRequests = new LinkedList<>();
for (GHPullRequest ghPullRequest : repository.queryPullRequests().base(branch).list()) {
for (GHPullRequest ghPullRequest : repository.queryPullRequests().state(GHIssueState.ALL).list()) {
log.debug("Found pull request: {}", ghPullRequest.getNumber());
pullRequests.add(cacheEndpoint.findOrCreatePullRequest(ghPullRequest));
}
Expand Down
Loading