Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 148d25f

Browse filesBrowse files
bitwisemanbitwiseman
authored
Merge branch 'main' into flaky-test
2 parents de1c7ec + a222b97 commit 148d25f
Copy full SHA for 148d25f

File tree

Expand file treeCollapse file tree

4 files changed

+43
-4
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+43
-4
lines changed

‎pom.xml

Copy file name to clipboardExpand all lines: pom.xml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<spotbugs-maven-plugin.version>4.7.1.1</spotbugs-maven-plugin.version>
36+
<spotbugs-maven-plugin.version>4.7.3.0</spotbugs-maven-plugin.version>
3737
<spotbugs.version>4.7.3</spotbugs.version>
3838
<spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
3939
<hamcrest.version>2.2</hamcrest.version>
@@ -567,7 +567,7 @@
567567
<dependency>
568568
<groupId>org.mockito</groupId>
569569
<artifactId>mockito-core</artifactId>
570-
<version>4.8.0</version>
570+
<version>4.11.0</version>
571571
<scope>test</scope>
572572
</dependency>
573573
<dependency>

‎src/main/java/org/kohsuke/github/GHEventPayload.java

Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GHEventPayload.java
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,7 @@ public static class Push extends GHEventPayload {
10431043
private String ref;
10441044
private int size;
10451045
private List<PushCommit> commits;
1046+
private PushCommit headCommit;
10461047
private Pusher pusher;
10471048
private String compare;
10481049

@@ -1124,6 +1125,16 @@ public List<PushCommit> getCommits() {
11241125
return Collections.unmodifiableList(commits);
11251126
}
11261127

1128+
/**
1129+
* The head commit of the push.
1130+
*
1131+
* @return the commit
1132+
*/
1133+
@SuppressFBWarnings(value = { "EI_EXPOSE_REP" }, justification = "Expected")
1134+
public PushCommit getHeadCommit() {
1135+
return headCommit;
1136+
}
1137+
11271138
/**
11281139
* Gets pusher.
11291140
*

‎src/main/java/org/kohsuke/github/GitHubClient.java

Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GitHubClient.java
+18-2Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ public <T> GitHubResponse<T> sendRequest(GitHubRequest request, @CheckForNull Bo
430430
logRequest(connectorRequest);
431431
rateLimitChecker.checkRateLimit(this, request.rateLimitTarget());
432432
connectorResponse = connector.send(connectorRequest);
433+
logResponse(connectorResponse);
433434
noteRateLimit(request.rateLimitTarget(), connectorResponse);
434435
detectKnownErrors(connectorResponse, request, handler != null);
435436
return createResponse(connectorResponse, handler);
@@ -520,8 +521,23 @@ private GitHubConnectorRequest prepareConnectorRequest(GitHubRequest request) th
520521

521522
private void logRequest(@Nonnull final GitHubConnectorRequest request) {
522523
LOGGER.log(FINE,
523-
() -> "GitHub API request [" + (getLogin() == null ? "anonymous" : getLogin()) + "]: "
524-
+ request.method() + " " + request.url().toString());
524+
() -> String.format("(%s) GitHub API request [%s]: %s",
525+
Integer.toHexString(request.hashCode()),
526+
(getLogin() == null ? "anonymous" : getLogin()),
527+
(request.method() + " " + request.url().toString())));
528+
}
529+
530+
private void logResponse(@Nonnull final GitHubConnectorResponse response) {
531+
LOGGER.log(FINE, () -> {
532+
try {
533+
return String.format("(%s) GitHub API response [%s]: %s",
534+
Integer.toHexString(response.request().hashCode()),
535+
(getLogin() == null ? "anonymous" : getLogin()),
536+
(response.statusCode() + " " + GitHubResponse.getBodyAsString(response)));
537+
} catch (IOException e) {
538+
throw new RuntimeException(e);
539+
}
540+
});
525541
}
526542

527543
@Nonnull

‎src/test/java/org/kohsuke/github/GHEventPayloadTest.java

Copy file name to clipboardExpand all lines: src/test/java/org/kohsuke/github/GHEventPayloadTest.java
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,18 @@ public void push() throws Exception {
624624
assertThat(event.getCommits().get(0).getRemoved().size(), is(0));
625625
assertThat(event.getCommits().get(0).getModified().size(), is(1));
626626
assertThat(event.getCommits().get(0).getModified().get(0), is("README.md"));
627+
628+
assertThat(event.getHeadCommit().getSha(), is("0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c"));
629+
assertThat(event.getHeadCommit().getAuthor().getEmail(), is("baxterthehacker@users.noreply.github.com"));
630+
assertThat(event.getHeadCommit().getAuthor().getUsername(), is("baxterthehacker"));
631+
assertThat(event.getHeadCommit().getCommitter().getEmail(), is("baxterthehacker@users.noreply.github.com"));
632+
assertThat(event.getHeadCommit().getCommitter().getUsername(), is("baxterthehacker"));
633+
assertThat(event.getHeadCommit().getAdded().size(), is(0));
634+
assertThat(event.getHeadCommit().getRemoved().size(), is(0));
635+
assertThat(event.getHeadCommit().getModified().size(), is(1));
636+
assertThat(event.getHeadCommit().getModified().get(0), is("README.md"));
637+
assertThat(event.getHeadCommit().getMessage(), is("Update README.md"));
638+
627639
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
628640
formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
629641
assertThat(formatter.format(event.getCommits().get(0).getTimestamp()), is("2015-05-05T23:40:15Z"));

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.