Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Builder property variables should not have @SerializedName annotation #220

Merged
merged 1 commit into from
Jun 11, 2019
Merged

Builder property variables should not have @SerializedName annotation #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Examples/Java/Sources/Board.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,16 @@ public boolean getUrlIsSet() {

public static class Builder {

@SerializedName("id") private @Nullable String uid;
@SerializedName("contributors") private @Nullable Set<User> contributors;
@SerializedName("counts") private @Nullable Map<String, Integer> counts;
@SerializedName("created_at") private @Nullable Date createdAt;
@SerializedName("creator") private @Nullable Map<String, String> creator;
@SerializedName("creator_url") private @Nullable String creatorURL;
@SerializedName("description") private @Nullable String description;
@SerializedName("image") private @NonNull Image image;
@SerializedName("name") private @Nullable String name;
@SerializedName("url") private @Nullable String url;
private @Nullable String uid;
private @Nullable Set<User> contributors;
private @Nullable Map<String, Integer> counts;
private @Nullable Date createdAt;
private @Nullable Map<String, String> creator;
private @Nullable String creatorURL;
private @Nullable String description;
private @NonNull Image image;
private @Nullable String name;
private @Nullable String url;

private boolean[] _bits = new boolean[10];

Expand Down
72 changes: 36 additions & 36 deletions Examples/Java/Sources/Everything.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,42 +696,42 @@ public boolean getUriPropIsSet() {

public static class Builder {

@SerializedName("array_prop") private @Nullable List<Object> arrayProp;
@SerializedName("boolean_prop") private @Nullable Boolean booleanProp;
@SerializedName("char_enum") private @Nullable EverythingCharEnum charEnum;
@SerializedName("date_prop") private @Nullable Date dateProp;
@SerializedName("int_enum") private @Nullable EverythingIntEnum intEnum;
@SerializedName("int_prop") private @Nullable Integer intProp;
@SerializedName("list_polymorphic_values") private @Nullable List<Object> listPolymorphicValues;
@SerializedName("list_with_list_and_other_model_values") private @Nullable List<List<User>> listWithListAndOtherModelValues;
@SerializedName("list_with_map_and_other_model_values") private @Nullable List<Map<String, User>> listWithMapAndOtherModelValues;
@SerializedName("list_with_object_values") private @Nullable List<String> listWithObjectValues;
@SerializedName("list_with_other_model_values") private @Nullable List<User> listWithOtherModelValues;
@SerializedName("list_with_primitive_values") private @Nullable List<Integer> listWithPrimitiveValues;
@SerializedName("map_polymorphic_values") private @Nullable Map<String, EverythingMapPolymorphicValues> mapPolymorphicValues;
@SerializedName("map_prop") private @Nullable Map<String, Object> mapProp;
@SerializedName("map_with_list_and_other_model_values") private @Nullable Map<String, List<User>> mapWithListAndOtherModelValues;
@SerializedName("map_with_map_and_other_model_values") private @Nullable Map<String, Map<String, Object>> mapWithMapAndOtherModelValues;
@SerializedName("map_with_object_values") private @Nullable Map<String, String> mapWithObjectValues;
@SerializedName("map_with_other_model_values") private @Nullable Map<String, User> mapWithOtherModelValues;
@SerializedName("map_with_primitive_values") private @Nullable Map<String, Integer> mapWithPrimitiveValues;
@SerializedName("nsinteger_enum") private @Nullable EverythingNsintegerEnum nsintegerEnum;
@SerializedName("nsuinteger_enum") private @Nullable EverythingNsuintegerEnum nsuintegerEnum;
@SerializedName("number_prop") private @Nullable Double numberProp;
@SerializedName("other_model_prop") private @Nullable User otherModelProp;
@SerializedName("polymorphic_prop") private @Nullable EverythingPolymorphicProp polymorphicProp;
@SerializedName("set_prop") private @Nullable Set<Object> setProp;
@SerializedName("set_prop_with_other_model_values") private @Nullable Set<User> setPropWithOtherModelValues;
@SerializedName("set_prop_with_primitive_values") private @Nullable Set<Integer> setPropWithPrimitiveValues;
@SerializedName("set_prop_with_values") private @Nullable Set<String> setPropWithValues;
@SerializedName("short_enum") private @Nullable EverythingShortEnum shortEnum;
@SerializedName("string_enum") private @Nullable EverythingStringEnum stringEnum;
@SerializedName("string_prop") private @Nullable String stringProp;
@SerializedName("type") private @Nullable String type;
@SerializedName("unsigned_char_enum") private @Nullable EverythingUnsignedCharEnum unsignedCharEnum;
@SerializedName("unsigned_int_enum") private @Nullable EverythingUnsignedIntEnum unsignedIntEnum;
@SerializedName("unsigned_short_enum") private @Nullable EverythingUnsignedShortEnum unsignedShortEnum;
@SerializedName("uri_prop") private @Nullable String uriProp;
private @Nullable List<Object> arrayProp;
private @Nullable Boolean booleanProp;
private @Nullable EverythingCharEnum charEnum;
private @Nullable Date dateProp;
private @Nullable EverythingIntEnum intEnum;
private @Nullable Integer intProp;
private @Nullable List<Object> listPolymorphicValues;
private @Nullable List<List<User>> listWithListAndOtherModelValues;
private @Nullable List<Map<String, User>> listWithMapAndOtherModelValues;
private @Nullable List<String> listWithObjectValues;
private @Nullable List<User> listWithOtherModelValues;
private @Nullable List<Integer> listWithPrimitiveValues;
private @Nullable Map<String, EverythingMapPolymorphicValues> mapPolymorphicValues;
private @Nullable Map<String, Object> mapProp;
private @Nullable Map<String, List<User>> mapWithListAndOtherModelValues;
private @Nullable Map<String, Map<String, Object>> mapWithMapAndOtherModelValues;
private @Nullable Map<String, String> mapWithObjectValues;
private @Nullable Map<String, User> mapWithOtherModelValues;
private @Nullable Map<String, Integer> mapWithPrimitiveValues;
private @Nullable EverythingNsintegerEnum nsintegerEnum;
private @Nullable EverythingNsuintegerEnum nsuintegerEnum;
private @Nullable Double numberProp;
private @Nullable User otherModelProp;
private @Nullable EverythingPolymorphicProp polymorphicProp;
private @Nullable Set<Object> setProp;
private @Nullable Set<User> setPropWithOtherModelValues;
private @Nullable Set<Integer> setPropWithPrimitiveValues;
private @Nullable Set<String> setPropWithValues;
private @Nullable EverythingShortEnum shortEnum;
private @Nullable EverythingStringEnum stringEnum;
private @Nullable String stringProp;
private @Nullable String type;
private @Nullable EverythingUnsignedCharEnum unsignedCharEnum;
private @Nullable EverythingUnsignedIntEnum unsignedIntEnum;
private @Nullable EverythingUnsignedShortEnum unsignedShortEnum;
private @Nullable String uriProp;

private boolean[] _bits = new boolean[36];

Expand Down
6 changes: 3 additions & 3 deletions Examples/Java/Sources/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ public boolean getWidthIsSet() {

public static class Builder {

@SerializedName("height") private @Nullable Integer height;
@SerializedName("url") private @Nullable String url;
@SerializedName("width") private @Nullable Integer width;
private @Nullable Integer height;
private @Nullable String url;
private @Nullable Integer width;

private boolean[] _bits = new boolean[3];

Expand Down
2 changes: 1 addition & 1 deletion Examples/Java/Sources/Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public boolean getUidIsSet() {

public static class Builder {

@SerializedName("id") private @Nullable String uid;
private @Nullable String uid;

private boolean[] _bits = new boolean[1];

Expand Down
34 changes: 17 additions & 17 deletions Examples/Java/Sources/Pin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,23 +329,23 @@ public boolean getVisualSearchAttrsIsSet() {

public static class Builder {

@SerializedName("attribution") private @Nullable Map<String, String> attribution;
@SerializedName("attribution_objects") private @Nullable List<PinAttributionObjects> attributionObjects;
@SerializedName("board") private @Nullable Board board;
@SerializedName("color") private @Nullable String color;
@SerializedName("counts") private @Nullable Map<String, Integer> counts;
@SerializedName("created_at") private @NonNull Date createdAt;
@SerializedName("creator") private @NonNull Map<String, User> creator;
@SerializedName("description") private @Nullable String description;
@SerializedName("id") private @NonNull String uid;
@SerializedName("image") private @Nullable Image image;
@SerializedName("in_stock") private @Nullable PinInStock inStock;
@SerializedName("link") private @Nullable String link;
@SerializedName("media") private @Nullable Map<String, String> media;
@SerializedName("note") private @Nullable String note;
@SerializedName("tags") private @Nullable List<Map<String, Object>> tags;
@SerializedName("url") private @Nullable String url;
@SerializedName("visual_search_attrs") private @Nullable Map<String, Object> visualSearchAttrs;
private @Nullable Map<String, String> attribution;
private @Nullable List<PinAttributionObjects> attributionObjects;
private @Nullable Board board;
private @Nullable String color;
private @Nullable Map<String, Integer> counts;
private @NonNull Date createdAt;
private @NonNull Map<String, User> creator;
private @Nullable String description;
private @NonNull String uid;
private @Nullable Image image;
private @Nullable PinInStock inStock;
private @Nullable String link;
private @Nullable Map<String, String> media;
private @Nullable String note;
private @Nullable List<Map<String, Object>> tags;
private @Nullable String url;
private @Nullable Map<String, Object> visualSearchAttrs;

private boolean[] _bits = new boolean[17];

Expand Down
20 changes: 10 additions & 10 deletions Examples/Java/Sources/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,16 @@ public boolean getUsernameIsSet() {

public static class Builder {

@SerializedName("bio") private @Nullable String bio;
@SerializedName("counts") private @Nullable Map<String, Integer> counts;
@SerializedName("created_at") private @Nullable Date createdAt;
@SerializedName("email_frequency") private @Nullable UserEmailFrequency emailFrequency;
@SerializedName("first_name") private @Nullable String firstName;
@SerializedName("id") private @Nullable String uid;
@SerializedName("image") private @Nullable Image image;
@SerializedName("last_name") private @Nullable String lastName;
@SerializedName("type") private @Nullable String type;
@SerializedName("username") private @Nullable String username;
private @Nullable String bio;
private @Nullable Map<String, Integer> counts;
private @Nullable Date createdAt;
private @Nullable UserEmailFrequency emailFrequency;
private @Nullable String firstName;
private @Nullable String uid;
private @Nullable Image image;
private @Nullable String lastName;
private @Nullable String type;
private @Nullable String username;

private boolean[] _bits = new boolean[10];

Expand Down
8 changes: 4 additions & 4 deletions Examples/Java/Sources/VariableSubtitution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ public boolean getNewPropIsSet() {

public static class Builder {

@SerializedName("alloc_prop") private @Nullable Integer allocProp;
@SerializedName("copy_prop") private @Nullable Integer copyProp;
@SerializedName("mutable_copy_prop") private @Nullable Integer mutableCopyProp;
@SerializedName("new_prop") private @Nullable Integer newProp;
private @Nullable Integer allocProp;
private @Nullable Integer copyProp;
private @Nullable Integer mutableCopyProp;
private @Nullable Integer newProp;

private boolean[] _bits = new boolean[4];

Expand Down
2 changes: 1 addition & 1 deletion Sources/Core/JavaModelRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public struct JavaModelRenderer: JavaFileRenderer {

func renderBuilderProperties(modifiers _: JavaModifier = [.private]) -> [[JavaIR.Property]] {
let props = transitiveProperties.map { param, schemaObj in
JavaIR.Property(annotations: [.serializedName(name: param)], modifiers: [.private], type: self.typeFromSchema(param, schemaObj), name: Languages.java.snakeCaseToPropertyName(param), initialValue: "")
JavaIR.Property(annotations: [], modifiers: [.private], type: self.typeFromSchema(param, schemaObj), name: Languages.java.snakeCaseToPropertyName(param), initialValue: "")
}

let bits = JavaIR.Property(annotations: [], modifiers: [.private], type: "boolean[]", name: "_bits", initialValue: "new boolean[" + String(props.count) + "]")
Expand Down