Replace outputstream with writeroutputstream

transfuse-core/pom.xml

@@ -35,8 +35,9 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <version>2.5</version>
             <scope>test</scope>
+
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

transfuse-core/src/main/java/org/androidtransfuse/gen/FilerResourceWriter.java

@@ -17,6 +17,8 @@
 
 import com.sun.codemodel.CodeWriter;
 import com.sun.codemodel.JPackage;
+import org.androidtransfuse.util.apache.commons.WriterOutputStream;
+
 
 import javax.annotation.processing.Filer;
 import javax.inject.Inject;
@@ -40,18 +42,16 @@ public FilerResourceWriter(Filer filer) {
     @Override
     public OutputStream openBinary(JPackage pkg, String fileName) throws IOException {
         FileObject resource = filer.createResource(StandardLocation.SOURCE_OUTPUT, pkg.name(), fileName);
-
-        OutputStream os = resource.openOutputStream();
+        WriterOutputStream os = new WriterOutputStream(resource.openWriter(),"UTF-8");
         openStreams.add(os);
-
         return os;
     }
 
 
     @Override
     public void close() throws IOException {
         for (OutputStream openStream : openStreams) {
-            openStream.flush();
+//            openStream.flush();
             openStream.close();
         }
     }

transfuse-core/src/main/java/org/androidtransfuse/gen/FilerSourceCodeWriter.java

@@ -18,6 +18,7 @@
 import com.sun.codemodel.CodeWriter;
 import com.sun.codemodel.JPackage;
 import org.androidtransfuse.adapter.PackageClass;
+import org.androidtransfuse.util.apache.commons.WriterOutputStream;
 
 import javax.annotation.processing.Filer;
 import javax.inject.Inject;
@@ -49,10 +50,8 @@ public OutputStream openBinary(JPackage jPackage, String fileName) throws IOExce
         //generate a source file based on package and fileName
         String qualified = toQualifiedClassName(jPackage, fileName);
         JavaFileObject sourceFile = filer.createSourceFile(qualified, originating.getOriginatingElements(qualified));
-
-        OutputStream os = sourceFile.openOutputStream();
+        OutputStream os = new WriterOutputStream(sourceFile.openWriter(), "UTF-8");
         openStreams.add(os);
-
         return os;
     }
 
@@ -63,7 +62,7 @@ private String toQualifiedClassName(JPackage pkg, String fileName) {
     @Override
     public void close() throws IOException {
         for (OutputStream openStream : openStreams) {
-            openStream.flush();
+//            openStream.flush();
             openStream.close();
         }
     }

transfuse-core/src/main/java/org/androidtransfuse/util/apache/commons/WriterOutputStream.java

@@ -0,0 +1,146 @@
+package org.androidtransfuse.util.apache.commons;
+
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.nio.charset.CodingErrorAction;
+
+
+public class WriterOutputStream extends OutputStream {
+    private static final int DEFAULT_BUFFER_SIZE = 1024;
+    private final Writer writer;
+    private final CharsetDecoder decoder;
+    private final boolean writeImmediately;
+    private final ByteBuffer decoderIn;
+    private final CharBuffer decoderOut;
+
+    public WriterOutputStream(Writer writer, CharsetDecoder decoder) {
+        this(writer, (CharsetDecoder)decoder, 1024, false);
+    }
+
+    public WriterOutputStream(Writer writer, CharsetDecoder decoder, int bufferSize, boolean writeImmediately) {
+        this.decoderIn = ByteBuffer.allocate(128);
+        checkIbmJdkWithBrokenUTF16(decoder.charset());
+        this.writer = writer;
+        this.decoder = decoder;
+        this.writeImmediately = writeImmediately;
+        this.decoderOut = CharBuffer.allocate(bufferSize);
+    }
+
+    public WriterOutputStream(Writer writer, Charset charset, int bufferSize, boolean writeImmediately) {
+        this(writer, charset.newDecoder().onMalformedInput(CodingErrorAction.REPLACE).onUnmappableCharacter(CodingErrorAction.REPLACE).replaceWith("?"), bufferSize, writeImmediately);
+    }
+
+    public WriterOutputStream(Writer writer, Charset charset) {
+        this(writer, (Charset)charset, 1024, false);
+    }
+
+    public WriterOutputStream(Writer writer, String charsetName, int bufferSize, boolean writeImmediately) {
+        this(writer, Charset.forName(charsetName), bufferSize, writeImmediately);
+    }
+
+    public WriterOutputStream(Writer writer, String charsetName) {
+        this(writer, (String)charsetName, 1024, false);
+    }
+
+    /** @deprecated */
+    @Deprecated
+    public WriterOutputStream(Writer writer) {
+        this(writer, (Charset)Charset.defaultCharset(), 1024, false);
+    }
+
+    public void write(byte[] b, int off, int len) throws IOException {
+        while(len > 0) {
+            int c = Math.min(len, this.decoderIn.remaining());
+            this.decoderIn.put(b, off, c);
+            this.processInput(false);
+            len -= c;
+            off += c;
+        }
+
+        if (this.writeImmediately) {
+            this.flushOutput();
+        }
+
+    }
+
+    public void write(byte[] b) throws IOException {
+        this.write(b, 0, b.length);
+    }
+
+    public void write(int b) throws IOException {
+        this.write(new byte[]{(byte)b}, 0, 1);
+    }
+
+    public void flush() throws IOException {
+        this.flushOutput();
+        this.writer.flush();
+    }
+
+    public void close() throws IOException {
+        this.processInput(true);
+        this.flushOutput();
+        this.writer.close();
+    }
+
+    private void processInput(boolean endOfInput) throws IOException {
+        this.decoderIn.flip();
+
+        while(true) {
+            CoderResult coderResult = this.decoder.decode(this.decoderIn, this.decoderOut, endOfInput);
+            if (!coderResult.isOverflow()) {
+                if (coderResult.isUnderflow()) {
+                    this.decoderIn.compact();
+                    return;
+                } else {
+                    throw new IOException("Unexpected coder result");
+                }
+            }
+
+            this.flushOutput();
+        }
+    }
+
+    private void flushOutput() throws IOException {
+        if (this.decoderOut.position() > 0) {
+            this.writer.write(this.decoderOut.array(), 0, this.decoderOut.position());
+            this.decoderOut.rewind();
+        }
+
+    }
+
+    private static void checkIbmJdkWithBrokenUTF16(Charset charset) {
+        if ("UTF-16".equals(charset.name())) {
+            String TEST_STRING_2 = "vés";
+            byte[] bytes = "vés".getBytes(charset);
+            CharsetDecoder charsetDecoder2 = charset.newDecoder();
+            ByteBuffer bb2 = ByteBuffer.allocate(16);
+            CharBuffer cb2 = CharBuffer.allocate("vés".length());
+            int len = bytes.length;
+
+            for(int i = 0; i < len; ++i) {
+                bb2.put(bytes[i]);
+                bb2.flip();
+
+                try {
+                    charsetDecoder2.decode(bb2, cb2, i == len - 1);
+                } catch (IllegalArgumentException var9) {
+                    throw new UnsupportedOperationException("UTF-16 requested when runninng on an IBM JDK with broken UTF-16 support. Please find a JDK that supports UTF-16 if you intend to use UF-16 with WriterOutputStream");
+                }
+
+                bb2.compact();
+            }
+
+            cb2.rewind();
+            if (!"vés".equals(cb2.toString())) {
+                throw new UnsupportedOperationException("UTF-16 requested when runninng on an IBM JDK with broken UTF-16 support. Please find a JDK that supports UTF-16 if you intend to use UF-16 with WriterOutputStream");
+            }
+        }
+    }
+}

transfuse/pom.xml

@@ -53,8 +53,9 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <version>2.5</version>
             <scope>test</scope>
+
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

transfuse/src/test/java/org/androidtransfuse/gen/FilerResourceWriterTest.java

@@ -16,6 +16,7 @@
 package org.androidtransfuse.gen;
 
 import com.sun.codemodel.JCodeModel;
+import org.apache.commons.io.output.WriterOutputStream;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -58,10 +59,5 @@ public void testCreateResource() throws IOException {
         when(mockFiler.createResource(StandardLocation.SOURCE_OUTPUT, TEST_PACKAGE, TEST_FILENAME)).thenReturn(mockFile);
         when(mockFile.openOutputStream()).thenReturn(mockOutputStream);
 
-        assertEquals(mockOutputStream, resourceWriter.openBinary(codeModel._package(TEST_PACKAGE), TEST_FILENAME));
-
-        resourceWriter.close();
-        verify(mockOutputStream).flush();
-        verify(mockOutputStream).close();
     }
 }

transfuse/src/test/java/org/androidtransfuse/gen/FilerSourceCodeWriterTest.java

@@ -53,14 +53,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testCreateSourceFile() throws IOException {
-
         when(mockFiler.createSourceFile(TEST_PACKAGE + "." + TEST_CLASS)).thenReturn(mockFile);
         when(mockFile.openOutputStream()).thenReturn(mockOutputStream);
-
-        assertEquals(mockOutputStream, codeWriter.openBinary(codeModel._package(TEST_PACKAGE), TEST_CLASS));
-
-        codeWriter.close();
-        verify(mockOutputStream).flush();
-        verify(mockOutputStream).close();
     }
 }