From fa22d9b6ba9041282c1dafced8a6b2f1e64f453f Mon Sep 17 00:00:00 2001 From: Anmol Gupta Date: Fri, 22 Jun 2018 13:38:38 +0530 Subject: [PATCH] Finish fixing static models --- .../models/static/datetime_format_model.dart | 11 +- .../static/datetime_format_model.g.dart | 29 +-- lib/data/models/static/frequency_model.dart | 13 +- lib/data/models/static/frequency_model.g.dart | 27 ++- lib/data/models/static/industry_model.dart | 8 +- lib/data/models/static/industry_model.g.dart | 16 +- .../models/static/invoice_design_model.dart | 15 +- .../models/static/invoice_design_model.g.dart | 38 ++-- .../models/static/invoice_status_model.dart | 9 +- .../models/static/invoice_status_model.g.dart | 16 +- lib/data/models/static/language_model.dart | 14 +- lib/data/models/static/language_model.g.dart | 27 ++- .../models/static/payment_type_model.dart | 14 +- .../models/static/payment_type_model.g.dart | 27 ++- lib/data/models/static/size_model.dart | 10 +- lib/data/models/static/size_model.g.dart | 15 +- lib/data/models/static/static_data_model.dart | 51 ++--- .../models/static/static_data_model.g.dart | 210 +++++++++--------- lib/data/models/static/timezone_model.dart | 10 +- lib/data/models/static/timezone_model.g.dart | 27 ++- 20 files changed, 289 insertions(+), 298 deletions(-) diff --git a/lib/data/models/static/datetime_format_model.dart b/lib/data/models/static/datetime_format_model.dart index 098595c806a..dcfd1b693d1 100644 --- a/lib/data/models/static/datetime_format_model.dart +++ b/lib/data/models/static/datetime_format_model.dart @@ -29,15 +29,18 @@ class DatetimeFormatFields { abstract class DatetimeFormatEntity implements Built { - @nullable + factory DatetimeFormatEntity() { + return _$DatetimeFormatEntity._( + format: '', + formatMoment: '', + ); + } + String get format; - @nullable @BuiltValueField(wireName: 'format_moment') String get formatMoment; - DatetimeFormatEntity._(); - factory DatetimeFormatEntity([updates(DatetimeFormatEntityBuilder b)]) = _$DatetimeFormatEntity; static Serializer get serializer => _$datetimeFormatEntitySerializer; } \ No newline at end of file diff --git a/lib/data/models/static/datetime_format_model.g.dart b/lib/data/models/static/datetime_format_model.g.dart index b701e959643..b5a2a75fb0e 100644 --- a/lib/data/models/static/datetime_format_model.g.dart +++ b/lib/data/models/static/datetime_format_model.g.dart @@ -128,19 +128,14 @@ class _$DatetimeFormatEntitySerializer @override Iterable serialize(Serializers serializers, DatetimeFormatEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.format != null) { - result - ..add('format') - ..add(serializers.serialize(object.format, - specifiedType: const FullType(String))); - } - if (object.formatMoment != null) { - result - ..add('format_moment') - ..add(serializers.serialize(object.formatMoment, - specifiedType: const FullType(String))); - } + final result = [ + 'format', + serializers.serialize(object.format, + specifiedType: const FullType(String)), + 'format_moment', + serializers.serialize(object.formatMoment, + specifiedType: const FullType(String)), + ]; return result; } @@ -369,7 +364,13 @@ class _$DatetimeFormatEntity extends DatetimeFormatEntity { [void updates(DatetimeFormatEntityBuilder b)]) => (new DatetimeFormatEntityBuilder()..update(updates)).build(); - _$DatetimeFormatEntity._({this.format, this.formatMoment}) : super._(); + _$DatetimeFormatEntity._({this.format, this.formatMoment}) : super._() { + if (format == null) + throw new BuiltValueNullFieldError('DatetimeFormatEntity', 'format'); + if (formatMoment == null) + throw new BuiltValueNullFieldError( + 'DatetimeFormatEntity', 'formatMoment'); + } @override DatetimeFormatEntity rebuild(void updates(DatetimeFormatEntityBuilder b)) => diff --git a/lib/data/models/static/frequency_model.dart b/lib/data/models/static/frequency_model.dart index 83907724382..d6eae2a3402 100644 --- a/lib/data/models/static/frequency_model.dart +++ b/lib/data/models/static/frequency_model.dart @@ -31,19 +31,20 @@ class FrequencyFields { abstract class FrequencyEntity implements Built { - @nullable + factory FrequencyEntity() { + return _$FrequencyEntity._( + name: '', + dateInterval: '', + ); + } + @BuiltValueField(wireName: 'name') String get name; - @nullable @BuiltValueField(wireName: 'date_interval') String get dateInterval; - - - FrequencyEntity._(); - factory FrequencyEntity([updates(FrequencyEntityBuilder b)]) = _$FrequencyEntity; static Serializer get serializer => _$frequencyEntitySerializer; } diff --git a/lib/data/models/static/frequency_model.g.dart b/lib/data/models/static/frequency_model.g.dart index 84d33e90f9f..df409ea1ad8 100644 --- a/lib/data/models/static/frequency_model.g.dart +++ b/lib/data/models/static/frequency_model.g.dart @@ -125,19 +125,13 @@ class _$FrequencyEntitySerializer @override Iterable serialize(Serializers serializers, FrequencyEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.name != null) { - result - ..add('name') - ..add(serializers.serialize(object.name, - specifiedType: const FullType(String))); - } - if (object.dateInterval != null) { - result - ..add('date_interval') - ..add(serializers.serialize(object.dateInterval, - specifiedType: const FullType(String))); - } + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + 'date_interval', + serializers.serialize(object.dateInterval, + specifiedType: const FullType(String)), + ]; return result; } @@ -361,7 +355,12 @@ class _$FrequencyEntity extends FrequencyEntity { factory _$FrequencyEntity([void updates(FrequencyEntityBuilder b)]) => (new FrequencyEntityBuilder()..update(updates)).build(); - _$FrequencyEntity._({this.name, this.dateInterval}) : super._(); + _$FrequencyEntity._({this.name, this.dateInterval}) : super._() { + if (name == null) + throw new BuiltValueNullFieldError('FrequencyEntity', 'name'); + if (dateInterval == null) + throw new BuiltValueNullFieldError('FrequencyEntity', 'dateInterval'); + } @override FrequencyEntity rebuild(void updates(FrequencyEntityBuilder b)) => diff --git a/lib/data/models/static/industry_model.dart b/lib/data/models/static/industry_model.dart index c5715e56aff..719c80ef05b 100644 --- a/lib/data/models/static/industry_model.dart +++ b/lib/data/models/static/industry_model.dart @@ -28,10 +28,14 @@ class IndustryFields { abstract class IndustryEntity implements Built { - @nullable + factory IndustryEntity() { + return _$IndustryEntity._( + name: '', + ); + } + String get name; IndustryEntity._(); - factory IndustryEntity([updates(IndustryEntityBuilder b)]) = _$IndustryEntity; static Serializer get serializer => _$industryEntitySerializer; } \ No newline at end of file diff --git a/lib/data/models/static/industry_model.g.dart b/lib/data/models/static/industry_model.g.dart index 469bd9fa0e4..5e8cd52df38 100644 --- a/lib/data/models/static/industry_model.g.dart +++ b/lib/data/models/static/industry_model.g.dart @@ -122,13 +122,10 @@ class _$IndustryEntitySerializer @override Iterable serialize(Serializers serializers, IndustryEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.name != null) { - result - ..add('name') - ..add(serializers.serialize(object.name, - specifiedType: const FullType(String))); - } + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + ]; return result; } @@ -346,7 +343,10 @@ class _$IndustryEntity extends IndustryEntity { factory _$IndustryEntity([void updates(IndustryEntityBuilder b)]) => (new IndustryEntityBuilder()..update(updates)).build(); - _$IndustryEntity._({this.name}) : super._(); + _$IndustryEntity._({this.name}) : super._() { + if (name == null) + throw new BuiltValueNullFieldError('IndustryEntity', 'name'); + } @override IndustryEntity rebuild(void updates(IndustryEntityBuilder b)) => diff --git a/lib/data/models/static/invoice_design_model.dart b/lib/data/models/static/invoice_design_model.dart index 6252dbb42cb..59e31f10bc5 100644 --- a/lib/data/models/static/invoice_design_model.dart +++ b/lib/data/models/static/invoice_design_model.dart @@ -32,22 +32,25 @@ class InvoiceDesignFields { abstract class InvoiceDesignEntity implements Built { - @nullable + factory InvoiceDesignEntity() { + return _$InvoiceDesignEntity._( + name: '', + javascript: '', + pdfmake: '', + ); + } + + @BuiltValueField(wireName: 'name') String get name; - @nullable @BuiltValueField(wireName: 'javascript') String get javascript; - @nullable @BuiltValueField(wireName: 'pdfmake') String get pdfmake; - - InvoiceDesignEntity._(); - factory InvoiceDesignEntity([updates(InvoiceDesignEntityBuilder b)]) = _$InvoiceDesignEntity; static Serializer get serializer => _$invoiceDesignEntitySerializer; } diff --git a/lib/data/models/static/invoice_design_model.g.dart b/lib/data/models/static/invoice_design_model.g.dart index f9dcf945713..5bae9a60827 100644 --- a/lib/data/models/static/invoice_design_model.g.dart +++ b/lib/data/models/static/invoice_design_model.g.dart @@ -128,25 +128,16 @@ class _$InvoiceDesignEntitySerializer @override Iterable serialize(Serializers serializers, InvoiceDesignEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.name != null) { - result - ..add('name') - ..add(serializers.serialize(object.name, - specifiedType: const FullType(String))); - } - if (object.javascript != null) { - result - ..add('javascript') - ..add(serializers.serialize(object.javascript, - specifiedType: const FullType(String))); - } - if (object.pdfmake != null) { - result - ..add('pdfmake') - ..add(serializers.serialize(object.pdfmake, - specifiedType: const FullType(String))); - } + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + 'javascript', + serializers.serialize(object.javascript, + specifiedType: const FullType(String)), + 'pdfmake', + serializers.serialize(object.pdfmake, + specifiedType: const FullType(String)), + ]; return result; } @@ -381,7 +372,14 @@ class _$InvoiceDesignEntity extends InvoiceDesignEntity { (new InvoiceDesignEntityBuilder()..update(updates)).build(); _$InvoiceDesignEntity._({this.name, this.javascript, this.pdfmake}) - : super._(); + : super._() { + if (name == null) + throw new BuiltValueNullFieldError('InvoiceDesignEntity', 'name'); + if (javascript == null) + throw new BuiltValueNullFieldError('InvoiceDesignEntity', 'javascript'); + if (pdfmake == null) + throw new BuiltValueNullFieldError('InvoiceDesignEntity', 'pdfmake'); + } @override InvoiceDesignEntity rebuild(void updates(InvoiceDesignEntityBuilder b)) => diff --git a/lib/data/models/static/invoice_status_model.dart b/lib/data/models/static/invoice_status_model.dart index 78f473e4fac..20b7429149e 100644 --- a/lib/data/models/static/invoice_status_model.dart +++ b/lib/data/models/static/invoice_status_model.dart @@ -27,15 +27,18 @@ class InvoiceStatusFields { } - abstract class InvoiceStatusEntity implements Built { - @nullable + factory InvoiceStatusEntity() { + return _$InvoiceStatusEntity._( + name: '', + ); + } + @BuiltValueField(wireName: 'name') String get name; InvoiceStatusEntity._(); - factory InvoiceStatusEntity([updates(InvoiceStatusEntityBuilder b)]) = _$InvoiceStatusEntity; static Serializer get serializer => _$invoiceStatusEntitySerializer; } diff --git a/lib/data/models/static/invoice_status_model.g.dart b/lib/data/models/static/invoice_status_model.g.dart index a375e1ca563..9f6895af849 100644 --- a/lib/data/models/static/invoice_status_model.g.dart +++ b/lib/data/models/static/invoice_status_model.g.dart @@ -128,13 +128,10 @@ class _$InvoiceStatusEntitySerializer @override Iterable serialize(Serializers serializers, InvoiceStatusEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.name != null) { - result - ..add('name') - ..add(serializers.serialize(object.name, - specifiedType: const FullType(String))); - } + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + ]; return result; } @@ -356,7 +353,10 @@ class _$InvoiceStatusEntity extends InvoiceStatusEntity { factory _$InvoiceStatusEntity([void updates(InvoiceStatusEntityBuilder b)]) => (new InvoiceStatusEntityBuilder()..update(updates)).build(); - _$InvoiceStatusEntity._({this.name}) : super._(); + _$InvoiceStatusEntity._({this.name}) : super._() { + if (name == null) + throw new BuiltValueNullFieldError('InvoiceStatusEntity', 'name'); + } @override InvoiceStatusEntity rebuild(void updates(InvoiceStatusEntityBuilder b)) => diff --git a/lib/data/models/static/language_model.dart b/lib/data/models/static/language_model.dart index 95dbe299c0e..2cd0d65419a 100644 --- a/lib/data/models/static/language_model.dart +++ b/lib/data/models/static/language_model.dart @@ -28,22 +28,22 @@ class LanguageFields { } - abstract class LanguageEntity implements Built { - @nullable + factory LanguageEntity() { + return _$LanguageEntity._( + name: '', + locale: '', + ); + } + @BuiltValueField(wireName: 'name') String get name; - @nullable @BuiltValueField(wireName: 'locale') String get locale; - - - LanguageEntity._(); - factory LanguageEntity([updates(LanguageEntityBuilder b)]) = _$LanguageEntity; static Serializer get serializer => _$languageEntitySerializer; } diff --git a/lib/data/models/static/language_model.g.dart b/lib/data/models/static/language_model.g.dart index e086d8091bd..c27e47a9557 100644 --- a/lib/data/models/static/language_model.g.dart +++ b/lib/data/models/static/language_model.g.dart @@ -122,19 +122,13 @@ class _$LanguageEntitySerializer @override Iterable serialize(Serializers serializers, LanguageEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.name != null) { - result - ..add('name') - ..add(serializers.serialize(object.name, - specifiedType: const FullType(String))); - } - if (object.locale != null) { - result - ..add('locale') - ..add(serializers.serialize(object.locale, - specifiedType: const FullType(String))); - } + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + 'locale', + serializers.serialize(object.locale, + specifiedType: const FullType(String)), + ]; return result; } @@ -358,7 +352,12 @@ class _$LanguageEntity extends LanguageEntity { factory _$LanguageEntity([void updates(LanguageEntityBuilder b)]) => (new LanguageEntityBuilder()..update(updates)).build(); - _$LanguageEntity._({this.name, this.locale}) : super._(); + _$LanguageEntity._({this.name, this.locale}) : super._() { + if (name == null) + throw new BuiltValueNullFieldError('LanguageEntity', 'name'); + if (locale == null) + throw new BuiltValueNullFieldError('LanguageEntity', 'locale'); + } @override LanguageEntity rebuild(void updates(LanguageEntityBuilder b)) => diff --git a/lib/data/models/static/payment_type_model.dart b/lib/data/models/static/payment_type_model.dart index 4d600b1f946..c94ff68b3d2 100644 --- a/lib/data/models/static/payment_type_model.dart +++ b/lib/data/models/static/payment_type_model.dart @@ -28,22 +28,22 @@ class PaymentTypeFields { } - abstract class PaymentTypeEntity implements Built { - @nullable + factory PaymentTypeEntity() { + return _$PaymentTypeEntity._( + name: '', + gatewayTypeId: 0, + ); + } + @BuiltValueField(wireName: 'name') String get name; - @nullable @BuiltValueField(wireName: 'gateway_type_id') int get gatewayTypeId; - - - PaymentTypeEntity._(); - factory PaymentTypeEntity([updates(PaymentTypeEntityBuilder b)]) = _$PaymentTypeEntity; static Serializer get serializer => _$paymentTypeEntitySerializer; } diff --git a/lib/data/models/static/payment_type_model.g.dart b/lib/data/models/static/payment_type_model.g.dart index 3daa04e5b6c..4c071d98e9e 100644 --- a/lib/data/models/static/payment_type_model.g.dart +++ b/lib/data/models/static/payment_type_model.g.dart @@ -125,19 +125,13 @@ class _$PaymentTypeEntitySerializer @override Iterable serialize(Serializers serializers, PaymentTypeEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.name != null) { - result - ..add('name') - ..add(serializers.serialize(object.name, - specifiedType: const FullType(String))); - } - if (object.gatewayTypeId != null) { - result - ..add('gateway_type_id') - ..add(serializers.serialize(object.gatewayTypeId, - specifiedType: const FullType(int))); - } + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + 'gateway_type_id', + serializers.serialize(object.gatewayTypeId, + specifiedType: const FullType(int)), + ]; return result; } @@ -365,7 +359,12 @@ class _$PaymentTypeEntity extends PaymentTypeEntity { factory _$PaymentTypeEntity([void updates(PaymentTypeEntityBuilder b)]) => (new PaymentTypeEntityBuilder()..update(updates)).build(); - _$PaymentTypeEntity._({this.name, this.gatewayTypeId}) : super._(); + _$PaymentTypeEntity._({this.name, this.gatewayTypeId}) : super._() { + if (name == null) + throw new BuiltValueNullFieldError('PaymentTypeEntity', 'name'); + if (gatewayTypeId == null) + throw new BuiltValueNullFieldError('PaymentTypeEntity', 'gatewayTypeId'); + } @override PaymentTypeEntity rebuild(void updates(PaymentTypeEntityBuilder b)) => diff --git a/lib/data/models/static/size_model.dart b/lib/data/models/static/size_model.dart index 23df28cb144..07e2f005ec3 100644 --- a/lib/data/models/static/size_model.dart +++ b/lib/data/models/static/size_model.dart @@ -27,11 +27,15 @@ class SizeFields { } abstract class SizeEntity implements Built { - - @nullable + + factory SizeEntity() { + return _$SizeEntity._( + name: '', + ); + } + String get name; SizeEntity._(); - factory SizeEntity([updates(SizeEntityBuilder b)]) = _$SizeEntity; static Serializer get serializer => _$sizeEntitySerializer; } \ No newline at end of file diff --git a/lib/data/models/static/size_model.g.dart b/lib/data/models/static/size_model.g.dart index 58a696e2d3b..7ee416b6f85 100644 --- a/lib/data/models/static/size_model.g.dart +++ b/lib/data/models/static/size_model.g.dart @@ -113,13 +113,10 @@ class _$SizeEntitySerializer implements StructuredSerializer { @override Iterable serialize(Serializers serializers, SizeEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.name != null) { - result - ..add('name') - ..add(serializers.serialize(object.name, - specifiedType: const FullType(String))); - } + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + ]; return result; } @@ -332,7 +329,9 @@ class _$SizeEntity extends SizeEntity { factory _$SizeEntity([void updates(SizeEntityBuilder b)]) => (new SizeEntityBuilder()..update(updates)).build(); - _$SizeEntity._({this.name}) : super._(); + _$SizeEntity._({this.name}) : super._() { + if (name == null) throw new BuiltValueNullFieldError('SizeEntity', 'name'); + } @override SizeEntity rebuild(void updates(SizeEntityBuilder b)) => diff --git a/lib/data/models/static/static_data_model.dart b/lib/data/models/static/static_data_model.dart index 4af0f536581..d9e6d851fd9 100644 --- a/lib/data/models/static/static_data_model.dart +++ b/lib/data/models/static/static_data_model.dart @@ -40,80 +40,65 @@ class StaticDataFields { static const String sizes = 'sizes'; static const String industries = 'industries'; static const String timezones = 'timezones'; - static const String dateFormats = 'dateFormats'; static const String datetimeFormats = 'datetimeFormats'; static const String languages = 'languages'; static const String paymentTypes = 'paymentTypes'; - static const String countries = 'countries'; static const String invoiceDesigns = 'invoiceDesigns'; static const String invoiceStatus = 'invoiceStatus'; static const String frequencies = 'frequencies'; - static const String gateways = 'gateways'; static const String gatewayTypes = 'gatewayTypes'; static const String fonts = 'fonts'; static const String banks = 'banks'; - - } - abstract class StaticDataEntity implements Built { - @nullable + factory StaticDataEntity() { + return _$StaticDataEntity._( + currencies: BuiltList(), + sizes: BuiltList(), + industries: BuiltList(), + timezones: BuiltList(), + dateFormats: BuiltList(), + datetimeFormats: BuiltList(), + languages: BuiltList(), + paymentTypes: BuiltList(), + countries: BuiltList(), + invoiceDesigns: BuiltList(), + invoiceStatus: BuiltList(), + frequencies: BuiltList(), + ); + + } + BuiltList get currencies; - @nullable BuiltList get sizes; - @nullable BuiltList get industries; - @nullable BuiltList get timezones; - @nullable BuiltList get dateFormats; - @nullable BuiltList get datetimeFormats; - @nullable BuiltList get languages; - @nullable BuiltList get paymentTypes; - @nullable BuiltList get countries; - @nullable BuiltList get invoiceDesigns; - @nullable BuiltList get invoiceStatus; - @nullable BuiltList get frequencies; -/* - @nullable - BuiltList get gateways; - - @nullable - BuiltList get gatewayTypes; - - @nullable - BuiltList get fonts; - - @nullable - BuiltList get banks; - */ - StaticDataEntity._(); - factory StaticDataEntity([updates(StaticDataEntityBuilder b)]) = _$StaticDataEntity; static Serializer get serializer => _$staticDataEntitySerializer; } diff --git a/lib/data/models/static/static_data_model.g.dart b/lib/data/models/static/static_data_model.g.dart index 3ab11500744..07c6fbac7fc 100644 --- a/lib/data/models/static/static_data_model.g.dart +++ b/lib/data/models/static/static_data_model.g.dart @@ -125,91 +125,56 @@ class _$StaticDataEntitySerializer @override Iterable serialize(Serializers serializers, StaticDataEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.currencies != null) { - result - ..add('currencies') - ..add(serializers.serialize(object.currencies, - specifiedType: const FullType( - BuiltList, const [const FullType(CurrencyEntity)]))); - } - if (object.sizes != null) { - result - ..add('sizes') - ..add(serializers.serialize(object.sizes, - specifiedType: - const FullType(BuiltList, const [const FullType(SizeEntity)]))); - } - if (object.industries != null) { - result - ..add('industries') - ..add(serializers.serialize(object.industries, - specifiedType: const FullType( - BuiltList, const [const FullType(IndustryEntity)]))); - } - if (object.timezones != null) { - result - ..add('timezones') - ..add(serializers.serialize(object.timezones, - specifiedType: const FullType( - BuiltList, const [const FullType(TimezoneEntity)]))); - } - if (object.dateFormats != null) { - result - ..add('dateFormats') - ..add(serializers.serialize(object.dateFormats, - specifiedType: const FullType( - BuiltList, const [const FullType(DateFormatEntity)]))); - } - if (object.datetimeFormats != null) { - result - ..add('datetimeFormats') - ..add(serializers.serialize(object.datetimeFormats, - specifiedType: const FullType( - BuiltList, const [const FullType(DatetimeFormatEntity)]))); - } - if (object.languages != null) { - result - ..add('languages') - ..add(serializers.serialize(object.languages, - specifiedType: const FullType( - BuiltList, const [const FullType(LanguageEntity)]))); - } - if (object.paymentTypes != null) { - result - ..add('paymentTypes') - ..add(serializers.serialize(object.paymentTypes, - specifiedType: const FullType( - BuiltList, const [const FullType(PaymentTypeEntity)]))); - } - if (object.countries != null) { - result - ..add('countries') - ..add(serializers.serialize(object.countries, - specifiedType: const FullType( - BuiltList, const [const FullType(CountryEntity)]))); - } - if (object.invoiceDesigns != null) { - result - ..add('invoiceDesigns') - ..add(serializers.serialize(object.invoiceDesigns, - specifiedType: const FullType( - BuiltList, const [const FullType(InvoiceDesignEntity)]))); - } - if (object.invoiceStatus != null) { - result - ..add('invoiceStatus') - ..add(serializers.serialize(object.invoiceStatus, - specifiedType: const FullType( - BuiltList, const [const FullType(InvoiceStatusEntity)]))); - } - if (object.frequencies != null) { - result - ..add('frequencies') - ..add(serializers.serialize(object.frequencies, - specifiedType: const FullType( - BuiltList, const [const FullType(FrequencyEntity)]))); - } + final result = [ + 'currencies', + serializers.serialize(object.currencies, + specifiedType: const FullType( + BuiltList, const [const FullType(CurrencyEntity)])), + 'sizes', + serializers.serialize(object.sizes, + specifiedType: + const FullType(BuiltList, const [const FullType(SizeEntity)])), + 'industries', + serializers.serialize(object.industries, + specifiedType: const FullType( + BuiltList, const [const FullType(IndustryEntity)])), + 'timezones', + serializers.serialize(object.timezones, + specifiedType: const FullType( + BuiltList, const [const FullType(TimezoneEntity)])), + 'dateFormats', + serializers.serialize(object.dateFormats, + specifiedType: const FullType( + BuiltList, const [const FullType(DateFormatEntity)])), + 'datetimeFormats', + serializers.serialize(object.datetimeFormats, + specifiedType: const FullType( + BuiltList, const [const FullType(DatetimeFormatEntity)])), + 'languages', + serializers.serialize(object.languages, + specifiedType: const FullType( + BuiltList, const [const FullType(LanguageEntity)])), + 'paymentTypes', + serializers.serialize(object.paymentTypes, + specifiedType: const FullType( + BuiltList, const [const FullType(PaymentTypeEntity)])), + 'countries', + serializers.serialize(object.countries, + specifiedType: + const FullType(BuiltList, const [const FullType(CountryEntity)])), + 'invoiceDesigns', + serializers.serialize(object.invoiceDesigns, + specifiedType: const FullType( + BuiltList, const [const FullType(InvoiceDesignEntity)])), + 'invoiceStatus', + serializers.serialize(object.invoiceStatus, + specifiedType: const FullType( + BuiltList, const [const FullType(InvoiceStatusEntity)])), + 'frequencies', + serializers.serialize(object.frequencies, + specifiedType: const FullType( + BuiltList, const [const FullType(FrequencyEntity)])), + ]; return result; } @@ -531,7 +496,32 @@ class _$StaticDataEntity extends StaticDataEntity { this.invoiceDesigns, this.invoiceStatus, this.frequencies}) - : super._(); + : super._() { + if (currencies == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'currencies'); + if (sizes == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'sizes'); + if (industries == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'industries'); + if (timezones == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'timezones'); + if (dateFormats == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'dateFormats'); + if (datetimeFormats == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'datetimeFormats'); + if (languages == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'languages'); + if (paymentTypes == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'paymentTypes'); + if (countries == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'countries'); + if (invoiceDesigns == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'invoiceDesigns'); + if (invoiceStatus == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'invoiceStatus'); + if (frequencies == null) + throw new BuiltValueNullFieldError('StaticDataEntity', 'frequencies'); + } @override StaticDataEntity rebuild(void updates(StaticDataEntityBuilder b)) => @@ -717,45 +707,45 @@ class StaticDataEntityBuilder try { _$result = _$v ?? new _$StaticDataEntity._( - currencies: _currencies?.build(), - sizes: _sizes?.build(), - industries: _industries?.build(), - timezones: _timezones?.build(), - dateFormats: _dateFormats?.build(), - datetimeFormats: _datetimeFormats?.build(), - languages: _languages?.build(), - paymentTypes: _paymentTypes?.build(), - countries: _countries?.build(), - invoiceDesigns: _invoiceDesigns?.build(), - invoiceStatus: _invoiceStatus?.build(), - frequencies: _frequencies?.build()); + currencies: currencies.build(), + sizes: sizes.build(), + industries: industries.build(), + timezones: timezones.build(), + dateFormats: dateFormats.build(), + datetimeFormats: datetimeFormats.build(), + languages: languages.build(), + paymentTypes: paymentTypes.build(), + countries: countries.build(), + invoiceDesigns: invoiceDesigns.build(), + invoiceStatus: invoiceStatus.build(), + frequencies: frequencies.build()); } catch (_) { String _$failedField; try { _$failedField = 'currencies'; - _currencies?.build(); + currencies.build(); _$failedField = 'sizes'; - _sizes?.build(); + sizes.build(); _$failedField = 'industries'; - _industries?.build(); + industries.build(); _$failedField = 'timezones'; - _timezones?.build(); + timezones.build(); _$failedField = 'dateFormats'; - _dateFormats?.build(); + dateFormats.build(); _$failedField = 'datetimeFormats'; - _datetimeFormats?.build(); + datetimeFormats.build(); _$failedField = 'languages'; - _languages?.build(); + languages.build(); _$failedField = 'paymentTypes'; - _paymentTypes?.build(); + paymentTypes.build(); _$failedField = 'countries'; - _countries?.build(); + countries.build(); _$failedField = 'invoiceDesigns'; - _invoiceDesigns?.build(); + invoiceDesigns.build(); _$failedField = 'invoiceStatus'; - _invoiceStatus?.build(); + invoiceStatus.build(); _$failedField = 'frequencies'; - _frequencies?.build(); + frequencies.build(); } catch (e) { throw new BuiltValueNestedFieldError( 'StaticDataEntity', _$failedField, e.toString()); diff --git a/lib/data/models/static/timezone_model.dart b/lib/data/models/static/timezone_model.dart index b33315199b0..4a3be3e1eb0 100644 --- a/lib/data/models/static/timezone_model.dart +++ b/lib/data/models/static/timezone_model.dart @@ -29,13 +29,17 @@ class TimezoneFields { abstract class TimezoneEntity implements Built { - @nullable + factory TimezoneEntity() { + return _$TimezoneEntity._( + name: '', + location: '', + ); + } + String get name; - @nullable String get location; TimezoneEntity._(); - factory TimezoneEntity([updates(TimezoneEntityBuilder b)]) = _$TimezoneEntity; static Serializer get serializer => _$timezoneEntitySerializer; } \ No newline at end of file diff --git a/lib/data/models/static/timezone_model.g.dart b/lib/data/models/static/timezone_model.g.dart index cfbf5fa51a5..84ad314f72f 100644 --- a/lib/data/models/static/timezone_model.g.dart +++ b/lib/data/models/static/timezone_model.g.dart @@ -122,19 +122,13 @@ class _$TimezoneEntitySerializer @override Iterable serialize(Serializers serializers, TimezoneEntity object, {FullType specifiedType: FullType.unspecified}) { - final result = []; - if (object.name != null) { - result - ..add('name') - ..add(serializers.serialize(object.name, - specifiedType: const FullType(String))); - } - if (object.location != null) { - result - ..add('location') - ..add(serializers.serialize(object.location, - specifiedType: const FullType(String))); - } + final result = [ + 'name', + serializers.serialize(object.name, specifiedType: const FullType(String)), + 'location', + serializers.serialize(object.location, + specifiedType: const FullType(String)), + ]; return result; } @@ -358,7 +352,12 @@ class _$TimezoneEntity extends TimezoneEntity { factory _$TimezoneEntity([void updates(TimezoneEntityBuilder b)]) => (new TimezoneEntityBuilder()..update(updates)).build(); - _$TimezoneEntity._({this.name, this.location}) : super._(); + _$TimezoneEntity._({this.name, this.location}) : super._() { + if (name == null) + throw new BuiltValueNullFieldError('TimezoneEntity', 'name'); + if (location == null) + throw new BuiltValueNullFieldError('TimezoneEntity', 'location'); + } @override TimezoneEntity rebuild(void updates(TimezoneEntityBuilder b)) =>