diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java index cf4db982..e3294cdc 100644 --- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java +++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java @@ -88,7 +88,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider private final String stopFinderEndpoint; private final String coordEndpoint; - private final String additionalQueryParameter; + private String additionalQueryParameter = null; private boolean canAcceptPoiId = false; private boolean needsSpEncId = false; private boolean includeRegionId = true; @@ -128,26 +128,25 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider public AbstractEfaProvider() { - this(null, null); + this(null); } - public AbstractEfaProvider(final String apiBase, final String additionalQueryParameter) + public AbstractEfaProvider(final String apiBase) { - this(apiBase, null, null, null, null, additionalQueryParameter); + this(apiBase, null, null, null, null); } public AbstractEfaProvider(final String apiBase, final String departureMonitorEndpoint, final String tripEndpoint, - final String stopFinderEndpoint, final String coordEndpoint, final String additionalQueryParameter) + final String stopFinderEndpoint, final String coordEndpoint) { this(apiBase + (departureMonitorEndpoint != null ? departureMonitorEndpoint : DEFAULT_DEPARTURE_MONITOR_ENDPOINT), // apiBase + (tripEndpoint != null ? tripEndpoint : DEFAULT_TRIP_ENDPOINT), // apiBase + (stopFinderEndpoint != null ? stopFinderEndpoint : DEFAULT_STOPFINDER_ENDPOINT), // - apiBase + (coordEndpoint != null ? coordEndpoint : DEFAULT_COORD_ENDPOINT), // - additionalQueryParameter); + apiBase + (coordEndpoint != null ? coordEndpoint : DEFAULT_COORD_ENDPOINT)); } public AbstractEfaProvider(final String departureMonitorEndpoint, final String tripEndpoint, final String stopFinderEndpoint, - final String coordEndpoint, final String additionalQueryParameter) + final String coordEndpoint) { try { @@ -162,8 +161,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider this.tripEndpoint = tripEndpoint; this.stopFinderEndpoint = stopFinderEndpoint; this.coordEndpoint = coordEndpoint; - - this.additionalQueryParameter = additionalQueryParameter; } protected void setRequestUrlEncoding(final Charset requestUrlEncoding) @@ -206,6 +203,11 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider this.needsSpEncId = needsSpEncId; } + protected void setAdditionalQueryParameter(final String additionalQueryParameter) + { + this.additionalQueryParameter = additionalQueryParameter; + } + protected TimeZone timeZone() { return TimeZone.getTimeZone("Europe/Berlin"); diff --git a/enabler/src/de/schildbach/pte/AtcProvider.java b/enabler/src/de/schildbach/pte/AtcProvider.java index f1bf1ec7..a2bc3265 100644 --- a/enabler/src/de/schildbach/pte/AtcProvider.java +++ b/enabler/src/de/schildbach/pte/AtcProvider.java @@ -33,7 +33,7 @@ public class AtcProvider extends AbstractEfaProvider public AtcProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/AvvProvider.java b/enabler/src/de/schildbach/pte/AvvProvider.java index fd68bf22..c9552304 100644 --- a/enabler/src/de/schildbach/pte/AvvProvider.java +++ b/enabler/src/de/schildbach/pte/AvvProvider.java @@ -32,7 +32,7 @@ public class AvvProvider extends AbstractEfaProvider public AvvProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/BayernProvider.java b/enabler/src/de/schildbach/pte/BayernProvider.java index af548e06..d29c5d66 100644 --- a/enabler/src/de/schildbach/pte/BayernProvider.java +++ b/enabler/src/de/schildbach/pte/BayernProvider.java @@ -27,7 +27,7 @@ public class BayernProvider extends AbstractEfaProvider public BayernProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/BsagProvider.java b/enabler/src/de/schildbach/pte/BsagProvider.java index 6d670e69..b8f13415 100644 --- a/enabler/src/de/schildbach/pte/BsagProvider.java +++ b/enabler/src/de/schildbach/pte/BsagProvider.java @@ -33,7 +33,7 @@ public class BsagProvider extends AbstractEfaProvider public BsagProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/BsvagProvider.java b/enabler/src/de/schildbach/pte/BsvagProvider.java index 72554fce..ad9156a4 100644 --- a/enabler/src/de/schildbach/pte/BsvagProvider.java +++ b/enabler/src/de/schildbach/pte/BsvagProvider.java @@ -36,7 +36,7 @@ public class BsvagProvider extends AbstractEfaProvider public BsvagProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/BvbProvider.java b/enabler/src/de/schildbach/pte/BvbProvider.java index b480cff5..d7979178 100644 --- a/enabler/src/de/schildbach/pte/BvbProvider.java +++ b/enabler/src/de/schildbach/pte/BvbProvider.java @@ -33,7 +33,7 @@ public class BvbProvider extends AbstractEfaProvider public BvbProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/DingProvider.java b/enabler/src/de/schildbach/pte/DingProvider.java index d8384c49..7ed180ac 100644 --- a/enabler/src/de/schildbach/pte/DingProvider.java +++ b/enabler/src/de/schildbach/pte/DingProvider.java @@ -27,7 +27,7 @@ public class DingProvider extends AbstractEfaProvider public DingProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/DubProvider.java b/enabler/src/de/schildbach/pte/DubProvider.java index 62c73f99..b580c823 100644 --- a/enabler/src/de/schildbach/pte/DubProvider.java +++ b/enabler/src/de/schildbach/pte/DubProvider.java @@ -34,7 +34,7 @@ public class DubProvider extends AbstractEfaProvider public DubProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/GvhProvider.java b/enabler/src/de/schildbach/pte/GvhProvider.java index 3c121cf9..fb6380d5 100644 --- a/enabler/src/de/schildbach/pte/GvhProvider.java +++ b/enabler/src/de/schildbach/pte/GvhProvider.java @@ -32,7 +32,9 @@ public class GvhProvider extends AbstractEfaProvider public GvhProvider(final String additionalQueryParameter) { - super(API_BASE, additionalQueryParameter); + super(API_BASE); + + setAdditionalQueryParameter(additionalQueryParameter); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/IvbProvider.java b/enabler/src/de/schildbach/pte/IvbProvider.java index 81e065f7..eaf3b837 100644 --- a/enabler/src/de/schildbach/pte/IvbProvider.java +++ b/enabler/src/de/schildbach/pte/IvbProvider.java @@ -27,7 +27,7 @@ public class IvbProvider extends AbstractEfaProvider public IvbProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/KvvProvider.java b/enabler/src/de/schildbach/pte/KvvProvider.java index ca3eeaac..86128bf2 100644 --- a/enabler/src/de/schildbach/pte/KvvProvider.java +++ b/enabler/src/de/schildbach/pte/KvvProvider.java @@ -40,7 +40,7 @@ public class KvvProvider extends AbstractEfaProvider public KvvProvider(final String apiBase) { - super(apiBase, null); + super(apiBase); setSuppressPositions(true); } diff --git a/enabler/src/de/schildbach/pte/LinzProvider.java b/enabler/src/de/schildbach/pte/LinzProvider.java index c14adff1..72acb4ec 100644 --- a/enabler/src/de/schildbach/pte/LinzProvider.java +++ b/enabler/src/de/schildbach/pte/LinzProvider.java @@ -32,7 +32,7 @@ public class LinzProvider extends AbstractEfaProvider public LinzProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/MariborProvider.java b/enabler/src/de/schildbach/pte/MariborProvider.java index cdaa2b0d..87aec18e 100644 --- a/enabler/src/de/schildbach/pte/MariborProvider.java +++ b/enabler/src/de/schildbach/pte/MariborProvider.java @@ -33,7 +33,7 @@ public class MariborProvider extends AbstractEfaProvider public MariborProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/MetProvider.java b/enabler/src/de/schildbach/pte/MetProvider.java index 8c9b0b2d..e1b7a50f 100644 --- a/enabler/src/de/schildbach/pte/MetProvider.java +++ b/enabler/src/de/schildbach/pte/MetProvider.java @@ -35,7 +35,7 @@ public class MetProvider extends AbstractEfaProvider public MetProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/MvgProvider.java b/enabler/src/de/schildbach/pte/MvgProvider.java index 003b3518..4abbe70d 100644 --- a/enabler/src/de/schildbach/pte/MvgProvider.java +++ b/enabler/src/de/schildbach/pte/MvgProvider.java @@ -33,7 +33,7 @@ public class MvgProvider extends AbstractEfaProvider public MvgProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/MvvProvider.java b/enabler/src/de/schildbach/pte/MvvProvider.java index aae11245..0da559d5 100644 --- a/enabler/src/de/schildbach/pte/MvvProvider.java +++ b/enabler/src/de/schildbach/pte/MvvProvider.java @@ -38,7 +38,7 @@ public class MvvProvider extends AbstractEfaProvider public MvvProvider(final String apiBase) { - super(apiBase, null); + super(apiBase); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/NaldoProvider.java b/enabler/src/de/schildbach/pte/NaldoProvider.java index 22120c43..a4d08965 100644 --- a/enabler/src/de/schildbach/pte/NaldoProvider.java +++ b/enabler/src/de/schildbach/pte/NaldoProvider.java @@ -33,7 +33,7 @@ public class NaldoProvider extends AbstractEfaProvider public NaldoProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/NvbwProvider.java b/enabler/src/de/schildbach/pte/NvbwProvider.java index 944fc47d..c7f5a099 100644 --- a/enabler/src/de/schildbach/pte/NvbwProvider.java +++ b/enabler/src/de/schildbach/pte/NvbwProvider.java @@ -33,7 +33,7 @@ public class NvbwProvider extends AbstractEfaProvider public NvbwProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/SfProvider.java b/enabler/src/de/schildbach/pte/SfProvider.java index 8f519c6a..100ff57f 100644 --- a/enabler/src/de/schildbach/pte/SfProvider.java +++ b/enabler/src/de/schildbach/pte/SfProvider.java @@ -33,7 +33,7 @@ public class SfProvider extends AbstractEfaProvider public SfProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/StvProvider.java b/enabler/src/de/schildbach/pte/StvProvider.java index 20148664..1ac82723 100644 --- a/enabler/src/de/schildbach/pte/StvProvider.java +++ b/enabler/src/de/schildbach/pte/StvProvider.java @@ -33,7 +33,7 @@ public class StvProvider extends AbstractEfaProvider public StvProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/enabler/src/de/schildbach/pte/SvvProvider.java index 3f657ce5..a4679f2d 100644 --- a/enabler/src/de/schildbach/pte/SvvProvider.java +++ b/enabler/src/de/schildbach/pte/SvvProvider.java @@ -33,7 +33,7 @@ public class SvvProvider extends AbstractEfaProvider public SvvProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/SydneyProvider.java b/enabler/src/de/schildbach/pte/SydneyProvider.java index 7698364c..f04f2e16 100644 --- a/enabler/src/de/schildbach/pte/SydneyProvider.java +++ b/enabler/src/de/schildbach/pte/SydneyProvider.java @@ -29,7 +29,7 @@ public class SydneyProvider extends AbstractEfaProvider public SydneyProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/TflProvider.java b/enabler/src/de/schildbach/pte/TflProvider.java index 701fd883..8a9f7eef 100644 --- a/enabler/src/de/schildbach/pte/TflProvider.java +++ b/enabler/src/de/schildbach/pte/TflProvider.java @@ -33,7 +33,7 @@ public class TflProvider extends AbstractEfaProvider public TflProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/TlemProvider.java b/enabler/src/de/schildbach/pte/TlemProvider.java index d9d9c024..f97523f2 100644 --- a/enabler/src/de/schildbach/pte/TlemProvider.java +++ b/enabler/src/de/schildbach/pte/TlemProvider.java @@ -36,7 +36,7 @@ public class TlemProvider extends AbstractEfaProvider public TlemProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/TlswProvider.java b/enabler/src/de/schildbach/pte/TlswProvider.java index b0154fb9..3b62e24c 100644 --- a/enabler/src/de/schildbach/pte/TlswProvider.java +++ b/enabler/src/de/schildbach/pte/TlswProvider.java @@ -34,7 +34,7 @@ public class TlswProvider extends AbstractEfaProvider public TlswProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/TlwmProvider.java b/enabler/src/de/schildbach/pte/TlwmProvider.java index 0a8644dd..7237057d 100644 --- a/enabler/src/de/schildbach/pte/TlwmProvider.java +++ b/enabler/src/de/schildbach/pte/TlwmProvider.java @@ -30,7 +30,7 @@ public class TlwmProvider extends AbstractEfaProvider public TlwmProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/VagfrProvider.java b/enabler/src/de/schildbach/pte/VagfrProvider.java index d1b1267a..09b430e7 100644 --- a/enabler/src/de/schildbach/pte/VagfrProvider.java +++ b/enabler/src/de/schildbach/pte/VagfrProvider.java @@ -37,7 +37,7 @@ public class VagfrProvider extends AbstractEfaProvider public VagfrProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/VblProvider.java b/enabler/src/de/schildbach/pte/VblProvider.java index a2af0d60..a5b6238e 100644 --- a/enabler/src/de/schildbach/pte/VblProvider.java +++ b/enabler/src/de/schildbach/pte/VblProvider.java @@ -27,7 +27,7 @@ public class VblProvider extends AbstractEfaProvider public VblProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/VgnProvider.java b/enabler/src/de/schildbach/pte/VgnProvider.java index 6694157c..f261cd8d 100644 --- a/enabler/src/de/schildbach/pte/VgnProvider.java +++ b/enabler/src/de/schildbach/pte/VgnProvider.java @@ -33,7 +33,7 @@ public class VgnProvider extends AbstractEfaProvider public VgnProvider(final String apiBase) { - super(apiBase, DEPARTURE_MONITOR_ENDPOINT, TRIP_ENDPOINT, null, null, null); + super(apiBase, DEPARTURE_MONITOR_ENDPOINT, TRIP_ENDPOINT, null, null); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/VmobilProvider.java b/enabler/src/de/schildbach/pte/VmobilProvider.java index 8662d68e..88e4abec 100644 --- a/enabler/src/de/schildbach/pte/VmobilProvider.java +++ b/enabler/src/de/schildbach/pte/VmobilProvider.java @@ -29,7 +29,7 @@ public class VmobilProvider extends AbstractEfaProvider public VmobilProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/VmsProvider.java b/enabler/src/de/schildbach/pte/VmsProvider.java index 0511e4bd..53d569f7 100644 --- a/enabler/src/de/schildbach/pte/VmsProvider.java +++ b/enabler/src/de/schildbach/pte/VmsProvider.java @@ -33,7 +33,7 @@ public class VmsProvider extends AbstractEfaProvider public VmsProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/VmvProvider.java b/enabler/src/de/schildbach/pte/VmvProvider.java index 23fa2323..6c41c6a1 100644 --- a/enabler/src/de/schildbach/pte/VmvProvider.java +++ b/enabler/src/de/schildbach/pte/VmvProvider.java @@ -33,7 +33,7 @@ public class VmvProvider extends AbstractEfaProvider public VmvProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/VorProvider.java b/enabler/src/de/schildbach/pte/VorProvider.java index 1a419683..d4aeeaf8 100644 --- a/enabler/src/de/schildbach/pte/VorProvider.java +++ b/enabler/src/de/schildbach/pte/VorProvider.java @@ -32,7 +32,7 @@ public class VorProvider extends AbstractEfaProvider public VorProvider() { - super(API_BASE, null); + super(API_BASE); setHttpReferer(API_BASE + DEFAULT_DEPARTURE_MONITOR_ENDPOINT); setHttpPost(true); diff --git a/enabler/src/de/schildbach/pte/VrnProvider.java b/enabler/src/de/schildbach/pte/VrnProvider.java index f6ebf677..ad23b1cb 100644 --- a/enabler/src/de/schildbach/pte/VrnProvider.java +++ b/enabler/src/de/schildbach/pte/VrnProvider.java @@ -27,7 +27,7 @@ public class VrnProvider extends AbstractEfaProvider public VrnProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/VrrProvider.java b/enabler/src/de/schildbach/pte/VrrProvider.java index 5cb98b89..c35cc623 100644 --- a/enabler/src/de/schildbach/pte/VrrProvider.java +++ b/enabler/src/de/schildbach/pte/VrrProvider.java @@ -36,7 +36,7 @@ public class VrrProvider extends AbstractEfaProvider public VrrProvider() { - super(API_BASE, null); + super(API_BASE); setNeedsSpEncId(true); } diff --git a/enabler/src/de/schildbach/pte/VrtProvider.java b/enabler/src/de/schildbach/pte/VrtProvider.java index e4a07148..91c46c2f 100644 --- a/enabler/src/de/schildbach/pte/VrtProvider.java +++ b/enabler/src/de/schildbach/pte/VrtProvider.java @@ -33,7 +33,7 @@ public class VrtProvider extends AbstractEfaProvider public VrtProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id() diff --git a/enabler/src/de/schildbach/pte/VvmProvider.java b/enabler/src/de/schildbach/pte/VvmProvider.java index 0c461b02..8a19e55b 100644 --- a/enabler/src/de/schildbach/pte/VvmProvider.java +++ b/enabler/src/de/schildbach/pte/VvmProvider.java @@ -33,7 +33,7 @@ public class VvmProvider extends AbstractEfaProvider public VvmProvider() { - super(API_BASE, null); + super(API_BASE); setNeedsSpEncId(true); } diff --git a/enabler/src/de/schildbach/pte/VvoProvider.java b/enabler/src/de/schildbach/pte/VvoProvider.java index 056b3eef..a7a59b12 100644 --- a/enabler/src/de/schildbach/pte/VvoProvider.java +++ b/enabler/src/de/schildbach/pte/VvoProvider.java @@ -38,7 +38,7 @@ public class VvoProvider extends AbstractEfaProvider public VvoProvider(final String apiBase) { - super(apiBase, null); + super(apiBase); setRequestUrlEncoding(UTF_8); } diff --git a/enabler/src/de/schildbach/pte/VvsProvider.java b/enabler/src/de/schildbach/pte/VvsProvider.java index bd954485..cbb39235 100644 --- a/enabler/src/de/schildbach/pte/VvsProvider.java +++ b/enabler/src/de/schildbach/pte/VvsProvider.java @@ -34,7 +34,7 @@ public class VvsProvider extends AbstractEfaProvider public VvsProvider(final String apiBase) { - super(apiBase, null); + super(apiBase); setCanAcceptPoiId(true); } diff --git a/enabler/src/de/schildbach/pte/VvtProvider.java b/enabler/src/de/schildbach/pte/VvtProvider.java index 520cb8ed..78921835 100644 --- a/enabler/src/de/schildbach/pte/VvtProvider.java +++ b/enabler/src/de/schildbach/pte/VvtProvider.java @@ -27,7 +27,7 @@ public class VvtProvider extends AbstractEfaProvider public VvtProvider() { - super(API_BASE, null); + super(API_BASE); setUseRouteIndexAsConnectionId(false); } diff --git a/enabler/src/de/schildbach/pte/VvvProvider.java b/enabler/src/de/schildbach/pte/VvvProvider.java index 3f540a7a..9cc32e26 100644 --- a/enabler/src/de/schildbach/pte/VvvProvider.java +++ b/enabler/src/de/schildbach/pte/VvvProvider.java @@ -29,7 +29,7 @@ public class VvvProvider extends AbstractEfaProvider public VvvProvider() { - super(API_BASE, null); + super(API_BASE); } public NetworkId id()