| commit | d9546d36c63788a8e45a0e5821f579a57d7aa65b | [log] [tgz] |
|---|---|---|
| author | margaretha <margaretha@ids-mannheim.de> | Fri Dec 20 12:19:17 2019 +0100 |
| committer | margaretha <margaretha@ids-mannheim.de> | Fri Dec 20 12:19:17 2019 +0100 |
| tree | 574ce664271a61b0202d14bf0291f678b8f45c65 | |
| parent | d3a46ecc30a4eafa7b9a17e7120c4738a985905a [diff] |
Updated free resource controller. Change-Id: I356096d0d6959ed3be50f9a4b4fe206f4b9cfcd2 Change-Id: I356096d0d6959ed3be50f9a4b4fe206f4b9cfcd2
diff --git a/full/Changes b/full/Changes index f39835b..d994517 100644 --- a/full/Changes +++ b/full/Changes
@@ -11,7 +11,8 @@ 19/12/2019 - Updated create update user-group API (margaretha) 20/12/2019 - - Removed transactional annotations from simple select queries (margaretha) + - Removed transactional annotations from simple select queries (margaretha) + - Updated free resource controller (margaretha) # version 0.62.2 17/10/2019
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java b/full/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java index 0d15e46..bee5a3d 100644 --- a/full/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java +++ b/full/src/main/java/de/ids_mannheim/korap/web/controller/ResourceController.java
@@ -24,7 +24,7 @@ * */ @Controller -@Path("{version}/resource/") +@Path("{version}/resource") @ResourceFilters({APIVersionFilter.class, PiwikFilter.class }) @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8") public class ResourceController { @@ -40,7 +40,6 @@ * the database. */ @GET - @Path("info") public List<ResourceDto> getAllResourceInfo () { return resourceService.getResourceDtos(); }
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java index 2c23b04..dbf62b2 100644 --- a/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java +++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
@@ -18,7 +18,7 @@ @Test public void testResource () throws KustvaktException { ClientResponse response = resource().path(API_VERSION) - .path("resource").path("info").get(ClientResponse.class); + .path("resource").get(ClientResponse.class); String entity = response.getEntity(String.class); JsonNode n = JsonUtils.readTree(entity).get(0);