Fix proguard issues:

https://github.com/koush/ion/issues/515

7 files changed, 41 insertions, 21 deletions

diff --git a/AndroidAsync/AndroidManifest.xml b/AndroidAsync/AndroidManifest.xml
index 024a881..30615a2 100644
--- a/AndroidAsync/AndroidManifest.xml
+++ b/AndroidAsync/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="211"
-    android:versionName="2.1.1">
+    android:versionCode="212"
+    android:versionName="2.1.2">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
deleted file mode 100644
index 337c4c1..0000000
--- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.koushikdutta.async.parser;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- * Created by koush on 3/6/15.
- */
-public abstract class AsyncParserBase<T> implements AsyncParser<T> {
-    @Override
-    public Type getType() {
-        return ((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0];
-    }
-}
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
index 7226062..11bd7fb 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java
@@ -9,10 +9,12 @@ import com.koushikdutta.async.callback.DataCallback;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.SimpleFuture;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by koush on 5/27/13.
  */
-public class ByteBufferListParser extends AsyncParserBase<ByteBufferList> {
+public class ByteBufferListParser implements AsyncParser<ByteBufferList> {
     @Override
     public Future<ByteBufferList> parse(final DataEmitter emitter) {
         final ByteBufferList bb = new ByteBufferList();
@@ -53,4 +55,9 @@ public class ByteBufferListParser extends AsyncParserBase<ByteBufferList> {
     public void write(DataSink sink, ByteBufferList value, CompletedCallback completed) {
         Util.writeAll(sink, value, completed);
     }
+
+    @Override
+    public Type getType() {
+        return ByteBufferList.class;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
index c64a300..de9053d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java
@@ -11,13 +11,15 @@ import com.koushikdutta.async.stream.ByteBufferListInputStream;
 
 import org.w3c.dom.Document;
 
+import java.lang.reflect.Type;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 /**
  * Created by koush on 8/3/13.
  */
-public class DocumentParser extends AsyncParserBase<Document> {
+public class DocumentParser implements AsyncParser<Document> {
     @Override
     public Future<Document> parse(DataEmitter emitter) {
         return new ByteBufferListParser().parse(emitter)
@@ -35,4 +37,9 @@ public class DocumentParser extends AsyncParserBase<Document> {
     public void write(DataSink sink, Document value, CompletedCallback completed) {
         new DocumentBody(value).write(null, sink, completed);
     }
+
+    @Override
+    public Type getType() {
+        return Document.class;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
index 687435a..4a351c0 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java
@@ -9,10 +9,12 @@ import com.koushikdutta.async.future.TransformFuture;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONArrayParser extends AsyncParserBase<JSONArray> {
+public class JSONArrayParser implements AsyncParser<JSONArray> {
     @Override
     public Future<JSONArray> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
@@ -28,4 +30,9 @@ public class JSONArrayParser extends AsyncParserBase<JSONArray> {
     public void write(DataSink sink, JSONArray value, CompletedCallback completed) {
         new StringParser().write(sink, value.toString(), completed);
     }
+
+    @Override
+    public Type getType() {
+        return JSONArray.class;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
index 5bd1eb0..e02db2c 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java
@@ -7,10 +7,12 @@ import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.TransformFuture;
 import org.json.JSONObject;
 
+import java.lang.reflect.Type;
+
 /**
  * Created by koush on 5/27/13.
  */
-public class JSONObjectParser extends AsyncParserBase<JSONObject> {
+public class JSONObjectParser implements AsyncParser<JSONObject> {
     @Override
     public Future<JSONObject> parse(DataEmitter emitter) {
         return new StringParser().parse(emitter)
@@ -26,4 +28,9 @@ public class JSONObjectParser extends AsyncParserBase<JSONObject> {
     public void write(DataSink sink, JSONObject value, CompletedCallback completed) {
         new StringParser().write(sink, value.toString(), completed);
     }
+
+    @Override
+    public Type getType() {
+        return JSONObject.class;
+    }
 }
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
index f8d82b6..257d603 100644
--- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
+++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java
@@ -7,12 +7,13 @@ import com.koushikdutta.async.callback.CompletedCallback;
 import com.koushikdutta.async.future.Future;
 import com.koushikdutta.async.future.TransformFuture;
 
+import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
 /**
  * Created by koush on 5/27/13.
  */
-public class StringParser extends AsyncParserBase<String> {
+public class StringParser implements AsyncParser<String> {
     Charset forcedCharset;
 
     public StringParser() {
@@ -41,4 +42,9 @@ public class StringParser extends AsyncParserBase<String> {
     public void write(DataSink sink, String value, CompletedCallback completed) {
         new ByteBufferListParser().write(sink, new ByteBufferList(value.getBytes()), completed);
     }
+
+    @Override
+    public Type getType() {
+        return String.class;
+    }
 }