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

Update jooq repository to improve reusability #9424

Merged
merged 27 commits into from
Oct 8, 2024
Merged

Update jooq repository to improve reusability #9424

merged 27 commits into from
Oct 8, 2024

Conversation

edwin-greene
Copy link
Contributor

Description:
Updates the Bound class to include fields.
Simplifies the JooqRepository to only accept Bounds as parameters.
Updates the JooqRepository to support N-numbered conditions.

Related issue(s):

Fixes #9379

Notes for reviewer:
This should not be merged until the work for pagination for airdrop nfts is completed in #9378

Checklist

  • Documented (Code comments, README, etc.)
  • Tested (unit, integration, etc.)

@edwin-greene
Add outstanding token airdrops to rest api
6a31732 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Fix code smell
0812194 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Cleanup unneeded comments
db31f89 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Updates per feedback
154aacb 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Remove serial number parameter for now
a404dd8 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Updates per feedback. Repository class changes
bc82e6c 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Reformat line breaks for easier diff review. Rename mapper
a6459ab 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Update jooqRepository and simplify conditionals
3f72fd3 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Merge branch 'main' into 8276-hip-904-add-outstanding-token-airdrops-…
3eaaa4a 
…endpoint-to-rest-api
@edwin-greene
Fix code smells
e131e22 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Update openapi, tests and query
8c0abbc 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Add pending airdrops rest api
4098d31 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Merge main
2a1189c 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Simplify JooqRepository Bound Conditions
6a99dde 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Merge main
16965cd 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Simplify Bounds instantiation, add tests
477dfec 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Simplify empty RangeParameter
c9fb6e7 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene edwin-greene added enhancement Type: New feature rest-java Area: Java REST API labels Sep 20, 2024
@edwin-greene edwin-greene added this to the 0.115.0 milestone Sep 20, 2024
@edwin-greene edwin-greene self-assigned this Sep 20, 2024
@edwin-greene edwin-greene linked an issue Sep 20, 2024 that may be closed by this pull request
Update Jooq Repository ConditionalFieldBounds to improve reusability #9379
Closed
@edwin-greene edwin-greene changed the title 9379 update jooq repository conditionalfieldbounds to improve reusability Update jooq repository to improve reusability Sep 20, 2024
@codecov Codecov
Copy link

codecov bot commented Sep 20, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 96.15385% with 5 lines in your changes missing coverage. Please review.

Project coverage is 92.35%. Comparing base (90dca10) to head (ba15842).
Report is 72 commits behind head on main.

Files with missing lines Patch % Lines
...era/mirror/restjava/repository/JooqRepository.java 93.87% 0 Missing and 3 partials ⚠️
...m/hedera/mirror/restjava/common/RangeOperator.java 0.00% 0 Missing and 1 partial ⚠️
.../hedera/mirror/restjava/common/RangeParameter.java 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #9424      +/-   ##
============================================
- Coverage     92.68%   92.35%   -0.33%     
- Complexity     6943     7267     +324     
============================================
  Files           896      923      +27     
  Lines         29553    30608    +1055     
  Branches       3745     3893     +148     
============================================
+ Hits          27390    28269     +879     
- Misses         1399     1488      +89     
- Partials        764      851      +87

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@edwin-greene
Add tests
23cfbed 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene edwin-greene marked this pull request as ready for review September 26, 2024 18:22
@edwin-greene edwin-greene requested a review from a team September 26, 2024 18:22
@edwin-greene
Fix code smells
feec0a1 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
steven-sheehy
steven-sheehy requested changes Sep 30, 2024
View reviewed changes
hedera-mirror-rest-java/src/main/java/com/hedera/mirror/restjava/common/RangeParameter.java Outdated Show resolved Hide resolved
...mirror-rest-java/src/main/java/com/hedera/mirror/restjava/common/EntityIdRangeParameter.java Outdated Show resolved Hide resolved
...r-rest-java/src/main/java/com/hedera/mirror/restjava/controller/TokenAirdropsController.java Show resolved Hide resolved
hedera-mirror-rest-java/src/main/java/com/hedera/mirror/restjava/dto/NftAllowanceRequest.java Outdated Show resolved Hide resolved
hedera-mirror-rest-java/src/main/java/com/hedera/mirror/restjava/dto/NftAllowanceRequest.java Outdated Show resolved Hide resolved
hedera-mirror-rest-java/src/main/java/com/hedera/mirror/restjava/dto/NftAllowanceRequest.java Outdated Show resolved Hide resolved
hedera-mirror-rest-java/src/main/java/com/hedera/mirror/restjava/dto/TokenAirdropRequest.java Outdated Show resolved Hide resolved
hedera-mirror-rest-java/src/main/java/com/hedera/mirror/restjava/service/Bound.java Show resolved Hide resolved
hedera-mirror-rest-java/src/main/java/com/hedera/mirror/restjava/repository/JooqRepository.java Outdated Show resolved Hide resolved
hedera-mirror-rest-java/src/main/java/com/hedera/mirror/restjava/repository/JooqRepository.java Outdated Show resolved Hide resolved
@edwin-greene
Updates per feedback
46c9487 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Fix rangeparameter isInclusive
eb2dcac 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Fix rangeparameter isInclusive
3c9aba4 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene edwin-greene modified the milestones: 0.115.0, 0.116.0 Oct 1, 2024
@edwin-greene
Updates per feedback
97ea887 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Add Jooq condition example documentation
c386fc1 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Updates to add test, clean up code
33f7a59 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@edwin-greene
Remove unneeded if clause
2ca9923 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
xin-hedera
xin-hedera previously approved these changes Oct 8, 2024
View reviewed changes
Copy link
Collaborator

@xin-hedera xin-hedera left a comment

Choose a reason for hiding this comment

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

LGTM

@edwin-greene
Remove unneeded parameter from toLower/upper
ba15842 
Signed-off-by: Edwin Greene <edwin@swirldslabs.com>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Oct 8, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@edwin-greene edwin-greene merged commit 75dc606 into main Oct 8, 2024
33 checks passed
@edwin-greene edwin-greene deleted the 9379-update-jooq-repository-conditionalfieldbounds-to-improve-reusability branch October 8, 2024 16:54
edwin-greene added a commit that referenced this pull request Oct 8, 2024
@edwin-greene
Update jooq repository to improve reusability (#9424)
e7c927a 
* Update jooqRepository and simplify conditionals

Signed-off-by: Edwin Greene <edwin@hashgraph.com>
(cherry picked from commit 75dc606)
edwin-greene added a commit that referenced this pull request Oct 8, 2024
@edwin-greene
Update jooq repository to improve reusability (0.115.0) (#9535)
f012e21 
Update jooq repository to improve reusability (#9424)

Signed-off-by: Edwin Greene <edwin@hashgraph.com>
(cherry picked from commit 75dc606)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xin-hedera xin-hedera xin-hedera approved these changes

@steven-sheehy steven-sheehy steven-sheehy approved these changes

Assignees

@edwin-greene edwin-greene

Labels
enhancement Type: New feature rest-java Area: Java REST API
Projects
None yet
Milestone
0.116.0
Development

Successfully merging this pull request may close these issues.

Update Jooq Repository ConditionalFieldBounds to improve reusability
3 participants
@edwin-greene @steven-sheehy @xin-hedera