From e0cfb5bd606d9dcc6029182cbfd4c5c2f7a9f3d2 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Sat, 3 Mar 2018 20:21:42 +0100
Subject: [PATCH] OO-3352: remove the string parameter of the sendError method
(excepted for WebDAV)
---
.../de/bps/course/nodes/ll/LLRunController.java | 4 ++--
.../org/olat/commons/calendar/ICalServlet.java | 6 +++---
.../commons/info/ui/InfoDisplayController.java | 8 ++++----
.../memberlist/ui/MembersPrintController.java | 2 +-
.../commons/servlets/StaticsLegacyDispatcher.java | 6 +++---
.../modules/bc/commands/CmdServeResource.java | 6 +++---
.../bc/commands/CmdServeThumbnailResource.java | 2 +-
.../org/olat/core/dispatcher/DispatcherModule.java | 6 +++---
.../dispatcher/mapper/GlobalMapperRegistry.java | 2 +-
.../gui/components/htmlsite/HtmlStaticMapper.java | 2 +-
.../htmlsite/HtmlStaticPageComponent.java | 2 +-
.../generic/iframe/IFrameDeliveryMapper.java | 6 +++---
.../textmarker/GlossaryDefinitionMapper.java | 6 +++---
.../generic/textmarker/GlossaryTermMapper.java | 4 ++--
.../core/gui/media/ForbiddenMediaResource.java | 14 +-------------
.../olat/core/gui/media/NotFoundMediaResource.java | 13 +------------
.../core/util/mail/ui/MailAttachmentMapper.java | 4 ++--
.../org/olat/core/util/vfs/VFSContainerMapper.java | 2 +-
.../course/assessment/ui/tool/AssessmentForm.java | 2 +-
.../course/certificate/CertificateDispatcher.java | 2 +-
.../nodes/dialog/ui/DialogElementController.java | 2 +-
.../gta/ui/component/DownloadDocumentMapper.java | 2 +-
.../nodes/iq/QTI21AssessmentRunController.java | 2 +-
.../org/olat/course/nodes/ms/DocumentsMapper.java | 2 +-
.../ims/qti21/ui/AssessmentResultController.java | 2 +-
.../org/olat/ims/qti21/ui/ResourcesMapper.java | 8 ++++----
.../ui/editor/interactions/BackgroundMapper.java | 2 +-
.../interactions/HotspotChoiceScoreController.java | 2 +-
.../HotspotInteractionStatisticsController.java | 2 +-
.../org/olat/modules/cp/CPDisplayController.java | 2 +-
.../java/org/olat/modules/cp/CPPrintMapper.java | 4 ++--
.../olat/modules/fo/ui/MessageListController.java | 4 ++--
.../portfolio/ui/AbstractPageListController.java | 2 +-
.../java/org/olat/modules/tu/TunnelMapper.java | 4 ++--
.../modules/video/manager/VideoMediaMapper.java | 4 ++--
.../modules/video/ui/VideoListingController.java | 2 +-
.../modules/video/ui/VideoPosterSelectionForm.java | 4 ++--
.../org/olat/repository/handlers/VideoHandler.java | 2 +-
.../repository/ui/CatalogEntryImageMapper.java | 2 +-
39 files changed, 65 insertions(+), 88 deletions(-)
diff --git a/src/main/java/de/bps/course/nodes/ll/LLRunController.java b/src/main/java/de/bps/course/nodes/ll/LLRunController.java
index 98e586cb92d..e2fcf2c5375 100644
--- a/src/main/java/de/bps/course/nodes/ll/LLRunController.java
+++ b/src/main/java/de/bps/course/nodes/ll/LLRunController.java
@@ -120,9 +120,9 @@ public class LLRunController extends BasicController {
} else if(customMediaMapper != null) {
return customMediaMapper.handle(relPath, request);
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
} else {
- return new ForbiddenMediaResource(relPath);
+ return new ForbiddenMediaResource();
}
}
}
diff --git a/src/main/java/org/olat/commons/calendar/ICalServlet.java b/src/main/java/org/olat/commons/calendar/ICalServlet.java
index 92602d87c8b..9a88f689a05 100644
--- a/src/main/java/org/olat/commons/calendar/ICalServlet.java
+++ b/src/main/java/org/olat/commons/calendar/ICalServlet.java
@@ -139,13 +139,13 @@ public class ICalServlet extends HttpServlet {
getIcalDocument(requestUrl, request, response);
} catch (ValidationException e) {
log.warn("Validation Error when generate iCal stream for path::" + request.getPathInfo(), e);
- response.sendError(HttpServletResponse.SC_CONFLICT, requestUrl);
+ response.sendError(HttpServletResponse.SC_CONFLICT);
} catch (IOException e) {
log.warn("IOException Error when generate iCal stream for path::" + request.getPathInfo(), e);
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, requestUrl);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} catch (Exception e) {
log.warn("Unknown Error in icalservlet", e);
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, requestUrl);
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
}
diff --git a/src/main/java/org/olat/commons/info/ui/InfoDisplayController.java b/src/main/java/org/olat/commons/info/ui/InfoDisplayController.java
index 7b5baf0fb71..c0bee1e38e3 100644
--- a/src/main/java/org/olat/commons/info/ui/InfoDisplayController.java
+++ b/src/main/java/org/olat/commons/info/ui/InfoDisplayController.java
@@ -508,7 +508,7 @@ public class InfoDisplayController extends FormBasicController {
@Override
public MediaResource handle(String relPath, HttpServletRequest request) {
if(infoKeyToAttachment == null) {
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
String[] query = relPath.split("/");
@@ -521,7 +521,7 @@ public class InfoDisplayController extends FormBasicController {
//ignore them
}
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
@@ -529,7 +529,7 @@ public class InfoDisplayController extends FormBasicController {
@Override
public MediaResource handle(String relPath, HttpServletRequest request) {
if(infoKeyToAttachment == null) {
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
String[] query = relPath.split("/");
@@ -553,7 +553,7 @@ public class InfoDisplayController extends FormBasicController {
//ignore them
}
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
}
diff --git a/src/main/java/org/olat/commons/memberlist/ui/MembersPrintController.java b/src/main/java/org/olat/commons/memberlist/ui/MembersPrintController.java
index b7afd5f4384..550842cd3ef 100644
--- a/src/main/java/org/olat/commons/memberlist/ui/MembersPrintController.java
+++ b/src/main/java/org/olat/commons/memberlist/ui/MembersPrintController.java
@@ -179,7 +179,7 @@ public class MembersPrintController extends BasicController {
}
}
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
}
diff --git a/src/main/java/org/olat/commons/servlets/StaticsLegacyDispatcher.java b/src/main/java/org/olat/commons/servlets/StaticsLegacyDispatcher.java
index 04130222005..791c837e838 100644
--- a/src/main/java/org/olat/commons/servlets/StaticsLegacyDispatcher.java
+++ b/src/main/java/org/olat/commons/servlets/StaticsLegacyDispatcher.java
@@ -171,14 +171,14 @@ public class StaticsLegacyDispatcher implements Dispatcher {
if (handler == null || relPath == null) {
// no handler found or relPath incomplete
- response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI());
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
return false;
}
ResourceDescriptor rd = handler.getResourceDescriptor(request, relPath);
if (rd == null) {
// no handler found or relPath incomplete
- response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI());
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
return false;
}
@@ -195,7 +195,7 @@ public class StaticsLegacyDispatcher implements Dispatcher {
InputStream is = handler.getInputStream(request, rd);
if (is == null) {
// resource not found or access denied
- response.sendError(HttpServletResponse.SC_NOT_FOUND, request.getRequestURI());
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
return false;
}
StaticMediaResource smr = new StaticMediaResource(is, rd);
diff --git a/src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeResource.java b/src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeResource.java
index 05b3049dfd9..cf8ec446a19 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeResource.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeResource.java
@@ -77,9 +77,9 @@ public class CmdServeResource implements FolderCommand {
}
if (vfsitem == null) {
- mr = new NotFoundMediaResource(path);
+ mr = new NotFoundMediaResource();
} else if(!(vfsitem instanceof VFSLeaf)) {
- mr = new NotFoundMediaResource(path);
+ mr = new NotFoundMediaResource();
} else {
VFSLeaf vfsfile = (VFSLeaf)vfsitem;
@@ -90,7 +90,7 @@ public class CmdServeResource implements FolderCommand {
// try to load in iso-8859-1
InputStream is = vfsfile.getInputStream();
if(is == null) {
- mr = new NotFoundMediaResource(path);
+ mr = new NotFoundMediaResource();
} else {
String page = FileUtils.load(is, DEFAULT_ENCODING);
// search for the <meta content="text/html; charset=utf-8"
diff --git a/src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeThumbnailResource.java b/src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeThumbnailResource.java
index 4abde829d5c..2509db81372 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeThumbnailResource.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/commands/CmdServeThumbnailResource.java
@@ -69,7 +69,7 @@ public class CmdServeThumbnailResource implements FolderCommand {
}
}
if(mr == null) {
- mr = new NotFoundMediaResource(path);
+ mr = new NotFoundMediaResource();
}
ureq.getDispatchResult().setResultingMediaResource(mr);
diff --git a/src/main/java/org/olat/core/dispatcher/DispatcherModule.java b/src/main/java/org/olat/core/dispatcher/DispatcherModule.java
index e0980468588..e5a9f3530db 100644
--- a/src/main/java/org/olat/core/dispatcher/DispatcherModule.java
+++ b/src/main/java/org/olat/core/dispatcher/DispatcherModule.java
@@ -163,7 +163,7 @@ public class DispatcherModule {
*/
public static final void sendNotFound(String url, HttpServletResponse response) {
try {
- response.sendError(HttpServletResponse.SC_NOT_FOUND, url);
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (IOException e) {
log.error("Send 404 failed: url=" + url, e);
}
@@ -177,7 +177,7 @@ public class DispatcherModule {
*/
public static final void sendForbidden(String url, HttpServletResponse response) {
try {
- response.sendError(HttpServletResponse.SC_FORBIDDEN, url);
+ response.sendError(HttpServletResponse.SC_FORBIDDEN);
} catch (IOException e) {
log.error("Send 403 failed: url=" + url, e);
}
@@ -191,7 +191,7 @@ public class DispatcherModule {
*/
public static final void sendBadRequest(String url, HttpServletResponse response) {
try {
- response.sendError(HttpServletResponse.SC_BAD_REQUEST, (url == null ? "n/a" : url));
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST);
} catch (IOException e) {
log.error("Send 400 failed: url=" + url, e);
}
diff --git a/src/main/java/org/olat/core/dispatcher/mapper/GlobalMapperRegistry.java b/src/main/java/org/olat/core/dispatcher/mapper/GlobalMapperRegistry.java
index 2e72fad486e..e9ea6e13c32 100644
--- a/src/main/java/org/olat/core/dispatcher/mapper/GlobalMapperRegistry.java
+++ b/src/main/java/org/olat/core/dispatcher/mapper/GlobalMapperRegistry.java
@@ -53,7 +53,7 @@ import org.olat.core.util.WebappHelper;
* @author Felix Jost
*/
public class GlobalMapperRegistry implements Dispatcher {
- private static final MediaResource NOTFOUND = new NotFoundMediaResource("not found");
+ private static final MediaResource NOTFOUND = new NotFoundMediaResource();
private static final GlobalMapperRegistry INSTANCE = new GlobalMapperRegistry();
// The global mapper hash map contains mappers:
diff --git a/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticMapper.java b/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticMapper.java
index d7376d2d318..56b3fa2ea27 100644
--- a/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticMapper.java
+++ b/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticMapper.java
@@ -57,7 +57,7 @@ public class HtmlStaticMapper implements Mapper {
VFSItem currentItem = mapperRootContainer.resolve(relPath);
if (currentItem == null || (currentItem instanceof VFSContainer)) {
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
VFSMediaResource vmr = new VFSMediaResource((VFSLeaf)currentItem);
String encoding = SimpleHtmlParser.extractHTMLCharset(((VFSLeaf)currentItem));
diff --git a/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponent.java b/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponent.java
index 8fa138b06b8..1b8fe5ff436 100644
--- a/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponent.java
+++ b/src/main/java/org/olat/core/gui/components/htmlsite/HtmlStaticPageComponent.java
@@ -136,7 +136,7 @@ public class HtmlStaticPageComponent extends AbstractComponent implements AsyncM
VFSItem sourceItem = rootContainer.resolve(moduleURI);
// return 404 if the requested file does not exist
if (sourceItem == null || (sourceItem instanceof VFSContainer)) {
- return new NotFoundMediaResource(moduleURI);
+ return new NotFoundMediaResource();
}
// we know the file exists.
diff --git a/src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java b/src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java
index c181daa9d00..3d472bda2bd 100644
--- a/src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java
+++ b/src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java
@@ -196,7 +196,7 @@ public class IFrameDeliveryMapper implements Mapper {
VFSItem vfsItem = null;
//if directory gets renamed root becomes null
if (rootDir == null) {
- return new NotFoundMediaResource("directory not found"+path);
+ return new NotFoundMediaResource();
} else {
vfsItem = rootDir.resolve(path);
}
@@ -204,10 +204,10 @@ public class IFrameDeliveryMapper implements Mapper {
if (vfsItem instanceof VFSLeaf) {
vfsLeaf = (VFSLeaf) rootDir.resolve(path);
} else {
- mr = new NotFoundMediaResource(path);
+ mr = new NotFoundMediaResource();
}
if (vfsLeaf == null) {
- mr = new NotFoundMediaResource(path);
+ mr = new NotFoundMediaResource();
} else {
// check if path ends with .html, .htm or .xhtml. We do this by searching for "htm"
// and accept positions of this string at length-3 or length-4
diff --git a/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryDefinitionMapper.java b/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryDefinitionMapper.java
index 68555dae486..905f62f4e87 100644
--- a/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryDefinitionMapper.java
+++ b/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryDefinitionMapper.java
@@ -64,12 +64,12 @@ class GlossaryDefinitionMapper extends LogDelegator implements Mapper {
File glossaryFolderFile = new File(glossaryFolderString);
if (!glossaryFolderFile.isDirectory()) {
logWarn("GlossaryDefinition delivery failed; path to glossaryFolder not existing: " + relPath, null);
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
VFSContainer glossaryFolder = new LocalFolderImpl(glossaryFolderFile);
if (!gIM.isFolderContainingGlossary(glossaryFolder)) {
logWarn("GlossaryDefinition delivery failed; glossaryFolder doesn't contain a valid Glossary: " + glossaryFolder, null);
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
String glossaryMainTerm = parts[2];
@@ -108,7 +108,7 @@ class GlossaryDefinitionMapper extends LogDelegator implements Mapper {
}
}
if (foundItem == null) {
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryTermMapper.java b/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryTermMapper.java
index 5ab13d26adb..fab1e95bab0 100644
--- a/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryTermMapper.java
+++ b/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryTermMapper.java
@@ -60,12 +60,12 @@ class GlossaryTermMapper extends LogDelegator implements Mapper {
File glossaryFolderFile = new File(glossaryFolderString);
if (!glossaryFolderFile.isDirectory()) {
logWarn("GlossaryTerms delivery failed; path to glossaryFolder not existing: " + relPath, null);
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
VFSContainer glossaryFolder = new LocalFolderImpl(glossaryFolderFile);
if (!gIM.isFolderContainingGlossary(glossaryFolder)) {
logWarn("GlossaryTerms delivery failed; glossaryFolder doesn't contain a valid Glossary: " + glossaryFolder, null);
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
// Create a media resource
diff --git a/src/main/java/org/olat/core/gui/media/ForbiddenMediaResource.java b/src/main/java/org/olat/core/gui/media/ForbiddenMediaResource.java
index 6a7be0dca0f..2093928574b 100644
--- a/src/main/java/org/olat/core/gui/media/ForbiddenMediaResource.java
+++ b/src/main/java/org/olat/core/gui/media/ForbiddenMediaResource.java
@@ -34,25 +34,13 @@ import javax.servlet.http.HttpServletResponse;
* @author Felix Jost
*/
public class ForbiddenMediaResource extends DefaultMediaResource {
- private String forbiddenFoundURI;
- /**
- * @param forbiddenFoundURI
- */
- public ForbiddenMediaResource(String forbiddenFoundURI) {
- this.forbiddenFoundURI = forbiddenFoundURI;
- }
-
- /**
- * @see org.olat.core.gui.media.MediaResource#prepare(javax.servlet.http.HttpServletResponse)
- */
@Override
public void prepare(HttpServletResponse hres) {
try {
- hres.sendError(HttpServletResponse.SC_FORBIDDEN, "Forbidden: " + forbiddenFoundURI);
+ hres.sendError(HttpServletResponse.SC_FORBIDDEN);
} catch (IOException e) {
// we can do nothing better
}
-
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/gui/media/NotFoundMediaResource.java b/src/main/java/org/olat/core/gui/media/NotFoundMediaResource.java
index 340bd49a6c0..e6026cf43c8 100644
--- a/src/main/java/org/olat/core/gui/media/NotFoundMediaResource.java
+++ b/src/main/java/org/olat/core/gui/media/NotFoundMediaResource.java
@@ -36,22 +36,11 @@ import javax.servlet.http.HttpServletResponse;
* @author Felix Jost
*/
public class NotFoundMediaResource extends DefaultMediaResource {
- private String notFoundURI;
- /**
- * @param notFoundURI
- */
- public NotFoundMediaResource(String notFoundURI) {
- this.notFoundURI = notFoundURI;
- }
-
- /**
- * @see org.olat.core.gui.media.MediaResource#prepare(javax.servlet.http.HttpServletResponse)
- */
@Override
public void prepare(HttpServletResponse hres) {
try {
- hres.sendError(HttpServletResponse.SC_NOT_FOUND, "Not found: " + notFoundURI);
+ hres.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (IOException e) {
// we can do nothing better
}
diff --git a/src/main/java/org/olat/core/util/mail/ui/MailAttachmentMapper.java b/src/main/java/org/olat/core/util/mail/ui/MailAttachmentMapper.java
index a83fbf2bb2e..9db0a9dc184 100644
--- a/src/main/java/org/olat/core/util/mail/ui/MailAttachmentMapper.java
+++ b/src/main/java/org/olat/core/util/mail/ui/MailAttachmentMapper.java
@@ -61,10 +61,10 @@ public class MailAttachmentMapper implements Mapper {
MediaResource resource = new VFSMediaResource(datas);
return resource;
} catch(NumberFormatException e) {
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
diff --git a/src/main/java/org/olat/core/util/vfs/VFSContainerMapper.java b/src/main/java/org/olat/core/util/vfs/VFSContainerMapper.java
index aabeb006f6a..1c9d943856c 100644
--- a/src/main/java/org/olat/core/util/vfs/VFSContainerMapper.java
+++ b/src/main/java/org/olat/core/util/vfs/VFSContainerMapper.java
@@ -48,7 +48,7 @@ public class VFSContainerMapper implements Mapper {
VFSItem vfsItem = container.resolve(relPath);
MediaResource mr;
if (vfsItem == null || !(vfsItem instanceof VFSLeaf)) {
- mr = new NotFoundMediaResource(relPath);
+ mr = new NotFoundMediaResource();
} else {
mr = new VFSMediaResource((VFSLeaf) vfsItem);
}
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
index 91ea9a1e6cc..0a6dd778917 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
@@ -669,7 +669,7 @@ public class AssessmentForm extends FormBasicController {
}
}
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
diff --git a/src/main/java/org/olat/course/certificate/CertificateDispatcher.java b/src/main/java/org/olat/course/certificate/CertificateDispatcher.java
index b2ffe8643b5..253d518f7bc 100644
--- a/src/main/java/org/olat/course/certificate/CertificateDispatcher.java
+++ b/src/main/java/org/olat/course/certificate/CertificateDispatcher.java
@@ -64,7 +64,7 @@ public class CertificateDispatcher implements Dispatcher {
MediaResource resource;
Certificate certificate = certificatesManager.getCertificateByUuid(uuid);
if(certificate == null) {
- resource = new NotFoundMediaResource(origUri);
+ resource = new NotFoundMediaResource();
} else {
VFSLeaf certificateFile = certificatesManager.getCertificateLeaf(certificate);
resource = new VFSMediaResource(certificateFile);
diff --git a/src/main/java/org/olat/course/nodes/dialog/ui/DialogElementController.java b/src/main/java/org/olat/course/nodes/dialog/ui/DialogElementController.java
index 50eedc1a659..1f00adb61df 100644
--- a/src/main/java/org/olat/course/nodes/dialog/ui/DialogElementController.java
+++ b/src/main/java/org/olat/course/nodes/dialog/ui/DialogElementController.java
@@ -148,7 +148,7 @@ public class DialogElementController extends BasicController implements Activate
ThreadLocalUserActivityLogger.log(CourseLoggingAction.DIALOG_ELEMENT_FILE_DOWNLOADED, getClass(),
LoggingResourceable.wrapBCFile(element.getFilename()));
} else {
- ureq.getDispatchResult().setResultingMediaResource(new NotFoundMediaResource(element.getFilename()));
+ ureq.getDispatchResult().setResultingMediaResource(new NotFoundMediaResource());
logError("No file to discuss: " + element, null);
}
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/component/DownloadDocumentMapper.java b/src/main/java/org/olat/course/nodes/gta/ui/component/DownloadDocumentMapper.java
index 40a472e86c3..9ebfe3ba2c6 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/component/DownloadDocumentMapper.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/component/DownloadDocumentMapper.java
@@ -51,6 +51,6 @@ public class DownloadDocumentMapper implements Mapper {
if(document.exists() && document.getParentFile().equals(documentDir)) {
return new FileMediaResource(document, true);
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
index 122deab3386..c0f2dbccc63 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
@@ -604,7 +604,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
}
}
if(resource == null) {
- resource = new NotFoundMediaResource("");
+ resource = new NotFoundMediaResource();
}
ureq.getDispatchResult().setResultingMediaResource(resource);
}
diff --git a/src/main/java/org/olat/course/nodes/ms/DocumentsMapper.java b/src/main/java/org/olat/course/nodes/ms/DocumentsMapper.java
index 179079c2546..ca0e8b9553d 100644
--- a/src/main/java/org/olat/course/nodes/ms/DocumentsMapper.java
+++ b/src/main/java/org/olat/course/nodes/ms/DocumentsMapper.java
@@ -59,6 +59,6 @@ public class DocumentsMapper implements Mapper {
}
}
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
diff --git a/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java b/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
index acd2dbfcf01..58110b9a2ef 100644
--- a/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
@@ -870,7 +870,7 @@ public class AssessmentResultController extends FormBasicController {
if(signature.exists()) {
resource = new DownloadeableMediaResource(signature);
} else {
- resource = new NotFoundMediaResource(relPath);
+ resource = new NotFoundMediaResource();
}
return resource;
}
diff --git a/src/main/java/org/olat/ims/qti21/ui/ResourcesMapper.java b/src/main/java/org/olat/ims/qti21/ui/ResourcesMapper.java
index 386be1065d6..8ffbd728cf3 100644
--- a/src/main/java/org/olat/ims/qti21/ui/ResourcesMapper.java
+++ b/src/main/java/org/olat/ims/qti21/ui/ResourcesMapper.java
@@ -85,7 +85,7 @@ public class ResourcesMapper implements Mapper {
File file = new File(root.getParentFile(), filename);
if(file.exists()) {
if(file.getName().endsWith(".xml")) {
- resource = new ForbiddenMediaResource(relPath);
+ resource = new ForbiddenMediaResource();
} else {
resource = new FileMediaResource(file, true);
}
@@ -120,15 +120,15 @@ public class ResourcesMapper implements Mapper {
if(submissionFile.exists()) {
resource = new FileMediaResource(submissionFile, true);
} else {
- resource = new NotFoundMediaResource(href);
+ resource = new NotFoundMediaResource();
}
} else {
- resource = new NotFoundMediaResource(href);
+ resource = new NotFoundMediaResource();
}
}
} catch (Exception e) {
log.error("", e);
- resource = new NotFoundMediaResource(filename);
+ resource = new NotFoundMediaResource();
}
return resource;
}
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/BackgroundMapper.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/BackgroundMapper.java
index 262b1850cf1..7072f1822cb 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/BackgroundMapper.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/BackgroundMapper.java
@@ -54,6 +54,6 @@ public class BackgroundMapper implements Mapper {
File backgroundFile = new File(itemFile.getParentFile(), relPath);
return new VFSMediaResource(new LocalFileImpl(backgroundFile));
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotChoiceScoreController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotChoiceScoreController.java
index 89cb3baec2f..c1c70772e02 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotChoiceScoreController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/HotspotChoiceScoreController.java
@@ -360,7 +360,7 @@ public class HotspotChoiceScoreController extends AssessmentItemRefEditorControl
File backgroundFile = new File(itemFile.getParentFile(), relPath);
return new VFSMediaResource(new LocalFileImpl(backgroundFile));
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
}
diff --git a/src/main/java/org/olat/ims/qti21/ui/statistics/interactions/HotspotInteractionStatisticsController.java b/src/main/java/org/olat/ims/qti21/ui/statistics/interactions/HotspotInteractionStatisticsController.java
index 3377dd1f3e3..b50f08add51 100644
--- a/src/main/java/org/olat/ims/qti21/ui/statistics/interactions/HotspotInteractionStatisticsController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/statistics/interactions/HotspotInteractionStatisticsController.java
@@ -370,7 +370,7 @@ public class HotspotInteractionStatisticsController extends BasicController {
File backgroundFile = new File(itemFile.getParentFile(), relPath);
return new VFSMediaResource(new LocalFileImpl(backgroundFile));
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
}
diff --git a/src/main/java/org/olat/modules/cp/CPDisplayController.java b/src/main/java/org/olat/modules/cp/CPDisplayController.java
index 035d50b4d8b..584bb7800e1 100644
--- a/src/main/java/org/olat/modules/cp/CPDisplayController.java
+++ b/src/main/java/org/olat/modules/cp/CPDisplayController.java
@@ -478,7 +478,7 @@ public class CPDisplayController extends BasicController implements Activateable
// controller has not been initialized display it non-inline
VFSItem currentItem = rootContainer.resolve(identifierRes);
MediaResource mr;
- if (currentItem == null || !(currentItem instanceof VFSLeaf)) mr = new NotFoundMediaResource(identifierRes);
+ if (currentItem == null || !(currentItem instanceof VFSLeaf)) mr = new NotFoundMediaResource();
else mr = new VFSMediaResource((VFSLeaf) currentItem);
ureq.getDispatchResult().setResultingMediaResource(mr);
// Prevent 'don't reload' warning
diff --git a/src/main/java/org/olat/modules/cp/CPPrintMapper.java b/src/main/java/org/olat/modules/cp/CPPrintMapper.java
index b948f8f88b1..abd6ab91f82 100644
--- a/src/main/java/org/olat/modules/cp/CPPrintMapper.java
+++ b/src/main/java/org/olat/modules/cp/CPPrintMapper.java
@@ -267,7 +267,7 @@ public class CPPrintMapper implements Mapper {
protected MediaResource deliverFile(HttpServletRequest httpRequest, String path) {
//if directory gets renamed root becomes null
if (rootDir == null) {
- return new NotFoundMediaResource("directory not found"+path);
+ return new NotFoundMediaResource();
}
VFSLeaf vfsLeaf = null;
@@ -276,7 +276,7 @@ public class CPPrintMapper implements Mapper {
if (vfsItem instanceof VFSLeaf) {
vfsLeaf = (VFSLeaf)vfsItem;
} else {
- return new NotFoundMediaResource(path);
+ return new NotFoundMediaResource();
}
MediaResource mr;
diff --git a/src/main/java/org/olat/modules/fo/ui/MessageListController.java b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
index 30c9eb6e365..32b0de4fc9e 100644
--- a/src/main/java/org/olat/modules/fo/ui/MessageListController.java
+++ b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
@@ -828,7 +828,7 @@ public class MessageListController extends BasicController implements GenericEve
logError("Cannot deliver message attachment", e);
}
if(res == null) {
- res = new NotFoundMediaResource(cmd);
+ res = new NotFoundMediaResource();
}
ureq.getDispatchResult().setResultingMediaResource(res);
}
@@ -1506,7 +1506,7 @@ public class MessageListController extends BasicController implements GenericEve
}
}
// In any error case, send not found
- return new NotFoundMediaResource(request.getRequestURI());
+ return new NotFoundMediaResource();
}
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
index e9e9f2aaa4b..674bbf8e39b 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
@@ -908,7 +908,7 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate {
}
if(mr == null) {
- mr = new NotFoundMediaResource(relPath);
+ mr = new NotFoundMediaResource();
}
return mr;
}
diff --git a/src/main/java/org/olat/modules/tu/TunnelMapper.java b/src/main/java/org/olat/modules/tu/TunnelMapper.java
index 6227b4988f8..5752dedf149 100644
--- a/src/main/java/org/olat/modules/tu/TunnelMapper.java
+++ b/src/main/java/org/olat/modules/tu/TunnelMapper.java
@@ -138,7 +138,7 @@ public class TunnelMapper implements Mapper {
HttpResponse response = httpClient.execute(meth);
if (response == null) {
// error
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
// get or post successfully
@@ -146,7 +146,7 @@ public class TunnelMapper implements Mapper {
if (responseHeader == null) {
// error
EntityUtils.consumeQuietly(response.getEntity());
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
return new HttpRequestMediaResource(response);
} catch (ClientProtocolException e) {
diff --git a/src/main/java/org/olat/modules/video/manager/VideoMediaMapper.java b/src/main/java/org/olat/modules/video/manager/VideoMediaMapper.java
index 67f4637ff60..f4ee545cce2 100644
--- a/src/main/java/org/olat/modules/video/manager/VideoMediaMapper.java
+++ b/src/main/java/org/olat/modules/video/manager/VideoMediaMapper.java
@@ -41,7 +41,7 @@ public class VideoMediaMapper implements Mapper {
@Override
public MediaResource handle(String relPath, HttpServletRequest request) {
if(relPath != null && relPath.contains("..")) {
- return new ForbiddenMediaResource(relPath);
+ return new ForbiddenMediaResource();
}
VFSItem mediaFile = mediaBase.resolve(relPath);
if (mediaFile instanceof VFSLeaf && !relPath.endsWith("xml")){
@@ -53,7 +53,7 @@ public class VideoMediaMapper implements Mapper {
}
return res;
} else {
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
}
diff --git a/src/main/java/org/olat/modules/video/ui/VideoListingController.java b/src/main/java/org/olat/modules/video/ui/VideoListingController.java
index 371d11fa262..e3bc95d15fb 100644
--- a/src/main/java/org/olat/modules/video/ui/VideoListingController.java
+++ b/src/main/java/org/olat/modules/video/ui/VideoListingController.java
@@ -228,7 +228,7 @@ public class VideoListingController extends FormBasicController implements Activ
return new VFSMediaResource(imageFile);
}
}
- return new NotFoundMediaResource("Image for resource ID::" + relPath + " not found");
+ return new NotFoundMediaResource();
}
}
diff --git a/src/main/java/org/olat/modules/video/ui/VideoPosterSelectionForm.java b/src/main/java/org/olat/modules/video/ui/VideoPosterSelectionForm.java
index 4c863463462..db61d53b109 100644
--- a/src/main/java/org/olat/modules/video/ui/VideoPosterSelectionForm.java
+++ b/src/main/java/org/olat/modules/video/ui/VideoPosterSelectionForm.java
@@ -167,13 +167,13 @@ public class VideoPosterSelectionForm extends BasicController {
@Override
public MediaResource handle(String relPath, HttpServletRequest request) {
if(relPath != null && relPath.contains("..") && !relPath.endsWith(FILENAME_POSTFIX_JPG)) {
- return new ForbiddenMediaResource(relPath);
+ return new ForbiddenMediaResource();
}
VFSItem mediaFile = tmpContainer.resolve(relPath);
if (mediaFile instanceof VFSLeaf){
return new VFSMediaResource((VFSLeaf)mediaFile);
}
- return new NotFoundMediaResource(relPath);
+ return new NotFoundMediaResource();
}
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/repository/handlers/VideoHandler.java b/src/main/java/org/olat/repository/handlers/VideoHandler.java
index 35cc32e0cd3..cda54006af7 100644
--- a/src/main/java/org/olat/repository/handlers/VideoHandler.java
+++ b/src/main/java/org/olat/repository/handlers/VideoHandler.java
@@ -148,7 +148,7 @@ public class VideoHandler extends FileHandler {
RepositoryManager repoManager = CoreSpringFactory.getImpl(RepositoryManager.class);
RepositoryEntry repoEntry = repoManager.lookupRepositoryEntry(res, false);
if (repoEntry == null) {
- return new NotFoundMediaResource("Video Resource not found. ResourceableId::" + res.getResourceableId());
+ return new NotFoundMediaResource();
}
VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class);
VideoExportMediaResource exportResource = videoManager.getVideoExportMediaResource(repoEntry);
diff --git a/src/main/java/org/olat/repository/ui/CatalogEntryImageMapper.java b/src/main/java/org/olat/repository/ui/CatalogEntryImageMapper.java
index 51482811c58..7ec1ee16e46 100644
--- a/src/main/java/org/olat/repository/ui/CatalogEntryImageMapper.java
+++ b/src/main/java/org/olat/repository/ui/CatalogEntryImageMapper.java
@@ -74,7 +74,7 @@ public class CatalogEntryImageMapper implements Mapper {
}
} else {
- resource = new NotFoundMediaResource(relPath);
+ resource = new NotFoundMediaResource();
}
return resource;
}
--
GitLab