opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-290 Document serialization fix

Browse Source
This commit is contained in:
Serge Rider
2020-10-02 13:07:50 +03:00
parent 8d4af4644d
commit bbf44f5d4a
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java
+22 -1
View File
@@ -26,6 +26,9 @@ import org.jkiss.dbeaver.model.struct.DBSAttributeBase;
import org.jkiss.dbeaver.model.struct.DBSTypedObject;
import org.jkiss.dbeaver.utils.ContentUtils;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -50,7 +53,7 @@ public class WebSQLUtils {
if (dataFormat != WebDataFormat.document) {
return serializeDocumentValue((DBDDocument) dbValue);
} else {
return new WebSQLDatabaseDocument(session, (DBDDocument) dbValue);
return serializeDocumentValue(session, (DBDDocument) dbValue);
}
} else if (dbValue instanceof DBDComplexValue) {
return serializeComplexValue(session, (DBDComplexValue)dbValue, dataFormat);
@@ -83,6 +86,24 @@ public class WebSQLUtils {
return value.toString();
}
private static Map<String, Object> serializeDocumentValue(WebSession session, DBDDocument document) throws DBCException {
String documentData;
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
document.serializeDocument(session.getProgressMonitor(), baos, StandardCharsets.UTF_8);
documentData = new String(baos.toByteArray(), StandardCharsets.UTF_8);
} catch (Exception e) {
throw new DBCException("Error serializing document", e);
}
Map<String, Object> map = new LinkedHashMap<>();
map.put("id", document.getDocumentId());
map.put("contentType", document.getDocumentContentType());
map.put("properties", Collections.emptyMap());
map.put("data", documentData);
return map;
}
private static Object serializeContentValue(WebSession session, DBDContent value) throws DBCException {
return ContentUtils.getContentStringValue(session.getProgressMonitor(), value);
}