Improved encoding management for CDO text resources.

ObeoNetwork · Sep 4, 2023 · 8f07f39 · 8f07f39
1 parent e9aa971
commit 8f07f39
Showing 1 changed file with 23 additions and 2 deletions.
diff --git a/...k.m2doc.cdo/src/org/obeonetwork/m2doc/cdo/providers/configuration/M2DocCDOURIHandler.java b/...k.m2doc.cdo/src/org/obeonetwork/m2doc/cdo/providers/configuration/M2DocCDOURIHandler.java
@@ -80,7 +80,9 @@ public void close() throws IOException {
             if (node instanceof CDOBinaryResource) {
                 ((CDOBinaryResource) node).setContents(new CDOBlob(new ByteArrayInputStream(buffer.toByteArray())));
             } else if (node instanceof CDOTextResource) {
-                ((CDOTextResource) node).setContents(new CDOClob(new StringReader(buffer.toString("UTF-8"))));
+                final CDOTextResource textResource = (CDOTextResource) node;
+                final String encoding = getEncoding(textResource);
+                textResource.setContents(new CDOClob(new StringReader(buffer.toString(encoding))));
             } else {
                 throw new IllegalStateException("CDOResourceNode type not supported.");
             }
@@ -108,14 +110,33 @@ public InputStream createInputStream(URI uri, Map<?, ?> options) throws IOExcept
         if (node instanceof CDOBinaryResource) {
             res = ((CDOBinaryResource) node).getContents().getContents();
         } else if (node instanceof CDOTextResource) {
-            res = new ReaderInputStream(((CDOTextResource) node).getContents().getContents(), "UTF-8");
+            final CDOTextResource textResource = (CDOTextResource) node;
+            final String encoding = getEncoding(textResource);
+            res = new ReaderInputStream(textResource.getContents().getContents(), encoding);
         } else {
             res = super.createInputStream(uri, options);
         }
 
         return res;
     }
 
+    /**
+     * Gets the encoding of the given {@link CDOTextResource} and fallback to UTF-8.
+     * 
+     * @param textResource
+     *            the {@link CDOTextResource}
+     * @return the encoding of the given {@link CDOTextResource} and fallback to UTF-8
+     */
+    private static String getEncoding(final CDOTextResource textResource) {
+        final String encoding;
+        if (textResource.getEncoding() != null) {
+            encoding = textResource.getEncoding();
+        } else {
+            encoding = "UTF-8";
+        }
+        return encoding;
+    }
+
     @Override
     public OutputStream createOutputStream(URI uri, Map<?, ?> options) throws IOException {
         final OutputStream res;