From b5c74d6c45a5bc31861c2498e4a1e33e115a53d1 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 16 Nov 2012 14:31:12 +0100
Subject: [PATCH] OO-419: remove last bits of illegal FormParam to be fully
JAX-RS compliant
---
pom.xml | 5 +++++
.../repository/course/CourseResourceFolderWebService.java | 6 ++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ff480c13a2d..ee596ff2e61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1668,6 +1668,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${com.sun.jersey.version}</version>
+ </dependency>
<dependency>
<groupId>com.sun.jersey.jersey-test-framework</groupId>
diff --git a/src/main/java/org/olat/restapi/repository/course/CourseResourceFolderWebService.java b/src/main/java/org/olat/restapi/repository/course/CourseResourceFolderWebService.java
index 736db5ab571..99b305124a4 100644
--- a/src/main/java/org/olat/restapi/repository/course/CourseResourceFolderWebService.java
+++ b/src/main/java/org/olat/restapi/repository/course/CourseResourceFolderWebService.java
@@ -33,7 +33,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.Consumes;
-import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
@@ -50,7 +49,6 @@ import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
-import org.apache.commons.io.IOUtils;
import org.olat.core.commons.modules.bc.meta.MetaInfo;
import org.olat.core.commons.modules.bc.meta.MetaInfoHelper;
import org.olat.core.commons.modules.bc.meta.tagged.MetaTagged;
@@ -203,7 +201,7 @@ public class CourseResourceFolderWebService {
@POST
@Path("coursefolder")
@Consumes(MediaType.MULTIPART_FORM_DATA)
- public Response attachFileToFolderPost(@PathParam("courseId") Long courseId, @FormParam("filename") String filename,
+ public Response attachFileToFolderPost(@PathParam("courseId") Long courseId,
@Context HttpServletRequest request) {
return attachFileToCourseFolder(courseId, Collections.<PathSegment>emptyList(), request);
}
@@ -249,7 +247,7 @@ public class CourseResourceFolderWebService {
@PUT
@Path("coursefolder")
@Consumes(MediaType.MULTIPART_FORM_DATA)
- public Response attachFileToFolder(@PathParam("courseId") Long courseId, @FormParam("filename") String filename,
+ public Response attachFileToFolder(@PathParam("courseId") Long courseId,
@Context HttpServletRequest request) {
return attachFileToCourseFolder(courseId, Collections.<PathSegment>emptyList(), request);
}
--
GitLab