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

Split rest endpoints and improve modularisation #817

Merged
merged 41 commits into from
Jul 22, 2019
Merged

Split rest endpoints and improve modularisation #817

merged 41 commits into from
Jul 22, 2019

Conversation

melowe
Copy link
Contributor

@melowe melowe commented Jul 13, 2019 •
edited
Loading

  1. Move JAX-RS endpoints into distinct modules and don't use spring to instantiate JAX-RS objects.
  2. Move JPA focused code into distinct module to prevent circular dependency when trying to use DAOs in modules external to core/transaction
  3. Remove GRPC modules and related code
  4. Start phasing out loading spring managed objects via ServiceLocator, providing a ServiceFactory to limit access to ServiceLoader.

melowe added 30 commits July 5, 2019 12:49
@melowe
Split rest applications into distinct modules module object creation
b14c756 
into application objects.
@melowe
Dont run grpc tests
10b4ec1
@melowe
Backup commit/push
f7750d6
@melowe
Add jersey backed tests
1bc2a01
@melowe
Rename jaxrs modules.
0675423
@melowe
Fix spelling error.
ed8245a 
Remove grpc dependencies
Ennforce version for jetty utils.
@melowe
Expose swagger api as a common resource rather than only from p2p
cf8a42a
@melowe
Remove spring config for jaxrs module
8720925
@melowe
Delegate called to ServiceLocator to ServiceFactory
a8f8fad
@melowe
Move p2p focused objects into partyinfo module. Limit use of
948bcc9 
ServiceLocator.getServices() to ServiceFactory .
@melowe
Add sync messages that also handle transaction syncing
34f0b50
@melowe
add missing test annoation
a1ce817
@melowe
95e9876
@melowe
A given key can have multiple urls.
32badff
@melowe
Start adding push to peers support
2fed7d5
@melowe
Merge origin/master into split-rest-endpoints
5444623 
Conflicts:
	jaxrs-service/src/main/java/com/quorum/tessera/api/exception/KeyNotFoundExceptionMapper.java
	jaxrs-service/src/test/java/com/quorum/tessera/api/exception/KeyNotFoundExceptionMapperTest.java
@melowe
Pushing changes to pick branch up on other machine.
534e4f7
@melowe
reflect change present on master
429a434
@melowe
Add push
7f49451
@melowe
Fix jackson dependency version
f69faa3
@melowe
Coverage 100% and tests pass.
1fa4c3d
@melowe
Change error code to reflect change in master
7b5aadf
@melowe
1.Deprecate p2pclient factory
138cbd3 
2.Add mock p2p client factory for tests
3. Use serviceFactory to inject objects into payload publisher improving 
encapulation and meaning it can also be created via service loader. 
4. Add factory function to PayloadPublisher meaing altrenatives 
can be provided via class loader and META-INF/services
@melowe
1.Deprecate p2pclient factory
f7af91d 
2.Add mock p2p client factory for tests
3. Use serviceFactory to inject objects into payload publisher improving 
encapulation and meaning it can also be created via service loader. 
4. Add factory function to PayloadPublisher meaing altrenatives 
can be provided via class loader and META-INF/services
@melowe
Deprecate unrequested enabled property
0f5199e
@melowe
Reduce dependencies as far as possible
e08a279
@melowe
Move publishers into partyinfo module as they are for p2p communciation.
4886e2a
@melowe
Remove GRPC tests
ec8f1d4
@melowe
Move jaxrs client factory into jaxrs pom.
179c5ca
@melowe
Not using container at the moment,.
cf9d9c9
@codecov-io
Copy link

codecov-io commented Jul 16, 2019 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@7bce6a7). Click here to learn what that means.
The diff coverage is 99.53%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #817   +/-   ##
=========================================
  Coverage          ?   99.48%           
  Complexity        ?     2032           
=========================================
  Files             ?      305           
  Lines             ?     6000           
  Branches          ?      300           
=========================================
  Hits              ?     5969           
  Misses            ?        5           
  Partials          ?       26
Impacted Files Coverage Δ Complexity Δ
...om/quorum/tessera/grpc/p2p/TesseraGrpcService.java 100% <ø> (ø) 6 <0> (?)
...tessera/api/exception/SecurityExceptionMapper.java 100% <ø> (ø) 3 <0> (?)
...ava/com/quorum/tessera/api/common/ApiResource.java 100% <ø> (ø) 5 <0> (?)
...om/quorum/tessera/grpc/StreamObserverTemplate.java 100% <ø> (ø) 3 <0> (?)
...n/java/com/quorum/tessera/grpc/p2p/P2PGrpcApp.java 100% <ø> (ø) 3 <0> (?)
...src/main/java/com/quorum/tessera/grpc/GrpcApp.java 100% <ø> (ø) 6 <0> (?)
...n/java/com/quorum/tessera/grpc/api/Q2TGrpcApp.java 100% <ø> (ø) 3 <0> (?)
...java/com/quorum/tessera/client/GrpcClientImpl.java 100% <ø> (ø) 7 <0> (?)
...com/quorum/tessera/api/common/VersionResource.java 100% <ø> (ø) 3 <0> (?)
...um/tessera/grpc/p2p/P2PTransactionGrpcService.java 100% <ø> (ø) 9 <0> (?)
... and 65 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7bce6a7...66b803b. Read the comment docs.

@melowe
Copy link
Contributor Author

melowe commented Jul 17, 2019

  1. Move JAX-RS endpoints into distinct modules and don't use spring to instantiate JAX-RS objects.
  2. Move JPA focused code into distinct module to prevent circular dependency when trying to use DAOs in modules external to core/transaction
  3. Remove GRPC modules and related code
  4. Start phasing out loading spring managed objects via ServiceLocator, providing a ServiceFactory to limit access to ServiceLoader.

@melowe melowe changed the title Split rest endpoints Split rest endpoints and improve modularisation Jul 17, 2019
@melowe melowe marked this pull request as ready for review July 17, 2019 13:06
@melowe melowe merged commit d94b76f into master Jul 22, 2019
@melowe melowe deleted the split-rest-endpoints branch July 22, 2019 12:49
@prd-fox prd-fox added 0.10.0 cleanup enhancement Non-user code enhancements labels Jul 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prd-fox prd-fox prd-fox approved these changes

@chris-j-h chris-j-h Awaiting requested review from chris-j-h chris-j-h is a code owner

@namtruong namtruong Awaiting requested review from namtruong namtruong is a code owner

@nicolae-leonte-go nicolae-leonte-go Awaiting requested review from nicolae-leonte-go

@SatpalSandhu61 SatpalSandhu61 Awaiting requested review from SatpalSandhu61

Assignees
No one assigned
Labels
0.10.0 cleanup enhancement Non-user code enhancements
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@melowe @codecov-io @prd-fox