-
Notifications
You must be signed in to change notification settings - Fork 266
fix: allowing sorting Contract Definitions by creation date #5020
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.
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
Open
bmg13
wants to merge
15
commits into
eclipse-edc:main
Choose a base branch
from
bmg13:fix/allow_sort_contract_definition_with_created_time
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
a135a72
allowing sorting Contract Definitions by creation date.
bmg13 86c621c
Merge branch 'main' of github.com:eclipse-edc/Connector into fix/allo…
bmg13 bf44068
Added ContractDefiniton createdAt tests in multiple flows.
bmg13 af5b9bd
Changes from PR.
bmg13 7172a21
Update sorting tests.
bmg13 8b49c1e
Update sorting tests.
bmg13 c5cee4e
Add api Contract Definition sort by create date.
bmg13 54d5d0a
Improve E2E test.
bmg13 4f5ec4d
Fix some tests.
bmg13 c957151
Changes from PR.
bmg13 72e1c59
Merge branch 'main' of github.com:eclipse-edc/Connector into fix/allo…
bmg13 c3f9e1c
Changes from PR.
bmg13 6456ff3
Small test update.
bmg13 6d8995b
Merge branch 'main' of github.com:eclipse-edc/Connector into fix/allo…
bmg13 52d6903
Improve Test Format.
bmg13 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,6 +34,7 @@ | |
import java.util.LinkedHashMap; | ||
import java.util.List; | ||
import java.util.UUID; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
import java.util.stream.Stream; | ||
|
||
import static io.restassured.http.ContentType.JSON; | ||
|
@@ -128,7 +129,9 @@ void queryContractDefinitions_sortByCreatedDate(ManagementEndToEndTestContext co | |
var id1 = UUID.randomUUID().toString(); | ||
var id2 = UUID.randomUUID().toString(); | ||
var id3 = UUID.randomUUID().toString(); | ||
Stream.of(id1, id2, id3).forEach(id -> store.save(createContractDefinition(id).createdAt(System.nanoTime()).build())); | ||
var createdAtTime = 1000L; | ||
var increment = new AtomicInteger(0); | ||
Stream.of(id1, id2, id3).forEach(id -> store.save(createContractDefinition(id).createdAt(createdAtTime + increment.getAndIncrement()).build())); | ||
|
||
var content = """ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is a JSON string created and parsed into a query object like this. The query object should be created in code directly. |
||
{ | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not use an AtomicLong and have it as one operation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right, simplified in here.