pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-02-10 18:05:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

java: delete using javafx.util.Pair

Browse Source
This commit is contained in:
Sergey Linnik
2017-07-31 16:41:47 +03:00
parent f4ed512fd0
commit 7e2a12c836
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
View File

@ -36,7 +36,6 @@ import java.io.InputStream;
import java.io.PrintWriter;
import java.net.URL;
import java.util.Scanner;
import javafx.util.Pair;
import javax.servlet.ServletException;
import javax.servlet.annotation.MultipartConfig;
import javax.servlet.annotation.WebServlet;
@ -149,14 +148,11 @@ public class IndexServlet extends HttpServlet {
{
String key = ServiceConverter.GenerateRevisionId(fileUri);
Pair<Integer, String> res = ServiceConverter.GetConvertedUri(fileUri, fileExt, internalFileExt, key, true);
String newFileUri = ServiceConverter.GetConvertedUri(fileUri, fileExt, internalFileExt, key, true);
int result = res.getKey();
String newFileUri = res.getValue();
if (result != 100)
if (newFileUri == "")
{
writer.write("{ \"step\" : \"" + result + "\", \"filename\" : \"" + fileName + "\"}");
writer.write("{ \"step\" : \"0\", \"filename\" : \"" + fileName + "\"}");
return;
}

12
web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java
View File

@ -70,7 +70,7 @@ public class ServiceConverter
}
}
public static Pair<Integer, String> GetConvertedUri(String documentUri, String fromExtension, String toExtension, String documentRevisionId, Boolean isAsync) throws Exception
public static String GetConvertedUri(String documentUri, String fromExtension, String toExtension, String documentRevisionId, Boolean isAsync) throws Exception
{
String convertedDocumentUri = null;
@ -112,7 +112,7 @@ public class ServiceConverter
percent = percent >= 100 ? 99 : percent;
}
return new Pair<>(percent, convertedDocumentUri);
return percent >= 100 ? convertedDocumentUri : "";
}
public static String GetExternalUri(InputStream fileStream, long contentLength, String contentType, String documentRevisionId) throws IOException, Exception
@ -154,9 +154,9 @@ public class ServiceConverter
connection.disconnect();
Pair <Integer, String> res = GetResponseUri(xml);
String res = GetResponseUri(xml);
return res.getValue();
return res;
}
public static String GenerateRevisionId(String expectedKey)
@ -270,7 +270,7 @@ public class ServiceConverter
throw new Exception(errorMessage);
}
private static Pair<Integer, String> GetResponseUri(String xml) throws Exception
private static String GetResponseUri(String xml) throws Exception
{
Document document = ConvertStringToXmlDocument(xml);
@ -309,7 +309,7 @@ public class ServiceConverter
resultPercent = resultPercent >= 100 ? 99 : resultPercent;
}
return new Pair<>(resultPercent, responseUri);
return resultPercent >= 100 ? responseUri : "";
}
private static String ConvertStreamToString(InputStream stream) throws IOException