From c96a47990f6010215aac424a2b15b5e9fe8890af Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Sun, 26 Jul 2020 11:28:21 +0200
Subject: [PATCH] Better paths for CategoriesApi

---
 .../admin/categorization/CategoriesApi.java   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/api/admin/categorization/CategoriesApi.java b/ccm-core/src/main/java/org/libreccm/api/admin/categorization/CategoriesApi.java
index c5412acff..657b8c747 100644
--- a/ccm-core/src/main/java/org/libreccm/api/admin/categorization/CategoriesApi.java
+++ b/ccm-core/src/main/java/org/libreccm/api/admin/categorization/CategoriesApi.java
@@ -497,7 +497,7 @@ public class CategoriesApi {
     }
 
     @GET
-    @Path("/{domainIdentifier}/{path:^[\\w\\-/]+$}/objects")
+    @Path("/{domainIdentifier}/{path:^[\\w\\-/]+$}/@objects")
     @Produces(MediaType.APPLICATION_JSON)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
@@ -523,12 +523,12 @@ public class CategoriesApi {
     }
 
     @GET
-    @Path("/ID-{categoryId}/objects")
+    @Path("/ID-{categoryId}/@objects")
     @Produces(MediaType.APPLICATION_JSON)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
-    public ListView<CategorizationData> getCategoryObjectsInCategory(
+    public ListView<CategorizationData> getObjectsInCategory(
         @PathParam("categoryId") final long categoryId,
         @QueryParam("limit") @DefaultValue("20") final int limit,
         @QueryParam("offset") @DefaultValue("0") final int offset
@@ -547,7 +547,7 @@ public class CategoriesApi {
     }
 
     @GET
-    @Path("/UUID-{uuid}/objects")
+    @Path("/UUID-{uuid}/@objects")
     @Produces(MediaType.APPLICATION_JSON)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
@@ -571,7 +571,7 @@ public class CategoriesApi {
     }
 
     @POST
-    @Path("/{domainIdentifier}/{path:^[\\w\\-/]+$}/objects/")
+    @Path("/{domainIdentifier}/{path:^[\\w\\-/]+$}/@objects/")
     @Consumes(MediaType.APPLICATION_JSON)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
@@ -613,7 +613,7 @@ public class CategoriesApi {
     }
 
     @POST
-    @Path("/ID-{categoryId}/objects/{objectIdentifier}")
+    @Path("/ID-{categoryId}/@objects/{objectIdentifier}")
     @Consumes(MediaType.APPLICATION_JSON)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
@@ -653,12 +653,12 @@ public class CategoriesApi {
     }
 
     @POST
-    @Path("/UUID-{categoryUuid}/objects/objectIdentifier")
+    @Path("/UUID-{categoryUuid}/@objects/objectIdentifier")
     @Consumes(MediaType.APPLICATION_JSON)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
-    public Response addObjectsToCategory(
+    public Response addObjectToCategory(
         @PathParam("categoryUuid") final String uuid,
         final CategorizationData categorizationData
     ) {
@@ -693,7 +693,7 @@ public class CategoriesApi {
     }
 
     @DELETE
-    @Path("/{domainIdentifier}/{path:^[\\w\\-/]+$}/objects/{objectIdentifier}")
+    @Path("/{domainIdentifier}/{path:^[\\w\\-/]+$}/@objects/{objectIdentifier}")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
@@ -739,7 +739,7 @@ public class CategoriesApi {
     }
 
     @DELETE
-    @Path("/ID-{categoryId}/objects/{objectIdentifier}")
+    @Path("/ID-{categoryId}/@objects/{objectIdentifier}")
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
     @Transactional(Transactional.TxType.REQUIRED)
@@ -779,7 +779,7 @@ public class CategoriesApi {
     }
 
     @DELETE
-    @Path("/UUID-{categoryId}/objects/{objectIdentifier}")
+    @Path("/UUID-{categoryId}/@objects/{objectIdentifier}")
     @Produces(MediaType.APPLICATION_JSON)
     @AuthorizationRequired
     @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)