Author: solomax
Date: Wed Oct 28 10:44:07 2015
New Revision: 1710984
URL: http://svn.apache.org/viewvc?rev=1710984&view=rev
Log:
[OPENMEETINGS-1118] all webparams are named
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1710984&r1=1710983&r2=1710984&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
Wed Oct 28 10:44:07 2015
@@ -85,7 +85,11 @@ public class CalendarWebService {
*/
@GET
@Path("/{start}/{end}")
- public List<AppointmentDTO> range(@QueryParam("sid") @WebParam String
sid, @PathParam("start") @WebParam Calendar start, @PathParam("end") @WebParam
Calendar end) throws ServiceException {
+ public List<AppointmentDTO> range(@QueryParam("sid")
@WebParam(name="sid") String sid
+ , @PathParam("start") @WebParam(name="start") Calendar
start
+ , @PathParam("end") @WebParam(name="end") Calendar end
+ ) throws ServiceException
+ {
log.debug("range : startdate - " + start.getTime() + ", enddate
- " + end.getTime());
try {
Long userId = sessionDao.checkSession(sid);
@@ -120,10 +124,11 @@ public class CalendarWebService {
@GET
@Path("/{userid}/{start}/{end}")
public List<AppointmentDTO> rangeForUser(
- @QueryParam("sid") @WebParam String sid
- , @PathParam("userid") @WebParam long userid
- , @PathParam("start") @WebParam Calendar start
- , @PathParam("end") @WebParam Calendar end) throws
ServiceException
+ @QueryParam("sid") @WebParam(name="sid") String sid
+ , @PathParam("userid") @WebParam(name="userid") long
userid
+ , @PathParam("start") @WebParam(name="start") Calendar
start
+ , @PathParam("end") @WebParam(name="end") Calendar end
+ ) throws ServiceException
{
log.debug("rangeForUser : startdate - " + start.getTime() + ",
enddate - " + end.getTime());
try {
@@ -151,7 +156,7 @@ public class CalendarWebService {
*/
@GET
@Path("/next")
- public AppointmentDTO next(@QueryParam("sid") @WebParam String sid)
throws ServiceException {
+ public AppointmentDTO next(@QueryParam("sid") @WebParam(name="sid")
String sid) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
@@ -180,7 +185,7 @@ public class CalendarWebService {
*/
@GET
@Path("/next/{userid}")
- public AppointmentDTO nextForUser(@QueryParam("sid") @WebParam String
sid, @PathParam("userid") @WebParam long userid) throws ServiceException {
+ public AppointmentDTO nextForUser(@QueryParam("sid")
@WebParam(name="sid") String sid, @PathParam("userid") @WebParam(name="userid")
long userid) throws ServiceException {
try {
Long authUserId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
@@ -207,7 +212,7 @@ public class CalendarWebService {
*/
@GET
@Path("/room/{roomid}")
- public AppointmentDTO getByRoom(@QueryParam("sid") @WebParam String
sid, @PathParam("roomid") @WebParam long roomid) throws ServiceException {
+ public AppointmentDTO getByRoom(@QueryParam("sid")
@WebParam(name="sid") String sid, @PathParam("roomid") @WebParam(name="roomid")
long roomid) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
@@ -240,7 +245,7 @@ public class CalendarWebService {
*/
@GET
@Path("/title/{title}")
- public List<AppointmentDTO> getByTitle(@QueryParam("sid") @WebParam
String sid, @PathParam("title") @WebParam String title) throws ServiceException
{
+ public List<AppointmentDTO> getByTitle(@QueryParam("sid")
@WebParam(name="sid") String sid, @PathParam("title") @WebParam(name="title")
String title) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
@@ -269,7 +274,7 @@ public class CalendarWebService {
*/
@POST
@Path("/") //TODO FIXME update is also here for now
- public AppointmentDTO save(@QueryParam("sid") @WebParam String sid,
@QueryParam("appointment") @WebParam AppointmentDTO appointment) throws
ServiceException {
+ public AppointmentDTO save(@QueryParam("sid") @WebParam(name="sid")
String sid, @QueryParam("appointment") @WebParam(name="appointment")
AppointmentDTO appointment) throws ServiceException {
//Seems to be create
log.debug("save SID:" + sid);
@@ -309,7 +314,7 @@ public class CalendarWebService {
*/
@DELETE
@Path("/{id}")
- public void delete(@QueryParam("sid") @WebParam String sid,
@PathParam("id") @WebParam Long id) throws ServiceException {
+ public void delete(@QueryParam("sid") @WebParam(name="sid") String sid,
@PathParam("id") @WebParam(name="id") Long id) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
Set<Right> rights = userDao.getRights(userId);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java?rev=1710984&r1=1710983&r2=1710984&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
Wed Oct 28 10:44:07 2015
@@ -72,7 +72,7 @@ public class ErrorWebService {
*/
@GET
@Path("/{id}/{lang}")
- public ServiceResult get(@WebParam @PathParam("id") long id, @WebParam
@PathParam("lang") long lang) {
+ public ServiceResult get(@WebParam(name="id") @PathParam("id") long id,
@WebParam(name="lang") @PathParam("lang") long lang) {
try {
if (id < 0) {
ErrorValue eValues = errorDao.get(-1 * id);
@@ -89,7 +89,7 @@ public class ErrorWebService {
return new ServiceResult(id, "Error ... please
check your input", "Error");
}
} catch (Exception err) {
- log.error("[getErrorByCode] ", err);
+ log.error("[get] ", err);
}
return null;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1710984&r1=1710983&r2=1710984&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
Wed Oct 28 10:44:07 2015
@@ -92,7 +92,7 @@ public class GroupWebService {
*/
@POST
@Path("/")
- public ServiceResult add(@QueryParam("sid") @WebParam String sid,
@QueryParam("name") @WebParam String name) throws ServiceException {
+ public ServiceResult add(@QueryParam("sid") @WebParam(name="sid")
String sid, @QueryParam("name") @WebParam(name="name") String name) throws
ServiceException {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
Group o = new Group();
@@ -119,9 +119,9 @@ public class GroupWebService {
@POST
@Path("/{id}/users/add/{userid}")
public ServiceResult addUser(
- @QueryParam("sid") @WebParam String sid
- , @PathParam("id") @WebParam Long id
- , @PathParam("userid") @WebParam Long userid
+ @QueryParam("sid") @WebParam(name="sid") String sid
+ , @PathParam("id") @WebParam(name="id") Long id
+ , @PathParam("userid") @WebParam(name="userid") Long
userid
) throws ServiceException
{
try {
@@ -154,9 +154,9 @@ public class GroupWebService {
@POST
@Path("/{id}/rooms/add/{roomId}")
public ServiceResult addRoom(
- @QueryParam("sid") @WebParam String sid
- , @PathParam("id") @WebParam Long id
- , @PathParam("roomid") @WebParam Long roomid
+ @QueryParam("sid") @WebParam(name="sid") String sid
+ , @PathParam("id") @WebParam(name="id") Long id
+ , @PathParam("roomid") @WebParam(name="roomid") Long
roomid
) throws ServiceException
{
try {
@@ -209,12 +209,12 @@ public class GroupWebService {
@GET
@Path("/users/{id}")
public UserSearchResult getUsers(
- @QueryParam("sid") @WebParam String sid
- , @PathParam("id") @WebParam long id
- , @QueryParam("start") @WebParam int start
- , @QueryParam("max") @WebParam int max
- , @QueryParam("orderby") @WebParam String orderby
- , @QueryParam("asc") @WebParam boolean asc
+ @QueryParam("sid") @WebParam(name="sid") String sid
+ , @PathParam("id") @WebParam(name="id") long id
+ , @QueryParam("start") @WebParam(name="start") int start
+ , @QueryParam("max") @WebParam(name="max") int max
+ , @QueryParam("orderby") @WebParam(name="orderby")
String orderby
+ , @QueryParam("asc") @WebParam(name="asc") boolean asc
) throws ServiceException
{
try {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java?rev=1710984&r1=1710983&r2=1710984&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
Wed Oct 28 10:44:07 2015
@@ -77,7 +77,7 @@ public class RecordingWebService {
*/
@DELETE
@Path("/{id}")
- public void delete(@QueryParam("sid") @WebParam String sid,
@PathParam("id") @WebParam Long id) throws ServiceException {
+ public void delete(@QueryParam("sid") @WebParam(name="sid") String sid,
@PathParam("id") @WebParam(name="id") Long id) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
@@ -107,9 +107,9 @@ public class RecordingWebService {
@WebMethod
@GET
@Path("/{externaltype}/{externalid}")
- public List<RecordingDTO> getExternal(@WebParam @QueryParam("sid")
String sid
- , @PathParam("externaltype") @WebParam String
externalType
- , @PathParam("externalid") @WebParam String externalId)
throws ServiceException {
+ public List<RecordingDTO> getExternal(@WebParam(name="sid")
@QueryParam("sid") String sid
+ , @PathParam("externaltype")
@WebParam(name="externaltype") String externalType
+ , @PathParam("externalid") @WebParam(name="externalid")
String externalId) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
@@ -139,8 +139,8 @@ public class RecordingWebService {
@WebMethod
@GET
@Path("/{externaltype}")
- public List<RecordingDTO> getExternalByType(@WebParam
@QueryParam("sid") String sid
- , @PathParam("externaltype") @WebParam String
externalType) throws ServiceException {
+ public List<RecordingDTO> getExternalByType(@WebParam(name="sid")
@QueryParam("sid") String sid
+ , @PathParam("externaltype")
@WebParam(name="externaltype") String externalType) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
@@ -170,8 +170,8 @@ public class RecordingWebService {
@WebMethod
@GET
@Path("/room/{id}")
- public List<RecordingDTO> getExternalByRoom(@WebParam
@QueryParam("sid") String sid
- , @PathParam("id") @WebParam Long roomId) throws
ServiceException {
+ public List<RecordingDTO> getExternalByRoom(@WebParam(name="sid")
@QueryParam("sid") String sid
+ , @PathParam("id") @WebParam(name="id") Long roomId)
throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1710984&r1=1710983&r2=1710984&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Wed Oct 28 10:44:07 2015
@@ -107,7 +107,7 @@ public class RoomWebService {
@WebMethod
@GET
@Path("/public/{type}")
- public List<RoomDTO> getPublic(@QueryParam("sid") @WebParam String sid,
@PathParam("type") @WebParam String type) throws ServiceException {
+ public List<RoomDTO> getPublic(@QueryParam("sid") @WebParam(name="sid")
String sid, @PathParam("type") @WebParam(name="type") String type) throws
ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
@@ -134,7 +134,7 @@ public class RoomWebService {
@WebMethod
@GET
@Path("/{id}")
- public RoomDTO getRoomById(@QueryParam("sid") @WebParam String sid,
@PathParam("id") @WebParam Long id) throws ServiceException {
+ public RoomDTO getRoomById(@QueryParam("sid") @WebParam(name="sid")
String sid, @PathParam("id") @WebParam(name="id") Long id) throws
ServiceException {
Long userId = sessionDao.checkSession(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return new RoomDTO(roomDao.get(id));
@@ -166,11 +166,11 @@ public class RoomWebService {
@WebMethod
@GET
@Path("/{type}/{externaltype}/{externaliId}")
- public RoomDTO getExternal(@WebParam @QueryParam("sid") String sid
- , @PathParam("type") @WebParam String type
- , @PathParam("externaltype") @WebParam String
externalType
- , @PathParam("externalid") @WebParam Long externalId
- , @WebParam @QueryParam("room") RoomDTO room) throws
ServiceException {
+ public RoomDTO getExternal(@WebParam(name="sid") @QueryParam("sid")
String sid
+ , @PathParam("type") @WebParam(name="type") String type
+ , @PathParam("externaltype")
@WebParam(name="externaltype") String externalType
+ , @PathParam("externalid") @WebParam(name="externalid")
Long externalId
+ , @WebParam(name="room") @QueryParam("room") RoomDTO
room) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -207,7 +207,7 @@ public class RoomWebService {
@WebMethod
@POST
@Path("/")
- public RoomDTO add(@WebParam @QueryParam("sid") String sid, @WebParam
@QueryParam("room") RoomDTO room) throws ServiceException {
+ public RoomDTO add(@WebParam(name="sid") @QueryParam("sid") String sid,
@WebParam(name="room") @QueryParam("room") RoomDTO room) throws
ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -239,7 +239,7 @@ public class RoomWebService {
@WebMethod
@PUT
@Path("/{id}")
- public RoomDTO update(@WebParam @QueryParam("sid") String sid,
@PathParam("id") @WebParam Long id, @WebParam @QueryParam("room") RoomDTO room)
throws ServiceException {
+ public RoomDTO update(@WebParam(name="sid") @QueryParam("sid") String
sid, @PathParam("id") @WebParam(name="id") Long id, @WebParam(name="room")
@QueryParam("room") RoomDTO room) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -272,7 +272,7 @@ public class RoomWebService {
@WebMethod
@DELETE
@Path("/{id}")
- public ServiceResult delete(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
+ public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid")
String sid, @WebParam(name="id") @PathParam("id") long id) throws
ServiceException {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
roomDao.delete(roomDao.get(id), userId);
@@ -301,7 +301,7 @@ public class RoomWebService {
@WebMethod
@GET
@Path("/close/{id}")
- public ServiceResult close(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
+ public ServiceResult close(@WebParam(name="sid") @QueryParam("sid")
String sid, @WebParam(name="id") @PathParam("id") long id) throws
ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
log.debug("close " + id);
@@ -347,7 +347,7 @@ public class RoomWebService {
@WebMethod
@GET
@Path("/open/{id}")
- public ServiceResult open(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
+ public ServiceResult open(@WebParam(name="sid") @QueryParam("sid")
String sid, @WebParam(name="id") @PathParam("id") long id) throws
ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
log.debug("open " + id);
@@ -384,7 +384,7 @@ public class RoomWebService {
@WebMethod
@GET
@Path("/kick/{id}")
- public ServiceResult kick(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
+ public ServiceResult kick(@WebParam(name="sid") @QueryParam("sid")
String sid, @WebParam(name="id") @PathParam("id") long id) throws
ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -412,7 +412,7 @@ public class RoomWebService {
@WebMethod
@GET
@Path("/counters")
- public List<RoomCountBean> counters(@WebParam @QueryParam("sid") String
sid, @WebParam @QueryParam("roomId") List<Long> ids) throws ServiceException {
+ public List<RoomCountBean> counters(@WebParam(name="sid")
@QueryParam("sid") String sid, @WebParam(name="id") @QueryParam("id")
List<Long> ids) throws ServiceException {
List<RoomCountBean> roomBeans = new ArrayList<RoomCountBean>();
try {
Long userId = sessionDao.checkSession(sid);
@@ -434,7 +434,7 @@ public class RoomWebService {
} catch (ServiceException err) {
throw err;
} catch (Exception err) {
- log.error("[getRoomCounters]", err);
+ log.error("[counters]", err);
throw new ServiceException(err.getMessage());
}
return roomBeans;
@@ -452,7 +452,11 @@ public class RoomWebService {
@WebMethod
@POST
@Path("/hash")
- private ServiceResult hash(@WebParam @QueryParam("sid") String sid,
@WebParam @QueryParam("invite") InvitationDTO invite, @WebParam
@QueryParam("sendmail") boolean sendmail) throws ServiceException {
+ private ServiceResult hash(@WebParam(name="sid") @QueryParam("sid")
String sid
+ , @WebParam(name="invite") @QueryParam("invite")
InvitationDTO invite
+ , @WebParam(name="sendmail") @QueryParam("sendmail")
boolean sendmail
+ ) throws ServiceException
+ {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -473,7 +477,7 @@ public class RoomWebService {
} catch (ServiceException err) {
throw err;
} catch (Exception err) {
- log.error("[sendInvitationHash] ", err);
+ log.error("[hash] ", err);
throw new ServiceException(err.getMessage());
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1710984&r1=1710983&r2=1710984&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
Wed Oct 28 10:44:07 2015
@@ -84,7 +84,11 @@ public class ServerWebService {
@WebMethod
@GET
@Path("/{start}/{max}")
- public List<ServerDTO> getServers(@QueryParam("sid") @WebParam String
sid, @PathParam("start") @WebParam int start, @PathParam("max") @WebParam int
max) throws ServiceException {
+ public List<ServerDTO> getServers(@QueryParam("sid")
@WebParam(name="sid") String sid
+ , @PathParam("start") @WebParam(name="start") int start
+ , @PathParam("max") @WebParam(name="max") int max
+ ) throws ServiceException
+ {
log.debug("getServers enter");
Long userId = sessionDao.checkSession(sid);
@@ -107,7 +111,7 @@ public class ServerWebService {
@WebMethod
@GET
@Path("/count")
- public long count(@QueryParam("sid") @WebParam String sid) throws
ServiceException {
+ public long count(@QueryParam("sid") @WebParam(name="sid") String sid)
throws ServiceException {
log.debug("getServerCount enter");
Long userId = sessionDao.checkSession(sid);
@@ -130,7 +134,7 @@ public class ServerWebService {
@WebMethod
@POST
@Path("/")
- public ServerDTO add(@WebParam @QueryParam("sid") String sid, @WebParam
@QueryParam("server") ServerDTO server) throws ServiceException {
+ public ServerDTO add(@WebParam(name="sid") @QueryParam("sid") String
sid, @WebParam(name="server") @QueryParam("server") ServerDTO server) throws
ServiceException {
log.debug("saveServerCount enter");
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -154,7 +158,7 @@ public class ServerWebService {
@WebMethod
@DELETE
@Path("/{id}")
- public ServiceResult delete(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
+ public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid")
String sid, @WebParam(name="id") @PathParam("id") long id) throws
ServiceException {
log.debug("saveServerCount enter");
Long userId = sessionDao.checkSession(sid);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1710984&r1=1710983&r2=1710984&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Wed Oct 28 10:44:07 2015
@@ -127,7 +127,7 @@ public class UserWebService {
* The SID from getSession
* @param user
* user object
- * @param email
+ * @param confirm
* whatever or not to send email, leave empty for auto-send
*
* @return - id of the user added or error code
@@ -137,9 +137,9 @@ public class UserWebService {
@POST
@Path("/")
public UserDTO add(
- @WebParam @QueryParam("sid") String sid
- , @WebParam @QueryParam("user") UserDTO user
- , @WebParam @QueryParam("email") Boolean email
+ @WebParam(name="sid") @QueryParam("sid") String sid
+ , @WebParam(name="user") @QueryParam("user") UserDTO
user
+ , @WebParam(name="confirm") @QueryParam("confirm")
Boolean confirm
) throws ServiceException
{
try {
@@ -167,7 +167,7 @@ public class UserWebService {
user.getAddress().getAdditionalname(), user.getAddress().getFax(),
user.getAddress().getZip(), user.getAddress().getState().getId()
, user.getAddress().getTown(),
user.getLanguageId(),
"", false, true, // generate
SIP Data if the config is enabled
- jName_timeZone, email);
+ jName_timeZone, confirm);
if (userId == null || userId < 0) {
throw new ServiceException("Unknown
error");
@@ -212,7 +212,7 @@ public class UserWebService {
@WebMethod
@DELETE
@Path("/{id}")
- public ServiceResult delete(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
+ public ServiceResult delete(@WebParam(name="sid") @QueryParam("sid")
String sid, @WebParam(name="id") @PathParam("id") long id) throws
ServiceException {
try {
Long authUserId = sessionDao.checkSession(sid);
@@ -244,11 +244,11 @@ public class UserWebService {
* @throws ServiceException
*/
@DELETE
- @Path("/{externalType}/{externalId}")
+ @Path("/{externaltype}/{externalid}")
public ServiceResult deleteExternal(
- @QueryParam("sid") String sid
- , @PathParam("externalType") String externalType
- , @PathParam("externalId") String externalId
+ @WebParam(name="sid") @QueryParam("sid") String sid
+ , @WebParam(name="externaltype")
@PathParam("externaltype") String externalType
+ , @WebParam(name="externalid") @PathParam("externalid")
String externalId
) throws ServiceException
{
try {
@@ -291,9 +291,9 @@ public class UserWebService {
@POST
@Path("/hash")
public ServiceResult getRoomHash(
- @WebParam @QueryParam("sid") String sid
- , @WebParam @QueryParam("user") ExternalUserDTO user
- , @WebParam @QueryParam("options") RoomOptionsDTO
options
+ @WebParam(name="sid") @QueryParam("sid") String sid
+ , @WebParam(name="user") @QueryParam("user")
ExternalUserDTO user
+ , @WebParam(name="options") @QueryParam("options")
RoomOptionsDTO options
) throws ServiceException
{
try {
@@ -347,7 +347,7 @@ public class UserWebService {
@WebMethod
@POST
@Path("/kick/{publicsid}")
- public ServiceResult kick(@WebParam @QueryParam("sid") String sid,
@PathParam("publicsid") String publicSID) throws ServiceException {
+ public ServiceResult kick(@WebParam(name="sid") @QueryParam("sid")
String sid, @WebParam(name="publicsid") @PathParam("publicsid") String
publicSID) throws ServiceException {
try {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -373,8 +373,8 @@ public class UserWebService {
*/
@WebMethod
@GET
- @Path("/count/{roomId}")
- public int count(@WebParam @QueryParam("sid") String sid,
@PathParam("roomid") Long roomId) {
+ @Path("/count/{roomid}")
+ public int count(@WebParam(name="sid") @QueryParam("sid") String sid,
@WebParam(name="roomid") @PathParam("roomid") Long roomId) {
Long userId = sessionDao.checkSession(sid);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
