Streamlining

Author: bitwiseman

pom.xml

@@ -163,9 +163,6 @@
                       <!-- V2.x changes -->
                       <exclude>org.kohsuke.github.GHRepositorySearchBuilder.Fork</exclude>
 
-                      <!-- Deprecated -->
-                      <exclude>org.kohsuke.github.GHPerson.1</exclude>
-
                       <!-- Sample only -->
                       <exclude>org.kohsuke.github.example.*</exclude>
 

src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java

@@ -10,7 +10,6 @@
  * Creates a access token for a GitHub App Installation.
  *
  * @author Paulo Miguel Almeida
- * @see GHAppInstallation#createToken(Map) GHAppInstallation#createToken(Map)
  * @see GHAppInstallation#createToken() GHAppInstallation#createToken()
  */
 public class GHAppCreateTokenBuilder extends GitHubInteractiveObject {
@@ -34,22 +33,6 @@ public class GHAppCreateTokenBuilder extends GitHubInteractiveObject {
         this.builder = root.createRequest();
     }
 
-    /**
-     * Instantiates a new GH app create token builder.
-     *
-     * @param root
-     *            the root
-     * @param apiUrlTail
-     *            the api url tail
-     * @param permissions
-     *            the permissions
-     */
-    @BetaApi
-    GHAppCreateTokenBuilder(GitHub root, String apiUrlTail, Map<String, GHPermissionType> permissions) {
-        this(root, apiUrlTail);
-        permissions(permissions);
-    }
-
     /**
      * By default the installation token has access to all repositories that the installation can access. To restrict
      * the access to specific repositories, you can provide the repository_ids when creating the token. When you omit

src/main/java/org/kohsuke/github/GHAppInstallation.java

@@ -221,12 +221,9 @@ public void deleteInstallation() throws IOException {
      * @return a GHAppCreateTokenBuilder instance
      * @deprecated Use {@link GHAppInstallation#createToken()} instead.
      */
-    @BetaApi
     @Deprecated
     public GHAppCreateTokenBuilder createToken(Map<String, GHPermissionType> permissions) {
-        return new GHAppCreateTokenBuilder(root(),
-                String.format("/app/installations/%d/access_tokens", getId()),
-                permissions);
+        return createToken().permissions(permissions);
     }
 
     /**
@@ -238,7 +235,6 @@ public GHAppCreateTokenBuilder createToken(Map<String, GHPermissionType> permiss
      *
      * @return a GHAppCreateTokenBuilder instance
      */
-    @BetaApi
     public GHAppCreateTokenBuilder createToken() {
         return new GHAppCreateTokenBuilder(root(), String.format("/app/installations/%d/access_tokens", getId()));
     }

src/main/java/org/kohsuke/github/GHAppInstallationToken.java

@@ -8,7 +8,7 @@
  * A Github App Installation Token.
  *
  * @author Paulo Miguel Almeida
- * @see GHAppInstallation#createToken(Map) GHAppInstallation#createToken(Map)
+ * @see GHAppInstallation#createToken() GHAppInstallation#createToken()
  */
 public class GHAppInstallationToken extends GitHubInteractiveObject {
     private String token;

src/main/java/org/kohsuke/github/GHBranchProtectionBuilder.java

@@ -11,7 +11,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -54,34 +53,6 @@ public GHBranchProtectionBuilder addRequiredStatusChecks(Collection<GHBranchProt
         return this;
     }
 
-    /**
-     * Add required checks gh branch protection builder.
-     *
-     * @param checks
-     *            the checks
-     * @return the gh branch protection builder
-     */
-    @Deprecated
-    public GHBranchProtectionBuilder addRequiredChecks(Collection<String> checks) {
-        getStatusChecks().checks.addAll(checks.stream()
-                .map(context -> new GHBranchProtection.Check(context, null))
-                .collect(Collectors.toList()));
-        return this;
-    }
-
-    /**
-     * Add required checks gh branch protection builder.
-     *
-     * @param checks
-     *            the checks
-     * @return the gh branch protection builder
-     */
-    @Deprecated
-    public GHBranchProtectionBuilder addRequiredChecks(String... checks) {
-        addRequiredChecks(Arrays.asList(checks));
-        return this;
-    }
-
     /**
      * Add required checks gh branch protection builder.
      *

src/main/java/org/kohsuke/github/GHContent.java

@@ -124,7 +124,7 @@ public String getTarget() {
     @Deprecated
     @SuppressFBWarnings("DM_DEFAULT_ENCODING")
     public String getContent() throws IOException {
-        return new String(Base64.getMimeDecoder().decode(getEncodedContent()));
+        return new String(readDecodedContent());
     }
 
     /**
@@ -180,11 +180,22 @@ public String getHtmlUrl() {
      *             the io exception
      */
     public InputStream read() throws IOException {
-        refresh(content);
+        return new ByteArrayInputStream(readDecodedContent());
+    }
+
+    /**
+     * Retrieves the decoded bytes of the blob.
+     *
+     * @return the input stream
+     * @throws IOException
+     *             the io exception
+     */
+    private byte[] readDecodedContent() throws IOException {
+        String encodedContent = getEncodedContent();
         if (encoding.equals("base64")) {
             try {
                 Base64.Decoder decoder = Base64.getMimeDecoder();
-                return new ByteArrayInputStream(decoder.decode(content.getBytes(StandardCharsets.US_ASCII)));
+                return decoder.decode(encodedContent.getBytes(StandardCharsets.US_ASCII));
             } catch (IllegalArgumentException e) {
                 throw new AssertionError(e); // US-ASCII is mandatory
             }

src/main/java/org/kohsuke/github/GHPullRequest.java

@@ -295,11 +295,8 @@ public Boolean getMergeable() throws IOException {
      * for test purposes only.
      *
      * @return the mergeable no refresh
-     * @throws IOException
-     *             Signals that an I/O exception has occurred.
      */
-    @Deprecated
-    Boolean getMergeableNoRefresh() throws IOException {
+    Boolean getMergeableNoRefresh() {
         return mergeable;
     }
 

src/main/java/org/kohsuke/github/GHTeamBuilder.java

@@ -76,7 +76,8 @@ public GHTeamBuilder repositories(String... repoNames) {
      * @param permission
      *            permssion to be applied
      * @return a builder to continue with building
-     * @deprecated https://docs.github.com/en/free-pro-team@latest/rest/teams/teams?apiVersion=2022-11-28#create-a-team
+     * @deprecated see
+     *             https://docs.github.com/en/free-pro-team@latest/rest/teams/teams?apiVersion=2022-11-28#create-a-team
      */
     @Deprecated
     public GHTeamBuilder permission(GHOrganization.Permission permission) {

src/main/java/org/kohsuke/github/GitHub.java

@@ -97,7 +97,7 @@ public class GitHub {
      *            The URL of GitHub (or GitHub enterprise) API endpoint, such as "https://api.github.com" or
      *            "http://ghe.acme.com/api/v3". Note that GitHub Enterprise has <code>/api/v3</code> in the URL. For
      *            historical reasons, this parameter still accepts the bare domain name, but that's considered
-     *            deprecated. Password is also considered deprecated as it is no longer required for api usage.
+     *            deprecated.
      * @param connector
      *            a connector
      * @param rateLimitHandler

src/main/java/org/kohsuke/github/GitHubBuilder.java

@@ -238,7 +238,7 @@ public GitHubBuilder withAuthorizationProvider(final AuthorizationProvider autho
      * @param appInstallationToken
      *            A string containing the GitHub App installation token
      * @return the configured Builder from given GitHub App installation token.
-     * @see GHAppInstallation#createToken(java.util.Map) GHAppInstallation#createToken(java.util.Map)
+     * @see GHAppInstallation#createToken() GHAppInstallation#createToken()
      */
     public GitHubBuilder withAppInstallationToken(String appInstallationToken) {
         return withAuthorizationProvider(ImmutableAuthorizationProvider.fromAppInstallationToken(appInstallationToken));