Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Add method override annotation #402

Merged
merged 1 commit into from
Mar 23, 2022
Merged

Add method override annotation #402

merged 1 commit into from
Mar 23, 2022

Conversation

HuiSF
Copy link
Member

@HuiSF HuiSF commented Mar 17, 2022 •
edited
Loading

Description of changes

Issue #, if available

aws-amplify/amplify-flutter#1426

Description of how you validated changes

Add @override to class methods.

Checklist

  • PR description included
  • yarn test passes
  • Tests are changed or added
  • Relevant documentation is changed or added (and PR referenced)
  • Breaking changes to existing customers are released behind a feature flag or major version update
  • Changes are tested using sample applications for all relevant platforms (iOS/android/flutter/Javascript) that use the feature added/modified

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@HuiSF HuiSF requested a review from a team March 17, 2022 18:50
@codecov-commenter
Copy link

codecov-commenter commented Mar 17, 2022 •
edited
Loading

Codecov Report

Merging #402 (e520108) into custom-pk-flutter (f673a6a) will not change coverage.
The diff coverage is 100.00%.

@@                Coverage Diff                 @@
##           custom-pk-flutter     #402   +/-   ##
==================================================
  Coverage              85.49%   85.49%           
==================================================
  Files                    145      145           
  Lines                   6865     6865           
  Branches                1781     1781           
==================================================
  Hits                    5869     5869           
  Misses                   905      905           
  Partials                  91       91
Impacted Files Coverage Δ
...delgen-plugin/src/visitors/appsync-dart-visitor.ts 98.11% <100.00%> (ø)

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

AaronZyLee
AaronZyLee approved these changes Mar 23, 2022
View reviewed changes
Copy link
Contributor

@AaronZyLee AaronZyLee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AaronZyLee AaronZyLee merged commit 0dde605 into aws-amplify:custom-pk-flutter Mar 23, 2022
@HuiSF HuiSF deleted the fix/custom-pk-flutter-override branch March 30, 2022 17:50
AaronZyLee pushed a commit that referenced this pull request May 23, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
58bdc1d
AaronZyLee pushed a commit that referenced this pull request May 31, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
3e87de9
AaronZyLee pushed a commit that referenced this pull request Jun 2, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
46770d6
AaronZyLee pushed a commit that referenced this pull request Jun 3, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
50128d0
AaronZyLee pushed a commit that referenced this pull request Jun 6, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
bf2c417
AaronZyLee pushed a commit that referenced this pull request Jun 13, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
44a260f
AaronZyLee pushed a commit that referenced this pull request Jun 14, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
bccf85c
AaronZyLee pushed a commit that referenced this pull request Jun 15, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
aac9850
AaronZyLee pushed a commit that referenced this pull request Jul 13, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
32ce897
AaronZyLee pushed a commit that referenced this pull request Jul 19, 2022
@HuiSF @AaronZyLee
Add method override annotation (#402)
307bbd4
AaronZyLee added a commit that referenced this pull request Jul 19, 2022
@AaronZyLee @HuiSF
@dpilch @phani-srikar @yeung-wah
feat(modelgen-dart): custom pk support for flutter (#428)
b489fa1 
* feat(appsync-dart-visitor): attach index info to model schema (#391)

* Chore/custom pk flutter (#393)

* Revert "fix: revert custom pk change (#376)"

This reverts commit fa4fe52.

* feat: change model meta generation in models

* feat: add useCustomPrimaryKey ff

* fix: rm unused import

* rebase master

Co-authored-by: Zeyu Li <[email protected]>

* Feat/custom pk flutter impl (#394)

* fix(appsync-dart-visitor): update broken test snapshot

* chore(appsync-dart-visitor): improve indexes generate following Dart lint rules

* feat(appsync-dart-visitor): generate custom PK supporting code

* Make custom PK fields immutable in copyWidth function

* Improve ModelIdentifier methods implementation

* Use the feature flag to control custom PK impl generation

* udpate snapshot for updated dart comment blocks

* Improve generated model identifier helper class

* Update existing unit test snapshots and add new tests for custom PK

* Remove unnecesary new initiating instances

* revert comment block changes

* Update the impl getting identifier fields

* Revert "Remove unnecesary new initiating instances"

This reverts commit 38927cb.

* Remove trash code...

* Add method override annotation (#402)

* Custom pk flutter merge main (#407)

* feat: update imports generated for flutter datastore plugin dependency (#382) (#388)

* chore(amplify-codegen): change flutter import path from datastore to core (#380)

* feat(appsync-modelgen-plugin): Change flutter datastore models dependency to use amplify_core

* feat(appsync-modelgen-plugin): add amplify_flutter version check to determine datastore dependency import

* fix(appsync-modelgen-plugin): correct indentation for error message

* fix(appsync-modelgen-plugin): run linter

* fix(amplify-codegen): update unit tests

* fix(amplify-codegen): lower minimum version to 0.4.0-rc.1

* fix(appsync-modelgen-plugin): remove duplicate .dart from imports

Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: Dane Pilcher <[email protected]>

Co-authored-by: Phani Srikar Edupuganti <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>

* chore(release): Publish [ci skip]

 - [email protected]
 - @aws-amplify/[email protected]

* feat: add null type union to optional fields

* chore(release): Publish [ci skip]

 - [email protected]
 - @aws-amplify/[email protected]

* fix(appsync-dart-visitor): update ignored linter rules (#404)

* fix(appsync-dart-visitor): update ignored linter rules

* Dedupe

* fix unit tests snapshot

Co-authored-by: Dane Pilcher <[email protected]>
Co-authored-by: Phani Srikar Edupuganti <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: phani-srikar <[email protected]>
Co-authored-by: yeung-wah <[email protected]>

* rm unrelated changes

* fix: unit tests for non model

* feat: add custom pk connected model support for belongsTo

* fix: lint error

* lgtm error

* fix snapshot after rebase

* feat: add support for hasMany CPK

* fix: snapshots

* fix: hasone associate with key

* fix: add PK field type respect

* feat(appsync-dart-visitor): capability of creating query predicate wi… (#441)

* feat(appsync-dart-visitor): capability of creating query predicate with custom PK

* wrap the code generation with the feature flag

* fix: snapshots

* fix: change unit test

Co-authored-by: Hui Zhao <[email protected]>
Co-authored-by: Dane Pilcher <[email protected]>
Co-authored-by: Phani Srikar Edupuganti <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: phani-srikar <[email protected]>
Co-authored-by: yeung-wah <[email protected]>
AaronZyLee added a commit that referenced this pull request Jul 19, 2022
@AaronZyLee @HuiSF
@dpilch @phani-srikar @yeung-wah
feat(modelgen):custom pk support for all platforms (#427)
4e724fe 
* feat(modelgen):custom pk support for all platforms

* feat(modelgen): connected model support for custom pk (#430)

* feat(modelgen): connected model support for custom pk

* remove additional code

* remove additional code

* use neat statements for targetName

* fix: manyToMany pk issue

* fix: distinguish between option id and custom id

* feat: add associateWithFields and model fk fields

* fix: adding fields in belongsTo

* feat: add associatedWithFields to support CPK

* fix lint error

* fix: rm error for fields in belongsTo

* fix: rewrite toCamelCase, manyToMany and belongsTo process

* feat: refactor hasOne process

* feat: add PK/SK original field respect

* fix: move constants and remove id type error

* fix: refactor get connected fields for hasOne and belongsTo

* add unit tests for connected fields refactor

* fix: import

* address CRs

* fix: change pk naming in manyToMany models (#455)

* address CRs

* feat(modelgen-java): custom PK support for android (#422)

* fix: remove id generation when custom pk is defined

* add primary key class generation

* add model config

* add import for model primary key

* add resolveIdentifier and pk class field

* use outer class for pk class

* fix: lgtm alert

* address feedback

* move pk class to nested one

* rename primary key to identifier

* feat: add target names for hasone/belongsTo

* update snapshot

* fix lint issue

* fix: change version from string to int

* always generate targetName field

* fix: add fk fields in models

* feat: add hasmany cpk support

* fix: snapshot

* fix: hasOne associateWith issue

* fix: add PK field type respect

* fix: apply feature flag to CPK java code

* fix lint

* fix: snapshots

* fix: pre-define booleans for backward compatability

* change ff condition

* feat(modelgen-swift): custom primary key support for ios (#425)

* fix: remove id generation when custom pk is defined

* feat: add custom pk support for ios

* fix snapshots

* add empty line

* fix: pk related fields to immutable

* feat: add target names in hasOne/belongsTo model

* rm additional parenthesis

* feat: add hasMany connected model CPK support

* fix: snapshot

* fix: hasOne asscociate with key

* fix: update ff name

* fix: use feature flag for swift CPK

* fix: snapshot

* fix lint

* add ff check

* feat(modelgen-js): custom primary key support (#389)

* Revert "fix: revert custom pk change (#376)"

This reverts commit fa4fe52.

* feat: change model meta generation in models

* feat: add useCustomPrimaryKey ff

* fix: rm unused import

* rebase master

* fix: add composite identifier type

* fix: use codegen field for sortKeyField

* fix: change ff name and set to true for test purpose

* fix: composite key for id with sk

* add targetNames in schema

* add target name fields in model

* add associateWithFields meta for hasOne relation

* feat: add hasMany CPK support

* fix: additional fiels in hasmany belongsTo

* fix: associate with key issue

* fix: use iscustomPK enabled

* fix: update PK field respect

* fix: meta snap

* feat(modelgen-dart): custom pk support for flutter (#428)

* feat(appsync-dart-visitor): attach index info to model schema (#391)

* Chore/custom pk flutter (#393)

* Revert "fix: revert custom pk change (#376)"

This reverts commit fa4fe52.

* feat: change model meta generation in models

* feat: add useCustomPrimaryKey ff

* fix: rm unused import

* rebase master

Co-authored-by: Zeyu Li <[email protected]>

* Feat/custom pk flutter impl (#394)

* fix(appsync-dart-visitor): update broken test snapshot

* chore(appsync-dart-visitor): improve indexes generate following Dart lint rules

* feat(appsync-dart-visitor): generate custom PK supporting code

* Make custom PK fields immutable in copyWidth function

* Improve ModelIdentifier methods implementation

* Use the feature flag to control custom PK impl generation

* udpate snapshot for updated dart comment blocks

* Improve generated model identifier helper class

* Update existing unit test snapshots and add new tests for custom PK

* Remove unnecesary new initiating instances

* revert comment block changes

* Update the impl getting identifier fields

* Revert "Remove unnecesary new initiating instances"

This reverts commit 38927cb.

* Remove trash code...

* Add method override annotation (#402)

* Custom pk flutter merge main (#407)

* feat: update imports generated for flutter datastore plugin dependency (#382) (#388)

* chore(amplify-codegen): change flutter import path from datastore to core (#380)

* feat(appsync-modelgen-plugin): Change flutter datastore models dependency to use amplify_core

* feat(appsync-modelgen-plugin): add amplify_flutter version check to determine datastore dependency import

* fix(appsync-modelgen-plugin): correct indentation for error message

* fix(appsync-modelgen-plugin): run linter

* fix(amplify-codegen): update unit tests

* fix(amplify-codegen): lower minimum version to 0.4.0-rc.1

* fix(appsync-modelgen-plugin): remove duplicate .dart from imports

Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: Dane Pilcher <[email protected]>

Co-authored-by: Phani Srikar Edupuganti <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>

* chore(release): Publish [ci skip]

 - [email protected]
 - @aws-amplify/[email protected]

* feat: add null type union to optional fields

* chore(release): Publish [ci skip]

 - [email protected]
 - @aws-amplify/[email protected]

* fix(appsync-dart-visitor): update ignored linter rules (#404)

* fix(appsync-dart-visitor): update ignored linter rules

* Dedupe

* fix unit tests snapshot

Co-authored-by: Dane Pilcher <[email protected]>
Co-authored-by: Phani Srikar Edupuganti <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: phani-srikar <[email protected]>
Co-authored-by: yeung-wah <[email protected]>

* rm unrelated changes

* fix: unit tests for non model

* feat: add custom pk connected model support for belongsTo

* fix: lint error

* lgtm error

* fix snapshot after rebase

* feat: add support for hasMany CPK

* fix: snapshots

* fix: hasone associate with key

* fix: add PK field type respect

* feat(appsync-dart-visitor): capability of creating query predicate wi… (#441)

* feat(appsync-dart-visitor): capability of creating query predicate with custom PK

* wrap the code generation with the feature flag

* fix: snapshots

* fix: change unit test

Co-authored-by: Hui Zhao <[email protected]>
Co-authored-by: Dane Pilcher <[email protected]>
Co-authored-by: Phani Srikar Edupuganti <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: phani-srikar <[email protected]>
Co-authored-by: yeung-wah <[email protected]>

* fix: use read ff to replace hardcode

Co-authored-by: Hui Zhao <[email protected]>
Co-authored-by: Dane Pilcher <[email protected]>
Co-authored-by: Phani Srikar Edupuganti <[email protected]>
Co-authored-by: Travis Sheppard <[email protected]>
Co-authored-by: phani-srikar <[email protected]>
Co-authored-by: yeung-wah <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AaronZyLee AaronZyLee AaronZyLee approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@HuiSF @codecov-commenter @AaronZyLee