Sort fields

Author: bitwiseman

pom.xml

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

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

@@ -43,13 +43,13 @@
  */
 abstract class AbstractBuilder<R, S> extends GitHubInteractiveObject implements GitHubRequestBuilderDone<R> {
 
-    @Nonnull
-    private final Class<R> returnType;
+    @CheckForNull
+    private final R baseInstance;
 
     private final boolean commitChangesImmediately;
 
-    @CheckForNull
-    private final R baseInstance;
+    @Nonnull
+    private final Class<R> returnType;
 
     /** The requester. */
     @Nonnull

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

@@ -14,11 +14,11 @@
  */
 class EnterpriseManagedSupport {
 
+    private static final Logger LOGGER = Logger.getLogger(EnterpriseManagedSupport.class.getName());
     static final String COULD_NOT_RETRIEVE_ORGANIZATION_EXTERNAL_GROUPS = "Could not retrieve organization external groups";
     static final String NOT_PART_OF_EXTERNALLY_MANAGED_ENTERPRISE_ERROR = "This organization is not part of externally managed enterprise.";
-    static final String TEAM_CANNOT_BE_EXTERNALLY_MANAGED_ERROR = "This team cannot be externally managed since it has explicit members.";
 
-    private static final Logger LOGGER = Logger.getLogger(EnterpriseManagedSupport.class.getName());
+    static final String TEAM_CANNOT_BE_EXTERNALLY_MANAGED_ERROR = "This team cannot be externally managed since it has explicit members.";
 
     private static String logUnexpectedFailure(final JsonProcessingException exception, final String payload) {
         final StringWriter sw = new StringWriter();

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

@@ -21,16 +21,16 @@
  */
 public class GHApp extends GHObject {
 
-    private GHUser owner;
-
-    private String name;
-    private String slug;
     private String description;
-    private String externalUrl;
-    private Map<String, String> permissions;
+
     private List<String> events;
-    private long installationsCount;
+    private String externalUrl;
     private String htmlUrl;
+    private long installationsCount;
+    private String name;
+    private GHUser owner;
+    private Map<String, String> permissions;
+    private String slug;
     /**
      * Create default GHApp instance
      */

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

@@ -14,9 +14,9 @@
  */
 public class GHAppCreateTokenBuilder extends GitHubInteractiveObject {
 
+    private final String apiUrlTail;
     /** The builder. */
     protected final Requester builder;
-    private final String apiUrlTail;
 
     /**
      * Instantiates a new GH app create token builder.

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

@@ -11,8 +11,8 @@ public class GHAppFromManifest extends GHApp {
     private String clientId;
 
     private String clientSecret;
-    private String webhookSecret;
     private String pem;
+    private String webhookSecret;
     /**
      * Create default GHAppFromManifest instance
      */

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

@@ -36,27 +36,27 @@ GHRepository[] getItems(GitHub root) {
         }
     }
 
-    private GHUser account;
-
     @JsonProperty("access_tokens_url")
     private String accessTokenUrl;
-    @JsonProperty("repositories_url")
-    private String repositoriesUrl;
+
+    private GHUser account;
     @JsonProperty("app_id")
     private long appId;
-    @JsonProperty("target_id")
-    private long targetId;
-    @JsonProperty("target_type")
-    private GHTargetType targetType;
-    private Map<String, GHPermissionType> permissions;
     private List<String> events;
-    @JsonProperty("single_file_name")
-    private String singleFileName;
+    private String htmlUrl;
+    private Map<String, GHPermissionType> permissions;
+    @JsonProperty("repositories_url")
+    private String repositoriesUrl;
     @JsonProperty("repository_selection")
     private GHRepositorySelection repositorySelection;
-    private String htmlUrl;
+    @JsonProperty("single_file_name")
+    private String singleFileName;
     private String suspendedAt;
     private GHUser suspendedBy;
+    @JsonProperty("target_id")
+    private long targetId;
+    @JsonProperty("target_type")
+    private GHTargetType targetType;
 
     /**
      * Create default GHAppInstallation instance

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

@@ -14,14 +14,14 @@
  */
 public class GHAppInstallationToken extends GitHubInteractiveObject {
 
-    private String token;
-
-    /** The expires at. */
-    protected String expiresAt;
-
     private Map<String, String> permissions;
+
     private List<GHRepository> repositories;
+
     private GHRepositorySelection repositorySelection;
+    private String token;
+    /** The expires at. */
+    protected String expiresAt;
     /**
      * Create default GHAppInstallationToken instance
      */

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

@@ -12,8 +12,8 @@ class GHAppInstallationsIterable extends PagedIterable<GHAppInstallation> {
 
     /** The Constant APP_INSTALLATIONS_URL. */
     public static final String APP_INSTALLATIONS_URL = "/user/installations";
-    private final transient GitHub root;
     private GHAppInstallationsPage result;
+    private final transient GitHub root;
 
     /**
      * Instantiates a new GH app installations iterable.

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

@@ -5,8 +5,8 @@
  * Represents the one page of GHAppInstallations.
  */
 class GHAppInstallationsPage {
-    private int totalCount;
     private GHAppInstallation[] installations;
+    private int totalCount;
 
     /**
      * Gets the total count.

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

@@ -22,16 +22,16 @@
  */
 public class GHArtifact extends GHObject {
 
+    private String archiveDownloadUrl;
+
+    private boolean expired;
+
+    private String expiresAt;
+    private String name;
     // Not provided by the API.
     @JsonIgnore
     private GHRepository owner;
-
-    private String name;
-
     private long sizeInBytes;
-    private String archiveDownloadUrl;
-    private boolean expired;
-    private String expiresAt;
     /**
      * Create default GHArtifact instance
      */

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

@@ -9,8 +9,8 @@
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
 class GHArtifactsPage {
-    private int totalCount;
     private GHArtifact[] artifacts;
+    private int totalCount;
 
     /**
      * Gets the total count.

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

@@ -28,15 +28,15 @@ public static GHAsset[] wrap(GHAsset[] assets, GHRelease release) {
         return assets;
     }
 
-    /** The owner. */
-    GHRepository owner;
-    private String name;
-    private String label;
-    private String state;
+    private String browserDownloadUrl;
     private String contentType;
-    private long size;
     private long downloadCount;
-    private String browserDownloadUrl;
+    private String label;
+    private String name;
+    private long size;
+    private String state;
+    /** The owner. */
+    GHRepository owner;
 
     /**
      * Create default GHAsset instance

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

@@ -20,75 +20,75 @@ public class GHAuthorization extends GHObject {
     @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD" },
             justification = "JSON API")
     private static class App {
-        private String url;
         private String name;
         // private String client_id; not yet used
+        private String url;
     }
 
-    /** The Constant USER. */
-    public static final String USER = "user";
-
-    /** The Constant USER_EMAIL. */
-    public static final String USER_EMAIL = "user:email";
-
-    /** The Constant USER_FOLLOW. */
-    public static final String USER_FOLLOW = "user:follow";
-
-    /** The Constant PUBLIC_REPO. */
-    public static final String PUBLIC_REPO = "public_repo";
+    /** The Constant ADMIN_KEY. */
+    public static final String ADMIN_KEY = "admin:public_key";
 
-    /** The Constant REPO. */
-    public static final String REPO = "repo";
+    /** The Constant ADMIN_ORG. */
+    public static final String ADMIN_ORG = "admin:org";
 
-    /** The Constant REPO_STATUS. */
-    public static final String REPO_STATUS = "repo:status";
+    /** The Constant AMIN_HOOK. */
+    public static final String AMIN_HOOK = "admin:repo_hook";
 
     /** The Constant DELETE_REPO. */
     public static final String DELETE_REPO = "delete_repo";
 
+    /** The Constant GIST. */
+    public static final String GIST = "gist";
+
     /** The Constant NOTIFICATIONS. */
     public static final String NOTIFICATIONS = "notifications";
 
-    /** The Constant GIST. */
-    public static final String GIST = "gist";
+    /** The Constant PUBLIC_REPO. */
+    public static final String PUBLIC_REPO = "public_repo";
 
     /** The Constant READ_HOOK. */
     public static final String READ_HOOK = "read:repo_hook";
 
-    /** The Constant WRITE_HOOK. */
-    public static final String WRITE_HOOK = "write:repo_hook";
-
-    /** The Constant AMIN_HOOK. */
-    public static final String AMIN_HOOK = "admin:repo_hook";
+    /** The Constant READ_KEY. */
+    public static final String READ_KEY = "read:public_key";
 
     /** The Constant READ_ORG. */
     public static final String READ_ORG = "read:org";
 
-    /** The Constant WRITE_ORG. */
-    public static final String WRITE_ORG = "write:org";
+    /** The Constant REPO. */
+    public static final String REPO = "repo";
 
-    /** The Constant ADMIN_ORG. */
-    public static final String ADMIN_ORG = "admin:org";
+    /** The Constant REPO_STATUS. */
+    public static final String REPO_STATUS = "repo:status";
 
-    /** The Constant READ_KEY. */
-    public static final String READ_KEY = "read:public_key";
+    /** The Constant USER. */
+    public static final String USER = "user";
+
+    /** The Constant USER_EMAIL. */
+    public static final String USER_EMAIL = "user:email";
+
+    /** The Constant USER_FOLLOW. */
+    public static final String USER_FOLLOW = "user:follow";
+
+    /** The Constant WRITE_HOOK. */
+    public static final String WRITE_HOOK = "write:repo_hook";
 
     /** The Constant WRITE_KEY. */
     public static final String WRITE_KEY = "write:public_key";
 
-    /** The Constant ADMIN_KEY. */
-    public static final String ADMIN_KEY = "admin:public_key";
+    /** The Constant WRITE_ORG. */
+    public static final String WRITE_ORG = "write:org";
 
-    private List<String> scopes;
-    private String token;
-    private String tokenLastEight;
-    private String hashedToken;
     private App app;
-    private String note;
-    private String noteUrl;
     private String fingerprint;
     // TODO add some user class for https://developer.github.com/v3/oauth_authorizations/#check-an-authorization ?
     // private GHUser user;
+    private String hashedToken;
+    private String note;
+    private String noteUrl;
+    private List<String> scopes;
+    private String token;
+    private String tokenLastEight;
 
     /**
      * Create default GHAuthorization instance

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

@@ -15,10 +15,10 @@
 public class GHAutolink {
 
     private int id;
-    private String keyPrefix;
-    private String urlTemplate;
     private boolean isAlphanumeric;
+    private String keyPrefix;
     private GHRepository owner;
+    private String urlTemplate;
 
     /**
      * Instantiates a new Gh autolink.

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

@@ -11,11 +11,11 @@
  */
 public class GHAutolinkBuilder {
 
+    private Boolean isAlphanumeric;
+    private String keyPrefix;
     private final GHRepository repo;
     private final Requester req;
-    private String keyPrefix;
     private String urlTemplate;
-    private Boolean isAlphanumeric;
 
     /**
      * Instantiates a new Gh autolink builder.

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

@@ -40,9 +40,9 @@ public Commit() {
         }
     }
 
-    private GHRepository owner;
-    private String name;
     private Commit commit;
+    private String name;
+    private GHRepository owner;
     @JsonProperty("protected")
     private boolean protection;