Skip to content

Commit 73ab6c4

Browse files
committed
Sort fields
1 parent 76d80cd commit 73ab6c4

File tree

185 files changed

+1386
-1385
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+1386
-1385
lines changed

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@
488488
<file>${basedir}/src/build/eclipse/formatter.xml</file>
489489
<sortMembersEnabled>true</sortMembersEnabled>
490490
<sortMembersVisibilityOrderEnabled>true</sortMembersVisibilityOrderEnabled>
491+
<sortMembersDoNotSortFields>false</sortMembersDoNotSortFields>
491492
</eclipse>
492493

493494
<importOrder>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
*/
4444
abstract class AbstractBuilder<R, S> extends GitHubInteractiveObject implements GitHubRequestBuilderDone<R> {
4545

46-
@Nonnull
47-
private final Class<R> returnType;
46+
@CheckForNull
47+
private final R baseInstance;
4848

4949
private final boolean commitChangesImmediately;
5050

51-
@CheckForNull
52-
private final R baseInstance;
51+
@Nonnull
52+
private final Class<R> returnType;
5353

5454
/** The requester. */
5555
@Nonnull

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
*/
1515
class EnterpriseManagedSupport {
1616

17+
private static final Logger LOGGER = Logger.getLogger(EnterpriseManagedSupport.class.getName());
1718
static final String COULD_NOT_RETRIEVE_ORGANIZATION_EXTERNAL_GROUPS = "Could not retrieve organization external groups";
1819
static final String NOT_PART_OF_EXTERNALLY_MANAGED_ENTERPRISE_ERROR = "This organization is not part of externally managed enterprise.";
19-
static final String TEAM_CANNOT_BE_EXTERNALLY_MANAGED_ERROR = "This team cannot be externally managed since it has explicit members.";
2020

21-
private static final Logger LOGGER = Logger.getLogger(EnterpriseManagedSupport.class.getName());
21+
static final String TEAM_CANNOT_BE_EXTERNALLY_MANAGED_ERROR = "This team cannot be externally managed since it has explicit members.";
2222

2323
private static String logUnexpectedFailure(final JsonProcessingException exception, final String payload) {
2424
final StringWriter sw = new StringWriter();

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
*/
2222
public class GHApp extends GHObject {
2323

24-
private GHUser owner;
25-
26-
private String name;
27-
private String slug;
2824
private String description;
29-
private String externalUrl;
30-
private Map<String, String> permissions;
25+
3126
private List<String> events;
32-
private long installationsCount;
27+
private String externalUrl;
3328
private String htmlUrl;
29+
private long installationsCount;
30+
private String name;
31+
private GHUser owner;
32+
private Map<String, String> permissions;
33+
private String slug;
3434
/**
3535
* Create default GHApp instance
3636
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
*/
1515
public class GHAppCreateTokenBuilder extends GitHubInteractiveObject {
1616

17+
private final String apiUrlTail;
1718
/** The builder. */
1819
protected final Requester builder;
19-
private final String apiUrlTail;
2020

2121
/**
2222
* Instantiates a new GH app create token builder.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public class GHAppFromManifest extends GHApp {
1111
private String clientId;
1212

1313
private String clientSecret;
14-
private String webhookSecret;
1514
private String pem;
15+
private String webhookSecret;
1616
/**
1717
* Create default GHAppFromManifest instance
1818
*/

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,27 @@ GHRepository[] getItems(GitHub root) {
3636
}
3737
}
3838

39-
private GHUser account;
40-
4139
@JsonProperty("access_tokens_url")
4240
private String accessTokenUrl;
43-
@JsonProperty("repositories_url")
44-
private String repositoriesUrl;
41+
42+
private GHUser account;
4543
@JsonProperty("app_id")
4644
private long appId;
47-
@JsonProperty("target_id")
48-
private long targetId;
49-
@JsonProperty("target_type")
50-
private GHTargetType targetType;
51-
private Map<String, GHPermissionType> permissions;
5245
private List<String> events;
53-
@JsonProperty("single_file_name")
54-
private String singleFileName;
46+
private String htmlUrl;
47+
private Map<String, GHPermissionType> permissions;
48+
@JsonProperty("repositories_url")
49+
private String repositoriesUrl;
5550
@JsonProperty("repository_selection")
5651
private GHRepositorySelection repositorySelection;
57-
private String htmlUrl;
52+
@JsonProperty("single_file_name")
53+
private String singleFileName;
5854
private String suspendedAt;
5955
private GHUser suspendedBy;
56+
@JsonProperty("target_id")
57+
private long targetId;
58+
@JsonProperty("target_type")
59+
private GHTargetType targetType;
6060

6161
/**
6262
* Create default GHAppInstallation instance

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
*/
1515
public class GHAppInstallationToken extends GitHubInteractiveObject {
1616

17-
private String token;
18-
19-
/** The expires at. */
20-
protected String expiresAt;
21-
2217
private Map<String, String> permissions;
18+
2319
private List<GHRepository> repositories;
20+
2421
private GHRepositorySelection repositorySelection;
22+
private String token;
23+
/** The expires at. */
24+
protected String expiresAt;
2525
/**
2626
* Create default GHAppInstallationToken instance
2727
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class GHAppInstallationsIterable extends PagedIterable<GHAppInstallation> {
1212

1313
/** The Constant APP_INSTALLATIONS_URL. */
1414
public static final String APP_INSTALLATIONS_URL = "/user/installations";
15-
private final transient GitHub root;
1615
private GHAppInstallationsPage result;
16+
private final transient GitHub root;
1717

1818
/**
1919
* Instantiates a new GH app installations iterable.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* Represents the one page of GHAppInstallations.
66
*/
77
class GHAppInstallationsPage {
8-
private int totalCount;
98
private GHAppInstallation[] installations;
9+
private int totalCount;
1010

1111
/**
1212
* Gets the total count.

0 commit comments

Comments
 (0)