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

refactor: Replace spray json with zio json for list endpoints #3226

Merged
merged 25 commits into from
May 2, 2024
Merged

refactor: Replace spray json with zio json for list endpoints #3226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b094844
Move project related models to admin api slice
seakayone Apr 29, 2024
f402e6d
Remove spray dependency from /admin/** api endpoints
seakayone Apr 29, 2024
6ba7431
fixup
seakayone Apr 29, 2024
9d24a3c
address codacy issue
seakayone Apr 30, 2024
1466506
remove println
seakayone Apr 30, 2024
a07771e
add copyright header
seakayone Apr 30, 2024
aef19f5
Remove ProjectIdentifierADM
seakayone Apr 30, 2024
b5e5685
Merge branch 'main' into refactor/remove-ProjectIdentifier
seakayone Apr 30, 2024
ce07721
revert merge mistake
seakayone Apr 30, 2024
6abda28
cleanup
seakayone Apr 30, 2024
fda17f5
Merge branch 'main' into refactor/remove-ProjectIdentifier
seakayone Apr 30, 2024
96202f4
Merge branch 'main' into refactor/remove-spray-from-list-endpoints
seakayone Apr 30, 2024
4fedec1
wip
seakayone May 1, 2024
60962d8
remove unused NodePathElementADM
seakayone May 1, 2024
d093b65
fmt
seakayone May 1, 2024
8ab72c8
Move spray json for list models to integration tests
seakayone May 1, 2024
67d437e
fix filename
seakayone May 1, 2024
36194ee
cleanup
seakayone May 1, 2024
9550c7a
Merge branch 'refactor/remove-ProjectIdentifier' into refactor/remove…
seakayone May 1, 2024
5bd5627
cleanup
seakayone May 1, 2024
3e742ce
Merge branch 'main' into refactor/remove-spray-from-list-endpoints
seakayone May 2, 2024
a73ad3c
Merge branch 'main' into refactor/remove-spray-from-list-endpoints
seakayone May 2, 2024
ed437bd
Update integration/src/test/scala/org/knora/webapi/messages/admin/res…
seakayone May 2, 2024
3b64db0
Update integration/src/test/scala/org/knora/webapi/messages/admin/res…
seakayone May 2, 2024
b63d431
Merge branch 'main' into refactor/remove-spray-from-list-endpoints
seakayone May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...tion/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ import pekko.http.scaladsl.unmarshalling.Unmarshal
/**
* End-to-End (E2E) test specification for testing lists endpoint.
*/
class CreateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtocol with ListADMJsonProtocol {
class CreateListItemsRouteADME2ESpec
extends E2ESpec
with TriplestoreJsonProtocol
with IntegrationTestListADMJsonProtocol {

implicit def default: RouteTestTimeout = RouteTestTimeout(5.seconds)

Expand Down
5 changes: 4 additions & 1 deletion ...tion/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ import pekko.http.scaladsl.testkit.RouteTestTimeout
/**
* End-to-End (E2E) test specification for testing endpoint.
*/
class DeleteListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtocol with ListADMJsonProtocol {
class DeleteListItemsRouteADME2ESpec
extends E2ESpec
with TriplestoreJsonProtocol
with IntegrationTestListADMJsonProtocol {

implicit def default: RouteTestTimeout = RouteTestTimeout(5.seconds)

Expand Down
2 changes: 1 addition & 1 deletion ...gration/src/test/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import pekko.http.scaladsl.testkit.RouteTestTimeout
/**
* End-to-End (E2E) test specification for testing lists endpoint.
*/
class GetListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtocol with ListADMJsonProtocol {
class GetListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtocol with IntegrationTestListADMJsonProtocol {

implicit def default: RouteTestTimeout = RouteTestTimeout(5.seconds)

Expand Down
5 changes: 4 additions & 1 deletion ...tion/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ import pekko.http.scaladsl.testkit.RouteTestTimeout
/**
* End-to-End (E2E) test specification for testing update node props routes.
*/
class UpdateListItemsRouteADME2ESpec extends E2ESpec with TriplestoreJsonProtocol with ListADMJsonProtocol {
class UpdateListItemsRouteADME2ESpec
extends E2ESpec
with TriplestoreJsonProtocol
with IntegrationTestListADMJsonProtocol {

implicit def default: RouteTestTimeout = RouteTestTimeout(5.seconds)

Expand Down
Loading
Loading