[refactor] internal BIO impl - for less cast-ing and/or byte copy-ing

Author: kares

src/main/java/org/jruby/ext/openssl/impl/BIO.java

@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import javax.crypto.Cipher;
 
@@ -202,13 +203,12 @@ public void flush() throws IOException, PKCS7Exception {
 
     private final static byte[] CONTENT_TEXT;
     static {
-        byte[] val = null;
         try {
-            val = "Content-Type: text/plain\r\n\r\n".getBytes("ISO8859-1");
-        } catch(Exception e) {
-            val = null;
+            CONTENT_TEXT = "Content-Type: text/plain\r\n\r\n".getBytes("ISO8859-1");
+        }
+        catch (UnsupportedEncodingException ex) {
+            throw new AssertionError(ex);
         }
-        CONTENT_TEXT = val;
     }
 
     /** c: SMIME_crlf_copy
@@ -342,4 +342,9 @@ public String toString() {
         String[] names = getClass().getName().split("\\.");
         return "#<BIO:" + names[names.length-1] + " next=" + next() + ">";
     }
+
+    public byte[] toBytes() {
+        throw new UnsupportedOperationException("toBytes() for " + getClass().getName());
+    }
+
 }// BIO

src/main/java/org/jruby/ext/openssl/impl/MemBIO.java

@@ -46,10 +46,8 @@ private void realloc() {
     }
 
     @Override
-    public int gets(byte[] in, int len) throws IOException {
-        if(rpointer == slen) {
-            return 0;
-        }
+    public int gets(byte[] in, int len) {
+        if (rpointer == slen) return 0;
 
         int i=0;
         for(;i<len && rpointer<slen; i++, rpointer++) {
@@ -90,11 +88,7 @@ public int write(byte[] out, int offset, int len) throws IOException {
 
     @Override
     public String toString() {
-        try {
-            return "<MemBIO w:" + wpointer + " r:" + rpointer + " buf:\"" + new String(buffer,rpointer,slen-rpointer) + "\" next=" + next() + ">";
-        } catch(Exception e) {}
-
-        return null;
+        return "<MemBIO w:" + wpointer + " r:" + rpointer + " buf:\"" + new String(buffer,rpointer,slen-rpointer) + "\" next=" + next() + ">";
     }
 
     @Override
@@ -105,12 +99,25 @@ public int getType() {
         return TYPE_MEM;
     }
 
-    public byte[] getMemCopy() {
+    @Override
+    public byte[] toBytes() {
         byte[] nbuf = new byte[slen];
         System.arraycopy(buffer, 0, nbuf, 0, slen);
         return nbuf;
     }
 
+    public byte[] getMemCopy() {
+        return toBytes();
+    }
+
+    public byte[] getBuffer() {
+        return buffer;
+    }
+
+    public int length() {
+        return slen;
+    }
+
     public void reset() {
         this.rpointer = 0;
     }