diff --git a/README.md b/README.md index 89f8f11..9c06b51 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ String taskId = result.getTaskId(); client.uploadFile(, taskId); // execute Task -client.executeTask(taskId); +client.executeTask(taskId, CPDFLanguageConstant.English); ``` @@ -122,7 +122,7 @@ String taskId = result.getTaskId(); client.uploadFile(, taskId); // Execute Task -client.executeTask(taskId); +client.executeTask(taskId, CPDFLanguageConstant.English); // Query TaskInfo CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); diff --git a/pom.xml b/pom.xml index 4334515..37df615 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ com.compdf compdfkit-api-java - 1.2.4 + 0.0.8 compdfkit-api-java compdfkit-api-java diff --git a/samples/pom.xml b/samples/pom.xml index 9f3064a..1812472 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -16,7 +16,7 @@ com.compdf compdfkit-api-java - 1.2.4 + 0.0.8 diff --git a/samples/src/main/java/com/compdfkit/AddWatermark.java b/samples/src/main/java/com/compdfkit/AddWatermark.java index 1741e60..850bb58 100644 --- a/samples/src/main/java/com/compdfkit/AddWatermark.java +++ b/samples/src/main/java/com/compdfkit/AddWatermark.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFAddWatermarkParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -40,7 +41,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void addWatermarkText() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.ADD_WATERMARK); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.ADD_WATERMARK, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -61,10 +62,10 @@ public static void addWatermarkText() throws FileNotFoundException { fileParameter.setFullScreen("1"); fileParameter.setHorizontalSpace("10"); fileParameter.setVerticalSpace("10"); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" @@ -81,7 +82,7 @@ public static void addWatermarkText() throws FileNotFoundException { public static void addWatermarkImage() throws IOException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.ADD_WATERMARK); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.ADD_WATERMARK, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -104,7 +105,7 @@ public static void addWatermarkImage() throws IOException { CPDFUploadFileResult uploadFileResult = client.uploadFile(file,taskId,fileParameter,new File("sample/test.jpg")); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/CSVToPDF.java b/samples/src/main/java/com/compdfkit/CSVToPDF.java index 81a200f..c022f00 100644 --- a/samples/src/main/java/com/compdfkit/CSVToPDF.java +++ b/samples/src/main/java/com/compdfkit/CSVToPDF.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CCSVToPDFParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void csvToPDF() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.CSV_TO_PDF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.CSV_TO_PDF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.csv"); String filePassword = ""; CCSVToPDFParameter fileParameter = new CCSVToPDFParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/DeleteWatermark.java b/samples/src/main/java/com/compdfkit/DeleteWatermark.java index 969369f..be1f064 100644 --- a/samples/src/main/java/com/compdfkit/DeleteWatermark.java +++ b/samples/src/main/java/com/compdfkit/DeleteWatermark.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFDeleteWatermarkParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void deleteWatermark() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.DEL_WATERMARK); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.DEL_WATERMARK, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; CPDFDeleteWatermarkParameter fileParameter = new CPDFDeleteWatermarkParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/ExcelToPDF.java b/samples/src/main/java/com/compdfkit/ExcelToPDF.java index b21e3bd..6fa1a46 100644 --- a/samples/src/main/java/com/compdfkit/ExcelToPDF.java +++ b/samples/src/main/java/com/compdfkit/ExcelToPDF.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CExcelToPDFParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void excelToPDF() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.XLSX_TO_PDF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.XLSX_TO_PDF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.xlsx"); String filePassword = ""; CExcelToPDFParameter fileParameter = new CExcelToPDFParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/FormRecognizer.java b/samples/src/main/java/com/compdfkit/FormRecognizer.java index 0697e72..e26de9e 100644 --- a/samples/src/main/java/com/compdfkit/FormRecognizer.java +++ b/samples/src/main/java/com/compdfkit/FormRecognizer.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentAIEnum; import com.compdfkit.param.CPDFFormRecognizerParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,7 +39,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void formRecognizer() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.TABLEREC); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.TABLEREC, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -46,10 +47,10 @@ public static void formRecognizer() throws FileNotFoundException { String filePassword = ""; CPDFFormRecognizerParameter fileParameter = new CPDFFormRecognizerParameter(); fileParameter.setLang("auto"); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/HtmlToPDF.java b/samples/src/main/java/com/compdfkit/HtmlToPDF.java index 9bfc9c4..c910f22 100644 --- a/samples/src/main/java/com/compdfkit/HtmlToPDF.java +++ b/samples/src/main/java/com/compdfkit/HtmlToPDF.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CHtmlToPDFParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void htmlToPDF() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.HTML_TO_PDF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.HTML_TO_PDF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.html"); String filePassword = ""; CHtmlToPDFParameter fileParameter = new CHtmlToPDFParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/ImageSharpeningEnhancement.java b/samples/src/main/java/com/compdfkit/ImageSharpeningEnhancement.java index eacefbc..a5af351 100644 --- a/samples/src/main/java/com/compdfkit/ImageSharpeningEnhancement.java +++ b/samples/src/main/java/com/compdfkit/ImageSharpeningEnhancement.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentAIEnum; import com.compdfkit.param.CPDFImageSharpeningEnhancementParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void imageSharpeningEnhancement() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.MAGICCOLOR); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.MAGICCOLOR, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.jpg"); String filePassword = ""; CPDFImageSharpeningEnhancementParameter fileParameter = new CPDFImageSharpeningEnhancementParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/LayoutAnalysis.java b/samples/src/main/java/com/compdfkit/LayoutAnalysis.java index cab0443..123861b 100644 --- a/samples/src/main/java/com/compdfkit/LayoutAnalysis.java +++ b/samples/src/main/java/com/compdfkit/LayoutAnalysis.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentAIEnum; import com.compdfkit.param.CPDFLayoutAnalysisParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void layoutAnalysis() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.LAYOUTANALYSIS); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.LAYOUTANALYSIS, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.jpg"); String filePassword = ""; CPDFLayoutAnalysisParameter fileParameter = new CPDFLayoutAnalysisParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/Ocr.java b/samples/src/main/java/com/compdfkit/Ocr.java index 4dfbc38..7035819 100644 --- a/samples/src/main/java/com/compdfkit/Ocr.java +++ b/samples/src/main/java/com/compdfkit/Ocr.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentAIEnum; import com.compdfkit.param.CPDFOcrParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,7 +39,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void ocr() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.OCR); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.OCR, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -46,10 +47,10 @@ public static void ocr() throws FileNotFoundException { String filePassword = ""; CPDFOcrParameter fileParameter = new CPDFOcrParameter(); fileParameter.setLang("auto"); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFCompression.java b/samples/src/main/java/com/compdfkit/PDFCompression.java index 8f7594f..c9da0f5 100644 --- a/samples/src/main/java/com/compdfkit/PDFCompression.java +++ b/samples/src/main/java/com/compdfkit/PDFCompression.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFCompressParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,7 +39,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfCompression() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.COMPRESS); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.COMPRESS, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -46,10 +47,10 @@ public static void pdfCompression() throws FileNotFoundException { String filePassword = ""; CPDFCompressParameter fileParameter = new CPDFCompressParameter(); fileParameter.setQuality("50"); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFDelete.java b/samples/src/main/java/com/compdfkit/PDFDelete.java index a767bdb..c4fbbbf 100644 --- a/samples/src/main/java/com/compdfkit/PDFDelete.java +++ b/samples/src/main/java/com/compdfkit/PDFDelete.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFPageDeleteParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -34,7 +35,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void pageDelete() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.DELETE); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.DELETE, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -42,10 +43,10 @@ public static void pageDelete() throws FileNotFoundException { String filePassword = ""; CPDFPageDeleteParameter fileParameter = new CPDFPageDeleteParameter(); fileParameter.setPageOptions(Arrays.asList("1","2")); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFExtract.java b/samples/src/main/java/com/compdfkit/PDFExtract.java index 0a1ea57..d11e3d9 100644 --- a/samples/src/main/java/com/compdfkit/PDFExtract.java +++ b/samples/src/main/java/com/compdfkit/PDFExtract.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFPageExtractParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -34,7 +35,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void pageExtract() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.EXTRACT); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.EXTRACT, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -42,10 +43,10 @@ public static void pageExtract() throws FileNotFoundException { String filePassword = ""; CPDFPageExtractParameter fileParameter = new CPDFPageExtractParameter(); fileParameter.setPageOptions(Arrays.asList("1","2")); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFInsert.java b/samples/src/main/java/com/compdfkit/PDFInsert.java index 234e48c..214f69e 100644 --- a/samples/src/main/java/com/compdfkit/PDFInsert.java +++ b/samples/src/main/java/com/compdfkit/PDFInsert.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFPageInsertParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -33,7 +34,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void pageInsert() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.INSERT); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.INSERT, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -44,10 +45,10 @@ public static void pageInsert() throws FileNotFoundException { fileParameter.setWidth("500"); fileParameter.setHeight("800"); fileParameter.setNumber("2"); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFMerge.java b/samples/src/main/java/com/compdfkit/PDFMerge.java index 2adc75e..2a2188e 100644 --- a/samples/src/main/java/com/compdfkit/PDFMerge.java +++ b/samples/src/main/java/com/compdfkit/PDFMerge.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFPageMergeParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -34,7 +35,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void pageMerge() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.MERGE); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.MERGE, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -42,7 +43,7 @@ public static void pageMerge() throws FileNotFoundException { String filePassword = ""; CPDFPageMergeParameter fileParameter = new CPDFPageMergeParameter(); fileParameter.setPageOptions(Arrays.asList("1","2")); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); // upload File File fileSecond = new File("sample/test.pdf"); CPDFPageMergeParameter fileParameterSecond = new CPDFPageMergeParameter(); @@ -50,7 +51,7 @@ public static void pageMerge() throws FileNotFoundException { client.uploadFile(new FileInputStream(fileSecond),taskId,fileParameterSecond,file.getName()); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFRotation.java b/samples/src/main/java/com/compdfkit/PDFRotation.java index 57ef485..fbb29f8 100644 --- a/samples/src/main/java/com/compdfkit/PDFRotation.java +++ b/samples/src/main/java/com/compdfkit/PDFRotation.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFPageRotationParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -34,7 +35,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void pageRotation() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.ROTATION); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.ROTATION, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -43,10 +44,10 @@ public static void pageRotation() throws FileNotFoundException { CPDFPageRotationParameter fileParameter = new CPDFPageRotationParameter(); fileParameter.setPageOptions(Arrays.asList("1","2")); fileParameter.setRotation("90"); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFSplit.java b/samples/src/main/java/com/compdfkit/PDFSplit.java index 00115bb..bf5413f 100644 --- a/samples/src/main/java/com/compdfkit/PDFSplit.java +++ b/samples/src/main/java/com/compdfkit/PDFSplit.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentEditorEnum; import com.compdfkit.param.CPDFPageSplitParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -34,7 +35,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void pageSplit() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.SPLIT); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentEditorEnum.SPLIT, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -42,10 +43,10 @@ public static void pageSplit() throws FileNotFoundException { String filePassword = ""; CPDFPageSplitParameter fileParameter = new CPDFPageSplitParameter(); fileParameter.setPageOptions(Arrays.asList("1","2")); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToCsv.java b/samples/src/main/java/com/compdfkit/PDFToCsv.java index 207b897..910e66a 100644 --- a/samples/src/main/java/com/compdfkit/PDFToCsv.java +++ b/samples/src/main/java/com/compdfkit/PDFToCsv.java @@ -10,8 +10,9 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; -import com.compdfkit.param.CPDFToRTFParameter; +import com.compdfkit.param.CPDFToCSVParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; import com.compdfkit.pojo.comPdfKit.CPDFFileInfo; import com.compdfkit.pojo.comPdfKit.CPDFTaskInfoResult; @@ -20,11 +21,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; public class PDFToCsv { @@ -38,17 +34,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToCsv() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_CSV); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_CSV, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; - CPDFToRTFParameter fileParameter = new CPDFToRTFParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFToCSVParameter fileParameter = new CPDFToCSVParameter(); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToExcel.java b/samples/src/main/java/com/compdfkit/PDFToExcel.java index 80b5474..0a269b3 100644 --- a/samples/src/main/java/com/compdfkit/PDFToExcel.java +++ b/samples/src/main/java/com/compdfkit/PDFToExcel.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFToExcelParameter; import com.compdfkit.param.CPDFToWordParameter; @@ -39,18 +40,18 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToExcel() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_EXCEL); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_EXCEL, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; CPDFToExcelParameter fileParameter = new CPDFToExcelParameter(); - fileParameter.setIsContainImg(CPDFToWordParameter.IS_CONTAIN_IMG); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + fileParameter.setIsContainImg(CPDFToExcelParameter.IS_CONTAIN_IMG); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToHtml.java b/samples/src/main/java/com/compdfkit/PDFToHtml.java index 0cee19b..5faa2a6 100644 --- a/samples/src/main/java/com/compdfkit/PDFToHtml.java +++ b/samples/src/main/java/com/compdfkit/PDFToHtml.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFToHtmlParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToHtml() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_HTML); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_HTML, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; CPDFToHtmlParameter fileParameter = new CPDFToHtmlParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToJpg.java b/samples/src/main/java/com/compdfkit/PDFToJpg.java index 8dad72b..7a23747 100644 --- a/samples/src/main/java/com/compdfkit/PDFToJpg.java +++ b/samples/src/main/java/com/compdfkit/PDFToJpg.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFToJpgParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToJpg() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_JPG); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_JPG, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; CPDFToJpgParameter fileParameter = new CPDFToJpgParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToPng.java b/samples/src/main/java/com/compdfkit/PDFToPng.java index e7418e9..b95212a 100644 --- a/samples/src/main/java/com/compdfkit/PDFToPng.java +++ b/samples/src/main/java/com/compdfkit/PDFToPng.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFToPngParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToPng() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_PNG); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_PNG, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; CPDFToPngParameter fileParameter = new CPDFToPngParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToPptx.java b/samples/src/main/java/com/compdfkit/PDFToPptx.java index b49179c..101dd0b 100644 --- a/samples/src/main/java/com/compdfkit/PDFToPptx.java +++ b/samples/src/main/java/com/compdfkit/PDFToPptx.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFToPPTParameter; import com.compdfkit.param.CPDFToWordParameter; @@ -39,18 +40,18 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToPptx() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_PPT); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_PPT, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; CPDFToPPTParameter fileParameter = new CPDFToPPTParameter(); - fileParameter.setIsContainImg(CPDFToWordParameter.IS_CONTAIN_IMG); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + fileParameter.setIsContainImg(CPDFToPPTParameter.IS_CONTAIN_IMG); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToRtf.java b/samples/src/main/java/com/compdfkit/PDFToRtf.java index 2cbf585..17807c9 100644 --- a/samples/src/main/java/com/compdfkit/PDFToRtf.java +++ b/samples/src/main/java/com/compdfkit/PDFToRtf.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFToRTFParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToRtf() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_RTF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_RTF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; CPDFToRTFParameter fileParameter = new CPDFToRTFParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToTxt.java b/samples/src/main/java/com/compdfkit/PDFToTxt.java index 2f40b7a..47b15a2 100644 --- a/samples/src/main/java/com/compdfkit/PDFToTxt.java +++ b/samples/src/main/java/com/compdfkit/PDFToTxt.java @@ -10,8 +10,9 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; -import com.compdfkit.param.CPDFToJpgParameter; +import com.compdfkit.param.CPDFToTxtParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; import com.compdfkit.pojo.comPdfKit.CPDFFileInfo; import com.compdfkit.pojo.comPdfKit.CPDFTaskInfoResult; @@ -20,11 +21,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; public class PDFToTxt { @@ -38,17 +34,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToTxt() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_TXT); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_TXT, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pdf"); String filePassword = ""; - CPDFToJpgParameter fileParameter = new CPDFToJpgParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFToTxtParameter fileParameter = new CPDFToTxtParameter(); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PDFToWord.java b/samples/src/main/java/com/compdfkit/PDFToWord.java index 3b628b2..de6650c 100644 --- a/samples/src/main/java/com/compdfkit/PDFToWord.java +++ b/samples/src/main/java/com/compdfkit/PDFToWord.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFToWordParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,7 +39,7 @@ public static void main(String[] args) throws FileNotFoundException { public static void pdfToWord() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_WORD); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PDF_TO_WORD, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File @@ -46,10 +47,10 @@ public static void pdfToWord() throws FileNotFoundException { String filePassword = ""; CPDFToWordParameter fileParameter = new CPDFToWordParameter(); fileParameter.setIsContainImg(CPDFToWordParameter.IS_CONTAIN_IMG); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PngToPDF.java b/samples/src/main/java/com/compdfkit/PngToPDF.java index 3a38d83..a8ee831 100644 --- a/samples/src/main/java/com/compdfkit/PngToPDF.java +++ b/samples/src/main/java/com/compdfkit/PngToPDF.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPngToPDFParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void pngToPDF() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PNG_TO_PDF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PNG_TO_PDF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.png"); String filePassword = ""; CPngToPDFParameter fileParameter = new CPngToPDFParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/PptToPDF.java b/samples/src/main/java/com/compdfkit/PptToPDF.java index c685005..d980f11 100644 --- a/samples/src/main/java/com/compdfkit/PptToPDF.java +++ b/samples/src/main/java/com/compdfkit/PptToPDF.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFToPngParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void pptToPDF() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PPTX_TO_PDF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.PPTX_TO_PDF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.pptx"); String filePassword = ""; CPDFToPngParameter fileParameter = new CPDFToPngParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/RtfToPDF.java b/samples/src/main/java/com/compdfkit/RtfToPDF.java index 1520947..e6297d0 100644 --- a/samples/src/main/java/com/compdfkit/RtfToPDF.java +++ b/samples/src/main/java/com/compdfkit/RtfToPDF.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CPDFFormRecognizerParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void rtfToPDF() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.RTF_TO_PDF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.RTF_TO_PDF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.rtf"); String filePassword = ""; CPDFFormRecognizerParameter fileParameter = new CPDFFormRecognizerParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/StampInspection.java b/samples/src/main/java/com/compdfkit/StampInspection.java index 557b713..d252566 100644 --- a/samples/src/main/java/com/compdfkit/StampInspection.java +++ b/samples/src/main/java/com/compdfkit/StampInspection.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentAIEnum; import com.compdfkit.param.CPDFStampInspectionParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void stampInspection() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.DETECTIONSTAMP); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.DETECTIONSTAMP, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.jpg"); String filePassword = ""; CPDFStampInspectionParameter fileParameter = new CPDFStampInspectionParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/TrimCorrection.java b/samples/src/main/java/com/compdfkit/TrimCorrection.java index 0cbc710..a30a233 100644 --- a/samples/src/main/java/com/compdfkit/TrimCorrection.java +++ b/samples/src/main/java/com/compdfkit/TrimCorrection.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentAIEnum; import com.compdfkit.param.CPDFTrimCorrectionParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void trimCorrection() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.DEWARP); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFDocumentAIEnum.DEWARP, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.jpg"); String filePassword = ""; CPDFTrimCorrectionParameter fileParameter = new CPDFTrimCorrectionParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/TxtToPDF.java b/samples/src/main/java/com/compdfkit/TxtToPDF.java index 8ca1c0a..8e882cc 100644 --- a/samples/src/main/java/com/compdfkit/TxtToPDF.java +++ b/samples/src/main/java/com/compdfkit/TxtToPDF.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CTxtToPDFParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void txtToPDF() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.TXT_TO_PDF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.TXT_TO_PDF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.txt"); String filePassword = ""; CTxtToPDFParameter fileParameter = new CTxtToPDFParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/samples/src/main/java/com/compdfkit/WordToPDF.java b/samples/src/main/java/com/compdfkit/WordToPDF.java index e1697d4..e0bcd6c 100644 --- a/samples/src/main/java/com/compdfkit/WordToPDF.java +++ b/samples/src/main/java/com/compdfkit/WordToPDF.java @@ -10,6 +10,7 @@ import com.compdfkit.client.CPDFClient; import com.compdfkit.constant.CPDFConstant; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.param.CWordToPDFParameter; import com.compdfkit.pojo.comPdfKit.CPDFCreateTaskResult; @@ -38,17 +39,17 @@ public static void main(String[] args) throws FileNotFoundException { public static void wordToPDF() throws FileNotFoundException { // create Task - CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.DOCX_TO_PDF); + CPDFCreateTaskResult createTaskResult = client.createTask(CPDFConversionEnum.DOCX_TO_PDF, CPDFLanguageConstant.English); // taskId String taskId = createTaskResult.getTaskId(); // upload File File file = new File("sample/test.docx"); String filePassword = ""; CWordToPDFParameter fileParameter = new CWordToPDFParameter(); - CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName()); + CPDFUploadFileResult uploadFileResult = client.uploadFile(new FileInputStream(file),taskId,filePassword,fileParameter,file.getName(), CPDFLanguageConstant.English); String fileKey = uploadFileResult.getFileKey(); // perform tasks - client.executeTask(taskId); + client.executeTask(taskId, CPDFLanguageConstant.English); // get task processing information CPDFTaskInfoResult taskInfo = client.getTaskInfo(taskId); // determine whether the task status is "TaskFinish" diff --git a/src/main/java/com/compdfkit/client/CPDFClient.java b/src/main/java/com/compdfkit/client/CPDFClient.java index 8944910..44c6ae6 100644 --- a/src/main/java/com/compdfkit/client/CPDFClient.java +++ b/src/main/java/com/compdfkit/client/CPDFClient.java @@ -8,6 +8,7 @@ package com.compdfkit.client; +import com.compdfkit.constant.CPDFLanguageConstant; import com.compdfkit.enums.CPDFDocumentAIEnum; import com.compdfkit.enums.CPDFConversionEnum; import com.compdfkit.enums.CPDFDocumentEditorEnum; @@ -47,7 +48,6 @@ public CPDFClient(String publicKey, String secretKey) { RestTemplate restTemplate = restTemplateBuilder .build(); httpClient = new CPDFHttpClient(restTemplate, publicKey, secretKey); - httpClient.refreshAccessToken(); } /** @@ -96,7 +96,18 @@ public List getTools() { * @return CPDFFileInfo */ public CPDFFileInfo getFileInfo(String fileKey) { - return httpClient.getFileInfo(fileKey); + return httpClient.getFileInfo(fileKey, null); + } + + /** + * get file info + * + * @param fileKey fileKey + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFFileInfo + */ + public CPDFFileInfo getFileInfo(String fileKey, Integer language) { + return httpClient.getFileInfo(fileKey, language); } /** @@ -127,7 +138,18 @@ public CPDFTaskRecordsResult getTaskList(String page, String size) { * @return CPDFCreateTaskResult */ public CPDFCreateTaskResult createTask(String executeTypeUrl) { - return httpClient.createTask(executeTypeUrl); + return httpClient.createTask(executeTypeUrl, null); + } + + /** + * createTask + * + * @param executeTypeUrl task execution type + * @param language Interface error information language (1, English, 2, Chinese) {@link CPDFLanguageConstant} + * @return CPDFCreateTaskResult + */ + public CPDFCreateTaskResult createTask(String executeTypeUrl, Integer language) { + return httpClient.createTask(executeTypeUrl, language); } /** @@ -140,6 +162,17 @@ public CPDFCreateTaskResult createTask(CPDFConversionEnum conversionEnum) { return this.createTask(conversionEnum.getValue()); } + /** + * createTask + * + * @param conversionEnum task execution type + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFCreateTaskResult + */ + public CPDFCreateTaskResult createTask(CPDFConversionEnum conversionEnum, Integer language) { + return this.createTask(conversionEnum.getValue(), language); + } + /** * createTask * @@ -150,6 +183,17 @@ public CPDFCreateTaskResult createTask(CPDFDocumentEditorEnum documentEditorEnum return this.createTask(documentEditorEnum.getValue()); } + /** + * createTask + * + * @param documentEditorEnum task execution type + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFCreateTaskResult + */ + public CPDFCreateTaskResult createTask(CPDFDocumentEditorEnum documentEditorEnum, Integer language) { + return this.createTask(documentEditorEnum.getValue(), language); + } + /** * createTask * @@ -160,6 +204,17 @@ public CPDFCreateTaskResult createTask(CPDFDocumentAIEnum documentAIEnum) { return this.createTask(documentAIEnum.getValue()); } + /** + * createTask + * + * @param documentAIEnum task execution type + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFCreateTaskResult + */ + public CPDFCreateTaskResult createTask(CPDFDocumentAIEnum documentAIEnum, Integer language) { + return this.createTask(documentAIEnum.getValue(), language); + } + /** * uploadFile * @@ -172,6 +227,19 @@ public CPDFUploadFileResult uploadFile(File file, String taskId, String password return getUploadFileResult(file, taskId, password, null); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + public CPDFUploadFileResult uploadFile(File file, String taskId, String password, Integer language) { + return getUploadFileResult(file, taskId, password, null, language); + } + /** * uploadFile * @@ -185,6 +253,20 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String p return getUploadFileResult(file, taskId, password, null, fileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String password, String fileName, Integer language) { + return getUploadFileResult(file, taskId, password, null, fileName, language); + } + /** * uploadFile * @@ -199,6 +281,21 @@ public CPDFUploadFileResult uploadFile(URL file, String taskId, String password, return getUploadFileResult(file.openConnection().getInputStream(), taskId, password, null, fileName); } + /** + * uploadFile + * + * @param file fileUrl + * @param taskId taskId + * @param password password + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException url openConnection error + */ + public CPDFUploadFileResult uploadFile(URL file, String taskId, String password, String fileName, Integer language) throws IOException { + return getUploadFileResult(file.openConnection().getInputStream(), taskId, password, null, fileName, language); + } + /** * uploadFile * @@ -212,6 +309,20 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, String return getUploadFileResult(file.getInputStream(), taskId, password, null, file.getOriginalFilename()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, String password, Integer language) throws IOException { + return getUploadFileResult(file.getInputStream(), taskId, password, null, file.getOriginalFilename(), language); + } + /** * uploadFile * @@ -223,6 +334,18 @@ public CPDFUploadFileResult uploadFile(File file, String taskId) { return getUploadFileResult(file, taskId, null, null); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + public CPDFUploadFileResult uploadFile(File file, String taskId, Integer language) { + return getUploadFileResult(file, taskId, null, null, language); + } + /** * uploadFile * @@ -235,6 +358,19 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String f return getUploadFileResult(file, taskId, null, null, fileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String fileName, Integer language) { + return getUploadFileResult(file, taskId, null, null, fileName, language); + } + /** * uploadFile * @@ -248,6 +384,20 @@ public CPDFUploadFileResult uploadFile(URL file, String taskId, String fileName) return getUploadFileResult(file.openConnection().getInputStream(), taskId, null, null, fileName); } + /** + * uploadFile + * + * @param file fileUrl + * @param taskId taskId + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException url openConnection error + */ + public CPDFUploadFileResult uploadFile(URL file, String taskId, String fileName, Integer language) throws IOException { + return getUploadFileResult(file.openConnection().getInputStream(), taskId, null, null, fileName, language); + } + /** * uploadFile * @@ -260,6 +410,19 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId) throws return getUploadFileResult(file.getInputStream(), taskId, null, null, file.getOriginalFilename()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, Integer language) throws IOException { + return getUploadFileResult(file.getInputStream(), taskId, null, null, file.getOriginalFilename(), language); + } + /** * uploadFile * @@ -273,6 +436,20 @@ public CPDFUploadFileResult uploadFile(File file, String taskId, String password return getUploadFileResult(file, taskId, password, fileParameter); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + public CPDFUploadFileResult uploadFile(File file, String taskId, String password, CPDFFileParameter fileParameter, Integer language) { + return getUploadFileResult(file, taskId, password, fileParameter, language); + } + /** * uploadFile * @@ -288,6 +465,22 @@ public CPDFUploadFileResult uploadFile(File file, String taskId, String password return getUploadFileResult(file, taskId, password, fileParameter, new FileInputStream(imageFile), imageFile.getName()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws FileNotFoundException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(File file, String taskId, String password, CPDFFileParameter fileParameter, File imageFile, Integer language) throws FileNotFoundException { + return getUploadFileResult(file, taskId, password, fileParameter, new FileInputStream(imageFile), imageFile.getName(), language); + } + /** * uploadFile * @@ -304,6 +497,23 @@ public CPDFUploadFileResult uploadFile(File file, String taskId, String password return getUploadFileResult(file, taskId, password, fileParameter, imageFile.openConnection().getInputStream(), imageFileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(File file, String taskId, String password, CPDFFileParameter fileParameter, URL imageFile, String imageFileName, Integer language) throws IOException { + return getUploadFileResult(file, taskId, password, fileParameter, imageFile.openConnection().getInputStream(), imageFileName, language); + } + /** * uploadFile * @@ -318,6 +528,21 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String p return getUploadFileResult(file, taskId, password, fileParameter, fileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, Integer language) { + return getUploadFileResult(file, taskId, password, fileParameter, fileName, language); + } + /** * uploadFile * @@ -334,6 +559,23 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String p return getUploadFileResult(file, taskId, password, fileParameter, fileName, new FileInputStream(imageFile), imageFile.getName()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param fileName fileName + * @param imageFile imageFile + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws FileNotFoundException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, File imageFile, Integer language) throws FileNotFoundException { + return getUploadFileResult(file, taskId, password, fileParameter, fileName, new FileInputStream(imageFile), imageFile.getName(), language); + } + /** * uploadFile * @@ -351,6 +593,24 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String p return getUploadFileResult(file, taskId, password, fileParameter, fileName, imageFile.openConnection().getInputStream(), imageFileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param fileName fileName + * @param imageFile imageFile + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, URL imageFile, String imageFileName, Integer language) throws IOException { + return getUploadFileResult(file, taskId, password, fileParameter, fileName, imageFile.openConnection().getInputStream(), imageFileName, language); + } + /** * uploadFile @@ -367,6 +627,22 @@ public CPDFUploadFileResult uploadFile(URL file, String taskId, String password, return getUploadFileResult(file.openConnection().getInputStream(), taskId, password, fileParameter, fileName); } + /** + * uploadFile + * + * @param file fileUrl + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException url openConnection error + */ + public CPDFUploadFileResult uploadFile(URL file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, Integer language) throws IOException { + return getUploadFileResult(file.openConnection().getInputStream(), taskId, password, fileParameter, fileName, language); + } + /** * uploadFile * @@ -383,6 +659,23 @@ public CPDFUploadFileResult uploadFile(URL file, String taskId, String password, return getUploadFileResult(file.openConnection().getInputStream(), taskId, password, fileParameter, fileName, new FileInputStream(imageFile), imageFile.getName()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param fileName fileName + * @param imageFile imageFile + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(URL file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, File imageFile, Integer language) throws IOException { + return getUploadFileResult(file.openConnection().getInputStream(), taskId, password, fileParameter, fileName, new FileInputStream(imageFile), imageFile.getName(), language); + } + /** * uploadFile * @@ -400,6 +693,24 @@ public CPDFUploadFileResult uploadFile(URL file, String taskId, String password, return getUploadFileResult(file.openConnection().getInputStream(), taskId, password, fileParameter, fileName, imageFile.openConnection().getInputStream(), imageFileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param fileName fileName + * @param imageFile imageFile + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(URL file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, URL imageFile, String imageFileName, Integer language) throws IOException { + return getUploadFileResult(file.openConnection().getInputStream(), taskId, password, fileParameter, fileName, imageFile.openConnection().getInputStream(), imageFileName, language); + } + /** * uploadFile * @@ -414,6 +725,21 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, String return getUploadFileResult(file.getInputStream(), taskId, password, fileParameter, file.getOriginalFilename()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, String password, CPDFFileParameter fileParameter, Integer language) throws IOException { + return getUploadFileResult(file.getInputStream(), taskId, password, fileParameter, file.getOriginalFilename(), language); + } + /** * uploadFile * @@ -429,6 +755,22 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, String return getUploadFileResult(file.getInputStream(), taskId, password, fileParameter, file.getOriginalFilename(), new FileInputStream(imageFile), imageFile.getName()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, String password, CPDFFileParameter fileParameter, File imageFile, Integer language) throws IOException { + return getUploadFileResult(file.getInputStream(), taskId, password, fileParameter, file.getOriginalFilename(), new FileInputStream(imageFile), imageFile.getName(), language); + } + /** * uploadFile * @@ -445,6 +787,23 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, String return getUploadFileResult(file.getInputStream(), taskId, password, fileParameter, file.getOriginalFilename(), imageFile.openConnection().getInputStream(), imageFileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, String password, CPDFFileParameter fileParameter, URL imageFile, String imageFileName, Integer language) throws IOException { + return getUploadFileResult(file.getInputStream(), taskId, password, fileParameter, file.getOriginalFilename(), imageFile.openConnection().getInputStream(), imageFileName, language); + } + /** * uploadFile * @@ -457,6 +816,19 @@ public CPDFUploadFileResult uploadFile(File file, String taskId, CPDFFileParamet return getUploadFileResult(file, taskId, null, fileParameter); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + public CPDFUploadFileResult uploadFile(File file, String taskId, CPDFFileParameter fileParameter, Integer language) { + return getUploadFileResult(file, taskId, null, fileParameter, language); + } + /** * uploadFile * @@ -471,6 +843,21 @@ public CPDFUploadFileResult uploadFile(File file, String taskId, CPDFFileParamet return getUploadFileResult(file, taskId, null, fileParameter, new FileInputStream(imageFile), imageFile.getName()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(File file, String taskId, CPDFFileParameter fileParameter, File imageFile, Integer language) throws IOException { + return getUploadFileResult(file, taskId, null, fileParameter, new FileInputStream(imageFile), imageFile.getName(), language); + } + /** * uploadFile * @@ -486,6 +873,22 @@ public CPDFUploadFileResult uploadFile(File file, String taskId, CPDFFileParamet return getUploadFileResult(file, taskId, null, fileParameter, imageFile.openConnection().getInputStream(), imageFileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(File file, String taskId, CPDFFileParameter fileParameter, URL imageFile, String imageFileName, Integer language) throws IOException { + return getUploadFileResult(file, taskId, null, fileParameter, imageFile.openConnection().getInputStream(), imageFileName, language); + } + /** * uploadFile * @@ -499,6 +902,20 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, CPDFFile return getUploadFileResult(file, taskId, null, fileParameter, fileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + public CPDFUploadFileResult uploadFile(InputStream file, String taskId, CPDFFileParameter fileParameter, String fileName, Integer language) { + return getUploadFileResult(file, taskId, null, fileParameter, fileName, language); + } + /** * uploadFile * @@ -514,6 +931,22 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, CPDFFile return getUploadFileResult(file, taskId, null, fileParameter, fileName, new FileInputStream(imageFile), imageFile.getName()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param fileName fileName + * @param imageFile imageFile + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(InputStream file, String taskId, CPDFFileParameter fileParameter, String fileName, File imageFile, Integer language) throws IOException { + return getUploadFileResult(file, taskId, null, fileParameter, fileName, new FileInputStream(imageFile), imageFile.getName(), language); + } + /** * uploadFile * @@ -530,6 +963,23 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, CPDFFile return getUploadFileResult(file, taskId, null, fileParameter, fileName, imageFile.openConnection().getInputStream(), imageFileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param fileName fileName + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(InputStream file, String taskId, CPDFFileParameter fileParameter, String fileName, URL imageFile, String imageFileName, Integer language) throws IOException { + return getUploadFileResult(file, taskId, null, fileParameter, fileName, imageFile.openConnection().getInputStream(), imageFileName, language); + } + /** * uploadFile * @@ -544,6 +994,21 @@ public CPDFUploadFileResult uploadFile(URL file, String taskId, CPDFFileParamete return getUploadFileResult(file.openConnection().getInputStream(), taskId, null, fileParameter, fileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException url openConnection error + */ + public CPDFUploadFileResult uploadFile(URL file, String taskId, CPDFFileParameter fileParameter, String fileName, Integer language) throws IOException { + return getUploadFileResult(file.openConnection().getInputStream(), taskId, null, fileParameter, fileName, language); + } + /** * uploadFile * @@ -559,6 +1024,22 @@ public CPDFUploadFileResult uploadFile(URL file, String taskId, CPDFFileParamete return getUploadFileResult(file.openConnection().getInputStream(), taskId, null, fileParameter, fileName, new FileInputStream(imageFile), imageFile.getName()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param fileName fileName + * @param imageFile imageFile + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(URL file, String taskId, CPDFFileParameter fileParameter, String fileName, File imageFile, Integer language) throws IOException { + return getUploadFileResult(file.openConnection().getInputStream(), taskId, null, fileParameter, fileName, new FileInputStream(imageFile), imageFile.getName(), language); + } + /** * uploadFile * @@ -575,6 +1056,23 @@ public CPDFUploadFileResult uploadFile(URL file, String taskId, CPDFFileParamete return getUploadFileResult(file.openConnection().getInputStream(), taskId, null, fileParameter, fileName, imageFile.openConnection().getInputStream(), imageFileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param fileName fileName + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(URL file, String taskId, CPDFFileParameter fileParameter, String fileName, URL imageFile, String imageFileName, Integer language) throws IOException { + return getUploadFileResult(file.openConnection().getInputStream(), taskId, null, fileParameter, fileName, imageFile.openConnection().getInputStream(), imageFileName, language); + } + /** * uploadFile * @@ -588,6 +1086,20 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, CPDFFi return getUploadFileResult(file.getInputStream(), taskId, null, fileParameter, file.getOriginalFilename()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, CPDFFileParameter fileParameter, Integer language) throws IOException { + return getUploadFileResult(file.getInputStream(), taskId, null, fileParameter, file.getOriginalFilename(), language); + } + /** * uploadFile * @@ -602,6 +1114,21 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, CPDFFi return getUploadFileResult(file.getInputStream(), taskId, null, fileParameter, file.getOriginalFilename(), new FileInputStream(imageFile), imageFile.getName()); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, CPDFFileParameter fileParameter, File imageFile, Integer language) throws IOException { + return getUploadFileResult(file.getInputStream(), taskId, null, fileParameter, file.getOriginalFilename(), new FileInputStream(imageFile), imageFile.getName(), language); + } + /** * uploadFile * @@ -617,6 +1144,22 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, CPDFFi return getUploadFileResult(file.getInputStream(), taskId, null, fileParameter, file.getOriginalFilename(), imageFile.openConnection().getInputStream(), imageFileName); } + /** + * uploadFile + * + * @param file file + * @param taskId taskId + * @param fileParameter fileParameter + * @param imageFile imageFile + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws IOException file getInputStream error + */ + public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, CPDFFileParameter fileParameter, URL imageFile, String imageFileName, Integer language) throws IOException { + return getUploadFileResult(file.getInputStream(), taskId, null, fileParameter, file.getOriginalFilename(), imageFile.openConnection().getInputStream(), imageFileName, language); + } + /** * getUploadFileResult * @@ -627,7 +1170,21 @@ public CPDFUploadFileResult uploadFile(MultipartFile file, String taskId, CPDFFi * @return CPDFUploadFileResult */ private CPDFUploadFileResult getUploadFileResult(File file, String taskId, String password, CPDFFileParameter fileParameter) { - return httpClient.getUploadFileResult(file, taskId, password, fileParameter); + return httpClient.getUploadFileResult(file, taskId, password, fileParameter, null); + } + + /** + * getUploadFileResult + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + private CPDFUploadFileResult getUploadFileResult(File file, String taskId, String password, CPDFFileParameter fileParameter, Integer language) { + return httpClient.getUploadFileResult(file, taskId, password, fileParameter, language); } /** @@ -643,7 +1200,24 @@ private CPDFUploadFileResult getUploadFileResult(File file, String taskId, Strin * @throws FileNotFoundException file getInputStream error */ private CPDFUploadFileResult getUploadFileResult(File file, String taskId, String password, CPDFFileParameter fileParameter, InputStream imageInputStream, String imageFileName) throws FileNotFoundException { - return httpClient.getUploadFileResult(new FileInputStream(file), taskId, password, fileParameter, file.getName(), imageInputStream, imageFileName); + return httpClient.getUploadFileResult(new FileInputStream(file), taskId, password, fileParameter, file.getName(), imageInputStream, imageFileName, null); + } + + /** + * getUploadFileResult + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param imageInputStream imageInputStream + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + * @throws FileNotFoundException file getInputStream error + */ + private CPDFUploadFileResult getUploadFileResult(File file, String taskId, String password, CPDFFileParameter fileParameter, InputStream imageInputStream, String imageFileName, Integer language) throws FileNotFoundException { + return httpClient.getUploadFileResult(new FileInputStream(file), taskId, password, fileParameter, file.getName(), imageInputStream, imageFileName, language); } /** @@ -657,7 +1231,22 @@ private CPDFUploadFileResult getUploadFileResult(File file, String taskId, Strin * @return CPDFUploadFileResult */ private CPDFUploadFileResult getUploadFileResult(InputStream file, String taskId, String password, CPDFFileParameter fileParameter, String fileName) { - return httpClient.getUploadFileResult(file, taskId, password, fileParameter, fileName, null, null); + return httpClient.getUploadFileResult(file, taskId, password, fileParameter, fileName, null, null, null); + } + + /** + * getUploadFileResult + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param fileName fileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + private CPDFUploadFileResult getUploadFileResult(InputStream file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, Integer language) { + return httpClient.getUploadFileResult(file, taskId, password, fileParameter, fileName, null, null, language); } /** @@ -673,7 +1262,24 @@ private CPDFUploadFileResult getUploadFileResult(InputStream file, String taskId * @return CPDFUploadFileResult */ private CPDFUploadFileResult getUploadFileResult(InputStream file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, InputStream imageInputStream, String imageFileName) { - return httpClient.getUploadFileResult(file, taskId, password, fileParameter, fileName, imageInputStream, imageFileName); + return httpClient.getUploadFileResult(file, taskId, password, fileParameter, fileName, imageInputStream, imageFileName, null); + } + + /** + * getUploadFileResult + * + * @param file file + * @param taskId taskId + * @param password password + * @param fileParameter fileParameter + * @param fileName fileName + * @param imageInputStream imageInputStream + * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFUploadFileResult + */ + private CPDFUploadFileResult getUploadFileResult(InputStream file, String taskId, String password, CPDFFileParameter fileParameter, String fileName, InputStream imageInputStream, String imageFileName, Integer language) { + return httpClient.getUploadFileResult(file, taskId, password, fileParameter, fileName, imageInputStream, imageFileName, language); } /** @@ -683,7 +1289,18 @@ private CPDFUploadFileResult getUploadFileResult(InputStream file, String taskId * @return CPDFCreateTaskResult */ public CPDFCreateTaskResult executeTask(String taskId) { - return httpClient.executeTask(taskId); + return httpClient.executeTask(taskId, null); + } + + /** + * executeTask + * + * @param taskId taskId + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFCreateTaskResult + */ + public CPDFCreateTaskResult executeTask(String taskId, Integer language) { + return httpClient.executeTask(taskId, language); } /** @@ -693,7 +1310,18 @@ public CPDFCreateTaskResult executeTask(String taskId) { * @return CPDFTaskInfoResult */ public CPDFTaskInfoResult getTaskInfo(String taskId) { - return httpClient.getTaskInfo(taskId); + return httpClient.getTaskInfo(taskId, null); + } + + /** + * get task file info + * + * @param taskId taskId + * @param language 1:English, 2:Chinese {@link CPDFLanguageConstant} + * @return CPDFTaskInfoResult + */ + public CPDFTaskInfoResult getTaskInfo(String taskId, Integer language) { + return httpClient.getTaskInfo(taskId, language); } diff --git a/src/main/java/com/compdfkit/client/CPDFHttpClient.java b/src/main/java/com/compdfkit/client/CPDFHttpClient.java index 3494f26..ba9925d 100644 --- a/src/main/java/com/compdfkit/client/CPDFHttpClient.java +++ b/src/main/java/com/compdfkit/client/CPDFHttpClient.java @@ -164,11 +164,12 @@ List getTools() { /** * getFileInfo * - * @param fileKey fileKey + * @param fileKey fileKey + * @param language 1:English, 2:Chinese * @return CFileInfo */ - CPDFFileInfo getFileInfo(String fileKey) { - String url = address.concat(CPDFConstant.API_V1_FILE_INFO).concat("?fileKey=").concat(fileKey); + CPDFFileInfo getFileInfo(String fileKey, Integer language) { + String url = address.concat(CPDFConstant.API_V1_FILE_INFO).concat("?fileKey=").concat(fileKey).concat("&language=").concat(String.valueOf(language)); ResponseEntity> response; ParameterizedTypeReference> typeRef = new ParameterizedTypeReference>() { }; @@ -255,10 +256,12 @@ CPDFTaskRecordsResult getTaskList(String page, String size) { * createTask * * @param executeTypeUrl executeTypeUrl + * @param language 1:English, 2:Chinese * @return CCreateTaskResult */ - CPDFCreateTaskResult createTask(String executeTypeUrl) { - String url = address.concat(CPDFConstant.API_V1_CREATE_TASK).replace("{executeTypeUrl}", executeTypeUrl); + CPDFCreateTaskResult createTask(String executeTypeUrl, Integer language) { + String url = address.concat(CPDFConstant.API_V1_CREATE_TASK).replace("{executeTypeUrl}", executeTypeUrl) + .concat("?language=").concat(String.valueOf(language)); ResponseEntity> response; ParameterizedTypeReference> typeRef = new ParameterizedTypeReference>() { }; @@ -286,11 +289,12 @@ CPDFCreateTaskResult createTask(String executeTypeUrl) { * @param taskId taskId * @param password password * @param fileParameter fileParameter + * @param language 1:English, 2:Chinese * @return CUploadFileResult */ - CPDFUploadFileResult getUploadFileResult(File file, String taskId, String password, CPDFFileParameter fileParameter) { + CPDFUploadFileResult getUploadFileResult(File file, String taskId, String password, CPDFFileParameter fileParameter, Integer language) { try { - return this.getUploadFileResult(new FileInputStream(file), taskId, password, fileParameter, file.getName(),null,null); + return this.getUploadFileResult(new FileInputStream(file), taskId, password, fileParameter, file.getName(), null, null, language); } catch (FileNotFoundException e) { throw new CPDFException(e.getMessage(), e); } @@ -306,9 +310,10 @@ CPDFUploadFileResult getUploadFileResult(File file, String taskId, String passwo * @param fileName fileName * @param imageInputStream imageFile * @param imageFileName imageFileName + * @param language 1:English, 2:Chinese * @return return CUploadFileResult */ - CPDFUploadFileResult getUploadFileResult(InputStream fileInputStream, String taskId, String password, CPDFFileParameter fileParameter, String fileName, InputStream imageInputStream, String imageFileName) { + CPDFUploadFileResult getUploadFileResult(InputStream fileInputStream, String taskId, String password, CPDFFileParameter fileParameter, String fileName, InputStream imageInputStream, String imageFileName, Integer language) { log.info("Start uploading files, task Id: {}, password: {}", taskId, password); String url = address.concat(CPDFConstant.API_V1_UPLOAD_FILE); MultiValueMap param = new LinkedMultiValueMap<>(); @@ -325,6 +330,7 @@ public String getFilename() { }; param.add("file", inputStreamResource); param.add("taskId", taskId); + param.add("language", language); if (!StringUtils.isEmpty(password)) { param.add("password", password); } @@ -337,6 +343,7 @@ public String getFilename() { public long contentLength() throws IOException { return imageInputStream.available(); } + @Override public String getFilename() { return imageFileName; @@ -375,12 +382,13 @@ public String getFilename() { /** * executeTask * - * @param taskId taskId + * @param taskId taskId + * @param language 1:English, 2:Chinese * @return CCreateTaskResult */ - CPDFCreateTaskResult executeTask(String taskId) { + CPDFCreateTaskResult executeTask(String taskId, Integer language) { log.info("Start executing task transfer, taskId: {}", taskId); - String url = address.concat(CPDFConstant.API_V1_EXECUTE_TASK).concat("?taskId=").concat(taskId); + String url = address.concat(CPDFConstant.API_V1_EXECUTE_TASK).concat("?taskId=").concat(taskId).concat("&language=").concat(String.valueOf(language)); ResponseEntity> response; ParameterizedTypeReference> result = new ParameterizedTypeReference>() { }; @@ -404,12 +412,13 @@ CPDFCreateTaskResult executeTask(String taskId) { /** * getTaskInfo * - * @param taskId taskId + * @param taskId taskId + * @param language 1:English, 2:Chinese * @return CTaskInfoResult */ - CPDFTaskInfoResult getTaskInfo(String taskId) { + CPDFTaskInfoResult getTaskInfo(String taskId, Integer language) { log.info("Start to query the transfer status, taskId: {}", taskId); - String url = address.concat(CPDFConstant.API_V1_TASK_INFO).concat("?taskId=").concat(taskId); + String url = address.concat(CPDFConstant.API_V1_TASK_INFO).concat("?taskId=").concat(taskId).concat("&language=").concat(String.valueOf(language)); ResponseEntity> response; ParameterizedTypeReference> result = new ParameterizedTypeReference>() { }; diff --git a/src/main/java/com/compdfkit/constant/CPDFLanguageConstant.java b/src/main/java/com/compdfkit/constant/CPDFLanguageConstant.java new file mode 100644 index 0000000..bf6315f --- /dev/null +++ b/src/main/java/com/compdfkit/constant/CPDFLanguageConstant.java @@ -0,0 +1,17 @@ +// Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved. +// +// THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW +// AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE ComPDFKit LICENSE AGREEMENT. +// UNAUTHORIZED REPRODUCTION OR DISTRIBUTION IS SUBJECT TO CIVIL AND CRIMINAL PENALTIES. +// This notice may not be removed from this file. + +package com.compdfkit.constant; + +/** + * Language Constant + */ +public interface CPDFLanguageConstant { + + Integer English = 1; + Integer Chinese = 2; +} diff --git a/src/main/java/com/compdfkit/param/CPDFAddWatermarkParameter.java b/src/main/java/com/compdfkit/param/CPDFAddWatermarkParameter.java index bf8387c..9a776d0 100644 --- a/src/main/java/com/compdfkit/param/CPDFAddWatermarkParameter.java +++ b/src/main/java/com/compdfkit/param/CPDFAddWatermarkParameter.java @@ -77,7 +77,10 @@ public class CPDFAddWatermarkParameter extends CPDFFileParameter { private String textColor; /** - * Is it at the front + * Setting watermark layer
+ * "0" false: No need to pin it to the top
+ * "1" true: Pin it to the top
+ * null No need to pin it to the top */ private String front;