Bring PR up to current main

Author: bitwiseman

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

@@ -29,14 +29,6 @@ public class GHCodeScanningAlert extends GHObject {
 
     GHCodeScanningAlert wrap(GHRepository owner) {
         this.owner = owner;
-        return wrap(owner.root);
-    }
-
-    GHCodeScanningAlert wrap(GitHub root) {
-        this.root = root;
-        if (owner != null) {
-            owner.wrap(root);
-        }
         return this;
     }
 
@@ -79,6 +71,7 @@ public GHCodeScanningAlertState getState() {
      *
      * @return the user
      */
+    @SuppressFBWarnings(value = { "EI_EXPOSE_REP" }, justification = "Expected behavior")
     public GHUser getDismissedBy() {
         return dismissed_by;
     }
@@ -134,7 +127,8 @@ public GHCodeScanningAlertInstance getMostRecentInstance() {
      * @return the paged iterable
      */
     public PagedIterable<GHCodeScanningAlertInstance> listAlertInstances() {
-        return new GHCodeScanningAlertInstancesIterable(this, root.createRequest().withUrlPath(instances_url));
+        return new GHCodeScanningAlertInstancesIterable(this,
+                root().createRequest().withUrlPath(instances_url).build());
     }
 
     @Override

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

@@ -1,6 +1,5 @@
 package org.kohsuke.github;
 
-import java.net.MalformedURLException;
 import java.util.Iterator;
 
 import javax.annotation.Nonnull;
@@ -10,21 +9,17 @@ public class GHCodeScanningAlertInstancesIterable extends PagedIterable<GHCodeSc
     private final GitHubRequest request;
     private GHCodeScanningAlertInstance[] result;
 
-    public GHCodeScanningAlertInstancesIterable(GHCodeScanningAlert owner, GitHubRequest.Builder<?> requestBuilder) {
+    GHCodeScanningAlertInstancesIterable(GHCodeScanningAlert owner, GitHubRequest request) {
         this.owner = owner;
-        try {
-            this.request = requestBuilder.build();
-        } catch (MalformedURLException e) {
-            throw new GHException("Malformed URL", e);
-        }
+        this.request = request;
     }
 
     @Nonnull
     @Override
     public PagedIterator<GHCodeScanningAlertInstance> _iterator(int pageSize) {
         return new PagedIterator<>(
                 adapt(GitHubPageIterator
-                        .create(owner.getRoot().getClient(), GHCodeScanningAlertInstance[].class, request, pageSize)),
+                        .create(owner.root().getClient(), GHCodeScanningAlertInstance[].class, request, pageSize)),
                 null);
     }
 

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

@@ -1,6 +1,5 @@
 package org.kohsuke.github;
 
-import java.net.MalformedURLException;
 import java.util.Iterator;
 
 import javax.annotation.Nonnull;
@@ -10,21 +9,17 @@ class GHCodeScanningAlertsIterable extends PagedIterable<GHCodeScanningAlert> {
     private final GitHubRequest request;
     private GHCodeScanningAlert[] result;
 
-    public GHCodeScanningAlertsIterable(GHRepository owner, GitHubRequest.Builder<?> requestBuilder) {
+    GHCodeScanningAlertsIterable(GHRepository owner, GitHubRequest request) {
         this.owner = owner;
-        try {
-            this.request = requestBuilder.build();
-        } catch (MalformedURLException e) {
-            throw new GHException("Malformed URL", e);
-        }
+        this.request = request;
     }
 
     @Nonnull
     @Override
     public PagedIterator<GHCodeScanningAlert> _iterator(int pageSize) {
         return new PagedIterator<>(
                 adapt(GitHubPageIterator
-                        .create(owner.getRoot().getClient(), GHCodeScanningAlert[].class, request, pageSize)),
+                        .create(owner.root().getClient(), GHCodeScanningAlert[].class, request, pageSize)),
                 null);
     }
 

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

@@ -3556,7 +3556,7 @@ public PagedIterable<GHCodeScanningAlert> listCodeScanningAlerts(String toolName
 
     private PagedIterable<GHCodeScanningAlert> listCodeScanningAlerts(Map<String, Object> filters) {
         return new GHCodeScanningAlertsIterable(this,
-                root.createRequest().withUrlPath(getApiTailUrl("code-scanning/alerts")).with(filters));
+                root().createRequest().withUrlPath(getApiTailUrl("code-scanning/alerts")).with(filters).build());
     }
 
     /**
@@ -3569,7 +3569,7 @@ private PagedIterable<GHCodeScanningAlert> listCodeScanningAlerts(Map<String, Ob
      *             the io exception
      */
     public GHCodeScanningAlert getCodeScanningAlert(long id) throws IOException {
-        return root.createRequest()
+        return root().createRequest()
                 .withUrlPath(getApiTailUrl("code-scanning/alerts"), String.valueOf(id))
                 .fetch(GHCodeScanningAlert.class)
                 .wrap(this);