From fc9eddf22443a45057bd293f2581e6d9ef5ed135 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2017 10:24:40 +0200 Subject: [PATCH 01/22] Allow direct local execution --- bin/gyro | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/gyro b/bin/gyro index f5db5fd..1ca7e48 100755 --- a/bin/gyro +++ b/bin/gyro @@ -16,6 +16,10 @@ abort 'error: gyro requires Ruby 2 or higher.' if RUBY_VERSION < '2.0.0' +if $0 == __FILE__ + $:.unshift File.expand_path('../lib', File.dirname(__FILE__)) +end + require 'gyro' require 'optparse' require 'pathname' From f6d7390f7f5d32e658489da4c992285d3680b58b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 23 Jun 2017 16:54:41 +0200 Subject: [PATCH 02/22] Improve templates --- lib/templates/android/entity.liquid | 13 ++++++------- lib/templates/android/enum.liquid | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/templates/android/entity.liquid b/lib/templates/android/entity.liquid index ec6d03e..2d647aa 100644 --- a/lib/templates/android/entity.liquid +++ b/lib/templates/android/entity.liquid @@ -1,16 +1,18 @@ {%- capture imports -%} {%- if params.package.size > 0 -%} package {{ params.package }}; -{% endif -%} -{%- if entity.has_json_key_path == true %} +{%- endif %} + +/* DO NOT EDIT | Generated by gyro */ +{% if entity.has_json_key_path == true %} import com.google.gson.annotations.SerializedName; -{%- endif -%} +{% endif -%} {%- if entity.has_date_attribute == true %} import java.util.Date; {%- endif -%} {%- if entity.has_list_relationship == true %} import java.util.List; -{%- endif -%} +{%- endif %} {%- if entity.has_list_attributes == true %} import io.realm.RealmList; {%- endif %} @@ -28,8 +30,6 @@ import io.realm.annotations.PrimaryKey; {{ imports }} -/* DO NOT EDIT | Generated by gyro */ - {% if entity.comment.size > 0 -%} /** * {{ entity.comment }} @@ -45,5 +45,4 @@ public class {{ entity.name }} extends RealmObject { {%- include 'inc/attributes_getter_setter' %} {%- include 'inc/relationships_getter_setter' %} {%- include 'inc/enum_getter_setter' %} - } diff --git a/lib/templates/android/enum.liquid b/lib/templates/android/enum.liquid index 7da3196..d225f15 100644 --- a/lib/templates/android/enum.liquid +++ b/lib/templates/android/enum.liquid @@ -3,6 +3,7 @@ {%- if params.package.size > 0 -%} package {{ params.package }}; {%- endif %} + /* DO NOT EDIT | Generated by gyro */ public enum {{ attribute.enum_type }} { @@ -39,6 +40,5 @@ public enum {{ attribute.enum_type }} { public String getJsonValue() { return jsonValue; } - } {%- endif %} From 48312998084bc675e43c58addc428dd05aea3e12 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2017 10:35:00 +0200 Subject: [PATCH 03/22] Avoid useless enum member --- lib/templates/android/entity.liquid | 2 +- lib/templates/android/inc/_attributes_properties.liquid | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/templates/android/entity.liquid b/lib/templates/android/entity.liquid index 2d647aa..ef1300a 100644 --- a/lib/templates/android/entity.liquid +++ b/lib/templates/android/entity.liquid @@ -17,7 +17,7 @@ import java.util.List; import io.realm.RealmList; {%- endif %} import io.realm.RealmObject; -{%- if entity.has_ignored == true or entity.has_enum_attributes == true %} +{%- if entity.has_ignored == true %} import io.realm.annotations.Ignore; {%- endif -%} {%- if entity.has_indexed_attributes == true %} diff --git a/lib/templates/android/inc/_attributes_properties.liquid b/lib/templates/android/inc/_attributes_properties.liquid index 9e7ac0e..8f15905 100644 --- a/lib/templates/android/inc/_attributes_properties.liquid +++ b/lib/templates/android/inc/_attributes_properties.liquid @@ -21,11 +21,8 @@ {%- if attribute.indexed == true %} @Index {%- endif -%} - {%- if attribute.realm_ignored == true or attribute.enum_type.size > 0 %} + {%- if attribute.realm_ignored == true %} @Ignore - {%- endif -%} - {%- if attribute.enum_type.size > 0 %} - private {{ attribute.enum_type }} {{ name }}Enum; {%- endif -%} {%- if attribute.json_key_path.size > 0 %} @SerializedName("{{ attribute.json_key_path }}") From 3ad447b7146ea61e650869b4c9093461459e743f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2017 10:51:09 +0200 Subject: [PATCH 04/22] Hide setter and getter for fields with enum values --- .../android/inc/_attributes_getter_setter.liquid | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/templates/android/inc/_attributes_getter_setter.liquid b/lib/templates/android/inc/_attributes_getter_setter.liquid index d7523cc..eeea8dd 100644 --- a/lib/templates/android/inc/_attributes_getter_setter.liquid +++ b/lib/templates/android/inc/_attributes_getter_setter.liquid @@ -1,6 +1,14 @@ {%- for attribute in entity.attributes %} - {% if attribute.realm_read_only.size == 0 -%} + {% capture visibility -%} + {%- if attribute.enum_type.size > 0 and params.hide_members_with_enum == true -%} + protected + {%- else -%} + public + {%- endif -%} + {%- endcapture -%} + + {%- if attribute.realm_read_only.size == 0 -%} {%- comment %} ******* CONVERT TYPE CAPTURE ******* {% endcomment -%} {%- capture convert_type -%} {%- if attribute.realm_read_only.size == 0 and attribute.enum_type.size > 0 -%} @@ -28,11 +36,11 @@ {%- if annotation.size > 0 %}{{ annotation | replace: "|"," " }} {% endif -%} - public {{ convert_type }} get{{ name | titleize }}() { + {{ visibility }} {{ convert_type }} get{{ name | titleize }}() { return {{ name }}; } - public void set{{ name | titleize }}({%- if annotation.size > 0 %}{{ annotation | replace: "|"," " }} {% endif %}final {{ convert_type }} {{ name }}) { + {{ visibility }} void set{{ name | titleize }}({%- if annotation.size > 0 %}{{ annotation | replace: "|"," " }} {% endif %}final {{ convert_type }} {{ name }}) { this.{{ name }} = {{ name }}; } {%- endif -%} From 5619f208327ebdba24a7fbd37bcfde387338b178 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2017 11:22:13 +0200 Subject: [PATCH 05/22] Better template for enums --- lib/templates/android/enum.liquid | 4 ++-- .../android/inc/_enum_getter_setter.liquid | 15 ++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/templates/android/enum.liquid b/lib/templates/android/enum.liquid index d225f15..d59e696 100644 --- a/lib/templates/android/enum.liquid +++ b/lib/templates/android/enum.liquid @@ -23,7 +23,7 @@ public enum {{ attribute.enum_type }} { {{ attribute.enum_type }}(final String jsonValue) { this.jsonValue = jsonValue; } - {% if params.support_annotations.size > 0 -%} + {% if params.support_annotations.size > 0 %} @android.support.annotation.Nullable {%- endif %} public static {{ attribute.enum_type }} get(final String jsonValue) { @@ -34,7 +34,7 @@ public enum {{ attribute.enum_type }} { } return null; } - {% if params.support_annotations.size > 0 -%} + {% if params.support_annotations.size > 0 %} @android.support.annotation.NonNull {%- endif %} public String getJsonValue() { diff --git a/lib/templates/android/inc/_enum_getter_setter.liquid b/lib/templates/android/inc/_enum_getter_setter.liquid index a10a516..d8f7e36 100644 --- a/lib/templates/android/inc/_enum_getter_setter.liquid +++ b/lib/templates/android/inc/_enum_getter_setter.liquid @@ -1,16 +1,12 @@ -{%- for attribute in entity.attributes -%} - {%- if attribute.realm_read_only.size == 0 and attribute.enum_type.size > 0 -%} - - {%- if params.support_annotations == true -%} +{%- for attribute in entity.attributes %} + + {%- if attribute.realm_read_only.size == 0 and attribute.enum_type.size > 0 %} + {% if params.support_annotations.size > 0 %} @android.support.annotation.Nullable + {%- capture annotation -%}@android.support.annotation.NonNull {% endcapture -%} {%- endif -%} - {%- capture annotation -%} - {%- if params.support_annotations == true -%} - @android.support.annotation.NonNull {% endif -%} - {%- endcapture -%} {%- assign name = attribute.name %} - {{ annotation }} public {{ attribute.enum_type }} get{{ name | titleize }}Enum() { return {{ attribute.enum_type }}.get(get{{ name | titleize }}()); } @@ -19,4 +15,5 @@ this.{{ name }} = {{ name }}.getJsonValue(); } {%- endif -%} + {%- endfor -%} \ No newline at end of file From 36da2b380e2586c337f2a8c28f138b5a0cda79ff Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2017 13:13:51 +0200 Subject: [PATCH 06/22] Fix issue --- lib/templates/android/inc/_attributes_properties.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/templates/android/inc/_attributes_properties.liquid b/lib/templates/android/inc/_attributes_properties.liquid index 8f15905..7746f96 100644 --- a/lib/templates/android/inc/_attributes_properties.liquid +++ b/lib/templates/android/inc/_attributes_properties.liquid @@ -27,7 +27,7 @@ {%- if attribute.json_key_path.size > 0 %} @SerializedName("{{ attribute.json_key_path }}") {%- endif -%} - {%- if params.support_annotations == true and attribute.support_annotation.size > 0 %} + {%- if params.support_annotations.size > 0 and attribute.support_annotation.size > 0 %} @android.support.annotation.{{ attribute.support_annotation }} {%- endif %} private {{ convert_type }} {{ name }}; From 39fecd8bf5d39337169d31cbb244be9dfbfa637c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2017 13:15:48 +0200 Subject: [PATCH 07/22] Fix issue with hide_members_with_enum not working --- lib/templates/android/inc/_attributes_getter_setter.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/templates/android/inc/_attributes_getter_setter.liquid b/lib/templates/android/inc/_attributes_getter_setter.liquid index eeea8dd..9e89735 100644 --- a/lib/templates/android/inc/_attributes_getter_setter.liquid +++ b/lib/templates/android/inc/_attributes_getter_setter.liquid @@ -1,7 +1,7 @@ {%- for attribute in entity.attributes %} {% capture visibility -%} - {%- if attribute.enum_type.size > 0 and params.hide_members_with_enum == true -%} + {%- if attribute.enum_type.size > 0 and params.hide_members_with_enum.size > 0 -%} protected {%- else -%} public From 9547fe86bf20e5973e663541d601f9c89d278601 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 26 Jun 2017 14:18:16 +0200 Subject: [PATCH 08/22] Class with private constructor have to be final --- lib/templates/android/inc/_attributes_enum.liquid | 2 +- lib/templates/android/inc/_relationships_enum.liquid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/templates/android/inc/_attributes_enum.liquid b/lib/templates/android/inc/_attributes_enum.liquid index cd3304a..b4958d5 100644 --- a/lib/templates/android/inc/_attributes_enum.liquid +++ b/lib/templates/android/inc/_attributes_enum.liquid @@ -1,6 +1,6 @@ {%- if entity.attributes.size > 0 %} - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } diff --git a/lib/templates/android/inc/_relationships_enum.liquid b/lib/templates/android/inc/_relationships_enum.liquid index 2ed9d41..5d596b3 100644 --- a/lib/templates/android/inc/_relationships_enum.liquid +++ b/lib/templates/android/inc/_relationships_enum.liquid @@ -1,6 +1,6 @@ {%- if entity.relationships.size > 0 and entity.has_only_inverse == false %} - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } From edbd7afb0ee504e4a0ff909d4f055bec45c95bf4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jun 2017 10:03:59 +0200 Subject: [PATCH 09/22] Improve template --- lib/templates/android/entity.liquid | 10 ++-- .../inc/_attributes_getter_setter.liquid | 20 ++++---- .../inc/_relationships_getter_setter.liquid | 46 ++++++++++--------- 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/lib/templates/android/entity.liquid b/lib/templates/android/entity.liquid index ef1300a..cddb45e 100644 --- a/lib/templates/android/entity.liquid +++ b/lib/templates/android/entity.liquid @@ -6,14 +6,14 @@ package {{ params.package }}; /* DO NOT EDIT | Generated by gyro */ {% if entity.has_json_key_path == true %} import com.google.gson.annotations.SerializedName; -{% endif -%} +{% endif %} {%- if entity.has_date_attribute == true %} import java.util.Date; -{%- endif -%} +{%- endif %} {%- if entity.has_list_relationship == true %} import java.util.List; {%- endif %} -{%- if entity.has_list_attributes == true %} +{% if entity.has_list_attributes == true %} import io.realm.RealmList; {%- endif %} import io.realm.RealmObject; @@ -22,7 +22,7 @@ import io.realm.annotations.Ignore; {%- endif -%} {%- if entity.has_indexed_attributes == true %} import io.realm.annotations.Index; -{%- endif -%} +{%- endif %} {%- if entity.has_primary_key == true %} import io.realm.annotations.PrimaryKey; {%- endif %} @@ -40,7 +40,7 @@ public class {{ entity.name }} extends RealmObject { {%- include 'inc/attributes_enum' %} {%- include 'inc/relationships_enum' %} - {%- include 'inc/attributes_properties' %} + {% include 'inc/attributes_properties' %} {%- include 'inc/relationships_properties' %} {%- include 'inc/attributes_getter_setter' %} {%- include 'inc/relationships_getter_setter' %} diff --git a/lib/templates/android/inc/_attributes_getter_setter.liquid b/lib/templates/android/inc/_attributes_getter_setter.liquid index 9e89735..c2d6d85 100644 --- a/lib/templates/android/inc/_attributes_getter_setter.liquid +++ b/lib/templates/android/inc/_attributes_getter_setter.liquid @@ -1,15 +1,16 @@ {%- for attribute in entity.attributes %} - {% capture visibility -%} - {%- if attribute.enum_type.size > 0 and params.hide_members_with_enum.size > 0 -%} - protected - {%- else -%} - public - {%- endif -%} - {%- endcapture -%} - {%- if attribute.realm_read_only.size == 0 -%} {%- comment %} ******* CONVERT TYPE CAPTURE ******* {% endcomment -%} + + {% capture visibility -%} + {%- if attribute.enum_type.size > 0 and params.hide_members_with_enum.size > 0 -%} + protected + {%- else -%} + public + {%- endif -%} + {%- endcapture %} + {%- capture convert_type -%} {%- if attribute.realm_read_only.size == 0 and attribute.enum_type.size > 0 -%} String @@ -35,7 +36,8 @@ {%- assign name = attribute.name -%} {%- if annotation.size > 0 %}{{ annotation | replace: "|"," " }} - {% endif -%} + {% endif %} + {{ visibility }} {{ convert_type }} get{{ name | titleize }}() { return {{ name }}; } diff --git a/lib/templates/android/inc/_relationships_getter_setter.liquid b/lib/templates/android/inc/_relationships_getter_setter.liquid index 938d521..0fc1169 100644 --- a/lib/templates/android/inc/_relationships_getter_setter.liquid +++ b/lib/templates/android/inc/_relationships_getter_setter.liquid @@ -1,36 +1,40 @@ {%- for relationship in entity.relationships %} - - {% if relationship.inverse == false -%} - {%- capture relationship_type -%} + {%- if relationship.inverse == false %} + {%- capture relationship_type %} {%- if relationship.realm_read_only.size == 0 and relationship.enum_type.size > 0 -%} String - {%- else -%} - {%- if relationship.destination.size == 0 -%} + {%- else %} + {%- if relationship.destination.size == 0 %} {%- if relationship.type != "to_many" -%} {{ relationship.inverse_type }} {%- else -%} RealmList<{{ relationship.inverse_type }}> - {%- endif -%} + {%- endif %} {%- else -%} List<{{ relationship.destination }}> - {%- endif -%} - {%- endif -%} - {%- endcapture -%} + {%- endif %} + {%- endif %} + {%- endcapture %} - {%- capture annotation -%} - {%- if params.support_annotations == true -%} - {%- if relationship.optional == true -%} - @android.support.annotation.Nullable{% endif -%} - {%- if relationship.optional == false -%} - @android.support.annotation.NonNull{% endif -%} - {%- if relationship.support_annotation.size > 0 %}|@android.support.annotation.{{ relationship.support_annotation }}{% endif -%} - {% endif -%} - {%- endcapture -%} + {%- capture annotation %} + {%- if params.support_annotations == true %} + {%- if relationship.optional == true -%} + @android.support.annotation.Nullable + {%- endif %} + {%- if relationship.optional == false -%} + @android.support.annotation.NonNull + {%- endif %} + {%- if relationship.support_annotation.size > 0 -%} + |@android.support.annotation.{{ relationship.support_annotation }} + {%- endif %} + {% endif %} + {%- endcapture %} {%- assign name = relationship.name %} {%- if annotation.size > 0 %}{{ annotation | replace: "|"," " }} - {% endif -%} + {%- endif %} + public {{ relationship_type }} get{{ name | titleize }}() { return {{ name }}; } @@ -38,5 +42,5 @@ public void set{{ name | titleize }}({%- if annotation.size > 0 %}{{ annotation | replace: "|"," " }} {% endif %}final {{ relationship_type }} {{ name }}) { this.{{ name }} = {{ name }}; } - {%- endif -%} -{%- endfor -%} \ No newline at end of file + {%- endif %} +{%- endfor %} \ No newline at end of file From 111f6228471b7b6fa928852996ed17333572cc82 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jun 2017 11:11:15 +0200 Subject: [PATCH 10/22] Fix Java fixtures --- spec/fixtures/java/annotations/FidelityCard.java | 10 +++++----- spec/fixtures/java/annotations/Product.java | 3 +-- spec/fixtures/java/annotations/Shop.java | 3 +-- spec/fixtures/java/annotations/User.java | 3 +-- spec/fixtures/java/enum/OptValue.java | 2 +- spec/fixtures/java/enum/Shop.java | 13 ++++--------- spec/fixtures/java/enum/Type.java | 2 +- spec/fixtures/java/enum_json/Shop.java | 14 +++++--------- spec/fixtures/java/enum_json/Type.java | 2 +- spec/fixtures/java/enum_json/Type2.java | 2 +- spec/fixtures/java/enum_multi/FidelityCard.java | 10 +++++----- spec/fixtures/java/enum_multi/Product.java | 13 +++++-------- spec/fixtures/java/enum_multi/Shop.java | 13 +++++-------- spec/fixtures/java/enum_multi/TypeA.java | 2 +- spec/fixtures/java/enum_multi/TypeB.java | 2 +- spec/fixtures/java/enum_multi/User.java | 13 +++++-------- spec/fixtures/java/ignored/Owner.java | 10 +++++----- spec/fixtures/java/ignored/Product.java | 8 ++++---- spec/fixtures/java/ignored/Shop.java | 12 +++++------- spec/fixtures/java/inverse/Dog.java | 10 ++++------ spec/fixtures/java/inverse/Person.java | 8 ++++---- spec/fixtures/java/json/Product.java | 8 ++++---- spec/fixtures/java/json/Shop.java | 11 ++++++----- spec/fixtures/java/no_value/Animal.java | 10 +++++----- spec/fixtures/java/primary/FidelityCard.java | 10 +++++----- spec/fixtures/java/primary/Product.java | 8 ++++---- spec/fixtures/java/primary/Shop.java | 10 +++++----- spec/fixtures/java/primary/User.java | 10 +++++----- spec/fixtures/java/realm/FidelityCard.java | 10 +++++----- spec/fixtures/java/realm/Product.java | 8 ++++---- spec/fixtures/java/realm/Shop.java | 10 +++++----- spec/fixtures/java/realm/User.java | 10 +++++----- spec/fixtures/java/wrappers/FidelityCard.java | 10 +++++----- spec/fixtures/java/wrappers/Product.java | 8 ++++---- spec/fixtures/java/wrappers/Shop.java | 10 +++++----- spec/fixtures/java/wrappers/User.java | 10 +++++----- .../java/wrappers_annotations/FidelityCard.java | 10 +++++----- .../java/wrappers_annotations/Product.java | 7 +++---- spec/fixtures/java/wrappers_annotations/Shop.java | 9 ++++----- spec/fixtures/java/wrappers_annotations/User.java | 9 ++++----- 40 files changed, 153 insertions(+), 180 deletions(-) diff --git a/spec/fixtures/java/annotations/FidelityCard.java b/spec/fixtures/java/annotations/FidelityCard.java index b94cc65..a4e3ed9 100644 --- a/spec/fixtures/java/annotations/FidelityCard.java +++ b/spec/fixtures/java/annotations/FidelityCard.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class FidelityCard extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +16,7 @@ private Attributes() { public static final String POINTS = "points"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -53,5 +54,4 @@ public User getUser() { public void setUser(@android.support.annotation.NonNull final User user) { this.user = user; } - } diff --git a/spec/fixtures/java/annotations/Product.java b/spec/fixtures/java/annotations/Product.java index dc0dc6f..b872447 100644 --- a/spec/fixtures/java/annotations/Product.java +++ b/spec/fixtures/java/annotations/Product.java @@ -6,7 +6,7 @@ public class Product extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -45,5 +45,4 @@ public int getPrice() { public void setPrice(final int price) { this.price = price; } - } diff --git a/spec/fixtures/java/annotations/Shop.java b/spec/fixtures/java/annotations/Shop.java index f6944dc..f1ab4ed 100644 --- a/spec/fixtures/java/annotations/Shop.java +++ b/spec/fixtures/java/annotations/Shop.java @@ -7,7 +7,7 @@ public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -43,5 +43,4 @@ public RealmList getProducts() { public void setProducts(@android.support.annotation.NonNull final RealmList products) { this.products = products; } - } diff --git a/spec/fixtures/java/annotations/User.java b/spec/fixtures/java/annotations/User.java index e23603f..bdf6479 100644 --- a/spec/fixtures/java/annotations/User.java +++ b/spec/fixtures/java/annotations/User.java @@ -7,7 +7,7 @@ public class User extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -54,5 +54,4 @@ public FidelityCard getFidelityCard() { public void setFidelityCard(@android.support.annotation.NonNull final FidelityCard fidelityCard) { this.fidelityCard = fidelityCard; } - } diff --git a/spec/fixtures/java/enum/OptValue.java b/spec/fixtures/java/enum/OptValue.java index 661b939..40650d7 100644 --- a/spec/fixtures/java/enum/OptValue.java +++ b/spec/fixtures/java/enum/OptValue.java @@ -1,4 +1,5 @@ package com.gyro.tests; + /* DO NOT EDIT | Generated by gyro */ public enum OptValue { @@ -25,5 +26,4 @@ public static OptValue get(final String jsonValue) { public String getJsonValue() { return jsonValue; } - } diff --git a/spec/fixtures/java/enum/Shop.java b/spec/fixtures/java/enum/Shop.java index 1119d23..ac87389 100644 --- a/spec/fixtures/java/enum/Shop.java +++ b/spec/fixtures/java/enum/Shop.java @@ -1,13 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; -import io.realm.annotations.Ignore; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -18,11 +18,7 @@ private Attributes() { } private String name; - @Ignore - private OptValue optionalValueEnum; private String optionalValue; - @Ignore - private Type typeEnum; private String type; public String getName() { @@ -64,5 +60,4 @@ public Type getTypeEnum() { public void setTypeEnum(final Type type) { this.type = type.getJsonValue(); } - } diff --git a/spec/fixtures/java/enum/Type.java b/spec/fixtures/java/enum/Type.java index 770bb4a..5632855 100644 --- a/spec/fixtures/java/enum/Type.java +++ b/spec/fixtures/java/enum/Type.java @@ -1,4 +1,5 @@ package com.gyro.tests; + /* DO NOT EDIT | Generated by gyro */ public enum Type { @@ -25,5 +26,4 @@ public static Type get(final String jsonValue) { public String getJsonValue() { return jsonValue; } - } diff --git a/spec/fixtures/java/enum_json/Shop.java b/spec/fixtures/java/enum_json/Shop.java index 5df126d..6e5d3a1 100644 --- a/spec/fixtures/java/enum_json/Shop.java +++ b/spec/fixtures/java/enum_json/Shop.java @@ -1,14 +1,15 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import com.google.gson.annotations.SerializedName; -import io.realm.RealmObject; -import io.realm.annotations.Ignore; -/* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -19,12 +20,8 @@ private Attributes() { } private String name; - @Ignore - private Type typeEnum; @SerializedName("type") private String type; - @Ignore - private Type2 typeOptionalEnum; @SerializedName("type") private String typeOptional; @@ -67,5 +64,4 @@ public Type2 getTypeOptionalEnum() { public void setTypeOptionalEnum(final Type2 typeOptional) { this.typeOptional = typeOptional.getJsonValue(); } - } diff --git a/spec/fixtures/java/enum_json/Type.java b/spec/fixtures/java/enum_json/Type.java index d389fd8..d26f56c 100644 --- a/spec/fixtures/java/enum_json/Type.java +++ b/spec/fixtures/java/enum_json/Type.java @@ -1,4 +1,5 @@ package com.gyro.tests; + /* DO NOT EDIT | Generated by gyro */ public enum Type { @@ -25,5 +26,4 @@ public static Type get(final String jsonValue) { public String getJsonValue() { return jsonValue; } - } diff --git a/spec/fixtures/java/enum_json/Type2.java b/spec/fixtures/java/enum_json/Type2.java index c15fec0..2470098 100644 --- a/spec/fixtures/java/enum_json/Type2.java +++ b/spec/fixtures/java/enum_json/Type2.java @@ -1,4 +1,5 @@ package com.gyro.tests; + /* DO NOT EDIT | Generated by gyro */ public enum Type2 { @@ -25,5 +26,4 @@ public static Type2 get(final String jsonValue) { public String getJsonValue() { return jsonValue; } - } diff --git a/spec/fixtures/java/enum_multi/FidelityCard.java b/spec/fixtures/java/enum_multi/FidelityCard.java index c45383f..68508c7 100644 --- a/spec/fixtures/java/enum_multi/FidelityCard.java +++ b/spec/fixtures/java/enum_multi/FidelityCard.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class FidelityCard extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +16,7 @@ private Attributes() { public static final String POINTS = "points"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -50,5 +51,4 @@ public User getUser() { public void setUser(final User user) { this.user = user; } - } diff --git a/spec/fixtures/java/enum_multi/Product.java b/spec/fixtures/java/enum_multi/Product.java index 1b55693..e866d2e 100644 --- a/spec/fixtures/java/enum_multi/Product.java +++ b/spec/fixtures/java/enum_multi/Product.java @@ -1,13 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; -import io.realm.annotations.Ignore; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class Product extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -18,7 +18,7 @@ private Attributes() { public static final String TYPE = "type"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -29,8 +29,6 @@ private Relationships() { private String brand; private String name; private int price; - @Ignore - private TypeA typeEnum; private String type; private Shop shop; @@ -81,5 +79,4 @@ public TypeA getTypeEnum() { public void setTypeEnum(final TypeA type) { this.type = type.getJsonValue(); } - } diff --git a/spec/fixtures/java/enum_multi/Shop.java b/spec/fixtures/java/enum_multi/Shop.java index 01a5aa0..67cab0b 100644 --- a/spec/fixtures/java/enum_multi/Shop.java +++ b/spec/fixtures/java/enum_multi/Shop.java @@ -1,14 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmList; import io.realm.RealmObject; -import io.realm.annotations.Ignore; - -/* DO NOT EDIT | Generated by gyro */ public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -17,7 +17,7 @@ private Attributes() { public static final String TYPE = "type"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -26,8 +26,6 @@ private Relationships() { } private String name; - @Ignore - private TypeA typeEnum; private String type; private RealmList products; @@ -62,5 +60,4 @@ public TypeA getTypeEnum() { public void setTypeEnum(final TypeA type) { this.type = type.getJsonValue(); } - } diff --git a/spec/fixtures/java/enum_multi/TypeA.java b/spec/fixtures/java/enum_multi/TypeA.java index 5ed7af6..458f4b0 100644 --- a/spec/fixtures/java/enum_multi/TypeA.java +++ b/spec/fixtures/java/enum_multi/TypeA.java @@ -1,4 +1,5 @@ package com.gyro.tests; + /* DO NOT EDIT | Generated by gyro */ public enum TypeA { @@ -25,5 +26,4 @@ public static TypeA get(final String jsonValue) { public String getJsonValue() { return jsonValue; } - } diff --git a/spec/fixtures/java/enum_multi/TypeB.java b/spec/fixtures/java/enum_multi/TypeB.java index 42e18ae..7bae8e7 100644 --- a/spec/fixtures/java/enum_multi/TypeB.java +++ b/spec/fixtures/java/enum_multi/TypeB.java @@ -1,4 +1,5 @@ package com.gyro.tests; + /* DO NOT EDIT | Generated by gyro */ public enum TypeB { @@ -25,5 +26,4 @@ public static TypeB get(final String jsonValue) { public String getJsonValue() { return jsonValue; } - } diff --git a/spec/fixtures/java/enum_multi/User.java b/spec/fixtures/java/enum_multi/User.java index f910ab9..0c3baa1 100644 --- a/spec/fixtures/java/enum_multi/User.java +++ b/spec/fixtures/java/enum_multi/User.java @@ -1,14 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import java.util.Date; -import io.realm.RealmObject; -import io.realm.annotations.Ignore; -/* DO NOT EDIT | Generated by gyro */ +import io.realm.RealmObject; public class User extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -18,7 +18,7 @@ private Attributes() { public static final String TYPE = "type"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -28,8 +28,6 @@ private Relationships() { private Date birthday; private String name; - @Ignore - private TypeB typeEnum; private String type; private FidelityCard fidelityCard; @@ -72,5 +70,4 @@ public TypeB getTypeEnum() { public void setTypeEnum(final TypeB type) { this.type = type.getJsonValue(); } - } diff --git a/spec/fixtures/java/ignored/Owner.java b/spec/fixtures/java/ignored/Owner.java index e7201b9..e9a88b4 100644 --- a/spec/fixtures/java/ignored/Owner.java +++ b/spec/fixtures/java/ignored/Owner.java @@ -1,13 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmObject; import io.realm.annotations.Ignore; -/* DO NOT EDIT | Generated by gyro */ - public class Owner extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +16,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -42,5 +43,4 @@ public Shop getShop() { public void setShop(final Shop shop) { this.shop = shop; } - } diff --git a/spec/fixtures/java/ignored/Product.java b/spec/fixtures/java/ignored/Product.java index 3fff7ce..524a0c6 100644 --- a/spec/fixtures/java/ignored/Product.java +++ b/spec/fixtures/java/ignored/Product.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class Product extends RealmObject { - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -23,5 +24,4 @@ public Shop getShop() { public void setShop(final Shop shop) { this.shop = shop; } - } diff --git a/spec/fixtures/java/ignored/Shop.java b/spec/fixtures/java/ignored/Shop.java index 1a8fc00..b9732e1 100644 --- a/spec/fixtures/java/ignored/Shop.java +++ b/spec/fixtures/java/ignored/Shop.java @@ -1,14 +1,15 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmList; import io.realm.RealmObject; import io.realm.annotations.Ignore; -/* DO NOT EDIT | Generated by gyro */ - public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -17,7 +18,7 @@ private Attributes() { public static final String READ_ONLY = "readOnly"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -58,8 +59,6 @@ public void setName(final String name) { this.name = name; } - - public Owner getOwner() { return owner; } @@ -75,5 +74,4 @@ public RealmList getProducts() { public void setProducts(final RealmList products) { this.products = products; } - } diff --git a/spec/fixtures/java/inverse/Dog.java b/spec/fixtures/java/inverse/Dog.java index 05cecbc..759bd3d 100644 --- a/spec/fixtures/java/inverse/Dog.java +++ b/spec/fixtures/java/inverse/Dog.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class Dog extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -33,7 +34,4 @@ public String getName() { public void setName(final String name) { this.name = name; } - - - } diff --git a/spec/fixtures/java/inverse/Person.java b/spec/fixtures/java/inverse/Person.java index ee8f619..ad69ff9 100644 --- a/spec/fixtures/java/inverse/Person.java +++ b/spec/fixtures/java/inverse/Person.java @@ -1,13 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmList; import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ - public class Person extends RealmObject { - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -24,5 +25,4 @@ public RealmList getDogs() { public void setDogs(final RealmList dogs) { this.dogs = dogs; } - } diff --git a/spec/fixtures/java/json/Product.java b/spec/fixtures/java/json/Product.java index 3fff7ce..524a0c6 100644 --- a/spec/fixtures/java/json/Product.java +++ b/spec/fixtures/java/json/Product.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class Product extends RealmObject { - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -23,5 +24,4 @@ public Shop getShop() { public void setShop(final Shop shop) { this.shop = shop; } - } diff --git a/spec/fixtures/java/json/Shop.java b/spec/fixtures/java/json/Shop.java index 6c24771..49adede 100644 --- a/spec/fixtures/java/json/Shop.java +++ b/spec/fixtures/java/json/Shop.java @@ -1,14 +1,16 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import com.google.gson.annotations.SerializedName; + + import io.realm.RealmList; import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ - public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -16,7 +18,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -44,5 +46,4 @@ public RealmList getProducts() { public void setProducts(final RealmList products) { this.products = products; } - } diff --git a/spec/fixtures/java/no_value/Animal.java b/spec/fixtures/java/no_value/Animal.java index b35c634..0e2a348 100644 --- a/spec/fixtures/java/no_value/Animal.java +++ b/spec/fixtures/java/no_value/Animal.java @@ -1,14 +1,15 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import java.util.List; + import io.realm.RealmList; import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ - public class Animal extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -16,7 +17,7 @@ private Attributes() { public static final String ATTRIBUTE = "attribute"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -42,5 +43,4 @@ public List getRelationshipNoValue() { public void setRelationshipNoValue(final List relationshipNoValue) { this.relationshipNoValue = relationshipNoValue; } - } diff --git a/spec/fixtures/java/primary/FidelityCard.java b/spec/fixtures/java/primary/FidelityCard.java index ab29cc1..69d4d88 100644 --- a/spec/fixtures/java/primary/FidelityCard.java +++ b/spec/fixtures/java/primary/FidelityCard.java @@ -1,13 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; -/* DO NOT EDIT | Generated by gyro */ - public class FidelityCard extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -16,7 +17,7 @@ private Attributes() { public static final String POINTS = "points"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -52,5 +53,4 @@ public User getUser() { public void setUser(final User user) { this.user = user; } - } diff --git a/spec/fixtures/java/primary/Product.java b/spec/fixtures/java/primary/Product.java index 7cb62ee..e36fc8b 100644 --- a/spec/fixtures/java/primary/Product.java +++ b/spec/fixtures/java/primary/Product.java @@ -1,13 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; -/* DO NOT EDIT | Generated by gyro */ - public class Product extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -45,5 +46,4 @@ public int getPrice() { public void setPrice(final int price) { this.price = price; } - } diff --git a/spec/fixtures/java/primary/Shop.java b/spec/fixtures/java/primary/Shop.java index 48bf06c..2e4c91d 100644 --- a/spec/fixtures/java/primary/Shop.java +++ b/spec/fixtures/java/primary/Shop.java @@ -1,14 +1,15 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmList; import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; -/* DO NOT EDIT | Generated by gyro */ - public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -16,7 +17,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -43,5 +44,4 @@ public RealmList getProducts() { public void setProducts(final RealmList products) { this.products = products; } - } diff --git a/spec/fixtures/java/primary/User.java b/spec/fixtures/java/primary/User.java index f0daa23..ad992f0 100644 --- a/spec/fixtures/java/primary/User.java +++ b/spec/fixtures/java/primary/User.java @@ -1,14 +1,15 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import java.util.Date; + import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; -/* DO NOT EDIT | Generated by gyro */ - public class User extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -17,7 +18,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -53,5 +54,4 @@ public FidelityCard getFidelityCard() { public void setFidelityCard(final FidelityCard fidelityCard) { this.fidelityCard = fidelityCard; } - } diff --git a/spec/fixtures/java/realm/FidelityCard.java b/spec/fixtures/java/realm/FidelityCard.java index c45383f..68508c7 100644 --- a/spec/fixtures/java/realm/FidelityCard.java +++ b/spec/fixtures/java/realm/FidelityCard.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class FidelityCard extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +16,7 @@ private Attributes() { public static final String POINTS = "points"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -50,5 +51,4 @@ public User getUser() { public void setUser(final User user) { this.user = user; } - } diff --git a/spec/fixtures/java/realm/Product.java b/spec/fixtures/java/realm/Product.java index 8e3098c..454f2e0 100644 --- a/spec/fixtures/java/realm/Product.java +++ b/spec/fixtures/java/realm/Product.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class Product extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -43,5 +44,4 @@ public int getPrice() { public void setPrice(final int price) { this.price = price; } - } diff --git a/spec/fixtures/java/realm/Shop.java b/spec/fixtures/java/realm/Shop.java index df36a37..ec28727 100644 --- a/spec/fixtures/java/realm/Shop.java +++ b/spec/fixtures/java/realm/Shop.java @@ -1,13 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmList; import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ - public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +16,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -41,5 +42,4 @@ public RealmList getProducts() { public void setProducts(final RealmList products) { this.products = products; } - } diff --git a/spec/fixtures/java/realm/User.java b/spec/fixtures/java/realm/User.java index 82384d5..b254799 100644 --- a/spec/fixtures/java/realm/User.java +++ b/spec/fixtures/java/realm/User.java @@ -1,13 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import java.util.Date; -import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ +import io.realm.RealmObject; public class User extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -16,7 +17,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -51,5 +52,4 @@ public FidelityCard getFidelityCard() { public void setFidelityCard(final FidelityCard fidelityCard) { this.fidelityCard = fidelityCard; } - } diff --git a/spec/fixtures/java/wrappers/FidelityCard.java b/spec/fixtures/java/wrappers/FidelityCard.java index e073a77..f57a358 100644 --- a/spec/fixtures/java/wrappers/FidelityCard.java +++ b/spec/fixtures/java/wrappers/FidelityCard.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class FidelityCard extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +16,7 @@ private Attributes() { public static final String POINTS = "points"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -50,5 +51,4 @@ public User getUser() { public void setUser(final User user) { this.user = user; } - } diff --git a/spec/fixtures/java/wrappers/Product.java b/spec/fixtures/java/wrappers/Product.java index 6cfa976..0173e7e 100644 --- a/spec/fixtures/java/wrappers/Product.java +++ b/spec/fixtures/java/wrappers/Product.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class Product extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -43,5 +44,4 @@ public Integer getPrice() { public void setPrice(final Integer price) { this.price = price; } - } diff --git a/spec/fixtures/java/wrappers/Shop.java b/spec/fixtures/java/wrappers/Shop.java index df36a37..ec28727 100644 --- a/spec/fixtures/java/wrappers/Shop.java +++ b/spec/fixtures/java/wrappers/Shop.java @@ -1,13 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmList; import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ - public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +16,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -41,5 +42,4 @@ public RealmList getProducts() { public void setProducts(final RealmList products) { this.products = products; } - } diff --git a/spec/fixtures/java/wrappers/User.java b/spec/fixtures/java/wrappers/User.java index 82384d5..b254799 100644 --- a/spec/fixtures/java/wrappers/User.java +++ b/spec/fixtures/java/wrappers/User.java @@ -1,13 +1,14 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import java.util.Date; -import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ +import io.realm.RealmObject; public class User extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -16,7 +17,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -51,5 +52,4 @@ public FidelityCard getFidelityCard() { public void setFidelityCard(final FidelityCard fidelityCard) { this.fidelityCard = fidelityCard; } - } diff --git a/spec/fixtures/java/wrappers_annotations/FidelityCard.java b/spec/fixtures/java/wrappers_annotations/FidelityCard.java index d54a7b1..81b568c 100644 --- a/spec/fixtures/java/wrappers_annotations/FidelityCard.java +++ b/spec/fixtures/java/wrappers_annotations/FidelityCard.java @@ -1,12 +1,13 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class FidelityCard extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +16,7 @@ private Attributes() { public static final String POINTS = "points"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -55,5 +56,4 @@ public User getUser() { public void setUser(@android.support.annotation.NonNull final User user) { this.user = user; } - } diff --git a/spec/fixtures/java/wrappers_annotations/Product.java b/spec/fixtures/java/wrappers_annotations/Product.java index ae129ed..1345565 100644 --- a/spec/fixtures/java/wrappers_annotations/Product.java +++ b/spec/fixtures/java/wrappers_annotations/Product.java @@ -1,12 +1,12 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ +import io.realm.RealmObject; + public class Product extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -46,5 +46,4 @@ public Integer getPrice() { public void setPrice(@android.support.annotation.Nullable final Integer price) { this.price = price; } - } diff --git a/spec/fixtures/java/wrappers_annotations/Shop.java b/spec/fixtures/java/wrappers_annotations/Shop.java index f6944dc..4813bb7 100644 --- a/spec/fixtures/java/wrappers_annotations/Shop.java +++ b/spec/fixtures/java/wrappers_annotations/Shop.java @@ -1,13 +1,13 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import io.realm.RealmList; import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ - public class Shop extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -15,7 +15,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -43,5 +43,4 @@ public RealmList getProducts() { public void setProducts(@android.support.annotation.NonNull final RealmList products) { this.products = products; } - } diff --git a/spec/fixtures/java/wrappers_annotations/User.java b/spec/fixtures/java/wrappers_annotations/User.java index e23603f..2e6e165 100644 --- a/spec/fixtures/java/wrappers_annotations/User.java +++ b/spec/fixtures/java/wrappers_annotations/User.java @@ -1,13 +1,13 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import java.util.Date; import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ - public class User extends RealmObject { - public static class Attributes { + public static final class Attributes { private Attributes() { // Hide constructor } @@ -16,7 +16,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } @@ -54,5 +54,4 @@ public FidelityCard getFidelityCard() { public void setFidelityCard(@android.support.annotation.NonNull final FidelityCard fidelityCard) { this.fidelityCard = fidelityCard; } - } From ca726c0caedbf41d7e141b53f9f12e25a5c6dad2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jun 2017 11:34:59 +0200 Subject: [PATCH 11/22] fix issue with annotations --- lib/templates/android/inc/_attributes_properties.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/templates/android/inc/_attributes_properties.liquid b/lib/templates/android/inc/_attributes_properties.liquid index 7746f96..8f15905 100644 --- a/lib/templates/android/inc/_attributes_properties.liquid +++ b/lib/templates/android/inc/_attributes_properties.liquid @@ -27,7 +27,7 @@ {%- if attribute.json_key_path.size > 0 %} @SerializedName("{{ attribute.json_key_path }}") {%- endif -%} - {%- if params.support_annotations.size > 0 and attribute.support_annotation.size > 0 %} + {%- if params.support_annotations == true and attribute.support_annotation.size > 0 %} @android.support.annotation.{{ attribute.support_annotation }} {%- endif %} private {{ convert_type }} {{ name }}; From 7a18b1c6c5a9472c38e8af314e7cdceb39462215 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jun 2017 11:55:22 +0200 Subject: [PATCH 12/22] Fix regression with annotations --- .../inc/_attributes_getter_setter.liquid | 55 +++++++++++-------- .../inc/_relationships_getter_setter.liquid | 7 ++- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/lib/templates/android/inc/_attributes_getter_setter.liquid b/lib/templates/android/inc/_attributes_getter_setter.liquid index c2d6d85..60328d4 100644 --- a/lib/templates/android/inc/_attributes_getter_setter.liquid +++ b/lib/templates/android/inc/_attributes_getter_setter.liquid @@ -1,17 +1,17 @@ {%- for attribute in entity.attributes %} - {%- if attribute.realm_read_only.size == 0 -%} + {%- if attribute.realm_read_only.size == 0 %} {%- comment %} ******* CONVERT TYPE CAPTURE ******* {% endcomment -%} - {% capture visibility -%} + {%- capture visibility %} {%- if attribute.enum_type.size > 0 and params.hide_members_with_enum.size > 0 -%} protected {%- else -%} public - {%- endif -%} + {%- endif %} {%- endcapture %} - {%- capture convert_type -%} + {%- capture convert_type %} {%- if attribute.realm_read_only.size == 0 and attribute.enum_type.size > 0 -%} String {%- else -%} @@ -19,25 +19,32 @@ {%- include 'inc/wrapper_type_converter' -%} {%- else -%} {%- include 'inc/type_converter' -%} - {%- endif -%} - {%- endif -%} - {%- endcapture -%} - {%- capture isPrimitives -%} - {%- include 'inc/primitives' -%} - {%- endcapture -%} - {%- capture annotation -%}{%- if params.support_annotations == true -%} - {%- if params.use_wrappers == true or attribute.enum_type.size > 0 or isPrimitives == "false" -%} - @android.support.annotation.{% if attribute.optional == true %}Nullable{% else %}NonNull{% endif -%} - {%- if attribute.support_annotation.size > 0 %}|{% endif -%} - {%- endif -%} - {%- if attribute.support_annotation.size > 0 %}@android.support.annotation.{{ attribute.support_annotation }}{%- endif -%} - {%- endif -%} - {%- endcapture -%} - {%- assign name = attribute.name -%} - {%- if annotation.size > 0 %}{{ annotation | replace: "|"," - " }} - {% endif %} + {%- endif %} + {%- endif %} + {%- endcapture %} + {%- capture isPrimitives %} + {%- include 'inc/primitives' %} + {%- endcapture %} + + {%- capture annotation %} + {%- if params.support_annotations == true %} + {%- if params.use_wrappers == true or attribute.enum_type.size > 0 or isPrimitives == "false" -%} + @android.support.annotation.{% if attribute.optional == true %}Nullable{% else %}NonNull{%- endif -%} + {%- if attribute.support_annotation.size > 0 %}|{%- endif -%} + {%- endif %} + {%- if attribute.support_annotation.size > 0 -%} + @android.support.annotation.{{ attribute.support_annotation }} + {%- endif %} + {%- endif %} + {%- endcapture %} + {%- assign name = attribute.name %} + {% comment %} *** Empty line *** {% endcomment %} + + {%- if annotation.size > 0 %} + {{ annotation | replace: "|"," + " }} + {%- endif %} {{ visibility }} {{ convert_type }} get{{ name | titleize }}() { return {{ name }}; } @@ -45,5 +52,5 @@ {{ visibility }} void set{{ name | titleize }}({%- if annotation.size > 0 %}{{ annotation | replace: "|"," " }} {% endif %}final {{ convert_type }} {{ name }}) { this.{{ name }} = {{ name }}; } - {%- endif -%} -{%- endfor -%} \ No newline at end of file + {%- endif %} +{%- endfor %} \ No newline at end of file diff --git a/lib/templates/android/inc/_relationships_getter_setter.liquid b/lib/templates/android/inc/_relationships_getter_setter.liquid index 0fc1169..7f9e0bf 100644 --- a/lib/templates/android/inc/_relationships_getter_setter.liquid +++ b/lib/templates/android/inc/_relationships_getter_setter.liquid @@ -27,14 +27,15 @@ {%- if relationship.support_annotation.size > 0 -%} |@android.support.annotation.{{ relationship.support_annotation }} {%- endif %} - {% endif %} + {%- endif %} {%- endcapture %} {%- assign name = relationship.name %} - {%- if annotation.size > 0 %}{{ annotation | replace: "|"," + {% comment %} *** Empty line *** {% endcomment %} + {%- if annotation.size > 0 %} + {{ annotation | replace: "|"," " }} {%- endif %} - public {{ relationship_type }} get{{ name | titleize }}() { return {{ name }}; } From 3d7afa306a67d4de892ebbe28bc647c2f7674b58 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jun 2017 14:59:55 +0200 Subject: [PATCH 13/22] Fix all java fixture --- spec/fixtures/java/annotations/Product.java | 5 +++-- spec/fixtures/java/annotations/Shop.java | 7 ++++--- spec/fixtures/java/annotations/User.java | 7 ++++--- spec/fixtures/java/wrappers_annotations/Product.java | 1 + spec/fixtures/java/wrappers_annotations/Shop.java | 1 + spec/fixtures/java/wrappers_annotations/User.java | 1 + 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/spec/fixtures/java/annotations/Product.java b/spec/fixtures/java/annotations/Product.java index b872447..d015969 100644 --- a/spec/fixtures/java/annotations/Product.java +++ b/spec/fixtures/java/annotations/Product.java @@ -1,9 +1,10 @@ package com.gyro.tests; -import io.realm.RealmObject; - /* DO NOT EDIT | Generated by gyro */ + +import io.realm.RealmObject; + public class Product extends RealmObject { public static final class Attributes { diff --git a/spec/fixtures/java/annotations/Shop.java b/spec/fixtures/java/annotations/Shop.java index f1ab4ed..54dbbbc 100644 --- a/spec/fixtures/java/annotations/Shop.java +++ b/spec/fixtures/java/annotations/Shop.java @@ -1,10 +1,11 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + + import io.realm.RealmList; import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ - public class Shop extends RealmObject { public static final class Attributes { @@ -15,7 +16,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } diff --git a/spec/fixtures/java/annotations/User.java b/spec/fixtures/java/annotations/User.java index bdf6479..4743d6d 100644 --- a/spec/fixtures/java/annotations/User.java +++ b/spec/fixtures/java/annotations/User.java @@ -1,9 +1,10 @@ package com.gyro.tests; +/* DO NOT EDIT | Generated by gyro */ + import java.util.Date; -import io.realm.RealmObject; -/* DO NOT EDIT | Generated by gyro */ +import io.realm.RealmObject; public class User extends RealmObject { @@ -16,7 +17,7 @@ private Attributes() { public static final String NAME = "name"; } - public static class Relationships { + public static final class Relationships { private Relationships() { // Hide constructor } diff --git a/spec/fixtures/java/wrappers_annotations/Product.java b/spec/fixtures/java/wrappers_annotations/Product.java index 1345565..8faebd4 100644 --- a/spec/fixtures/java/wrappers_annotations/Product.java +++ b/spec/fixtures/java/wrappers_annotations/Product.java @@ -2,6 +2,7 @@ /* DO NOT EDIT | Generated by gyro */ + import io.realm.RealmObject; public class Product extends RealmObject { diff --git a/spec/fixtures/java/wrappers_annotations/Shop.java b/spec/fixtures/java/wrappers_annotations/Shop.java index 4813bb7..54dbbbc 100644 --- a/spec/fixtures/java/wrappers_annotations/Shop.java +++ b/spec/fixtures/java/wrappers_annotations/Shop.java @@ -2,6 +2,7 @@ /* DO NOT EDIT | Generated by gyro */ + import io.realm.RealmList; import io.realm.RealmObject; diff --git a/spec/fixtures/java/wrappers_annotations/User.java b/spec/fixtures/java/wrappers_annotations/User.java index 2e6e165..4743d6d 100644 --- a/spec/fixtures/java/wrappers_annotations/User.java +++ b/spec/fixtures/java/wrappers_annotations/User.java @@ -3,6 +3,7 @@ /* DO NOT EDIT | Generated by gyro */ import java.util.Date; + import io.realm.RealmObject; public class User extends RealmObject { From 2c36a5222be367ec9ff25fb5ab593c3923884c4d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jun 2017 15:34:20 +0200 Subject: [PATCH 14/22] Fix issue with extra empty lines --- lib/templates/android/entity.liquid | 17 +++++++++-------- .../inc/_attributes_getter_setter.liquid | 4 ++-- .../fixtures/java/annotations/FidelityCard.java | 1 - spec/fixtures/java/annotations/Product.java | 1 - spec/fixtures/java/annotations/Shop.java | 1 - spec/fixtures/java/enum/Shop.java | 1 - spec/fixtures/java/enum_json/Shop.java | 1 - spec/fixtures/java/enum_multi/FidelityCard.java | 1 - spec/fixtures/java/enum_multi/Product.java | 1 - spec/fixtures/java/enum_multi/Shop.java | 1 - spec/fixtures/java/ignored/Owner.java | 1 - spec/fixtures/java/ignored/Product.java | 1 - spec/fixtures/java/ignored/Shop.java | 1 - spec/fixtures/java/inverse/Dog.java | 1 - spec/fixtures/java/inverse/Person.java | 1 - spec/fixtures/java/json/Product.java | 1 - spec/fixtures/java/json/Shop.java | 1 - spec/fixtures/java/primary/FidelityCard.java | 1 - spec/fixtures/java/primary/Product.java | 1 - spec/fixtures/java/primary/Shop.java | 1 - spec/fixtures/java/realm/FidelityCard.java | 1 - spec/fixtures/java/realm/Product.java | 1 - spec/fixtures/java/realm/Shop.java | 1 - spec/fixtures/java/wrappers/FidelityCard.java | 1 - spec/fixtures/java/wrappers/Product.java | 1 - spec/fixtures/java/wrappers/Shop.java | 1 - .../java/wrappers_annotations/FidelityCard.java | 1 - .../java/wrappers_annotations/Product.java | 1 - .../java/wrappers_annotations/Shop.java | 1 - 29 files changed, 11 insertions(+), 37 deletions(-) diff --git a/lib/templates/android/entity.liquid b/lib/templates/android/entity.liquid index cddb45e..1116bd8 100644 --- a/lib/templates/android/entity.liquid +++ b/lib/templates/android/entity.liquid @@ -1,34 +1,35 @@ -{%- capture imports -%} {%- if params.package.size > 0 -%} package {{ params.package }}; {%- endif %} /* DO NOT EDIT | Generated by gyro */ -{% if entity.has_json_key_path == true %} +{{ empty_line }} +{%- if entity.has_json_key_path == true %} import com.google.gson.annotations.SerializedName; -{% endif %} +{% comment %} *** Empty line *** {% endcomment %} +{%- endif %} {%- if entity.has_date_attribute == true %} import java.util.Date; {%- endif %} {%- if entity.has_list_relationship == true %} import java.util.List; {%- endif %} -{% if entity.has_list_attributes == true %} +{%- if entity.has_date_attribute == true or entity.has_list_relationship == true %} +{{ empty_line }} +{%- endif %} +{%- if entity.has_list_attributes == true %} import io.realm.RealmList; {%- endif %} import io.realm.RealmObject; {%- if entity.has_ignored == true %} import io.realm.annotations.Ignore; -{%- endif -%} +{%- endif %} {%- if entity.has_indexed_attributes == true %} import io.realm.annotations.Index; {%- endif %} {%- if entity.has_primary_key == true %} import io.realm.annotations.PrimaryKey; {%- endif %} -{%- endcapture -%} - -{{ imports }} {% if entity.comment.size > 0 -%} /** diff --git a/lib/templates/android/inc/_attributes_getter_setter.liquid b/lib/templates/android/inc/_attributes_getter_setter.liquid index 60328d4..43fafda 100644 --- a/lib/templates/android/inc/_attributes_getter_setter.liquid +++ b/lib/templates/android/inc/_attributes_getter_setter.liquid @@ -39,8 +39,8 @@ {%- endif %} {%- endcapture %} {%- assign name = attribute.name %} - {% comment %} *** Empty line *** {% endcomment %} - + {{ empty_line }} + {%- if annotation.size > 0 %} {{ annotation | replace: "|"," " }} diff --git a/spec/fixtures/java/annotations/FidelityCard.java b/spec/fixtures/java/annotations/FidelityCard.java index a4e3ed9..915a8e9 100644 --- a/spec/fixtures/java/annotations/FidelityCard.java +++ b/spec/fixtures/java/annotations/FidelityCard.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class FidelityCard extends RealmObject { diff --git a/spec/fixtures/java/annotations/Product.java b/spec/fixtures/java/annotations/Product.java index d015969..20045cb 100644 --- a/spec/fixtures/java/annotations/Product.java +++ b/spec/fixtures/java/annotations/Product.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Product extends RealmObject { diff --git a/spec/fixtures/java/annotations/Shop.java b/spec/fixtures/java/annotations/Shop.java index 54dbbbc..4813bb7 100644 --- a/spec/fixtures/java/annotations/Shop.java +++ b/spec/fixtures/java/annotations/Shop.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmList; import io.realm.RealmObject; diff --git a/spec/fixtures/java/enum/Shop.java b/spec/fixtures/java/enum/Shop.java index ac87389..2ad8d98 100644 --- a/spec/fixtures/java/enum/Shop.java +++ b/spec/fixtures/java/enum/Shop.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Shop extends RealmObject { diff --git a/spec/fixtures/java/enum_json/Shop.java b/spec/fixtures/java/enum_json/Shop.java index 6e5d3a1..0c6754e 100644 --- a/spec/fixtures/java/enum_json/Shop.java +++ b/spec/fixtures/java/enum_json/Shop.java @@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName; - import io.realm.RealmObject; public class Shop extends RealmObject { diff --git a/spec/fixtures/java/enum_multi/FidelityCard.java b/spec/fixtures/java/enum_multi/FidelityCard.java index 68508c7..47d0eef 100644 --- a/spec/fixtures/java/enum_multi/FidelityCard.java +++ b/spec/fixtures/java/enum_multi/FidelityCard.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class FidelityCard extends RealmObject { diff --git a/spec/fixtures/java/enum_multi/Product.java b/spec/fixtures/java/enum_multi/Product.java index e866d2e..8a35f1f 100644 --- a/spec/fixtures/java/enum_multi/Product.java +++ b/spec/fixtures/java/enum_multi/Product.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Product extends RealmObject { diff --git a/spec/fixtures/java/enum_multi/Shop.java b/spec/fixtures/java/enum_multi/Shop.java index 67cab0b..da10228 100644 --- a/spec/fixtures/java/enum_multi/Shop.java +++ b/spec/fixtures/java/enum_multi/Shop.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmList; import io.realm.RealmObject; diff --git a/spec/fixtures/java/ignored/Owner.java b/spec/fixtures/java/ignored/Owner.java index e9a88b4..4a2a3ba 100644 --- a/spec/fixtures/java/ignored/Owner.java +++ b/spec/fixtures/java/ignored/Owner.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; import io.realm.annotations.Ignore; diff --git a/spec/fixtures/java/ignored/Product.java b/spec/fixtures/java/ignored/Product.java index 524a0c6..119ad08 100644 --- a/spec/fixtures/java/ignored/Product.java +++ b/spec/fixtures/java/ignored/Product.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Product extends RealmObject { diff --git a/spec/fixtures/java/ignored/Shop.java b/spec/fixtures/java/ignored/Shop.java index b9732e1..da0bf1e 100644 --- a/spec/fixtures/java/ignored/Shop.java +++ b/spec/fixtures/java/ignored/Shop.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmList; import io.realm.RealmObject; import io.realm.annotations.Ignore; diff --git a/spec/fixtures/java/inverse/Dog.java b/spec/fixtures/java/inverse/Dog.java index 759bd3d..4513ee0 100644 --- a/spec/fixtures/java/inverse/Dog.java +++ b/spec/fixtures/java/inverse/Dog.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Dog extends RealmObject { diff --git a/spec/fixtures/java/inverse/Person.java b/spec/fixtures/java/inverse/Person.java index ad69ff9..a1151d6 100644 --- a/spec/fixtures/java/inverse/Person.java +++ b/spec/fixtures/java/inverse/Person.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmList; import io.realm.RealmObject; diff --git a/spec/fixtures/java/json/Product.java b/spec/fixtures/java/json/Product.java index 524a0c6..119ad08 100644 --- a/spec/fixtures/java/json/Product.java +++ b/spec/fixtures/java/json/Product.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Product extends RealmObject { diff --git a/spec/fixtures/java/json/Shop.java b/spec/fixtures/java/json/Shop.java index 49adede..aba25db 100644 --- a/spec/fixtures/java/json/Shop.java +++ b/spec/fixtures/java/json/Shop.java @@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName; - import io.realm.RealmList; import io.realm.RealmObject; diff --git a/spec/fixtures/java/primary/FidelityCard.java b/spec/fixtures/java/primary/FidelityCard.java index 69d4d88..b5b7a00 100644 --- a/spec/fixtures/java/primary/FidelityCard.java +++ b/spec/fixtures/java/primary/FidelityCard.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; diff --git a/spec/fixtures/java/primary/Product.java b/spec/fixtures/java/primary/Product.java index e36fc8b..959e25b 100644 --- a/spec/fixtures/java/primary/Product.java +++ b/spec/fixtures/java/primary/Product.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; diff --git a/spec/fixtures/java/primary/Shop.java b/spec/fixtures/java/primary/Shop.java index 2e4c91d..5a3b20e 100644 --- a/spec/fixtures/java/primary/Shop.java +++ b/spec/fixtures/java/primary/Shop.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmList; import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; diff --git a/spec/fixtures/java/realm/FidelityCard.java b/spec/fixtures/java/realm/FidelityCard.java index 68508c7..47d0eef 100644 --- a/spec/fixtures/java/realm/FidelityCard.java +++ b/spec/fixtures/java/realm/FidelityCard.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class FidelityCard extends RealmObject { diff --git a/spec/fixtures/java/realm/Product.java b/spec/fixtures/java/realm/Product.java index 454f2e0..296e13f 100644 --- a/spec/fixtures/java/realm/Product.java +++ b/spec/fixtures/java/realm/Product.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Product extends RealmObject { diff --git a/spec/fixtures/java/realm/Shop.java b/spec/fixtures/java/realm/Shop.java index ec28727..9b87e82 100644 --- a/spec/fixtures/java/realm/Shop.java +++ b/spec/fixtures/java/realm/Shop.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmList; import io.realm.RealmObject; diff --git a/spec/fixtures/java/wrappers/FidelityCard.java b/spec/fixtures/java/wrappers/FidelityCard.java index f57a358..d6ec6e0 100644 --- a/spec/fixtures/java/wrappers/FidelityCard.java +++ b/spec/fixtures/java/wrappers/FidelityCard.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class FidelityCard extends RealmObject { diff --git a/spec/fixtures/java/wrappers/Product.java b/spec/fixtures/java/wrappers/Product.java index 0173e7e..5bbcd2f 100644 --- a/spec/fixtures/java/wrappers/Product.java +++ b/spec/fixtures/java/wrappers/Product.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Product extends RealmObject { diff --git a/spec/fixtures/java/wrappers/Shop.java b/spec/fixtures/java/wrappers/Shop.java index ec28727..9b87e82 100644 --- a/spec/fixtures/java/wrappers/Shop.java +++ b/spec/fixtures/java/wrappers/Shop.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmList; import io.realm.RealmObject; diff --git a/spec/fixtures/java/wrappers_annotations/FidelityCard.java b/spec/fixtures/java/wrappers_annotations/FidelityCard.java index 81b568c..0f34823 100644 --- a/spec/fixtures/java/wrappers_annotations/FidelityCard.java +++ b/spec/fixtures/java/wrappers_annotations/FidelityCard.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class FidelityCard extends RealmObject { diff --git a/spec/fixtures/java/wrappers_annotations/Product.java b/spec/fixtures/java/wrappers_annotations/Product.java index 8faebd4..1345565 100644 --- a/spec/fixtures/java/wrappers_annotations/Product.java +++ b/spec/fixtures/java/wrappers_annotations/Product.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmObject; public class Product extends RealmObject { diff --git a/spec/fixtures/java/wrappers_annotations/Shop.java b/spec/fixtures/java/wrappers_annotations/Shop.java index 54dbbbc..4813bb7 100644 --- a/spec/fixtures/java/wrappers_annotations/Shop.java +++ b/spec/fixtures/java/wrappers_annotations/Shop.java @@ -2,7 +2,6 @@ /* DO NOT EDIT | Generated by gyro */ - import io.realm.RealmList; import io.realm.RealmObject; From e35b51f24a8f0a6d790c3fbe02cbff58a745a2f3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jun 2017 16:00:07 +0200 Subject: [PATCH 15/22] Fix issue on comment. Note: comment on relationship does not work --- lib/templates/android/entity.liquid | 2 +- lib/templates/android/inc/_attributes_enum.liquid | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/templates/android/entity.liquid b/lib/templates/android/entity.liquid index 1116bd8..873eff6 100644 --- a/lib/templates/android/entity.liquid +++ b/lib/templates/android/entity.liquid @@ -35,7 +35,7 @@ import io.realm.annotations.PrimaryKey; /** * {{ entity.comment }} */ -{%- endif %} +{% endif %} {%- assign primary_key = entity.identity_attribute -%} public class {{ entity.name }} extends RealmObject { diff --git a/lib/templates/android/inc/_attributes_enum.liquid b/lib/templates/android/inc/_attributes_enum.liquid index b4958d5..6263755 100644 --- a/lib/templates/android/inc/_attributes_enum.liquid +++ b/lib/templates/android/inc/_attributes_enum.liquid @@ -6,8 +6,8 @@ } {% for attribute in entity.attributes -%} {%- if attribute.realm_ignored == false or attribute.read_only == false -%} - {%- if attribute.comment.size > 0 -%} - /** {{ attribute.comment }} */ + {%- if attribute.comment.size > 0 %} + // {{ attribute.comment }} {%- endif %} public static final String {{ attribute.name | snake_case | upcase }} = "{{ attribute.name }}"; {%- endif -%} From 5660490a6e0d21f9ef2b502fd019056115a18ff9 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 28 Jun 2017 11:16:30 +0200 Subject: [PATCH 16/22] Fix rubocop offenses --- bin/gyro | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/gyro b/bin/gyro index 1ca7e48..0d42b02 100755 --- a/bin/gyro +++ b/bin/gyro @@ -16,9 +16,8 @@ abort 'error: gyro requires Ruby 2 or higher.' if RUBY_VERSION < '2.0.0' -if $0 == __FILE__ - $:.unshift File.expand_path('../lib', File.dirname(__FILE__)) -end + +$LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__)) if $PROGRAM_NAME == __FILE__ require 'gyro' require 'optparse' From 30195e6019cb0083cef340efde0f6fe235cfca28 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 28 Jun 2017 11:18:20 +0200 Subject: [PATCH 17/22] Fix rubocop offense --- bin/gyro | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/gyro b/bin/gyro index 0d42b02..f2e50a4 100755 --- a/bin/gyro +++ b/bin/gyro @@ -16,7 +16,6 @@ abort 'error: gyro requires Ruby 2 or higher.' if RUBY_VERSION < '2.0.0' - $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__)) if $PROGRAM_NAME == __FILE__ require 'gyro' From 313fdbef2893332fd7c5e016b8ab6c676e3a5509 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 3 Aug 2017 16:28:14 +0200 Subject: [PATCH 18/22] Fix sonar issue about order of elements --- lib/templates/android/inc/_attributes_enum.liquid | 9 +++++---- lib/templates/android/inc/_relationships_enum.liquid | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/templates/android/inc/_attributes_enum.liquid b/lib/templates/android/inc/_attributes_enum.liquid index 6263755..b3b50a1 100644 --- a/lib/templates/android/inc/_attributes_enum.liquid +++ b/lib/templates/android/inc/_attributes_enum.liquid @@ -1,10 +1,7 @@ {%- if entity.attributes.size > 0 %} public static final class Attributes { - private Attributes() { - // Hide constructor - } - {% for attribute in entity.attributes -%} + {%- for attribute in entity.attributes -%} {%- if attribute.realm_ignored == false or attribute.read_only == false -%} {%- if attribute.comment.size > 0 %} // {{ attribute.comment }} @@ -12,5 +9,9 @@ public static final String {{ attribute.name | snake_case | upcase }} = "{{ attribute.name }}"; {%- endif -%} {%- endfor %} + + private Attributes() { + // Hide constructor + } } {%- endif -%} diff --git a/lib/templates/android/inc/_relationships_enum.liquid b/lib/templates/android/inc/_relationships_enum.liquid index 5d596b3..55a67fc 100644 --- a/lib/templates/android/inc/_relationships_enum.liquid +++ b/lib/templates/android/inc/_relationships_enum.liquid @@ -1,13 +1,14 @@ {%- if entity.relationships.size > 0 and entity.has_only_inverse == false %} public static final class Relationships { - private Relationships() { - // Hide constructor - } - {% for relationship in entity.relationships -%} + {%- for relationship in entity.relationships -%} {%- if relationship.inverse == false %} public static final String {{ relationship.name | snake_case | upcase }} = "{{ relationship.name }}"; {%- endif -%} {%- endfor %} + + private Relationships() { + // Hide constructor + } } {%- endif -%} \ No newline at end of file From 67f750c1965ac45ec0f8635618c1cb16c6158d5c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 3 Aug 2017 16:36:33 +0200 Subject: [PATCH 19/22] Fix sonar issue about order of elements - update unitary tests --- spec/fixtures/java/annotations/FidelityCard.java | 10 +++++----- spec/fixtures/java/annotations/Product.java | 8 ++++---- spec/fixtures/java/annotations/Shop.java | 8 ++++---- spec/fixtures/java/annotations/User.java | 10 +++++----- spec/fixtures/java/enum/Shop.java | 8 ++++---- spec/fixtures/java/enum_json/Shop.java | 8 ++++---- spec/fixtures/java/enum_multi/FidelityCard.java | 10 +++++----- spec/fixtures/java/enum_multi/Product.java | 12 ++++++------ spec/fixtures/java/enum_multi/Shop.java | 10 +++++----- spec/fixtures/java/enum_multi/User.java | 12 ++++++------ spec/fixtures/java/ignored/Owner.java | 8 ++++---- spec/fixtures/java/ignored/Product.java | 4 ++-- spec/fixtures/java/ignored/Shop.java | 12 ++++++------ spec/fixtures/java/inverse/Dog.java | 6 +++--- spec/fixtures/java/inverse/Person.java | 4 ++-- spec/fixtures/java/json/Product.java | 4 ++-- spec/fixtures/java/json/Shop.java | 8 ++++---- spec/fixtures/java/no_value/Animal.java | 8 ++++---- spec/fixtures/java/primary/FidelityCard.java | 10 +++++----- spec/fixtures/java/primary/Product.java | 8 ++++---- spec/fixtures/java/primary/Shop.java | 8 ++++---- spec/fixtures/java/primary/User.java | 10 +++++----- spec/fixtures/java/realm/FidelityCard.java | 10 +++++----- spec/fixtures/java/realm/Product.java | 8 ++++---- spec/fixtures/java/realm/Shop.java | 8 ++++---- spec/fixtures/java/realm/User.java | 10 +++++----- spec/fixtures/java/wrappers/FidelityCard.java | 10 +++++----- spec/fixtures/java/wrappers/Product.java | 8 ++++---- spec/fixtures/java/wrappers/Shop.java | 8 ++++---- spec/fixtures/java/wrappers/User.java | 10 +++++----- .../java/wrappers_annotations/FidelityCard.java | 10 +++++----- spec/fixtures/java/wrappers_annotations/Product.java | 8 ++++---- spec/fixtures/java/wrappers_annotations/Shop.java | 8 ++++---- spec/fixtures/java/wrappers_annotations/User.java | 10 +++++----- 34 files changed, 147 insertions(+), 147 deletions(-) diff --git a/spec/fixtures/java/annotations/FidelityCard.java b/spec/fixtures/java/annotations/FidelityCard.java index 915a8e9..3acfff2 100644 --- a/spec/fixtures/java/annotations/FidelityCard.java +++ b/spec/fixtures/java/annotations/FidelityCard.java @@ -7,20 +7,20 @@ public class FidelityCard extends RealmObject { public static final class Attributes { + public static final String IDENTIFIER = "identifier"; + public static final String POINTS = "points"; + private Attributes() { // Hide constructor } - - public static final String IDENTIFIER = "identifier"; - public static final String POINTS = "points"; } public static final class Relationships { + public static final String USER = "user"; + private Relationships() { // Hide constructor } - - public static final String USER = "user"; } private short identifier; diff --git a/spec/fixtures/java/annotations/Product.java b/spec/fixtures/java/annotations/Product.java index 20045cb..1b07608 100644 --- a/spec/fixtures/java/annotations/Product.java +++ b/spec/fixtures/java/annotations/Product.java @@ -7,13 +7,13 @@ public class Product extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String BRAND = "brand"; public static final String NAME = "name"; public static final String PRICE = "price"; + + private Attributes() { + // Hide constructor + } } private String brand; diff --git a/spec/fixtures/java/annotations/Shop.java b/spec/fixtures/java/annotations/Shop.java index 4813bb7..440cf2f 100644 --- a/spec/fixtures/java/annotations/Shop.java +++ b/spec/fixtures/java/annotations/Shop.java @@ -8,19 +8,19 @@ public class Shop extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; } public static final class Relationships { + public static final String PRODUCTS = "products"; + private Relationships() { // Hide constructor } - - public static final String PRODUCTS = "products"; } private String name; diff --git a/spec/fixtures/java/annotations/User.java b/spec/fixtures/java/annotations/User.java index 4743d6d..ead0fe0 100644 --- a/spec/fixtures/java/annotations/User.java +++ b/spec/fixtures/java/annotations/User.java @@ -9,20 +9,20 @@ public class User extends RealmObject { public static final class Attributes { + public static final String BIRTHDAY = "birthday"; + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String BIRTHDAY = "birthday"; - public static final String NAME = "name"; } public static final class Relationships { + public static final String FIDELITY_CARD = "fidelityCard"; + private Relationships() { // Hide constructor } - - public static final String FIDELITY_CARD = "fidelityCard"; } private Date birthday; diff --git a/spec/fixtures/java/enum/Shop.java b/spec/fixtures/java/enum/Shop.java index 2ad8d98..e37b9e7 100644 --- a/spec/fixtures/java/enum/Shop.java +++ b/spec/fixtures/java/enum/Shop.java @@ -7,13 +7,13 @@ public class Shop extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String NAME = "name"; public static final String OPTIONAL_VALUE = "optionalValue"; public static final String TYPE = "type"; + + private Attributes() { + // Hide constructor + } } private String name; diff --git a/spec/fixtures/java/enum_json/Shop.java b/spec/fixtures/java/enum_json/Shop.java index 0c6754e..26656df 100644 --- a/spec/fixtures/java/enum_json/Shop.java +++ b/spec/fixtures/java/enum_json/Shop.java @@ -9,13 +9,13 @@ public class Shop extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String NAME = "name"; public static final String TYPE = "type"; public static final String TYPE_OPTIONAL = "typeOptional"; + + private Attributes() { + // Hide constructor + } } private String name; diff --git a/spec/fixtures/java/enum_multi/FidelityCard.java b/spec/fixtures/java/enum_multi/FidelityCard.java index 47d0eef..a75d107 100644 --- a/spec/fixtures/java/enum_multi/FidelityCard.java +++ b/spec/fixtures/java/enum_multi/FidelityCard.java @@ -7,20 +7,20 @@ public class FidelityCard extends RealmObject { public static final class Attributes { + public static final String IDENTIFIER = "identifier"; + public static final String POINTS = "points"; + private Attributes() { // Hide constructor } - - public static final String IDENTIFIER = "identifier"; - public static final String POINTS = "points"; } public static final class Relationships { + public static final String USER = "user"; + private Relationships() { // Hide constructor } - - public static final String USER = "user"; } private short identifier; diff --git a/spec/fixtures/java/enum_multi/Product.java b/spec/fixtures/java/enum_multi/Product.java index 8a35f1f..34dfe2f 100644 --- a/spec/fixtures/java/enum_multi/Product.java +++ b/spec/fixtures/java/enum_multi/Product.java @@ -7,22 +7,22 @@ public class Product extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String BRAND = "brand"; public static final String NAME = "name"; public static final String PRICE = "price"; public static final String TYPE = "type"; + + private Attributes() { + // Hide constructor + } } public static final class Relationships { + public static final String SHOP = "shop"; + private Relationships() { // Hide constructor } - - public static final String SHOP = "shop"; } private String brand; diff --git a/spec/fixtures/java/enum_multi/Shop.java b/spec/fixtures/java/enum_multi/Shop.java index da10228..1824468 100644 --- a/spec/fixtures/java/enum_multi/Shop.java +++ b/spec/fixtures/java/enum_multi/Shop.java @@ -8,20 +8,20 @@ public class Shop extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + public static final String TYPE = "type"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; - public static final String TYPE = "type"; } public static final class Relationships { + public static final String PRODUCTS = "products"; + private Relationships() { // Hide constructor } - - public static final String PRODUCTS = "products"; } private String name; diff --git a/spec/fixtures/java/enum_multi/User.java b/spec/fixtures/java/enum_multi/User.java index 0c3baa1..d53539d 100644 --- a/spec/fixtures/java/enum_multi/User.java +++ b/spec/fixtures/java/enum_multi/User.java @@ -9,21 +9,21 @@ public class User extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String BIRTHDAY = "birthday"; public static final String NAME = "name"; public static final String TYPE = "type"; + + private Attributes() { + // Hide constructor + } } public static final class Relationships { + public static final String FIDELITY_CARD = "fidelityCard"; + private Relationships() { // Hide constructor } - - public static final String FIDELITY_CARD = "fidelityCard"; } private Date birthday; diff --git a/spec/fixtures/java/ignored/Owner.java b/spec/fixtures/java/ignored/Owner.java index 4a2a3ba..24c2445 100644 --- a/spec/fixtures/java/ignored/Owner.java +++ b/spec/fixtures/java/ignored/Owner.java @@ -8,19 +8,19 @@ public class Owner extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; } public static final class Relationships { + public static final String SHOP = "shop"; + private Relationships() { // Hide constructor } - - public static final String SHOP = "shop"; } private String name; diff --git a/spec/fixtures/java/ignored/Product.java b/spec/fixtures/java/ignored/Product.java index 119ad08..d5d33ad 100644 --- a/spec/fixtures/java/ignored/Product.java +++ b/spec/fixtures/java/ignored/Product.java @@ -7,11 +7,11 @@ public class Product extends RealmObject { public static final class Relationships { + public static final String SHOP = "shop"; + private Relationships() { // Hide constructor } - - public static final String SHOP = "shop"; } private Shop shop; diff --git a/spec/fixtures/java/ignored/Shop.java b/spec/fixtures/java/ignored/Shop.java index da0bf1e..c50f79d 100644 --- a/spec/fixtures/java/ignored/Shop.java +++ b/spec/fixtures/java/ignored/Shop.java @@ -9,21 +9,21 @@ public class Shop extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + public static final String READ_ONLY = "readOnly"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; - public static final String READ_ONLY = "readOnly"; } public static final class Relationships { + public static final String OWNER = "owner"; + public static final String PRODUCTS = "products"; + private Relationships() { // Hide constructor } - - public static final String OWNER = "owner"; - public static final String PRODUCTS = "products"; } @Ignore diff --git a/spec/fixtures/java/inverse/Dog.java b/spec/fixtures/java/inverse/Dog.java index 4513ee0..1fb66f2 100644 --- a/spec/fixtures/java/inverse/Dog.java +++ b/spec/fixtures/java/inverse/Dog.java @@ -7,12 +7,12 @@ public class Dog extends RealmObject { public static final class Attributes { + public static final String AGE = "age"; + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String AGE = "age"; - public static final String NAME = "name"; } private short age; diff --git a/spec/fixtures/java/inverse/Person.java b/spec/fixtures/java/inverse/Person.java index a1151d6..df8ff28 100644 --- a/spec/fixtures/java/inverse/Person.java +++ b/spec/fixtures/java/inverse/Person.java @@ -8,11 +8,11 @@ public class Person extends RealmObject { public static final class Relationships { + public static final String DOGS = "dogs"; + private Relationships() { // Hide constructor } - - public static final String DOGS = "dogs"; } private RealmList dogs; diff --git a/spec/fixtures/java/json/Product.java b/spec/fixtures/java/json/Product.java index 119ad08..d5d33ad 100644 --- a/spec/fixtures/java/json/Product.java +++ b/spec/fixtures/java/json/Product.java @@ -7,11 +7,11 @@ public class Product extends RealmObject { public static final class Relationships { + public static final String SHOP = "shop"; + private Relationships() { // Hide constructor } - - public static final String SHOP = "shop"; } private Shop shop; diff --git a/spec/fixtures/java/json/Shop.java b/spec/fixtures/java/json/Shop.java index aba25db..4280a6d 100644 --- a/spec/fixtures/java/json/Shop.java +++ b/spec/fixtures/java/json/Shop.java @@ -10,19 +10,19 @@ public class Shop extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; } public static final class Relationships { + public static final String PRODUCTS = "products"; + private Relationships() { // Hide constructor } - - public static final String PRODUCTS = "products"; } @SerializedName("json_name") diff --git a/spec/fixtures/java/no_value/Animal.java b/spec/fixtures/java/no_value/Animal.java index 0e2a348..c51617a 100644 --- a/spec/fixtures/java/no_value/Animal.java +++ b/spec/fixtures/java/no_value/Animal.java @@ -10,19 +10,19 @@ public class Animal extends RealmObject { public static final class Attributes { + public static final String ATTRIBUTE = "attribute"; + private Attributes() { // Hide constructor } - - public static final String ATTRIBUTE = "attribute"; } public static final class Relationships { + public static final String RELATIONSHIP_NO_VALUE = "relationshipNoValue"; + private Relationships() { // Hide constructor } - - public static final String RELATIONSHIP_NO_VALUE = "relationshipNoValue"; } private String attribute; diff --git a/spec/fixtures/java/primary/FidelityCard.java b/spec/fixtures/java/primary/FidelityCard.java index b5b7a00..fea2ed8 100644 --- a/spec/fixtures/java/primary/FidelityCard.java +++ b/spec/fixtures/java/primary/FidelityCard.java @@ -8,20 +8,20 @@ public class FidelityCard extends RealmObject { public static final class Attributes { + public static final String IDENTIFIER = "identifier"; + public static final String POINTS = "points"; + private Attributes() { // Hide constructor } - - public static final String IDENTIFIER = "identifier"; - public static final String POINTS = "points"; } public static final class Relationships { + public static final String USER = "user"; + private Relationships() { // Hide constructor } - - public static final String USER = "user"; } @PrimaryKey diff --git a/spec/fixtures/java/primary/Product.java b/spec/fixtures/java/primary/Product.java index 959e25b..4df401a 100644 --- a/spec/fixtures/java/primary/Product.java +++ b/spec/fixtures/java/primary/Product.java @@ -8,13 +8,13 @@ public class Product extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String BRAND = "brand"; public static final String NAME = "name"; public static final String PRICE = "price"; + + private Attributes() { + // Hide constructor + } } private String brand; diff --git a/spec/fixtures/java/primary/Shop.java b/spec/fixtures/java/primary/Shop.java index 5a3b20e..64c324c 100644 --- a/spec/fixtures/java/primary/Shop.java +++ b/spec/fixtures/java/primary/Shop.java @@ -9,19 +9,19 @@ public class Shop extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; } public static final class Relationships { + public static final String PRODUCTS = "products"; + private Relationships() { // Hide constructor } - - public static final String PRODUCTS = "products"; } @PrimaryKey diff --git a/spec/fixtures/java/primary/User.java b/spec/fixtures/java/primary/User.java index ad992f0..51bdc4b 100644 --- a/spec/fixtures/java/primary/User.java +++ b/spec/fixtures/java/primary/User.java @@ -10,20 +10,20 @@ public class User extends RealmObject { public static final class Attributes { + public static final String BIRTHDAY = "birthday"; + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String BIRTHDAY = "birthday"; - public static final String NAME = "name"; } public static final class Relationships { + public static final String FIDELITY_CARD = "fidelityCard"; + private Relationships() { // Hide constructor } - - public static final String FIDELITY_CARD = "fidelityCard"; } private Date birthday; diff --git a/spec/fixtures/java/realm/FidelityCard.java b/spec/fixtures/java/realm/FidelityCard.java index 47d0eef..a75d107 100644 --- a/spec/fixtures/java/realm/FidelityCard.java +++ b/spec/fixtures/java/realm/FidelityCard.java @@ -7,20 +7,20 @@ public class FidelityCard extends RealmObject { public static final class Attributes { + public static final String IDENTIFIER = "identifier"; + public static final String POINTS = "points"; + private Attributes() { // Hide constructor } - - public static final String IDENTIFIER = "identifier"; - public static final String POINTS = "points"; } public static final class Relationships { + public static final String USER = "user"; + private Relationships() { // Hide constructor } - - public static final String USER = "user"; } private short identifier; diff --git a/spec/fixtures/java/realm/Product.java b/spec/fixtures/java/realm/Product.java index 296e13f..b54352e 100644 --- a/spec/fixtures/java/realm/Product.java +++ b/spec/fixtures/java/realm/Product.java @@ -7,13 +7,13 @@ public class Product extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String BRAND = "brand"; public static final String NAME = "name"; public static final String PRICE = "price"; + + private Attributes() { + // Hide constructor + } } private String brand; diff --git a/spec/fixtures/java/realm/Shop.java b/spec/fixtures/java/realm/Shop.java index 9b87e82..8912994 100644 --- a/spec/fixtures/java/realm/Shop.java +++ b/spec/fixtures/java/realm/Shop.java @@ -8,19 +8,19 @@ public class Shop extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; } public static final class Relationships { + public static final String PRODUCTS = "products"; + private Relationships() { // Hide constructor } - - public static final String PRODUCTS = "products"; } private String name; diff --git a/spec/fixtures/java/realm/User.java b/spec/fixtures/java/realm/User.java index b254799..39cd6c5 100644 --- a/spec/fixtures/java/realm/User.java +++ b/spec/fixtures/java/realm/User.java @@ -9,20 +9,20 @@ public class User extends RealmObject { public static final class Attributes { + public static final String BIRTHDAY = "birthday"; + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String BIRTHDAY = "birthday"; - public static final String NAME = "name"; } public static final class Relationships { + public static final String FIDELITY_CARD = "fidelityCard"; + private Relationships() { // Hide constructor } - - public static final String FIDELITY_CARD = "fidelityCard"; } private Date birthday; diff --git a/spec/fixtures/java/wrappers/FidelityCard.java b/spec/fixtures/java/wrappers/FidelityCard.java index d6ec6e0..0bc9a2d 100644 --- a/spec/fixtures/java/wrappers/FidelityCard.java +++ b/spec/fixtures/java/wrappers/FidelityCard.java @@ -7,20 +7,20 @@ public class FidelityCard extends RealmObject { public static final class Attributes { + public static final String IDENTIFIER = "identifier"; + public static final String POINTS = "points"; + private Attributes() { // Hide constructor } - - public static final String IDENTIFIER = "identifier"; - public static final String POINTS = "points"; } public static final class Relationships { + public static final String USER = "user"; + private Relationships() { // Hide constructor } - - public static final String USER = "user"; } private Short identifier; diff --git a/spec/fixtures/java/wrappers/Product.java b/spec/fixtures/java/wrappers/Product.java index 5bbcd2f..e737e23 100644 --- a/spec/fixtures/java/wrappers/Product.java +++ b/spec/fixtures/java/wrappers/Product.java @@ -7,13 +7,13 @@ public class Product extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String BRAND = "brand"; public static final String NAME = "name"; public static final String PRICE = "price"; + + private Attributes() { + // Hide constructor + } } private String brand; diff --git a/spec/fixtures/java/wrappers/Shop.java b/spec/fixtures/java/wrappers/Shop.java index 9b87e82..8912994 100644 --- a/spec/fixtures/java/wrappers/Shop.java +++ b/spec/fixtures/java/wrappers/Shop.java @@ -8,19 +8,19 @@ public class Shop extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; } public static final class Relationships { + public static final String PRODUCTS = "products"; + private Relationships() { // Hide constructor } - - public static final String PRODUCTS = "products"; } private String name; diff --git a/spec/fixtures/java/wrappers/User.java b/spec/fixtures/java/wrappers/User.java index b254799..39cd6c5 100644 --- a/spec/fixtures/java/wrappers/User.java +++ b/spec/fixtures/java/wrappers/User.java @@ -9,20 +9,20 @@ public class User extends RealmObject { public static final class Attributes { + public static final String BIRTHDAY = "birthday"; + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String BIRTHDAY = "birthday"; - public static final String NAME = "name"; } public static final class Relationships { + public static final String FIDELITY_CARD = "fidelityCard"; + private Relationships() { // Hide constructor } - - public static final String FIDELITY_CARD = "fidelityCard"; } private Date birthday; diff --git a/spec/fixtures/java/wrappers_annotations/FidelityCard.java b/spec/fixtures/java/wrappers_annotations/FidelityCard.java index 0f34823..861ea8e 100644 --- a/spec/fixtures/java/wrappers_annotations/FidelityCard.java +++ b/spec/fixtures/java/wrappers_annotations/FidelityCard.java @@ -7,20 +7,20 @@ public class FidelityCard extends RealmObject { public static final class Attributes { + public static final String IDENTIFIER = "identifier"; + public static final String POINTS = "points"; + private Attributes() { // Hide constructor } - - public static final String IDENTIFIER = "identifier"; - public static final String POINTS = "points"; } public static final class Relationships { + public static final String USER = "user"; + private Relationships() { // Hide constructor } - - public static final String USER = "user"; } private Short identifier; diff --git a/spec/fixtures/java/wrappers_annotations/Product.java b/spec/fixtures/java/wrappers_annotations/Product.java index 1345565..eba5241 100644 --- a/spec/fixtures/java/wrappers_annotations/Product.java +++ b/spec/fixtures/java/wrappers_annotations/Product.java @@ -7,13 +7,13 @@ public class Product extends RealmObject { public static final class Attributes { - private Attributes() { - // Hide constructor - } - public static final String BRAND = "brand"; public static final String NAME = "name"; public static final String PRICE = "price"; + + private Attributes() { + // Hide constructor + } } private String brand; diff --git a/spec/fixtures/java/wrappers_annotations/Shop.java b/spec/fixtures/java/wrappers_annotations/Shop.java index 4813bb7..440cf2f 100644 --- a/spec/fixtures/java/wrappers_annotations/Shop.java +++ b/spec/fixtures/java/wrappers_annotations/Shop.java @@ -8,19 +8,19 @@ public class Shop extends RealmObject { public static final class Attributes { + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String NAME = "name"; } public static final class Relationships { + public static final String PRODUCTS = "products"; + private Relationships() { // Hide constructor } - - public static final String PRODUCTS = "products"; } private String name; diff --git a/spec/fixtures/java/wrappers_annotations/User.java b/spec/fixtures/java/wrappers_annotations/User.java index 4743d6d..ead0fe0 100644 --- a/spec/fixtures/java/wrappers_annotations/User.java +++ b/spec/fixtures/java/wrappers_annotations/User.java @@ -9,20 +9,20 @@ public class User extends RealmObject { public static final class Attributes { + public static final String BIRTHDAY = "birthday"; + public static final String NAME = "name"; + private Attributes() { // Hide constructor } - - public static final String BIRTHDAY = "birthday"; - public static final String NAME = "name"; } public static final class Relationships { + public static final String FIDELITY_CARD = "fidelityCard"; + private Relationships() { // Hide constructor } - - public static final String FIDELITY_CARD = "fidelityCard"; } private Date birthday; From 5db3b982b5cf0278aa5966d4b2dc457e0323bcd6 Mon Sep 17 00:00:00 2001 From: Steven Watremez Date: Tue, 12 Sep 2017 14:53:21 +0200 Subject: [PATCH 20/22] fix injected params check --- lib/templates/android/inc/_attributes_getter_setter.liquid | 6 +++--- lib/templates/android/inc/_attributes_properties.liquid | 6 +++--- .../android/inc/_relationships_getter_setter.liquid | 2 +- spec/fixtures/java/wrappers/FidelityCard.java | 6 +++--- spec/fixtures/java/wrappers_annotations/FidelityCard.java | 7 +++---- spec/gyro/liquid_generator_java_spec.rb | 6 +++--- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/templates/android/inc/_attributes_getter_setter.liquid b/lib/templates/android/inc/_attributes_getter_setter.liquid index 43fafda..a442de7 100644 --- a/lib/templates/android/inc/_attributes_getter_setter.liquid +++ b/lib/templates/android/inc/_attributes_getter_setter.liquid @@ -15,7 +15,7 @@ {%- if attribute.realm_read_only.size == 0 and attribute.enum_type.size > 0 -%} String {%- else -%} - {%- if params.use_wrappers == true -%} + {%- if params.use_wrappers.size > 0 and attribute.optional == true -%} {%- include 'inc/wrapper_type_converter' -%} {%- else -%} {%- include 'inc/type_converter' -%} @@ -28,8 +28,8 @@ {%- endcapture %} {%- capture annotation %} - {%- if params.support_annotations == true %} - {%- if params.use_wrappers == true or attribute.enum_type.size > 0 or isPrimitives == "false" -%} + {%- if params.support_annotations.size > 0 %} + {%- if params.use_wrappers.size > 0 or attribute.enum_type.size > 0 or isPrimitives == "false" -%} @android.support.annotation.{% if attribute.optional == true %}Nullable{% else %}NonNull{%- endif -%} {%- if attribute.support_annotation.size > 0 %}|{%- endif -%} {%- endif %} diff --git a/lib/templates/android/inc/_attributes_properties.liquid b/lib/templates/android/inc/_attributes_properties.liquid index 8f15905..5f16fc9 100644 --- a/lib/templates/android/inc/_attributes_properties.liquid +++ b/lib/templates/android/inc/_attributes_properties.liquid @@ -1,12 +1,12 @@ -{% for attribute in entity.attributes -%} +{%- for attribute in entity.attributes -%} {%- if attribute.realm_read_only.size == 0 -%} {%- comment %} ******* CONVERT TYPE CAPTURE ******* {% endcomment -%} {%- capture convert_type -%} {%- if attribute.realm_read_only.size == 0 and attribute.enum_type.size > 0 -%} String {%- else -%} - {%- if params.use_wrappers == true -%} + {%- if params.use_wrappers == "true" and attribute.optional == true -%} {%- include 'inc/wrapper_type_converter' -%} {%- else -%} {%- include 'inc/type_converter' -%} @@ -27,7 +27,7 @@ {%- if attribute.json_key_path.size > 0 %} @SerializedName("{{ attribute.json_key_path }}") {%- endif -%} - {%- if params.support_annotations == true and attribute.support_annotation.size > 0 %} + {%- if params.support_annotations.size > 0 and attribute.support_annotation.size > 0 %} @android.support.annotation.{{ attribute.support_annotation }} {%- endif %} private {{ convert_type }} {{ name }}; diff --git a/lib/templates/android/inc/_relationships_getter_setter.liquid b/lib/templates/android/inc/_relationships_getter_setter.liquid index 7f9e0bf..faf2e04 100644 --- a/lib/templates/android/inc/_relationships_getter_setter.liquid +++ b/lib/templates/android/inc/_relationships_getter_setter.liquid @@ -17,7 +17,7 @@ {%- endcapture %} {%- capture annotation %} - {%- if params.support_annotations == true %} + {%- if params.support_annotations.size > 0 %} {%- if relationship.optional == true -%} @android.support.annotation.Nullable {%- endif %} diff --git a/spec/fixtures/java/wrappers/FidelityCard.java b/spec/fixtures/java/wrappers/FidelityCard.java index 0bc9a2d..14a5fef 100644 --- a/spec/fixtures/java/wrappers/FidelityCard.java +++ b/spec/fixtures/java/wrappers/FidelityCard.java @@ -23,15 +23,15 @@ private Relationships() { } } - private Short identifier; + private short identifier; private Integer points; private User user; - public Short getIdentifier() { + public short getIdentifier() { return identifier; } - public void setIdentifier(final Short identifier) { + public void setIdentifier(final short identifier) { this.identifier = identifier; } diff --git a/spec/fixtures/java/wrappers_annotations/FidelityCard.java b/spec/fixtures/java/wrappers_annotations/FidelityCard.java index 861ea8e..0501552 100644 --- a/spec/fixtures/java/wrappers_annotations/FidelityCard.java +++ b/spec/fixtures/java/wrappers_annotations/FidelityCard.java @@ -23,17 +23,16 @@ private Relationships() { } } - private Short identifier; + private short identifier; @android.support.annotation.IntRange(from=0,to=255) private Integer points; private User user; - @android.support.annotation.NonNull - public Short getIdentifier() { + public short getIdentifier() { return identifier; } - public void setIdentifier(@android.support.annotation.NonNull final Short identifier) { + public void setIdentifier(final short identifier) { this.identifier = identifier; } diff --git a/spec/gyro/liquid_generator_java_spec.rb b/spec/gyro/liquid_generator_java_spec.rb index acb4195..6dacf70 100644 --- a/spec/gyro/liquid_generator_java_spec.rb +++ b/spec/gyro/liquid_generator_java_spec.rb @@ -54,7 +54,7 @@ module Gyro xcdatamodel = Parser::XCDataModel::XCDataModel.new(xcdatamodel_dir) Dir.mktmpdir(TMP_DIR_NAME) do |tmp_dir| template_dir = Pathname.new(ANDROID_TEMPLATE_DIR) - gen = Generator::Liquid.new(template_dir, tmp_dir, 'package' => PACKAGE_NAME, 'use_wrappers' => true) + gen = Generator::Liquid.new(template_dir, tmp_dir, 'package' => PACKAGE_NAME, 'use_wrappers' => 'true') gen.generate(xcdatamodel) fixtures_files_dir = fixture('java', 'wrappers') compare_dirs(tmp_dir, fixtures_files_dir) @@ -66,7 +66,7 @@ module Gyro xcdatamodel = Parser::XCDataModel::XCDataModel.new(xcdatamodel_dir) Dir.mktmpdir(TMP_DIR_NAME) do |tmp_dir| template_dir = Pathname.new(ANDROID_TEMPLATE_DIR) - gen = Generator::Liquid.new(template_dir, tmp_dir, 'package' => PACKAGE_NAME, 'support_annotations' => true) + gen = Generator::Liquid.new(template_dir, tmp_dir, 'package' => PACKAGE_NAME, 'support_annotations' => 'true') gen.generate(xcdatamodel) fixtures_files_dir = fixture('java', 'annotations') compare_dirs(tmp_dir, fixtures_files_dir) @@ -78,7 +78,7 @@ module Gyro xcdatamodel = Parser::XCDataModel::XCDataModel.new(xcdatamodel_dir) Dir.mktmpdir(TMP_DIR_NAME) do |tmp_dir| template_dir = Pathname.new(ANDROID_TEMPLATE_DIR) - options = { 'package' => PACKAGE_NAME, 'use_wrappers' => true, 'support_annotations' => true } + options = { 'package' => PACKAGE_NAME, 'use_wrappers' => 'true', 'support_annotations' => 'true' } gen = Generator::Liquid.new(template_dir, tmp_dir, options) gen.generate(xcdatamodel) fixtures_files_dir = fixture('java', 'wrappers_annotations') From c552aaa9ca55f6c15cebb33270b29199b2fb62b9 Mon Sep 17 00:00:00 2001 From: Steven Watremez Date: Tue, 12 Sep 2017 16:19:41 +0200 Subject: [PATCH 21/22] fix primitive anotations --- .../inc/_attributes_getter_setter.liquid | 18 +++++++++-------- lib/templates/android/inc/_primitives.liquid | 20 +++++++++++++++---- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/lib/templates/android/inc/_attributes_getter_setter.liquid b/lib/templates/android/inc/_attributes_getter_setter.liquid index a442de7..21d7ddc 100644 --- a/lib/templates/android/inc/_attributes_getter_setter.liquid +++ b/lib/templates/android/inc/_attributes_getter_setter.liquid @@ -29,18 +29,20 @@ {%- capture annotation %} {%- if params.support_annotations.size > 0 %} - {%- if params.use_wrappers.size > 0 or attribute.enum_type.size > 0 or isPrimitives == "false" -%} + {%- if isPrimitives == "false" -%} + {%- if params.use_wrappers.size > 0 or attribute.enum_type.size > 0 or isPrimitives == "false" -%} @android.support.annotation.{% if attribute.optional == true %}Nullable{% else %}NonNull{%- endif -%} - {%- if attribute.support_annotation.size > 0 %}|{%- endif -%} - {%- endif %} - {%- if attribute.support_annotation.size > 0 -%} + {%- if attribute.support_annotation.size > 0 %}|{%- endif -%} + {%- endif -%} + {%- endif -%} + {%- if attribute.support_annotation.size > 0 -%} @android.support.annotation.{{ attribute.support_annotation }} - {%- endif %} - {%- endif %} - {%- endcapture %} + {%- endif %} + {%- endif %} + {%- endcapture %} {%- assign name = attribute.name %} {{ empty_line }} - + {%- if annotation.size > 0 %} {{ annotation | replace: "|"," " }} diff --git a/lib/templates/android/inc/_primitives.liquid b/lib/templates/android/inc/_primitives.liquid index 7921227..a8c67c2 100644 --- a/lib/templates/android/inc/_primitives.liquid +++ b/lib/templates/android/inc/_primitives.liquid @@ -1,9 +1,21 @@ -{%- case attribute.type -%} -{%- when 'integer_16' -%} +{%- capture convert_type %} + {%- if attribute.realm_read_only.size == 0 and attribute.enum_type.size > 0 -%} + String + {%- else -%} + {%- if params.use_wrappers.size > 0 and attribute.optional == true -%} + {%- include 'inc/wrapper_type_converter' -%} + {%- else -%} + {%- include 'inc/type_converter' -%} + {%- endif %} + {%- endif %} +{%- endcapture %} + +{%- case convert_type -%} +{%- when 'integer_16' or 'short' -%} true -{%- when 'integer_32' -%} +{%- when 'integer_32' or 'int' -%} true -{%- when 'integer_64' -%} +{%- when 'integer_64' or 'long' -%} true {%- when 'double' or 'decimal' -%} true From 3325f3ac49c234dcebe7c1e356bdc7199bf0e721 Mon Sep 17 00:00:00 2001 From: Steven Watremez Date: Tue, 12 Sep 2017 17:51:03 +0200 Subject: [PATCH 22/22] remove $LOAD_PATH --- bin/gyro | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/gyro b/bin/gyro index f2e50a4..f5db5fd 100755 --- a/bin/gyro +++ b/bin/gyro @@ -16,8 +16,6 @@ abort 'error: gyro requires Ruby 2 or higher.' if RUBY_VERSION < '2.0.0' -$LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__)) if $PROGRAM_NAME == __FILE__ - require 'gyro' require 'optparse' require 'pathname'