Merge branch 'main' into feature/hub4j#1497

Author: bitwiseman

.github/workflows/maven-build.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'zulu'
+          distribution: 'temurin'
           cache: 'maven'
       - name: Maven Install (skipTests)
         env:
@@ -50,7 +50,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'maven'
       - name: Maven Site
         env:
@@ -70,7 +70,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java }}
-        distribution: 'zulu'
+        distribution: 'temurin'
         cache: 'maven'
     # JDK 8
     - name: Maven Install with Code Coverage
@@ -91,7 +91,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.java }}
-        distribution: 'zulu'
+        distribution: 'temurin'
         cache: 'maven'
     # JDK 11+
     - name: Maven Install without Code Coverage

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.kohsuke</groupId>
   <artifactId>github-api</artifactId>
-  <version>1.314-SNAPSHOT</version>
+  <version>1.315-SNAPSHOT</version>
   <name>GitHub API for Java</name>
   <url>https://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
@@ -396,7 +396,7 @@
       <plugin>
         <groupId>com.github.siom79.japicmp</groupId>
         <artifactId>japicmp-maven-plugin</artifactId>
-        <version>0.16.0</version>
+        <version>0.17.1</version>
         <configuration>
           <parameter>
             <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
@@ -453,6 +453,12 @@
       <version>${hamcrest.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.npathai</groupId>
+      <artifactId>hamcrest-optional</artifactId>
+      <version>2.0.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -698,7 +704,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.1</version>
             <executions>
               <execution>
                 <id>enforce-jacoco-exist</id>

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

@@ -366,4 +366,25 @@ public GHAppCreateTokenBuilder createToken(Map<String, GHPermissionType> permiss
     public GHAppCreateTokenBuilder createToken() {
         return new GHAppCreateTokenBuilder(root(), String.format("/app/installations/%d/access_tokens", getId()));
     }
+
+    /**
+     * Shows whether the user or organization account actively subscribes to a plan listed by the authenticated GitHub
+     * App. When someone submits a plan change that won't be processed until the end of their billing cycle, you will
+     * also see the upcoming pending change.
+     *
+     * <p>
+     * GitHub Apps must use a JWT to access this endpoint.
+     * <p>
+     * OAuth Apps must use basic authentication with their client ID and client secret to access this endpoint.
+     *
+     * @return a GHMarketplaceAccountPlan instance
+     * @throws IOException
+     *             it may throw an {@link IOException}
+     * @see <a href=
+     *      "https://docs.github.com/en/rest/apps/marketplace?apiVersion=2022-11-28#get-a-subscription-plan-for-an-account">Get
+     *      a subscription plan for an account</a>
+     */
+    public GHMarketplaceAccountPlan getMarketplaceAccount() throws IOException {
+        return new GHMarketplacePlanForAccountBuilder(root(), account.getId()).createRequest();
+    }
 }

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

@@ -0,0 +1,77 @@
+package org.kohsuke.github;
+
+/**
+ * Represents an error in a {@code CODEOWNERS} file. See <a href=
+ * "https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners">the
+ * relevant documentation</a>.
+ *
+ * @author Michael Grant
+ */
+public class GHCodeownersError {
+    private int line, column;
+
+    private String kind, source, suggestion, message, path;
+
+    /**
+     * Gets line.
+     *
+     * @return the line
+     */
+    public int getLine() {
+        return line;
+    }
+
+    /**
+     * Gets column.
+     *
+     * @return the column
+     */
+    public int getColumn() {
+        return column;
+    }
+
+    /**
+     * Gets kind.
+     *
+     * @return the kind
+     */
+    public String getKind() {
+        return kind;
+    }
+
+    /**
+     * Gets source.
+     *
+     * @return the source
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Gets suggestion.
+     *
+     * @return the suggestion
+     */
+    public String getSuggestion() {
+        return suggestion;
+    }
+
+    /**
+     * Gets message.
+     *
+     * @return the message
+     */
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Gets path.
+     *
+     * @return the path
+     */
+    public String getPath() {
+        return path;
+    }
+}

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

@@ -3,6 +3,7 @@
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.io.IOException;
+import java.util.Date;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -20,6 +21,18 @@ public class GHDeployKey {
     protected long id;
     private GHRepository owner;
 
+    /** Creation date of the deploy key */
+    private String created_at;
+
+    /** Last used date of the deploy key */
+    private String last_used;
+
+    /** Name of user that added the deploy key */
+    private String added_by;
+
+    /** Whether the deploykey has readonly permission or full access */
+    private boolean read_only;
+
     /**
      * Gets id.
      *
@@ -65,6 +78,42 @@ public boolean isVerified() {
         return verified;
     }
 
+    /**
+     * Gets created_at.
+     *
+     * @return the created_at
+     */
+    public Date getCreatedAt() {
+        return GitHubClient.parseDate(created_at);
+    }
+
+    /**
+     * Gets last_used.
+     *
+     * @return the last_used
+     */
+    public Date getLastUsedAt() {
+        return GitHubClient.parseDate(last_used);
+    }
+
+    /**
+     * Gets added_by
+     *
+     * @return the added_by
+     */
+    public String getAdded_by() {
+        return added_by;
+    }
+
+    /**
+     * Is read_only
+     *
+     * @return true if the key can only read. False if the key has write permission as well.
+     */
+    public boolean isRead_only() {
+        return read_only;
+    }
+
     /**
      * Wrap gh deploy key.
      *
@@ -95,7 +144,14 @@ GHDeployKey lateBind(GHRepository repo) {
      * @return the string
      */
     public String toString() {
-        return new ToStringBuilder(this).append("title", title).append("id", id).append("key", key).toString();
+        return new ToStringBuilder(this).append("title", title)
+                .append("id", id)
+                .append("key", key)
+                .append("created_at", created_at)
+                .append("last_used", last_used)
+                .append("added_by", added_by)
+                .append("read_only", read_only)
+                .toString();
     }
 
     /**

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

@@ -3,6 +3,8 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.io.IOException;
+
 // TODO: Auto-generated Javadoc
 /**
  * SSH public key.
@@ -74,4 +76,14 @@ public boolean isVerified() {
     public String toString() {
         return new ToStringBuilder(this).append("title", title).append("id", id).append("key", key).toString();
     }
+
+    /**
+     * Delete the GHKey
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    public void delete() throws IOException {
+        root().createRequest().method("DELETE").withUrlPath(String.format("/user/keys/%d", id)).send();
+    }
 }

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

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import java.io.IOException;
 import java.net.URL;
 
 // TODO: Auto-generated Javadoc
@@ -72,4 +73,25 @@ public GHMarketplaceAccountType getType() {
         return type;
     }
 
+    /**
+     * Shows whether the user or organization account actively subscribes to a plan listed by the authenticated GitHub
+     * App. When someone submits a plan change that won't be processed until the end of their billing cycle, you will
+     * also see the upcoming pending change.
+     *
+     * <p>
+     * GitHub Apps must use a JWT to access this endpoint.
+     * <p>
+     * OAuth Apps must use basic authentication with their client ID and client secret to access this endpoint.
+     *
+     * @return a GHMarketplaceListAccountBuilder instance
+     * @throws IOException
+     *             in case of {@link IOException}
+     * @see <a href=
+     *      "https://docs.github.com/en/rest/apps/marketplace?apiVersion=2022-11-28#get-a-subscription-plan-for-an-account">Get
+     *      a subscription plan for an account</a>
+     */
+    public GHMarketplaceAccountPlan getPlan() throws IOException {
+        return new GHMarketplacePlanForAccountBuilder(root(), this.id).createRequest();
+    }
+
 }

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

@@ -0,0 +1,45 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+// TODO: Auto-generated Javadoc
+/**
+ * Returns the plan associated with current account.
+ *
+ * @author Benoit Lacelle
+ * @see GHMarketplacePlan#listAccounts()
+ * @see GitHub#listMarketplacePlans()
+ */
+public class GHMarketplacePlanForAccountBuilder extends GitHubInteractiveObject {
+    private final Requester builder;
+    private final long accountId;
+
+    /**
+     * Instantiates a new GH marketplace list account builder.
+     *
+     * @param root
+     *            the root
+     * @param accountId
+     *            the account id
+     */
+    GHMarketplacePlanForAccountBuilder(GitHub root, long accountId) {
+        super(root);
+        this.builder = root.createRequest();
+        this.accountId = accountId;
+    }
+
+    /**
+     * Fetch the plan associated with the account specified on construction.
+     * <p>
+     * GitHub Apps must use a JWT to access this endpoint.
+     *
+     * @return a GHMarketplaceAccountPlan
+     * @throws IOException
+     *             on error
+     */
+    public GHMarketplaceAccountPlan createRequest() throws IOException {
+        return builder.withUrlPath(String.format("/marketplace_listing/accounts/%d", this.accountId))
+                .fetch(GHMarketplaceAccountPlan.class);
+    }
+
+}

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

@@ -12,11 +12,11 @@
 public enum GHMarketplacePriceModel {
 
     /** The free. */
-    FREE("free"),
+    FREE("FREE"),
     /** The per unit. */
-    PER_UNIT("per-unit"),
+    PER_UNIT("PER_UNIT"),
     /** The flat rate. */
-    FLAT_RATE("flat-rate");
+    FLAT_RATE("FLAT_RATE");
 
     @JsonValue
     private final String internalName;