Merge branch 'master' into BUG-id-can-be-bigger-than-int32

Author: Abhi347

.github/workflows/release.yml

@@ -24,21 +24,20 @@ jobs:
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           settings-path: ${{ github.workspace }} # Location for settings.xml file
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY_ABHI }}
           gpg-passphrase: GPG_PASSPHRASE
 
       - name: Publish with Maven deploy
-        run: >
-          mvn
-          --batch-mode
-          --activate-profiles deploy
-          --settings $GITHUB_WORKSPACE/settings.xml
-          -Pcoverage
-          clean deploy
+        run: |
+          if [ "${{ env.ACTIONS_STEP_DEBUG }}" == "true" ]; then
+            mvn --batch-mode --activate-profiles deploy --settings $GITHUB_WORKSPACE/settings.xml -Pcoverage clean deploy -X
+          else
+            mvn --batch-mode --activate-profiles deploy --settings $GITHUB_WORKSPACE/settings.xml -Pcoverage clean deploy
+          fi
         env:
           MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE_ABHI }}
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>github-client</artifactId>
-    <version>0.3.3-SNAPSHOT</version>
+    <version>0.3.10-SNAPSHOT</version>
 
     <parent>
         <groupId>com.spotify</groupId>
@@ -23,7 +23,7 @@
         <connection>scm:git:https://github.com/spotify/github-java-client.git</connection>
         <developerConnection>scm:git:[email protected]:spotify/github-java-client.git</developerConnection>
         <url>scm:https://github.com/spotify/github-java-client/</url>
-        <tag>HEAD</tag>
+        <tag>v0.3.7</tag>
     </scm>
 
     <organization>
@@ -84,7 +84,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <project.build.outputTimestamp>1726146382</project.build.outputTimestamp>
+        <project.build.outputTimestamp>1740484047</project.build.outputTimestamp>
         <spotbugs.excludeFilterFile>spotbugsexclude.xml</spotbugs.excludeFilterFile>
         <checkstyle.violationSeverity>error</checkstyle.violationSeverity>
         <checkstyle.config.location>checkstyle.xml</checkstyle.config.location>
@@ -221,6 +221,12 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.mockito</groupId>
@@ -359,6 +365,8 @@
                             <serverId>ossrh</serverId>
                             <nexusUrl>https://oss.sonatype.org/</nexusUrl>
                             <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                            <connectTimeout>600000</connectTimeout> <!-- 10 minutes -->
+                            <readTimeout>600000</readTimeout> <!-- 10 minutes -->
                         </configuration>
                     </plugin>
                 </plugins>

src/main/java/com/spotify/github/jackson/CommentReactionContentDeserializer.java

@@ -0,0 +1,43 @@
+/*-
+ * -\-\-
+ * github-api
+ * --
+ * Copyright (C) 2016 - 2020 Spotify AB
+ * --
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * -/-/-
+ */
+package com.spotify.github.jackson;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.spotify.github.v3.comment.CommentReactionContent;
+
+import java.io.IOException;
+/**
+ * Custom deserializer for {@link CommentReactionContent}.
+ */
+public class CommentReactionContentDeserializer extends JsonDeserializer<CommentReactionContent> {
+  @Override
+  public CommentReactionContent deserialize(final JsonParser p, final DeserializationContext ctxt)
+      throws IOException {
+    String value = p.getText();
+    for (CommentReactionContent content : CommentReactionContent.values()) {
+      if (content.toString().equals(value)) {
+        return content;
+      }
+    }
+    return null;
+  }
+}

src/main/java/com/spotify/github/jackson/CommentReactionContentSerializer.java

@@ -0,0 +1,35 @@
+/*-
+ * -\-\-
+ * github-api
+ * --
+ * Copyright (C) 2016 - 2020 Spotify AB
+ * --
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * -/-/-
+ */
+package com.spotify.github.jackson;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.spotify.github.v3.comment.CommentReactionContent;
+import java.io.IOException;
+/**
+ * Custom serializer for {@link CommentReactionContent}.
+ */
+public class CommentReactionContentSerializer extends JsonSerializer<CommentReactionContent> {
+  @Override
+  public void serialize(final CommentReactionContent value, final JsonGenerator gen, final SerializerProvider serializers) throws IOException {
+    gen.writeString(value.toString());
+  }
+}

src/main/java/com/spotify/github/jackson/Json.java

@@ -20,7 +20,7 @@
 
 package com.spotify.github.jackson;
 
-import static com.fasterxml.jackson.databind.PropertyNamingStrategy.SNAKE_CASE;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import static java.util.Objects.isNull;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -248,6 +248,6 @@ private static class DefaultMapper {
             .enable(SerializationFeature.WRITE_DATES_WITH_ZONE_ID)
             .enable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-            .setPropertyNamingStrategy(SNAKE_CASE);
+            .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
   }
 }

src/main/java/com/spotify/github/v3/activity/events/CreateEvent.java

@@ -47,7 +47,6 @@ public interface CreateEvent extends BaseEvent {
   String masterBranch();
 
   /** The repository's current description. */
-  @Nullable
   Optional<String> description();
 
   /** No doc found on github - Usually is "user". */

src/main/java/com/spotify/github/v3/activity/events/PushEvent.java

@@ -93,7 +93,6 @@ public interface PushEvent {
   List<PushCommit> commits();
 
   /** The push commit object of the most recent commit on ref after the push. */
-  @Nullable
   Optional<PushCommit> headCommit();
 
   /** Pusher */

src/main/java/com/spotify/github/v3/activity/events/StatusEvent.java

@@ -66,7 +66,6 @@ public interface StatusEvent extends BaseEvent, UpdateTracking {
   String context();
 
   /** The optional human-readable description added to the status. */
-  @Nullable
   Optional<String> description();
 
   /** The new state. Can be pending, success, failure, or error. */

src/main/java/com/spotify/github/v3/clients/GitHubClient.java

@@ -32,6 +32,7 @@
 import com.spotify.github.v3.checks.AccessToken;
 import com.spotify.github.v3.checks.Installation;
 import com.spotify.github.v3.comment.Comment;
+import com.spotify.github.v3.comment.CommentReaction;
 import com.spotify.github.v3.exceptions.ReadOnlyRepositoryException;
 import com.spotify.github.v3.exceptions.RequestNotOkException;
 import com.spotify.github.v3.git.Reference;
@@ -85,6 +86,8 @@ public class GitHubClient {
   };
   static final TypeReference<List<Comment>> LIST_COMMENT_TYPE_REFERENCE =
       new TypeReference<>() {};
+  static final TypeReference<List<CommentReaction>> LIST_COMMENT_REACTION_TYPE_REFERENCE =
+          new TypeReference<>() {};
   static final TypeReference<List<Repository>> LIST_REPOSITORY =
       new TypeReference<>() {};
   static final TypeReference<List<CommitItem>> LIST_COMMIT_TYPE_REFERENCE =

src/main/java/com/spotify/github/v3/clients/IssueClient.java

@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,15 +20,18 @@
 
 package com.spotify.github.v3.clients;
 
-import static com.spotify.github.v3.clients.GitHubClient.IGNORE_RESPONSE_CONSUMER;
-import static com.spotify.github.v3.clients.GitHubClient.LIST_COMMENT_TYPE_REFERENCE;
+import static com.spotify.github.v3.clients.GitHubClient.*;
 
 import com.google.common.collect.ImmutableMap;
 import com.spotify.github.async.AsyncPage;
 import com.spotify.github.v3.comment.Comment;
+import com.spotify.github.v3.comment.CommentReaction;
+import com.spotify.github.v3.comment.CommentReactionContent;
+import com.spotify.github.v3.issues.Issue;
 import java.lang.invoke.MethodHandles;
 import java.util.Iterator;
 import java.util.concurrent.CompletableFuture;
+import okhttp3.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,6 +41,9 @@ public class IssueClient {
   static final String COMMENTS_URI_NUMBER_TEMPLATE = "/repos/%s/%s/issues/%s/comments";
   static final String COMMENTS_URI_TEMPLATE = "/repos/%s/%s/issues/comments";
   static final String COMMENTS_URI_ID_TEMPLATE = "/repos/%s/%s/issues/comments/%s";
+  static final String COMMENTS_REACTION_TEMPLATE = "/repos/%s/%s/issues/comments/%s/reactions";
+  static final String COMMENTS_REACTION_ID_TEMPLATE = "/repos/%s/%s/issues/%s/reactions/%s";
+  static final String ISSUES_URI_ID_TEMPLATE = "/repos/%s/%s/issues/%s";
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private final GitHubClient github;
@@ -125,4 +131,60 @@ public CompletableFuture<Void> deleteComment(final int id) {
   private Iterator<AsyncPage<Comment>> listComments(final String path) {
     return new GithubPageIterator<>(new GithubPage<>(github, path, LIST_COMMENT_TYPE_REFERENCE));
   }
+
+  /**
+   * Get issue by id
+   *
+   * @param id issue id
+   * @return the Issue for the given id if exists.
+   */
+  public CompletableFuture<Issue> getIssue(final int id) {
+    return github.request(String.format(ISSUES_URI_ID_TEMPLATE, owner, repo, id), Issue.class);
+  }
+
+  /**
+   * Create a reaction on a comment. See <a *
+   * href="https://docs.github.com/en/rest/reactions/reactions?apiVersion=2022-11-28#create-reaction-for-an-issue-comment">Create
+   * reaction for an issue comment</a>
+   *
+   * @param commentId comment id
+   * @param reaction reaction content
+   * @return the Comment that was just created
+   */
+  public CompletableFuture<CommentReaction> createCommentReaction(
+      final long commentId, final CommentReactionContent reaction) {
+    final String path = String.format(COMMENTS_REACTION_TEMPLATE, owner, repo, commentId);
+    final String requestBody =
+        github.json().toJsonUnchecked(ImmutableMap.of("content", reaction.toString()));
+    return github.post(path, requestBody, CommentReaction.class);
+  }
+
+  /**
+   * Delete a reaction on a comment. See <a
+   * href="https://docs.github.com/en/rest/reactions/reactions?apiVersion=2022-11-28#delete-an-issue-comment-reaction">List
+   * reactions for an issue comment</a>
+   *
+   * @param issueNumber issue number
+   * @param reactionId reaction id
+   */
+  public CompletableFuture<Response> deleteCommentReaction(
+      final long issueNumber, final long reactionId) {
+    final String path =
+        String.format(COMMENTS_REACTION_ID_TEMPLATE, owner, repo, issueNumber, reactionId);
+    return github.delete(path);
+  }
+
+  /**
+   * List reactions on a comment. See <a
+   * href="https://docs.github.com/en/rest/reactions/reactions?apiVersion=2022-11-28#list-reactions-for-an-issue-comment">List
+   * reactions for an issue comment</a>
+   *
+   * @param commentId comment id
+   * @return reactions
+   */
+  public GithubPageIterator<CommentReaction> listCommentReaction(final long commentId) {
+    final String path = String.format(COMMENTS_REACTION_TEMPLATE, owner, repo, commentId);
+    return new GithubPageIterator<>(
+        new GithubPage<>(github, path, LIST_COMMENT_REACTION_TYPE_REFERENCE));
+  }
 }