CELDEV-1006 - refactor AttachmentURLCommand to ResourceUrlService #297
Conversation
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
msladek
requested changes
Feb 2, 2022
src/main/java/com/celements/ressource_url/RessourceUrlService.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/web/plugin/cmd/AttachmentURLCommand.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/ressource_url/RessourceUrlService.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/ressource_url/RessourceUrlService.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/ressource_url/RessourceUrlService.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/ressource_url/RessourceUrlService.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/ressource_url/RessourceUrlService.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/ressource_url/UrlRessourceNotExistException.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/ressource_url/RessourceUrlService.java
Outdated
Show resolved
Hide resolved
msladek
requested changes
Feb 9, 2022
src/main/java/com/celements/filebase/references/FileReference.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/filebase/references/FileReference.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/filebase/references/FileReferenceType.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/filebase/uri/FileUriScriptService.java
Outdated
Show resolved
Hide resolved
src/main/java/com/celements/filebase/references/FileReference.java
Outdated
Show resolved
Hide resolved
| UriBuilder addContextUri(UriBuilder uriBuilder) { | ||
| Optional<XWikiDocument> currentDoc = context.getCurrentDoc().toJavaUtil(); | ||
| if (currentDoc.isPresent() && uriBuilder.toString().startsWith("?")) { | ||
| uriBuilder.replacePath(currentDoc.get().getURL("view", context.getXWikiContext())); |
Member
There was a problem hiding this comment.
I think this does nothing since replacePath isn't inplace. perhaps write a test for this method.
| try { | ||
| XWikiDocument doc = modelAccess.getDocument(fileRef.getDocRef()); | ||
| XWikiAttachment att = attachmentSrv.getAttachmentNameEqual(doc, attName); | ||
|
|
Comment on lines
+154
to
+155
| .replace("/skin/", | ||
| "/" + action.orElse(getDefaultAction()) + "/")); |
Member
There was a problem hiding this comment.
Suggested change
| .replace("/skin/", | |
| "/" + action.orElse(getDefaultAction()) + "/")); | |
| .replace("/skin/", "/" + action.orElse(getDefaultAction()) + "/")); |
Comment on lines
+156
to
+157
| uri.queryParam("version", lastStartupTimeStamp.getFileModificationDate(path)); | ||
| return uri; |
Member
There was a problem hiding this comment.
Suggested change
| uri.queryParam("version", lastStartupTimeStamp.getFileModificationDate(path)); | |
| return uri; | |
| return uri.queryParam("version", lastStartupTimeStamp.getFileModificationDate(path)); |
Comment on lines
+591
to
+592
| String deletedDocsHql = "select distinct ddoc.fullName" | ||
| + " from XWikiDeletedDocument as ddoc"; |
Member
There was a problem hiding this comment.
Suggested change
| String deletedDocsHql = "select distinct ddoc.fullName" | |
| + " from XWikiDeletedDocument as ddoc"; | |
| String deletedDocsHql = "select distinct ddoc.fullName from XWikiDeletedDocument as ddoc"; |
…java Co-authored-by: Marc Sladek <[email protected]>
….git into CELDEV-1006
[email protected]:celements/celements-core.git into CELDEV-1006
Conflicts: pom.xml src/main/java/com/celements/docform/DocFormRequestKeyParser.java src/main/resources/META-INF/components.txt src/test/java/com/celements/auth/user/CelementsUserServiceTest.java src/test/java/com/celements/docform/DocFormRequestKeyParserTest.java src/test/java/com/celements/docform/DocFormRequestKeyTest.java src/test/java/com/celements/docform/DocFormScriptServiceTest.java src/test/java/com/celements/web/plugin/cmd/PasswordRecoveryAndEmailValidationCommandTest.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://synjira.atlassian.net/browse/CELDEV-1006