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

AbstractHafasClientInterfaceProvider: Allow configuration of the endpoint.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-16 21:55:44 +01:00
parent 389cd53bbf
commit db7b4c8a0d
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -82,17 +82,18 @@ import okhttp3.HttpUrl;
* @author Andreas Schildbach
*/
public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafasProvider {
public HttpUrl mgateEndpoint;
private final HttpUrl apiBase;
private String apiEndpoint = "mgate.exe";
@Nullable
public String apiVersion;
private String apiVersion;
@Nullable
public String apiAuthorization;
private String apiAuthorization;
@Nullable
public String apiClient;
private String apiClient;
@Nullable
public byte[] requestChecksumSalt;
private byte[] requestChecksumSalt;
@Nullable
public byte[] requestMicMacSalt;
private byte[] requestMicMacSalt;
private static final String SERVER_PRODUCT = "hci";
private static final HashFunction MD5 = Hashing.md5();
@ -101,7 +102,12 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
public AbstractHafasClientInterfaceProvider(final NetworkId network, final HttpUrl apiBase,
final Product[] productsMap) {
super(network, productsMap);
this.mgateEndpoint = apiBase.newBuilder().addPathSegment("mgate.exe").build();
this.apiBase = checkNotNull(apiBase);
}
protected AbstractHafasClientInterfaceProvider setApiEndpoint(final String apiEndpoint) {
this.apiEndpoint = checkNotNull(apiEndpoint);
return this;
}
protected AbstractHafasClientInterfaceProvider setApiVersion(final String apiVersion) {
@ -658,7 +664,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
}
private HttpUrl requestUrl(final String body) {
final HttpUrl.Builder url = checkNotNull(mgateEndpoint).newBuilder();
final HttpUrl.Builder url = apiBase.newBuilder().addPathSegment(apiEndpoint);
if (requestChecksumSalt != null) {
final HashCode checksum = MD5.newHasher().putString(body, Charsets.UTF_8).putBytes(requestChecksumSalt)
.hash();