-
Notifications
You must be signed in to change notification settings - Fork 480
maintenance portlet | Implement search/replace, drop old versions, and delete pushed assets APIs #35191 #35231
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
hassandotcms
wants to merge
7
commits into
main
Choose a base branch
from
35199-maintenance-search-replace-old-versions-pushed-assets
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 all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1b1955c
feat(maintenance): add REST APIs for search/replace, drop old version…
hassandotcms e82cfab
test(maintenance): add integration tests for search/replace, old vers…
hassandotcms 2bb8e9c
fix(test): correct exception expectation for empty searchString valid…
hassandotcms fcf313f
chore: add generated openapi.yaml for maintenance endpoints
hassandotcms 6a06d66
fix(maintenance): use UTC for date conversion, add final, remove redu…
hassandotcms 8e5b15b
fix(maintenance): throw 500 on failed dropOldVersions, remove searchS…
hassandotcms fb599c9
docs(maintenance): fix stale deletedCount schema, document partial fa…
hassandotcms 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
33 changes: 33 additions & 0 deletions
33
...S/src/main/java/com/dotcms/rest/api/v1/maintenance/AbstractDropOldVersionsResultView.java
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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.dotcms.rest.api.v1.maintenance; | ||
|
|
||
| import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
| import org.immutables.value.Value; | ||
|
|
||
| /** | ||
| * Immutable view representing the result of dropping old asset versions. | ||
| * | ||
| * @author hassandotcms | ||
| */ | ||
| @Value.Style(typeImmutable = "*", typeAbstract = "Abstract*") | ||
| @Value.Immutable | ||
| @JsonSerialize(as = DropOldVersionsResultView.class) | ||
| @JsonDeserialize(as = DropOldVersionsResultView.class) | ||
| @Schema(description = "Result of dropping old asset versions older than a specified date") | ||
| public interface AbstractDropOldVersionsResultView { | ||
|
|
||
| @Schema( | ||
| description = "Number of asset versions deleted", | ||
| example = "1523", | ||
| requiredMode = Schema.RequiredMode.REQUIRED | ||
| ) | ||
| int deletedCount(); | ||
|
|
||
| @Schema( | ||
| description = "Whether the operation completed successfully", | ||
| example = "true", | ||
| requiredMode = Schema.RequiredMode.REQUIRED | ||
| ) | ||
| boolean success(); | ||
| } |
34 changes: 34 additions & 0 deletions
34
.../src/main/java/com/dotcms/rest/api/v1/maintenance/AbstractSearchAndReplaceResultView.java
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 |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.dotcms.rest.api.v1.maintenance; | ||
|
|
||
| import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
| import org.immutables.value.Value; | ||
|
|
||
| /** | ||
| * Immutable view representing the result of a database-wide search and replace operation. | ||
| * | ||
| * @author hassandotcms | ||
| */ | ||
| @Value.Style(typeImmutable = "*", typeAbstract = "Abstract*") | ||
| @Value.Immutable | ||
| @JsonSerialize(as = SearchAndReplaceResultView.class) | ||
| @JsonDeserialize(as = SearchAndReplaceResultView.class) | ||
| @Schema(description = "Result of a database-wide search and replace operation") | ||
| public interface AbstractSearchAndReplaceResultView { | ||
|
|
||
| @Schema( | ||
| description = "Whether the operation completed without errors", | ||
| example = "true", | ||
| requiredMode = Schema.RequiredMode.REQUIRED | ||
| ) | ||
| boolean success(); | ||
|
|
||
| @Schema( | ||
| description = "Whether any table updates encountered errors. " | ||
| + "When true, some tables may not have been updated.", | ||
| example = "false", | ||
| requiredMode = Schema.RequiredMode.REQUIRED | ||
| ) | ||
| boolean hasErrors(); | ||
| } |
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
15 changes: 15 additions & 0 deletions
15
...main/java/com/dotcms/rest/api/v1/maintenance/ResponseEntityDropOldVersionsResultView.java
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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package com.dotcms.rest.api.v1.maintenance; | ||
|
|
||
| import com.dotcms.rest.ResponseEntityView; | ||
|
|
||
| /** | ||
| * Response wrapper for the drop old versions endpoint. | ||
| * | ||
| * @author hassandotcms | ||
| */ | ||
| public class ResponseEntityDropOldVersionsResultView extends ResponseEntityView<DropOldVersionsResultView> { | ||
|
|
||
| public ResponseEntityDropOldVersionsResultView(final DropOldVersionsResultView entity) { | ||
| super(entity); | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
...ain/java/com/dotcms/rest/api/v1/maintenance/ResponseEntitySearchAndReplaceResultView.java
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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package com.dotcms.rest.api.v1.maintenance; | ||
|
|
||
| import com.dotcms.rest.ResponseEntityView; | ||
|
|
||
| /** | ||
| * Response wrapper for the search and replace endpoint. | ||
| * | ||
| * @author hassandotcms | ||
| */ | ||
| public class ResponseEntitySearchAndReplaceResultView extends ResponseEntityView<SearchAndReplaceResultView> { | ||
|
|
||
| public ResponseEntitySearchAndReplaceResultView(final SearchAndReplaceResultView entity) { | ||
| super(entity); | ||
| } | ||
| } |
Oops, something went wrong.
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.
Let's include the value of
dateStrin the message.