From fe86c0498c8067830fc07305e6e432dffa54a2ce Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 27 Oct 2018 17:43:54 +0200 Subject: [PATCH] Rename AbstractHafasMobileProvider to AbstractHafasClientInterfaceProvider. --- ... => AbstractHafasClientInterfaceProvider.java} | 15 ++++++++------- enabler/src/de/schildbach/pte/BvgProvider.java | 2 +- enabler/src/de/schildbach/pte/CmtaProvider.java | 2 +- enabler/src/de/schildbach/pte/NasaProvider.java | 2 +- enabler/src/de/schildbach/pte/OoevvProvider.java | 2 +- enabler/src/de/schildbach/pte/ShProvider.java | 2 +- enabler/src/de/schildbach/pte/SvvProvider.java | 2 +- enabler/src/de/schildbach/pte/VaoProvider.java | 2 +- enabler/src/de/schildbach/pte/VbnProvider.java | 2 +- enabler/src/de/schildbach/pte/VmobilProvider.java | 2 +- enabler/src/de/schildbach/pte/VmtProvider.java | 2 +- enabler/src/de/schildbach/pte/VorProvider.java | 2 +- enabler/src/de/schildbach/pte/VvtProvider.java | 2 +- 13 files changed, 20 insertions(+), 19 deletions(-) rename enabler/src/de/schildbach/pte/{AbstractHafasMobileProvider.java => AbstractHafasClientInterfaceProvider.java} (98%) diff --git a/enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java similarity index 98% rename from enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java rename to enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java index eb86f76f..48b50674 100644 --- a/enabler/src/de/schildbach/pte/AbstractHafasMobileProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java @@ -77,7 +77,7 @@ import okhttp3.HttpUrl; * * @author Andreas Schildbach */ -public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider { +public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafasProvider { public HttpUrl mgateEndpoint; @Nullable public String apiVersion; @@ -93,33 +93,34 @@ public abstract class AbstractHafasMobileProvider extends AbstractHafasProvider private static final HashFunction MD5 = Hashing.md5(); private static final BaseEncoding HEX = BaseEncoding.base16().lowerCase(); - public AbstractHafasMobileProvider(final NetworkId network, final HttpUrl apiBase, final Product[] productsMap) { + public AbstractHafasClientInterfaceProvider(final NetworkId network, final HttpUrl apiBase, + final Product[] productsMap) { super(network, productsMap); this.mgateEndpoint = apiBase.newBuilder().addPathSegment("mgate.exe").build(); } - protected AbstractHafasMobileProvider setApiVersion(final String apiVersion) { + protected AbstractHafasClientInterfaceProvider setApiVersion(final String apiVersion) { checkArgument(apiVersion.compareToIgnoreCase("1.11") >= 0, "apiVersion must be 1.11 or higher"); this.apiVersion = apiVersion; return this; } - protected AbstractHafasMobileProvider setApiAuthorization(final String apiAuthorization) { + protected AbstractHafasClientInterfaceProvider setApiAuthorization(final String apiAuthorization) { this.apiAuthorization = apiAuthorization; return this; } - protected AbstractHafasMobileProvider setApiClient(final String apiClient) { + protected AbstractHafasClientInterfaceProvider setApiClient(final String apiClient) { this.apiClient = apiClient; return this; } - protected AbstractHafasMobileProvider setRequestChecksumSalt(final String requestChecksumSalt) { + protected AbstractHafasClientInterfaceProvider setRequestChecksumSalt(final String requestChecksumSalt) { this.requestChecksumSalt = requestChecksumSalt; return this; } - protected AbstractHafasMobileProvider setRequestMicMacSalt(final String requestMicMacSalt) { + protected AbstractHafasClientInterfaceProvider setRequestMicMacSalt(final String requestMicMacSalt) { this.requestMicMacSalt = requestMicMacSalt; return this; } diff --git a/enabler/src/de/schildbach/pte/BvgProvider.java b/enabler/src/de/schildbach/pte/BvgProvider.java index 50ee785e..e5b8e190 100644 --- a/enabler/src/de/schildbach/pte/BvgProvider.java +++ b/enabler/src/de/schildbach/pte/BvgProvider.java @@ -38,7 +38,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public final class BvgProvider extends AbstractHafasMobileProvider { +public final class BvgProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://bvg-apps.hafas.de/bin/"); private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.TRAM, Product.BUS, Product.FERRY, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.ON_DEMAND, null, null }; diff --git a/enabler/src/de/schildbach/pte/CmtaProvider.java b/enabler/src/de/schildbach/pte/CmtaProvider.java index 26c870c4..7e11cb32 100644 --- a/enabler/src/de/schildbach/pte/CmtaProvider.java +++ b/enabler/src/de/schildbach/pte/CmtaProvider.java @@ -24,7 +24,7 @@ import okhttp3.HttpUrl; /** * @author Colin Murphy */ -public class CmtaProvider extends AbstractHafasMobileProvider { +public class CmtaProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://capmetro.hafas.cloud/bin/"); // MetroRail: 8, MetroBus: 32, MetroRapid: 4096 private static final Product[] PRODUCTS_MAP = { null, null, null, Product.REGIONAL_TRAIN, null, Product.BUS, null, diff --git a/enabler/src/de/schildbach/pte/NasaProvider.java b/enabler/src/de/schildbach/pte/NasaProvider.java index d4258f0c..37e2bc39 100644 --- a/enabler/src/de/schildbach/pte/NasaProvider.java +++ b/enabler/src/de/schildbach/pte/NasaProvider.java @@ -26,7 +26,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class NasaProvider extends AbstractHafasMobileProvider { +public class NasaProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://reiseauskunft.insa.de/bin/"); private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.TRAM, Product.BUS, diff --git a/enabler/src/de/schildbach/pte/OoevvProvider.java b/enabler/src/de/schildbach/pte/OoevvProvider.java index 5a1d1f0e..8013bea2 100644 --- a/enabler/src/de/schildbach/pte/OoevvProvider.java +++ b/enabler/src/de/schildbach/pte/OoevvProvider.java @@ -28,7 +28,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class OoevvProvider extends AbstractHafasMobileProvider { +public class OoevvProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://verkehrsauskunft.ooevv.at/bin/"); private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, diff --git a/enabler/src/de/schildbach/pte/ShProvider.java b/enabler/src/de/schildbach/pte/ShProvider.java index 8eb8833c..0126021b 100644 --- a/enabler/src/de/schildbach/pte/ShProvider.java +++ b/enabler/src/de/schildbach/pte/ShProvider.java @@ -34,7 +34,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class ShProvider extends AbstractHafasMobileProvider { +public class ShProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://nah.sh.hafas.de/bin/"); private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.FERRY, diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/enabler/src/de/schildbach/pte/SvvProvider.java index e820f1d2..849da43e 100644 --- a/enabler/src/de/schildbach/pte/SvvProvider.java +++ b/enabler/src/de/schildbach/pte/SvvProvider.java @@ -31,7 +31,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class SvvProvider extends AbstractHafasMobileProvider { +public class SvvProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.salzburg-verkehr.at/bin/"); private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, diff --git a/enabler/src/de/schildbach/pte/VaoProvider.java b/enabler/src/de/schildbach/pte/VaoProvider.java index 08f9fc34..f1361bb7 100644 --- a/enabler/src/de/schildbach/pte/VaoProvider.java +++ b/enabler/src/de/schildbach/pte/VaoProvider.java @@ -31,7 +31,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class VaoProvider extends AbstractHafasMobileProvider { +public class VaoProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://app.verkehrsauskunft.at/bin/"); private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, diff --git a/enabler/src/de/schildbach/pte/VbnProvider.java b/enabler/src/de/schildbach/pte/VbnProvider.java index afa6db2d..524a9abf 100644 --- a/enabler/src/de/schildbach/pte/VbnProvider.java +++ b/enabler/src/de/schildbach/pte/VbnProvider.java @@ -35,7 +35,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class VbnProvider extends AbstractHafasMobileProvider { +public class VbnProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplaner.vbn.de/hafas/"); // http://fahrplaner.vsninfo.de/hafas/ // http://fahrplan.rsag-online.de/hafas/ diff --git a/enabler/src/de/schildbach/pte/VmobilProvider.java b/enabler/src/de/schildbach/pte/VmobilProvider.java index fa8714b3..5d05220e 100644 --- a/enabler/src/de/schildbach/pte/VmobilProvider.java +++ b/enabler/src/de/schildbach/pte/VmobilProvider.java @@ -28,7 +28,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class VmobilProvider extends AbstractHafasMobileProvider { +public class VmobilProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.vmobil.at/bin/"); private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, diff --git a/enabler/src/de/schildbach/pte/VmtProvider.java b/enabler/src/de/schildbach/pte/VmtProvider.java index 6fff5854..f758fd6e 100644 --- a/enabler/src/de/schildbach/pte/VmtProvider.java +++ b/enabler/src/de/schildbach/pte/VmtProvider.java @@ -26,7 +26,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class VmtProvider extends AbstractHafasMobileProvider { +public class VmtProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://vmt.hafas.de/bin/"); // http://www.routenplaner.nahverkehr-jena.de/bin/ private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN, diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java index 45136b91..70b49780 100644 --- a/enabler/src/de/schildbach/pte/VorProvider.java +++ b/enabler/src/de/schildbach/pte/VorProvider.java @@ -31,7 +31,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class VorProvider extends AbstractHafasMobileProvider { +public class VorProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://anachb.vor.at/bin/"); private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY, diff --git a/enabler/src/de/schildbach/pte/VvtProvider.java b/enabler/src/de/schildbach/pte/VvtProvider.java index 3af3e6a6..8ecde46f 100644 --- a/enabler/src/de/schildbach/pte/VvtProvider.java +++ b/enabler/src/de/schildbach/pte/VvtProvider.java @@ -28,7 +28,7 @@ import okhttp3.HttpUrl; /** * @author Andreas Schildbach */ -public class VvtProvider extends AbstractHafasMobileProvider { +public class VvtProvider extends AbstractHafasClientInterfaceProvider { private static final HttpUrl API_BASE = HttpUrl.parse("https://fahrplan.vvt.at/bin/"); private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY, null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,