Sort by visibility

Author: bitwiseman

pom.xml

@@ -487,6 +487,7 @@
               <version>4.35</version>
               <file>${basedir}/src/build/eclipse/formatter.xml</file>
               <sortMembersEnabled>true</sortMembersEnabled>
+              <sortMembersVisibilityOrderEnabled>true</sortMembersVisibilityOrderEnabled>
             </eclipse>
 
             <importOrder>

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

@@ -94,6 +94,22 @@ protected AbstractBuilder(@Nonnull Class<R> finalReturnType,
         this.updateInPlace = false;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @Nonnull
+    @BetaApi
+    public R done() throws IOException {
+        R result;
+        if (updateInPlace && baseInstance != null) {
+            result = requester.fetchInto(baseInstance);
+        } else {
+            result = requester.fetch(returnType);
+        }
+        return result;
+    }
+
     /**
      * Chooses whether to return a continuing builder or an updated data record
      *
@@ -122,22 +138,6 @@ protected S continueOrDone() throws IOException {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @Nonnull
-    @BetaApi
-    public R done() throws IOException {
-        R result;
-        if (updateInPlace && baseInstance != null) {
-            result = requester.fetchInto(baseInstance);
-        } else {
-            result = requester.fetch(returnType);
-        }
-        return result;
-    }
-
     /**
      * Applies a value to a name for this builder.
      *

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

@@ -20,17 +20,17 @@ class EnterpriseManagedSupport {
 
     private static final Logger LOGGER = Logger.getLogger(EnterpriseManagedSupport.class.getName());
 
-    static EnterpriseManagedSupport forOrganization(final GHOrganization org) {
-        return new EnterpriseManagedSupport(org);
-    }
-
     private static String logUnexpectedFailure(final JsonProcessingException exception, final String payload) {
         final StringWriter sw = new StringWriter();
         final PrintWriter pw = new PrintWriter(sw);
         exception.printStackTrace(pw);
         return String.format("Could not parse GitHub error response: '%s'. Full stacktrace follows:%n%s", payload, sw);
     }
 
+    static EnterpriseManagedSupport forOrganization(final GHOrganization org) {
+        return new EnterpriseManagedSupport(org);
+    }
+
     private final GHOrganization organization;
 
     private EnterpriseManagedSupport(GHOrganization organization) {

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

@@ -9,20 +9,20 @@ class GHAppInstallationsPage {
     private GHAppInstallation[] installations;
 
     /**
-     * Gets the installations.
+     * Gets the total count.
      *
-     * @return the installations
+     * @return the total count
      */
-    GHAppInstallation[] getInstallations() {
-        return installations;
+    public int getTotalCount() {
+        return totalCount;
     }
 
     /**
-     * Gets the total count.
+     * Gets the installations.
      *
-     * @return the total count
+     * @return the installations
      */
-    public int getTotalCount() {
-        return totalCount;
+    GHAppInstallation[] getInstallations() {
+        return installations;
     }
 }

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

@@ -65,15 +65,6 @@ public <T> T download(InputStreamFunction<T> streamFunction) throws IOException
         return root().createRequest().method("GET").withUrlPath(getApiRoute(), "zip").fetchStream(streamFunction);
     }
 
-    private String getApiRoute() {
-        if (owner == null) {
-            // Workflow runs returned from search to do not have an owner. Attempt to use url.
-            final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
-            return StringUtils.prependIfMissing(url.toString().replace(root().getApiUrl(), ""), "/");
-        }
-        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/actions/artifacts/" + getId();
-    }
-
     /**
      * Gets the archive download URL.
      *
@@ -130,6 +121,15 @@ public boolean isExpired() {
         return expired;
     }
 
+    private String getApiRoute() {
+        if (owner == null) {
+            // Workflow runs returned from search to do not have an owner. Attempt to use url.
+            final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
+            return StringUtils.prependIfMissing(url.toString().replace(root().getApiUrl(), ""), "/");
+        }
+        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/actions/artifacts/" + getId();
+    }
+
     /**
      * Wrap up.
      *

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

@@ -12,6 +12,15 @@ class GHArtifactsPage {
     private int totalCount;
     private GHArtifact[] artifacts;
 
+    /**
+     * Gets the total count.
+     *
+     * @return the total count
+     */
+    public int getTotalCount() {
+        return totalCount;
+    }
+
     /**
      * Gets the artifacts.
      *
@@ -25,13 +34,4 @@ GHArtifact[] getArtifacts(GHRepository owner) {
         }
         return artifacts;
     }
-
-    /**
-     * Gets the total count.
-     *
-     * @return the total count
-     */
-    public int getTotalCount() {
-        return totalCount;
-    }
 }

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

@@ -54,14 +54,6 @@ public void delete() throws IOException {
         root().createRequest().method("DELETE").withUrlPath(getApiRoute()).send();
     }
 
-    private void edit(String key, Object value) throws IOException {
-        root().createRequest().with(key, value).method("PATCH").withUrlPath(getApiRoute()).send();
-    }
-
-    private String getApiRoute() {
-        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + getId();
-    }
-
     /**
      * Gets browser download url.
      *
@@ -161,6 +153,14 @@ public void setLabel(String label) throws IOException {
         this.label = label;
     }
 
+    private void edit(String key, Object value) throws IOException {
+        root().createRequest().with(key, value).method("PATCH").withUrlPath(getApiRoute()).send();
+    }
+
+    private String getApiRoute() {
+        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + getId();
+    }
+
     /**
      * Wrap.
      *

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

@@ -47,10 +47,6 @@ public GHAutolink create() throws IOException {
         return autolink.lateBind(repo);
     }
 
-    private String getApiTail() {
-        return String.format("/repos/%s/%s/autolinks", repo.getOwnerName(), repo.getName());
-    }
-
     /**
      * With is alphanumeric gh autolink builder.
      *
@@ -87,4 +83,8 @@ public GHAutolinkBuilder withUrlTemplate(String urlTemplate) {
         return this;
     }
 
+    private String getApiTail() {
+        return String.format("/repos/%s/%s/autolinks", repo.getOwnerName(), repo.getName());
+    }
+
 }

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

@@ -47,10 +47,6 @@ public GHBlob create() throws IOException {
         return req.method("POST").withUrlPath(getApiTail()).fetch(GHBlob.class);
     }
 
-    private String getApiTail() {
-        return String.format("/repos/%s/%s/git/blobs", repo.getOwnerName(), repo.getName());
-    }
-
     /**
      * Configures a blob with the specified text {@code content}.
      *
@@ -63,4 +59,8 @@ public GHBlobBuilder textContent(String content) {
         req.with("encoding", "utf-8");
         return this;
     }
+
+    private String getApiTail() {
+        return String.format("/repos/%s/%s/git/blobs", repo.getOwnerName(), repo.getName());
+    }
 }

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

@@ -80,15 +80,6 @@ public GHBranchProtectionBuilder enableProtection() {
         return new GHBranchProtectionBuilder(this);
     }
 
-    /**
-     * Gets the api route.
-     *
-     * @return the api route
-     */
-    String getApiRoute() {
-        return owner.getApiTailUrl("/branches/" + name);
-    }
-
     /**
      * Gets name.
      *
@@ -210,6 +201,15 @@ public String toString() {
         return "Branch:" + name + " in " + url;
     }
 
+    /**
+     * Gets the api route.
+     *
+     * @return the api route
+     */
+    String getApiRoute() {
+        return owner.getApiTailUrl("/branches/" + name);
+    }
+
     /**
      * Wrap.
      *