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

AbstractEfaProvider: Remove unused ability to HTTP POST.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-05 02:17:15 +01:00
parent bcc43a3b45
commit cb9cbf978e
1 changed files with 10 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
private boolean useProxFootSearch = true; private boolean useProxFootSearch = true;
private @Nullable String httpReferer = null; private @Nullable String httpReferer = null;
private @Nullable String httpRefererTrip = null; private @Nullable String httpRefererTrip = null;
private boolean httpPost = false;
private boolean useRouteIndexAsTripId = true; private boolean useRouteIndexAsTripId = true;
private boolean useLineRestriction = true; private boolean useLineRestriction = true;
private boolean useStringCoordListOutputFormat = true; private boolean useStringCoordListOutputFormat = true;
@ -193,11 +192,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
return this; return this;
} }
protected AbstractEfaProvider setHttpPost(final boolean httpPost) {
this.httpPost = httpPost;
return this;
}
protected AbstractEfaProvider setIncludeRegionId(final boolean includeRegionId) { protected AbstractEfaProvider setIncludeRegionId(final boolean includeRegionId) {
this.includeRegionId = includeRegionId; this.includeRegionId = includeRegionId;
return this; return this;
@ -248,11 +242,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
protected SuggestLocationsResult jsonStopfinderRequest(final Location constraint) throws IOException { protected SuggestLocationsResult jsonStopfinderRequest(final Location constraint) throws IOException {
final HttpUrl.Builder url = stopFinderEndpoint.newBuilder(); final HttpUrl.Builder url = stopFinderEndpoint.newBuilder();
appendStopfinderRequestParameters(url, constraint, "JSON"); appendStopfinderRequestParameters(url, constraint, "JSON");
final CharSequence page; final CharSequence page = httpClient.get(url.build());
if (httpPost)
page = httpClient.get(url.build(), url.build().encodedQuery(), "application/x-www-form-urlencoded");
else
page = httpClient.get(url.build());
final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT); final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT);
try { try {
@ -388,11 +378,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpReferer);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpReferer);
else
httpClient.getInputStream(callback, url.build(), httpReferer);
return result.get(); return result.get();
} }
@ -467,11 +453,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpReferer);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpReferer);
else
httpClient.getInputStream(callback, url.build(), httpReferer);
return result.get(); return result.get();
} }
@ -562,11 +544,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpReferer);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpReferer);
else
httpClient.getInputStream(callback, url.build(), httpReferer);
return result.get(); return result.get();
} }
@ -636,11 +614,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpReferer);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpReferer);
else
httpClient.getInputStream(callback, url.build(), httpReferer);
return result.get(); return result.get();
} }
@ -908,11 +882,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpReferer);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpReferer);
else
httpClient.getInputStream(callback, url.build(), httpReferer);
return result.get(); return result.get();
} }
@ -1607,11 +1577,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpReferer);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpReferer);
else
httpClient.getInputStream(callback, url.build(), httpReferer);
return result.get(); return result.get();
} }
@ -1701,11 +1667,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpReferer);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpReferer);
else
httpClient.getInputStream(callback, url.build(), httpReferer);
return result.get(); return result.get();
} }
@ -2096,11 +2058,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpRefererTrip);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpRefererTrip);
else
httpClient.getInputStream(callback, url.build(), httpRefererTrip);
return result.get(); return result.get();
} }
@ -2124,11 +2082,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider {
} }
}; };
if (httpPost) httpClient.getInputStream(callback, url.build(), httpRefererTrip);
httpClient.getInputStream(callback, url.build(), url.build().encodedQuery(),
"application/x-www-form-urlencoded", httpRefererTrip);
else
httpClient.getInputStream(callback, url.build(), httpRefererTrip);
return result.get(); return result.get();
} }