mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-14 08:40:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AbstractEfaProvider: Pass Reader from request body to XML parser, rather than InputStream.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-14 01:36:19 +01:00
parent ef9c452166
commit dd99ab90b7
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.Reader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Currency; import java.util.Currency;
@ -376,7 +376,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
final XmlPullParser pp = parserFactory.newPullParser(); final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(body.byteStream(), null); // Read encoding from XML declaration pp.setInput(body.charStream());
final ResultHeader header = enterEfa(pp); final ResultHeader header = enterEfa(pp);
XmlPullUtil.optSkip(pp, "ers"); XmlPullUtil.optSkip(pp, "ers");
@ -475,7 +475,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
final XmlPullParser pp = parserFactory.newPullParser(); final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(body.byteStream(), null); // Read encoding from XML declaration pp.setInput(body.charStream());
final ResultHeader header = enterItdRequest(pp); final ResultHeader header = enterItdRequest(pp);
XmlPullUtil.enter(pp, "itdCoordInfoRequest"); XmlPullUtil.enter(pp, "itdCoordInfoRequest");
@ -543,7 +543,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
final XmlPullParser pp = parserFactory.newPullParser(); final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(body.byteStream(), null); // Read encoding from XML declaration pp.setInput(body.charStream());
final ResultHeader header = enterEfa(pp); final ResultHeader header = enterEfa(pp);
XmlPullUtil.enter(pp, "ci"); XmlPullUtil.enter(pp, "ci");
@ -825,7 +825,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
final XmlPullParser pp = parserFactory.newPullParser(); final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(body.byteStream(), null); // Read encoding from XML declaration pp.setInput(body.charStream());
final ResultHeader header = enterItdRequest(pp); final ResultHeader header = enterItdRequest(pp);
XmlPullUtil.enter(pp, "itdDepartureMonitorRequest"); XmlPullUtil.enter(pp, "itdDepartureMonitorRequest");
@ -1434,7 +1434,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
final XmlPullParser pp = parserFactory.newPullParser(); final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(body.byteStream(), null); // Read encoding from XML declaration pp.setInput(body.charStream());
final ResultHeader header = enterItdRequest(pp); final ResultHeader header = enterItdRequest(pp);
final QueryDeparturesResult r = new QueryDeparturesResult(header); final QueryDeparturesResult r = new QueryDeparturesResult(header);
@ -1582,7 +1582,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
final XmlPullParser pp = parserFactory.newPullParser(); final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(body.byteStream(), null); // Read encoding from XML declaration pp.setInput(body.charStream());
final ResultHeader header = enterEfa(pp); final ResultHeader header = enterEfa(pp);
final QueryDeparturesResult r = new QueryDeparturesResult(header); final QueryDeparturesResult r = new QueryDeparturesResult(header);
@ -2038,7 +2038,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
@Override @Override
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
result.set(queryTrips(url.build(), body.byteStream())); result.set(queryTrips(url.build(), body.charStream()));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} catch (final RuntimeException x) { } catch (final RuntimeException x) {
@ -2062,7 +2062,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
@Override @Override
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
result.set(queryTripsMobile(url.build(), from, via, to, body.byteStream())); result.set(queryTripsMobile(url.build(), from, via, to, body.charStream()));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} catch (final RuntimeException x) { } catch (final RuntimeException x) {
@ -2089,7 +2089,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
@Override @Override
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
result.set(queryTrips(url.build(), body.byteStream())); result.set(queryTrips(url.build(), body.charStream()));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} catch (final RuntimeException x) { } catch (final RuntimeException x) {
@ -2116,7 +2116,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
@Override @Override
public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException { public void onSuccessful(final CharSequence bodyPeek, final ResponseBody body) throws IOException {
try { try {
result.set(queryTripsMobile(url.build(), null, null, null, body.byteStream())); result.set(queryTripsMobile(url.build(), null, null, null, body.charStream()));
} catch (final XmlPullParserException x) { } catch (final XmlPullParserException x) {
throw new ParserException("cannot parse xml: " + bodyPeek, x); throw new ParserException("cannot parse xml: " + bodyPeek, x);
} catch (final RuntimeException x) { } catch (final RuntimeException x) {
@ -2130,10 +2130,10 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return result.get(); return result.get();
} }
private QueryTripsResult queryTrips(final HttpUrl url, final InputStream is) private QueryTripsResult queryTrips(final HttpUrl url, final Reader reader)
throws XmlPullParserException, IOException { throws XmlPullParserException, IOException {
final XmlPullParser pp = parserFactory.newPullParser(); final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(is, null); // Read encoding from XML declaration pp.setInput(reader);
final ResultHeader header = enterItdRequest(pp); final ResultHeader header = enterItdRequest(pp);
final Object context = header.context; final Object context = header.context;
@ -2619,9 +2619,9 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
private QueryTripsResult queryTripsMobile(final HttpUrl url, final Location from, final @Nullable Location via, private QueryTripsResult queryTripsMobile(final HttpUrl url, final Location from, final @Nullable Location via,
final Location to, final InputStream is) throws XmlPullParserException, IOException { final Location to, final Reader reader) throws XmlPullParserException, IOException {
final XmlPullParser pp = parserFactory.newPullParser(); final XmlPullParser pp = parserFactory.newPullParser();
pp.setInput(is, null); // Read encoding from XML declaration pp.setInput(reader);
final ResultHeader header = enterEfa(pp); final ResultHeader header = enterEfa(pp);
final Calendar plannedTimeCal = new GregorianCalendar(timeZone); final Calendar plannedTimeCal = new GregorianCalendar(timeZone);