You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/02/03 12:15:24 UTC
[openmeetings] branch master updated: OPENMEETINGS-2565 Spelling
mistake in web service method (#124)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 3fd2675 OPENMEETINGS-2565 Spelling mistake in web service method (#124)
3fd2675 is described below
commit 3fd26756d2e88a5022ff3b480938f2369f61bb33
Author: Sebastian Wagner <se...@apache.org>
AuthorDate: Thu Feb 4 01:15:16 2021 +1300
OPENMEETINGS-2565 Spelling mistake in web service method (#124)
* OPENMEETINGS-2565 Spelling mistake in web service method.
* [OPENMEETINGS-2565] test is added
Co-authored-by: Maxim Solodovnik <so...@gmail.com>
---
.../test/java/org/apache/openmeetings/webservice/TestRoomService.java | 2 ++
.../main/java/org/apache/openmeetings/webservice/RoomWebService.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
index 03a8312..2e56b5b 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
@@ -60,12 +60,14 @@ class TestRoomService extends AbstractWebServiceTest {
.query("room", r.toString())
.get(RoomDTO.class);
assertNotNull(room, "Valid room should be returned");
+ assertEquals(extId, room.getExternalId(), "External ID of room should match");
assertNotNull(room.getId(), "Room ID should be not empty");
RoomDTO room1 = getClient(getRoomUrl()).path(String.format("/%s/%s/%s", Room.Type.PRESENTATION, UNIT_TEST_EXT_TYPE, extId))
.query("sid", sr.getMessage())
.get(RoomDTO.class);
assertNotNull(room1, "Valid room should be returned");
+ assertEquals(extId, room1.getExternalId(), "External ID of room should match");
assertEquals(room.getId(), room1.getId(), "Same Room should be returned");
}
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 d704577..ace6598 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
@@ -164,7 +164,7 @@ public class RoomWebService extends BaseWebService {
*/
@WebMethod
@GET
- @Path("/{type}/{externaltype}/{externaliid}")
+ @Path("/{type}/{externaltype}/{externalid}")
public RoomDTO getExternal(@WebParam(name="sid") @QueryParam("sid") String sid
, @PathParam("type") @WebParam(name="type") String type
, @PathParam("externaltype") @WebParam(name="externaltype") String externalType