diff options
author | Koushik Dutta <koushd@gmail.com> | 2015-03-07 15:17:15 -1000 |
---|---|---|
committer | Koushik Dutta <koushd@gmail.com> | 2015-03-07 15:17:15 -1000 |
commit | 2f8678ddb2530d582d7f50245272604d916f2609 (patch) | |
tree | 4442deb2a9d3a05d882ded2dc1fb06eab70e920d | |
parent | d9975f4f5b51ccc3f3dcfaca0221f8cd0639ddbb (diff) | |
download | AndroidAsync-2f8678ddb2530d582d7f50245272604d916f2609.tar.gz AndroidAsync-2f8678ddb2530d582d7f50245272604d916f2609.tar.bz2 AndroidAsync-2f8678ddb2530d582d7f50245272604d916f2609.zip |
Revert "Add getType to AsyncParser."
This reverts commit 4c85f8686eaf5dd33597d22b3ffa2f8e6f0db211.
8 files changed, 5 insertions, 27 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java index 44e1a83..bcbb440 100644 --- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java +++ b/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParser.java @@ -11,5 +11,4 @@ import com.koushikdutta.async.future.Future; public interface AsyncParser<T> { Future<T> parse(DataEmitter emitter); void write(DataSink sink, T value, CompletedCallback completed); - Class<T> getType(); } 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 d6a7f35..0000000 --- a/AndroidAsync/src/com/koushikdutta/async/parser/AsyncParserBase.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.koushikdutta.async.parser; - -import java.lang.reflect.ParameterizedType; - -/** - * Created by koush on 3/6/15. - */ -public abstract class AsyncParserBase<T> implements AsyncParser<T> { - @Override - public Class<T> getType() { - return (Class<T>)((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..abfaa87 100644 --- a/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java +++ b/AndroidAsync/src/com/koushikdutta/async/parser/ByteBufferListParser.java @@ -12,7 +12,7 @@ import com.koushikdutta.async.future.SimpleFuture; /** * 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(); diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java index c64a300..fe54e04 100644 --- a/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java +++ b/AndroidAsync/src/com/koushikdutta/async/parser/DocumentParser.java @@ -17,7 +17,7 @@ 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) diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java index 687435a..d8eb7e5 100644 --- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java +++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONArrayParser.java @@ -12,7 +12,7 @@ import org.json.JSONObject; /** * 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) diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java index 5bd1eb0..dbdcbef 100644 --- a/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java +++ b/AndroidAsync/src/com/koushikdutta/async/parser/JSONObjectParser.java @@ -10,7 +10,7 @@ import org.json.JSONObject; /** * 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) diff --git a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java index f8d82b6..5a9f880 100644 --- a/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java +++ b/AndroidAsync/src/com/koushikdutta/async/parser/StringParser.java @@ -12,7 +12,7 @@ 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() { diff --git a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java index 13773ea..3374eff 100644 --- a/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java +++ b/AndroidAsync/test/src/com/koushikdutta/async/test/ParserTests.java @@ -3,14 +3,11 @@ package com.koushikdutta.async.test; import com.koushikdutta.async.ByteBufferList; import com.koushikdutta.async.FilteredDataEmitter; import com.koushikdutta.async.future.Future; -import com.koushikdutta.async.parser.DocumentParser; import com.koushikdutta.async.parser.StringParser; import com.koushikdutta.async.util.Charsets; import junit.framework.TestCase; -import org.w3c.dom.Document; - import java.nio.ByteBuffer; import java.nio.charset.Charset; @@ -56,9 +53,4 @@ public class ParserTests extends TestCase { String s = ret.get(); assertEquals(s, "æææ"); } - - public void testAsyncParserBase() throws Exception { - DocumentParser parser = new DocumentParser(); - assertEquals(parser.getType(), Document.class); - } } |