Order modifiers according to the Java spec (#241)

Specifically follow checkstyle's recommendation of conforming to the Java Language specification, sections 8.1.1, 8.3.1, 8.4.3 and 9.4. https://checkstyle.sourceforge.io/config_modifier.html#ModifierOrder
pinterest · Aug 27, 2019 · f650f01 · f650f01
1 parent 42a168b
commit f650f01
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 99 deletions.
diff --git a/Examples/Java/Sources/Board.java b/Examples/Java/Sources/Board.java
@@ -39,16 +39,16 @@ public class Board {
     @SerializedName("name") private @Nullable String name;
     @SerializedName("url") private @Nullable String url;
 
-    static final private int ID_INDEX = 0;
-    static final private int CONTRIBUTORS_INDEX = 1;
-    static final private int COUNTS_INDEX = 2;
-    static final private int CREATED_AT_INDEX = 3;
-    static final private int CREATOR_INDEX = 4;
-    static final private int CREATOR_URL_INDEX = 5;
-    static final private int DESCRIPTION_INDEX = 6;
-    static final private int IMAGE_INDEX = 7;
-    static final private int NAME_INDEX = 8;
-    static final private int URL_INDEX = 9;
+    private static final int ID_INDEX = 0;
+    private static final int CONTRIBUTORS_INDEX = 1;
+    private static final int COUNTS_INDEX = 2;
+    private static final int CREATED_AT_INDEX = 3;
+    private static final int CREATOR_INDEX = 4;
+    private static final int CREATOR_URL_INDEX = 5;
+    private static final int DESCRIPTION_INDEX = 6;
+    private static final int IMAGE_INDEX = 7;
+    private static final int NAME_INDEX = 8;
+    private static final int URL_INDEX = 9;
 
     private boolean[] _bits;
 
@@ -466,9 +466,9 @@ public <T> TypeAdapter<T> create(@NonNull Gson gson, @NonNull TypeToken<T> typeT
         }
     }
 
-    static private class BoardTypeAdapter extends TypeAdapter<Board> {
+    private static class BoardTypeAdapter extends TypeAdapter<Board> {
 
-        final private Gson gson;
+        private final Gson gson;
         private TypeAdapter<Date> dateTypeAdapter;
         private TypeAdapter<Image> imageTypeAdapter;
         private TypeAdapter<Map<String, Integer>> map_String__Integer_TypeAdapter;

diff --git a/Examples/Java/Sources/Everything.java b/Examples/Java/Sources/Everything.java
@@ -185,42 +185,42 @@ public int getValue() {
     @SerializedName("unsigned_short_enum") private @Nullable EverythingUnsignedShortEnum unsignedShortEnum;
     @SerializedName("uri_prop") private @Nullable String uriProp;
 
-    static final private int ARRAY_PROP_INDEX = 0;
-    static final private int BOOLEAN_PROP_INDEX = 1;
-    static final private int CHAR_ENUM_INDEX = 2;
-    static final private int DATE_PROP_INDEX = 3;
-    static final private int INT_ENUM_INDEX = 4;
-    static final private int INT_PROP_INDEX = 5;
-    static final private int LIST_POLYMORPHIC_VALUES_INDEX = 6;
-    static final private int LIST_WITH_LIST_AND_OTHER_MODEL_VALUES_INDEX = 7;
-    static final private int LIST_WITH_MAP_AND_OTHER_MODEL_VALUES_INDEX = 8;
-    static final private int LIST_WITH_OBJECT_VALUES_INDEX = 9;
-    static final private int LIST_WITH_OTHER_MODEL_VALUES_INDEX = 10;
-    static final private int LIST_WITH_PRIMITIVE_VALUES_INDEX = 11;
-    static final private int MAP_POLYMORPHIC_VALUES_INDEX = 12;
-    static final private int MAP_PROP_INDEX = 13;
-    static final private int MAP_WITH_LIST_AND_OTHER_MODEL_VALUES_INDEX = 14;
-    static final private int MAP_WITH_MAP_AND_OTHER_MODEL_VALUES_INDEX = 15;
-    static final private int MAP_WITH_OBJECT_VALUES_INDEX = 16;
-    static final private int MAP_WITH_OTHER_MODEL_VALUES_INDEX = 17;
-    static final private int MAP_WITH_PRIMITIVE_VALUES_INDEX = 18;
-    static final private int NSINTEGER_ENUM_INDEX = 19;
-    static final private int NSUINTEGER_ENUM_INDEX = 20;
-    static final private int NUMBER_PROP_INDEX = 21;
-    static final private int OTHER_MODEL_PROP_INDEX = 22;
-    static final private int POLYMORPHIC_PROP_INDEX = 23;
-    static final private int SET_PROP_INDEX = 24;
-    static final private int SET_PROP_WITH_OTHER_MODEL_VALUES_INDEX = 25;
-    static final private int SET_PROP_WITH_PRIMITIVE_VALUES_INDEX = 26;
-    static final private int SET_PROP_WITH_VALUES_INDEX = 27;
-    static final private int SHORT_ENUM_INDEX = 28;
-    static final private int STRING_ENUM_INDEX = 29;
-    static final private int STRING_PROP_INDEX = 30;
-    static final private int TYPE_INDEX = 31;
-    static final private int UNSIGNED_CHAR_ENUM_INDEX = 32;
-    static final private int UNSIGNED_INT_ENUM_INDEX = 33;
-    static final private int UNSIGNED_SHORT_ENUM_INDEX = 34;
-    static final private int URI_PROP_INDEX = 35;
+    private static final int ARRAY_PROP_INDEX = 0;
+    private static final int BOOLEAN_PROP_INDEX = 1;
+    private static final int CHAR_ENUM_INDEX = 2;
+    private static final int DATE_PROP_INDEX = 3;
+    private static final int INT_ENUM_INDEX = 4;
+    private static final int INT_PROP_INDEX = 5;
+    private static final int LIST_POLYMORPHIC_VALUES_INDEX = 6;
+    private static final int LIST_WITH_LIST_AND_OTHER_MODEL_VALUES_INDEX = 7;
+    private static final int LIST_WITH_MAP_AND_OTHER_MODEL_VALUES_INDEX = 8;
+    private static final int LIST_WITH_OBJECT_VALUES_INDEX = 9;
+    private static final int LIST_WITH_OTHER_MODEL_VALUES_INDEX = 10;
+    private static final int LIST_WITH_PRIMITIVE_VALUES_INDEX = 11;
+    private static final int MAP_POLYMORPHIC_VALUES_INDEX = 12;
+    private static final int MAP_PROP_INDEX = 13;
+    private static final int MAP_WITH_LIST_AND_OTHER_MODEL_VALUES_INDEX = 14;
+    private static final int MAP_WITH_MAP_AND_OTHER_MODEL_VALUES_INDEX = 15;
+    private static final int MAP_WITH_OBJECT_VALUES_INDEX = 16;
+    private static final int MAP_WITH_OTHER_MODEL_VALUES_INDEX = 17;
+    private static final int MAP_WITH_PRIMITIVE_VALUES_INDEX = 18;
+    private static final int NSINTEGER_ENUM_INDEX = 19;
+    private static final int NSUINTEGER_ENUM_INDEX = 20;
+    private static final int NUMBER_PROP_INDEX = 21;
+    private static final int OTHER_MODEL_PROP_INDEX = 22;
+    private static final int POLYMORPHIC_PROP_INDEX = 23;
+    private static final int SET_PROP_INDEX = 24;
+    private static final int SET_PROP_WITH_OTHER_MODEL_VALUES_INDEX = 25;
+    private static final int SET_PROP_WITH_PRIMITIVE_VALUES_INDEX = 26;
+    private static final int SET_PROP_WITH_VALUES_INDEX = 27;
+    private static final int SHORT_ENUM_INDEX = 28;
+    private static final int STRING_ENUM_INDEX = 29;
+    private static final int STRING_PROP_INDEX = 30;
+    private static final int TYPE_INDEX = 31;
+    private static final int UNSIGNED_CHAR_ENUM_INDEX = 32;
+    private static final int UNSIGNED_INT_ENUM_INDEX = 33;
+    private static final int UNSIGNED_SHORT_ENUM_INDEX = 34;
+    private static final int URI_PROP_INDEX = 35;
 
     private boolean[] _bits;
 
@@ -1525,9 +1525,9 @@ public <T> TypeAdapter<T> create(@NonNull Gson gson, @NonNull TypeToken<T> typeT
         }
     }
 
-    static private class EverythingTypeAdapter extends TypeAdapter<Everything> {
+    private static class EverythingTypeAdapter extends TypeAdapter<Everything> {
 
-        final private Gson gson;
+        private final Gson gson;
         private TypeAdapter<Boolean> booleanTypeAdapter;
         private TypeAdapter<Date> dateTypeAdapter;
         private TypeAdapter<Double> doubleTypeAdapter;
@@ -2056,7 +2056,7 @@ public int getValue() {
         private @Nullable List<Object> value5;
         private @Nullable Map<String, Object> value6;
 
-        static private InternalStorage internalStorage;
+        private static InternalStorage internalStorage;
 
         private EverythingMapPolymorphicValues() {
         }
@@ -2102,7 +2102,7 @@ public int getValue() {
         private @Nullable Date value9;
         private @Nullable String value10;
 
-        static private InternalStorage internalStorage;
+        private static InternalStorage internalStorage;
 
         private EverythingPolymorphicProp() {
         }

diff --git a/Examples/Java/Sources/Image.java b/Examples/Java/Sources/Image.java
@@ -29,9 +29,9 @@ public class Image {
     @SerializedName("url") private @Nullable String url;
     @SerializedName("width") private @Nullable Integer width;
 
-    static final private int HEIGHT_INDEX = 0;
-    static final private int URL_INDEX = 1;
-    static final private int WIDTH_INDEX = 2;
+    private static final int HEIGHT_INDEX = 0;
+    private static final int URL_INDEX = 1;
+    private static final int WIDTH_INDEX = 2;
 
     private boolean[] _bits;
 
@@ -213,9 +213,9 @@ public <T> TypeAdapter<T> create(@NonNull Gson gson, @NonNull TypeToken<T> typeT
         }
     }
 
-    static private class ImageTypeAdapter extends TypeAdapter<Image> {
+    private static class ImageTypeAdapter extends TypeAdapter<Image> {
 
-        final private Gson gson;
+        private final Gson gson;
         private TypeAdapter<Integer> integerTypeAdapter;
         private TypeAdapter<String> stringTypeAdapter;
 

diff --git a/Examples/Java/Sources/Model.java b/Examples/Java/Sources/Model.java
@@ -27,7 +27,7 @@ public class Model {
 
     @SerializedName("id") private @Nullable String uid;
 
-    static final private int ID_INDEX = 0;
+    private static final int ID_INDEX = 0;
 
     private boolean[] _bits;
 
@@ -139,9 +139,9 @@ public <T> TypeAdapter<T> create(@NonNull Gson gson, @NonNull TypeToken<T> typeT
         }
     }
 
-    static private class ModelTypeAdapter extends TypeAdapter<Model> {
+    private static class ModelTypeAdapter extends TypeAdapter<Model> {
 
-        final private Gson gson;
+        private final Gson gson;
         private TypeAdapter<String> stringTypeAdapter;
 
         ModelTypeAdapter(Gson gson) {

diff --git a/Examples/Java/Sources/Pin.java b/Examples/Java/Sources/Pin.java
@@ -64,23 +64,23 @@ public int getValue() {
     @SerializedName("url") private @Nullable String url;
     @SerializedName("visual_search_attrs") private @Nullable Map<String, Object> visualSearchAttrs;
 
-    static final private int ATTRIBUTION_INDEX = 0;
-    static final private int ATTRIBUTION_OBJECTS_INDEX = 1;
-    static final private int BOARD_INDEX = 2;
-    static final private int COLOR_INDEX = 3;
-    static final private int COUNTS_INDEX = 4;
-    static final private int CREATED_AT_INDEX = 5;
-    static final private int CREATOR_INDEX = 6;
-    static final private int DESCRIPTION_INDEX = 7;
-    static final private int ID_INDEX = 8;
-    static final private int IMAGE_INDEX = 9;
-    static final private int IN_STOCK_INDEX = 10;
-    static final private int LINK_INDEX = 11;
-    static final private int MEDIA_INDEX = 12;
-    static final private int NOTE_INDEX = 13;
-    static final private int TAGS_INDEX = 14;
-    static final private int URL_INDEX = 15;
-    static final private int VISUAL_SEARCH_ATTRS_INDEX = 16;
+    private static final int ATTRIBUTION_INDEX = 0;
+    private static final int ATTRIBUTION_OBJECTS_INDEX = 1;
+    private static final int BOARD_INDEX = 2;
+    private static final int COLOR_INDEX = 3;
+    private static final int COUNTS_INDEX = 4;
+    private static final int CREATED_AT_INDEX = 5;
+    private static final int CREATOR_INDEX = 6;
+    private static final int DESCRIPTION_INDEX = 7;
+    private static final int ID_INDEX = 8;
+    private static final int IMAGE_INDEX = 9;
+    private static final int IN_STOCK_INDEX = 10;
+    private static final int LINK_INDEX = 11;
+    private static final int MEDIA_INDEX = 12;
+    private static final int NOTE_INDEX = 13;
+    private static final int TAGS_INDEX = 14;
+    private static final int URL_INDEX = 15;
+    private static final int VISUAL_SEARCH_ATTRS_INDEX = 16;
 
     private boolean[] _bits;
 
@@ -736,9 +736,9 @@ public <T> TypeAdapter<T> create(@NonNull Gson gson, @NonNull TypeToken<T> typeT
         }
     }
 
-    static private class PinTypeAdapter extends TypeAdapter<Pin> {
+    private static class PinTypeAdapter extends TypeAdapter<Pin> {
 
-        final private Gson gson;
+        private final Gson gson;
         private TypeAdapter<Board> boardTypeAdapter;
         private TypeAdapter<Date> dateTypeAdapter;
         private TypeAdapter<Image> imageTypeAdapter;
@@ -1007,7 +1007,7 @@ public int getValue() {
         private @Nullable Board value0;
         private @Nullable User value1;
 
-        static private InternalStorage internalStorage;
+        private static InternalStorage internalStorage;
 
         private PinAttributionObjects() {
         }

diff --git a/Examples/Java/Sources/User.java b/Examples/Java/Sources/User.java
@@ -42,16 +42,16 @@ public enum UserEmailFrequency {
     @SerializedName("type") private @Nullable String type;
     @SerializedName("username") private @Nullable String username;
 
-    static final private int BIO_INDEX = 0;
-    static final private int COUNTS_INDEX = 1;
-    static final private int CREATED_AT_INDEX = 2;
-    static final private int EMAIL_FREQUENCY_INDEX = 3;
-    static final private int FIRST_NAME_INDEX = 4;
-    static final private int ID_INDEX = 5;
-    static final private int IMAGE_INDEX = 6;
-    static final private int LAST_NAME_INDEX = 7;
-    static final private int TYPE_INDEX = 8;
-    static final private int USERNAME_INDEX = 9;
+    private static final int BIO_INDEX = 0;
+    private static final int COUNTS_INDEX = 1;
+    private static final int CREATED_AT_INDEX = 2;
+    private static final int EMAIL_FREQUENCY_INDEX = 3;
+    private static final int FIRST_NAME_INDEX = 4;
+    private static final int ID_INDEX = 5;
+    private static final int IMAGE_INDEX = 6;
+    private static final int LAST_NAME_INDEX = 7;
+    private static final int TYPE_INDEX = 8;
+    private static final int USERNAME_INDEX = 9;
 
     private boolean[] _bits;
 
@@ -469,9 +469,9 @@ public <T> TypeAdapter<T> create(@NonNull Gson gson, @NonNull TypeToken<T> typeT
         }
     }
 
-    static private class UserTypeAdapter extends TypeAdapter<User> {
+    private static class UserTypeAdapter extends TypeAdapter<User> {
 
-        final private Gson gson;
+        private final Gson gson;
         private TypeAdapter<Date> dateTypeAdapter;
         private TypeAdapter<Image> imageTypeAdapter;
         private TypeAdapter<Map<String, Integer>> map_String__Integer_TypeAdapter;

diff --git a/Examples/Java/Sources/VariableSubtitution.java b/Examples/Java/Sources/VariableSubtitution.java
@@ -30,10 +30,10 @@ public class VariableSubtitution {
     @SerializedName("mutable_copy_prop") private @Nullable Integer mutableCopyProp;
     @SerializedName("new_prop") private @Nullable Integer newProp;
 
-    static final private int ALLOC_PROP_INDEX = 0;
-    static final private int COPY_PROP_INDEX = 1;
-    static final private int MUTABLE_COPY_PROP_INDEX = 2;
-    static final private int NEW_PROP_INDEX = 3;
+    private static final int ALLOC_PROP_INDEX = 0;
+    private static final int COPY_PROP_INDEX = 1;
+    private static final int MUTABLE_COPY_PROP_INDEX = 2;
+    private static final int NEW_PROP_INDEX = 3;
 
     private boolean[] _bits;
 
@@ -251,9 +251,9 @@ public <T> TypeAdapter<T> create(@NonNull Gson gson, @NonNull TypeToken<T> typeT
         }
     }
 
-    static private class VariableSubtitutionTypeAdapter extends TypeAdapter<VariableSubtitution> {
+    private static class VariableSubtitutionTypeAdapter extends TypeAdapter<VariableSubtitution> {
 
-        final private Gson gson;
+        private final Gson gson;
         private TypeAdapter<Integer> integerTypeAdapter;
 
         VariableSubtitutionTypeAdapter(Gson gson) {

diff --git a/Sources/Core/JavaIR.swift b/Sources/Core/JavaIR.swift
@@ -16,13 +16,14 @@ struct JavaModifier: OptionSet {
     static let `private` = JavaModifier(rawValue: 1 << 4)
     static let transient = JavaModifier(rawValue: 1 << 5)
 
+    // https://checkstyle.sourceforge.io/config_modifier.html#ModifierOrder
     func render() -> String {
         return [
             self.contains(.public) ? "public" : "",
+            self.contains(.private) ? "private" : "",
             self.contains(.abstract) ? "abstract" : "",
             self.contains(.static) ? "static" : "",
             self.contains(.final) ? "final" : "",
-            self.contains(.private) ? "private" : "",
             self.contains(.transient) ? "transient" : "",
         ].filter { $0 != "" }.joined(separator: " ")
     }