Updated vc search path.
Change-Id: I22939ee788732aed028153294a3c89460da1765b
diff --git a/full/Changes b/full/Changes
index 37dbe84..93157b5 100644
--- a/full/Changes
+++ b/full/Changes
@@ -1,6 +1,7 @@
version 0.60.2
-03/04/2018
+09/04/2018
- implemented OAuth2 client registration (margaretha)
+ - changed virtual corpus search to retrieval (margaretha)
version 0.60.1
28/03/2018
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java b/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
index 3be0fa7..5781520 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
+++ b/full/src/main/java/de/ids_mannheim/korap/web/controller/UserGroupController.java
@@ -210,11 +210,8 @@
}
/** Invites group members to join a user-group specified in the JSON object.
-<<<<<<< Upstream, based on dev
* Only user-group admins and system admins are allowed.
*
-=======
->>>>>>> 18533fd Implemented #17 and added role removal after deleting members.
* @param securityContext
* @param group UserGroupJson containing groupId and usernames to be invited
* as members
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java b/full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java
index b68ab2d..1ef676d 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java
+++ b/full/src/main/java/de/ids_mannheim/korap/web/controller/VirtualCorpusController.java
@@ -121,9 +121,9 @@
* @return a list of virtual corpora
*/
@GET
- @Path("search/{vcId}")
+ @Path("{vcId}")
@Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
- public VirtualCorpusDto searchVC (@Context SecurityContext securityContext,
+ public VirtualCorpusDto retrieveVC (@Context SecurityContext securityContext,
@PathParam("vcId") int vcId) {
TokenContext context =
(TokenContext) securityContext.getUserPrincipal();
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerAdminTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerAdminTest.java
index d1cbfa6..0653e69 100644
--- a/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerAdminTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/UserGroupControllerAdminTest.java
@@ -303,6 +303,8 @@
.header(HttpHeaders.X_FORWARDED_FOR, "149.27.0.32")
.delete(ClientResponse.class);
+ assertEquals(Status.OK.getStatusCode(), response.getStatus());
+
// check group member
JsonNode node = listGroup(testUsername);
node = node.get(0);
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerAdminTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerAdminTest.java
index d8ff61b..2b98f0d 100644
--- a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerAdminTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerAdminTest.java
@@ -35,7 +35,7 @@
@Test
public void testSearchPrivateVC () throws UniformInterfaceException,
ClientHandlerException, KustvaktException {
- ClientResponse response = resource().path("vc").path("search").path("1")
+ ClientResponse response = resource().path("vc").path("1")
.header(Attributes.AUTHORIZATION,
handler.createBasicAuthorizationHeaderValue(admin,
"pass"))
@@ -55,7 +55,7 @@
public void testSearchProjectVC () throws UniformInterfaceException,
ClientHandlerException, KustvaktException {
- ClientResponse response = resource().path("vc").path("search").path("2")
+ ClientResponse response = resource().path("vc").path("2")
.header(Attributes.AUTHORIZATION,
handler.createBasicAuthorizationHeaderValue(admin,
"pass"))
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerTest.java
index 956ae6e..b01a164 100644
--- a/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/VirtualCorpusControllerTest.java
@@ -64,7 +64,7 @@
throws UniformInterfaceException, ClientHandlerException,
KustvaktException {
ClientResponse response =
- resource().path("vc").path("search").path(vcId)
+ resource().path("vc").path(vcId)
.header(Attributes.AUTHORIZATION,
handler.createBasicAuthorizationHeaderValue(
username, "pass"))
@@ -167,7 +167,7 @@
public void testSearchPrivateVCUnauthorized ()
throws UniformInterfaceException, ClientHandlerException,
KustvaktException {
- ClientResponse response = resource().path("vc").path("search").path("1")
+ ClientResponse response = resource().path("vc").path("1")
.header(Attributes.AUTHORIZATION,
handler.createBasicAuthorizationHeaderValue(
"VirtualCorpusControllerTest", "pass"))
@@ -200,7 +200,7 @@
throws UniformInterfaceException, ClientHandlerException,
KustvaktException {
- ClientResponse response = resource().path("vc").path("search").path("2")
+ ClientResponse response = resource().path("vc").path("2")
.header(Attributes.AUTHORIZATION,
handler.createBasicAuthorizationHeaderValue("marlin",
"pass"))