From 79c5f8f5db1bd21da1787f2b7720a206038ff9f1 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Mon, 29 Sep 2014 14:46:29 +1000 Subject: [PATCH] remove p and i from rest url --- ...ansUnitStatusResource.java => TransUnitResource.java} | 9 +++++---- .../org/zanata/rest/service/VersionLocalesResource.java | 7 +++++-- 2 files changed, 10 insertions(+), 6 deletions(-) rename zanata-common-api/src/main/java/org/zanata/rest/service/{TransUnitStatusResource.java => TransUnitResource.java} (87%) diff --git a/zanata-common-api/src/main/java/org/zanata/rest/service/TransUnitStatusResource.java b/zanata-common-api/src/main/java/org/zanata/rest/service/TransUnitResource.java similarity index 87% rename from zanata-common-api/src/main/java/org/zanata/rest/service/TransUnitStatusResource.java rename to zanata-common-api/src/main/java/org/zanata/rest/service/TransUnitResource.java index 6388af3..ee41bac 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/service/TransUnitStatusResource.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/service/TransUnitResource.java @@ -2,6 +2,7 @@ import javax.ws.rs.Consumes; import javax.ws.rs.GET; +import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -18,11 +19,10 @@ */ @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) -public interface TransUnitStatusResource { +public interface TransUnitResource { public static final String SERVICE_PATH = - VersionLocalesResource.VERSION_PATH + - "/r/{docId}/status/{localeId}" ; + VersionLocalesResource.VERSION_PATH; /** * Retrieves a list translation unit with status in a document. @@ -39,5 +39,6 @@ public interface TransUnitStatusResource { @Produces({ MediaTypes.APPLICATION_ZANATA_TRANS_UNIT_RESOURCE_JSON, MediaType.APPLICATION_JSON }) @TypeHint(TransUnitStatus[].class) - public Response get(); + @Path("/r/{docId}/status/{localeId}") + public Response getStatus(); } diff --git a/zanata-common-api/src/main/java/org/zanata/rest/service/VersionLocalesResource.java b/zanata-common-api/src/main/java/org/zanata/rest/service/VersionLocalesResource.java index 6d9b53b..cb36f71 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/service/VersionLocalesResource.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/service/VersionLocalesResource.java @@ -18,11 +18,14 @@ @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) public interface VersionLocalesResource { + public static final String PROJECT_PATH = "/projects/" + + ProjectResource.PROJECT_SLUG_TEMPLATE; + public static final String VERSION_SLUG_TEMPLATE = "{versionSlug:" + RestConstants.SLUG_PATTERN + "}"; - public static final String VERSION_PATH = ProjectResource.SERVICE_PATH - + "/iterations/i/" + VERSION_SLUG_TEMPLATE; + public static final String VERSION_PATH = PROJECT_PATH + + "/versions/" + VERSION_SLUG_TEMPLATE; public static final String SERVICE_PATH = VERSION_PATH + "/locales";