This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/OPENMEETINGS-2664-fix-consumes-tag-for-rest-apis in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit e01c014430f0691587a7f5ddf35f9c774aac415b Author: Sebastian Wagner <seba.wag...@gmail.com> AuthorDate: Sat Sep 11 14:16:33 2021 +1200 OPENMEETINGS-2664 Fix consumes tag so generated swagger is correct. --- .../java/org/apache/openmeetings/webservice/CalendarWebService.java | 2 ++ .../main/java/org/apache/openmeetings/webservice/ErrorWebService.java | 2 ++ .../main/java/org/apache/openmeetings/webservice/FileWebService.java | 1 + .../main/java/org/apache/openmeetings/webservice/GroupWebService.java | 2 ++ .../main/java/org/apache/openmeetings/webservice/InfoWebService.java | 2 ++ .../java/org/apache/openmeetings/webservice/RecordingWebService.java | 2 ++ .../main/java/org/apache/openmeetings/webservice/RoomWebService.java | 2 ++ .../main/java/org/apache/openmeetings/webservice/UserWebService.java | 2 ++ .../src/main/java/org/apache/openmeetings/webservice/WbWebService.java | 2 ++ 9 files changed, 17 insertions(+) diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java index e10b5f6..cdf1e5c 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java @@ -28,6 +28,7 @@ import java.util.Set; import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebService; +import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.FormParam; import javax.ws.rs.GET; @@ -72,6 +73,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; @Service("calendarWebService") @WebService(serviceName="org.apache.openmeetings.webservice.CalendarWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "CalendarService") @Path("/calendar") diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java index 849afc2..c2c6695 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java @@ -23,6 +23,7 @@ import static org.apache.openmeetings.webservice.Constants.TNS; import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebService; +import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -57,6 +58,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; @Service("errorWebService") @WebService(serviceName="org.apache.openmeetings.webservice.ErrorWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "ErrorService") @Path("/error") diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java index 9f2bdea..87f24d1 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java @@ -76,6 +76,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; @Service("fileWebService") @WebService(serviceName="org.apache.openmeetings.webservice.FileWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "FileService") @Path("/file") diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java index 19eb3b3..07425c8 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java @@ -28,6 +28,7 @@ import java.util.List; import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebService; +import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -75,6 +76,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; @Service("groupWebService") @WebService(serviceName="org.apache.openmeetings.webservice.GroupWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "GroupService") @Path("/group") diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java index 4a5a7f9..2347b74 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java @@ -22,6 +22,7 @@ import static org.apache.openmeetings.webservice.Constants.TNS; import javax.jws.WebMethod; import javax.jws.WebService; +import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -48,6 +49,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; @Service("infoWebService") @WebService(serviceName="org.apache.openmeetings.webservice.InfoWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "InfoService") @Path("/info") diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java index 3f5e90a..c1dfd6c 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java @@ -25,6 +25,7 @@ import java.util.List; import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebService; +import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -63,6 +64,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; @Service("recordWebService") @WebService(serviceName="org.apache.openmeetings.webservice.RecordingWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "RecordingService") @Path("/record") diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java index 6d9b9fe..df51056 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java @@ -27,6 +27,7 @@ import java.util.stream.Collectors; import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebService; +import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.FormParam; import javax.ws.rs.GET; @@ -81,6 +82,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; @Service("roomWebService") @WebService(serviceName="org.apache.openmeetings.webservice.RoomWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "RoomService") @Path("/room") diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java index 0481a2c..64e5dac 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java @@ -47,6 +47,7 @@ import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; +import javax.ws.rs.Consumes; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; @@ -91,6 +92,7 @@ import org.springframework.stereotype.Service; @Service("userWebService") @WebService(serviceName = USER_SERVICE_NAME, targetNamespace = TNS, portName = USER_SERVICE_PORT_NAME) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "UserService") @Path("/user") diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/WbWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/WbWebService.java index d34ae39..13109f4 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/WbWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/WbWebService.java @@ -32,6 +32,7 @@ import javax.imageio.ImageIO; import javax.jws.WebMethod; import javax.jws.WebParam; import javax.jws.WebService; +import javax.ws.rs.Consumes; import javax.ws.rs.FormParam; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -81,6 +82,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; @Service("wbWebService") @WebService(serviceName="org.apache.openmeetings.webservice.WbWebService", targetNamespace = TNS) @Features(features = "org.apache.cxf.ext.logging.LoggingFeature") +@Consumes(MediaType.MULTIPART_FORM_DATA) @Produces({MediaType.APPLICATION_JSON}) @Tag(name = "WbService") @Path("/wb")