From 7a537e7886fbe49835a2418d8ef031e6f5ed4765 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 30 Sep 2016 10:13:22 +0200 Subject: [PATCH] [Major] REST APIs are supposed to be plural --- .../main/java/li/strolch/rest/endpoint/AuditsService.java | 2 +- .../src/main/java/li/strolch/rest/endpoint/EnumQuery.java | 2 +- .../main/java/li/strolch/rest/endpoint/ModelQuery.java | 6 +++--- .../strolch/rest/endpoint/PrivilegePoliciesService.java | 2 +- .../li/strolch/rest/endpoint/PrivilegeRolesService.java | 6 +++--- .../li/strolch/rest/endpoint/PrivilegeUsersService.java | 8 ++++---- .../li/strolch/rest/endpoint/UserSessionsService.java | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuditsService.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuditsService.java index e494fe1d4..0bee71f9f 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuditsService.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuditsService.java @@ -40,7 +40,7 @@ import li.strolch.rest.model.AuditQueryResult; import li.strolch.rest.model.StringListResult; import li.strolch.rest.model.visitor.ToAuditQueryVisitor; -@Path("strolch/audit") +@Path("strolch/audits") public class AuditsService { @GET diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/EnumQuery.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/EnumQuery.java index e2cd79b2c..8f6b23f39 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/EnumQuery.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/EnumQuery.java @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; /** * @author Robert von Burg */ -@Path("strolch/enum") +@Path("strolch/enums") public class EnumQuery { private static final Logger logger = LoggerFactory.getLogger(EnumQuery.class); diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java index 04bc33e46..d4bea27db 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java @@ -64,7 +64,7 @@ public class ModelQuery { */ @GET @Produces(MediaType.APPLICATION_JSON) - @Path("resource") + @Path("resources") public Response queryResources(@BeanParam QueryData queryData, @Context HttpServletRequest request) { Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); @@ -120,7 +120,7 @@ public class ModelQuery { */ @GET @Produces(MediaType.APPLICATION_JSON) - @Path("order") + @Path("orders") public Response queryOrders(@BeanParam QueryData queryData, @Context HttpServletRequest request) { Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); @@ -177,7 +177,7 @@ public class ModelQuery { */ @GET @Produces(MediaType.APPLICATION_JSON) - @Path("activity") + @Path("activities") public Response queryActivities(@BeanParam QueryData queryData, @Context HttpServletRequest request) { Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegePoliciesService.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegePoliciesService.java index d2d41de08..8c63f453b 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegePoliciesService.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegePoliciesService.java @@ -37,7 +37,7 @@ import li.strolch.utils.xml.XmlKeyValue; /** * @author Robert von Burg */ -@Path("strolch/privilege/policy") +@Path("strolch/privilege/policies") public class PrivilegePoliciesService { // private static final Logger logger = LoggerFactory.getLogger(PrivilegePoliciesService.class); diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeRolesService.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeRolesService.java index e384f811d..4713c4e2b 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeRolesService.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeRolesService.java @@ -57,7 +57,7 @@ import li.strolch.service.privilege.roles.PrivilegeUpdateRoleService; /** * @author Robert von Burg */ -@Path("strolch/privilege/role") +@Path("strolch/privilege/roles") public class PrivilegeRolesService { private PrivilegeHandler getPrivilegeHandler() { @@ -143,7 +143,7 @@ public class PrivilegeRolesService { @PUT @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - @Path("{rolename}/privilege") + @Path("{rolename}/privileges") public Response addOrReplacePrivilegeOnRole(@PathParam("rolename") String rolename, PrivilegeRep privilegeRep, @Context HttpServletRequest request) { Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); @@ -161,7 +161,7 @@ public class PrivilegeRolesService { @DELETE @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - @Path("{rolename}/privilege/{privilege}") + @Path("{rolename}/privileges/{privilege}") public Response removePrivilegeFromRole(@PathParam("rolename") String rolename, @PathParam("privilege") String privilege, @Context HttpServletRequest request) { Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java index 4350a515c..0df168ca4 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java @@ -76,7 +76,7 @@ import li.strolch.service.privilege.users.PrivilegeUserResult; /** * @author Robert von Burg */ -@Path("strolch/privilege/user") +@Path("strolch/privilege/users") public class PrivilegeUsersService { private PrivilegeHandler getPrivilegeHandler() { @@ -114,7 +114,7 @@ public class PrivilegeUsersService { JsonObject propObj = new JsonObject(); propObj.addProperty("key", propKey); propObj.addProperty("value", userRep.getProperty(propKey)); - rolesArr.add(propObj); + propsArr.add(propObj); } return jsonObject; @@ -248,7 +248,7 @@ public class PrivilegeUsersService { @PUT @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - @Path("{username}/role/{rolename}") + @Path("{username}/roles/{rolename}") public Response addRoleToUser(@PathParam("username") String username, @PathParam("rolename") String rolename, @Context HttpServletRequest request) { Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); @@ -266,7 +266,7 @@ public class PrivilegeUsersService { @DELETE @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - @Path("{username}/role/{rolename}") + @Path("{username}/roles/{rolename}") public Response removeRoleFromUser(@PathParam("username") String username, @PathParam("rolename") String rolename, @Context HttpServletRequest request) { Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE); diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/UserSessionsService.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/UserSessionsService.java index a8ed664f8..2b9451ff2 100644 --- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/UserSessionsService.java +++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/UserSessionsService.java @@ -41,7 +41,7 @@ import li.strolch.rest.model.UserSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Path("strolch/session") +@Path("strolch/sessions") public class UserSessionsService { private static final Logger logger = LoggerFactory.getLogger(UserSessionsService.class);