refactor

Author: DGSmartling

smartling-files-api/src/main/java/com/smartling/api/files/v2/FilesApi.java

@@ -43,83 +43,82 @@
 
 @Produces(APPLICATION_JSON)
 @Consumes(APPLICATION_JSON)
-@Path("/files-api/v2")
 @DetailedErrorMessage(args = "fileUri")
 public interface FilesApi extends AutoCloseable
 {
     @POST
-    @Path("/projects/{projectId}/file")
+    @Path("/files-api/v2/projects/{projectId}/file")
     @Consumes(MULTIPART_FORM_DATA)
     UploadFileResponse uploadFile(@PathParam("projectId") String projectId, @MultipartForm UploadFilePTO uploadFilePTO);
 
     @GET
-    @Path("/projects/{projectId}/file")
+    @Path("/files-api/v2/projects/{projectId}/file")
     @Produces(WILDCARD)
     InputStream downloadSourceFile(@PathParam("projectId") String projectId, @QueryParam("fileUri") String fileUri);
 
     @GET
-    @Path("/projects/{projectId}/file/status")
+    @Path("/files-api/v2/projects/{projectId}/file/status")
     FileStatusResponse getFileStatus(@PathParam("projectId") String projectId, @QueryParam("fileUri") String fileUri);
 
     @GET
-    @Path("/projects/{projectId}/locales/{localeId}/file/status")
+    @Path("/files-api/v2/projects/{projectId}/locales/{localeId}/file/status")
     FileLocaleStatusResponse getFileLocaleStatus(@PathParam("projectId") String projectId, @PathParam("localeId") String localeId, @QueryParam("fileUri") String fileUri);
 
     @GET
-    @Path("/projects/{projectId}/locales/{localeId}/file")
+    @Path("/files-api/v2/projects/{projectId}/locales/{localeId}/file")
     @Produces(WILDCARD)
     InputStream downloadTranslatedFile(@PathParam("projectId") String projectId, @PathParam("localeId") String localeId, @BeanParam DownloadTranslationPTO downloadTranslationPTO);
 
     @GET
-    @Path("/projects/{projectId}/locales/{localeId}/file")
+    @Path("/files-api/v2/projects/{projectId}/locales/{localeId}/file")
     @Produces(MULTIPART_MIXED)
     TranslatedFileMultipart downloadTranslatedFileMultipart(@PathParam("projectId") String projectId, @PathParam("localeId") String localeId, @BeanParam DownloadTranslationPTO downloadTranslationPTO);
 
     @GET
-    @Path("/projects/{projectId}/locales/all/file/zip")
+    @Path("/files-api/v2/projects/{projectId}/locales/all/file/zip")
     @Produces(WILDCARD)
     InputStream downloadAllFileTranslations(@PathParam("projectId") String projectId, @BeanParam DownloadAllFileTranslationsPTO downloadAllFileTranslationsPTO);
 
     @GET
-    @Path("/projects/{projectId}/files/zip")
+    @Path("/files-api/v2/projects/{projectId}/files/zip")
     @Produces(WILDCARD)
     InputStream downloadMultipleFileTranslations(@PathParam("projectId") String projectId, @BeanParam DownloadMultipleTranslationsPTO downloadMultipleTranslationsPTO);
 
     @GET
-    @Path("/projects/{projectId}/files/list")
+    @Path("/files-api/v2/projects/{projectId}/files/list")
     ListResponse<FileItemPTO> getFilesList(@PathParam("projectId") String projectId, @BeanParam GetFilesListPTO getFilesListPTO);
 
     @GET
-    @Path("/projects/{projectId}/files/list/recently-published")
+    @Path("/published-files-api/v2/projects/{projectId}/files/list/recently-published")
     ListResponse<RecentlyPublishedFileItemPTO> getRecentlyPublishedFiles(@PathParam("projectId") String projectId, @BeanParam GetRecentlyPublishedFilesPTO getRecentlyPublishedFilesPTO);
 
     @GET
     @Path("/files-api/v2/projects/{projectId}/file-types")
     FileTypesListPTO getFilesTypesList(@PathParam("projectId") String projectId);
 
     @POST
-    @Path("/projects/{projectId}/file/rename")
+    @Path("/files-api/v2/projects/{projectId}/file/rename")
     EmptyData renameFile(@PathParam("projectId") String projectId, RenameFilePto renameFilePto);
 
     @POST
-    @Path("/projects/{projectId}/file/delete")
+    @Path("/files-api/v2/projects/{projectId}/file/delete")
     EmptyData deleteFile(@PathParam("projectId") String projectId, DeleteFilePTO deleteFilePTO);
 
     @GET
-    @Path("/projects/{projectId}/file/last-modified")
+    @Path("/files-api/v2/projects/{projectId}/file/last-modified")
     ListResponse<FileLocaleLastModifiedPTO> getFileLastModified(@PathParam("projectId") String projectId, @BeanParam GetFileLastModifiedPTO getFileLastModifiedPto);
 
     @GET
-    @Path("/projects/{projectId}/locales/{localeId}/file/last-modified")
+    @Path("/files-api/v2/projects/{projectId}/locales/{localeId}/file/last-modified")
     FileLocaleLastModifiedPTO getFileLocaleLastModified(@PathParam("projectId") String projectId, @PathParam("localeId") String localeId, @BeanParam GetFileLastModifiedPTO getFileLastModifiedPto);
 
     @POST
-    @Path("/projects/{projectId}/locales/{localeId}/file/import")
+    @Path("/files-api/v2/projects/{projectId}/locales/{localeId}/file/import")
     @Consumes(MULTIPART_FORM_DATA)
     ImportTranslationsResponse importTranslations(@PathParam("projectId") String projectId, @PathParam("localeId") String localeId, @MultipartForm ImportTranslationsPTO importTranslationsPTO);
 
     @POST
-    @Path("/projects/{projectId}/locales/{localeId}/file/get-translations")
+    @Path("/files-api/v2/projects/{projectId}/locales/{localeId}/file/get-translations")
     @Consumes(MULTIPART_FORM_DATA)
     @Produces(WILDCARD)
     InputStream exportTranslations(@PathParam("projectId") String projectId, @PathParam("localeId") String localeId, @MultipartForm ExportTranslationsPTO exportTranslationsPTO);

smartling-files-api/src/test/java/com/smartling/api/files/v2/FilesApiTest.java

@@ -299,7 +299,7 @@ public void testGetRecentlyPublishedFilesList() throws Exception {
 
         RecordedRequest recordedRequest = mockWebServer.takeRequest();
         assertEquals("GET", recordedRequest.getMethod());
-        assertTrue(recordedRequest.getPath().contains("/projects/" + PROJECT_ID + "/files/list/recently-published"));
+        assertTrue(recordedRequest.getPath().contains("/published-files-api/v2/projects/" + PROJECT_ID + "/files/list/recently-published"));
         assertTrue(recordedRequest.getPath().contains("fileUris" + URLEncoder.encode("[]", "UTF-8") + "=" + FILE_URI));
         assertTrue(recordedRequest.getPath().contains("publishedAfter=" + URLEncoder.encode("2018-07-20T00:6:34Z", "UTF-8")));
         assertTrue(recordedRequest.getPath().contains("localeIds" + URLEncoder.encode("[]", "UTF-8") + "=" + "de-DE"));