From 32142ed1843476c93a6ead71aafb70dcecbd9526 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 18 Sep 2018 15:16:36 +0200 Subject: [PATCH] Fix API_REGION not a constant for some Navitia-based providers. --- enabler/src/de/schildbach/pte/BritishColumbiaProvider.java | 2 +- enabler/src/de/schildbach/pte/FranceNorthEastProvider.java | 2 +- enabler/src/de/schildbach/pte/FranceNorthWestProvider.java | 2 +- enabler/src/de/schildbach/pte/FranceSouthEastProvider.java | 2 +- enabler/src/de/schildbach/pte/FranceSouthWestProvider.java | 2 +- enabler/src/de/schildbach/pte/GhanaProvider.java | 2 +- enabler/src/de/schildbach/pte/ItalyProvider.java | 2 +- enabler/src/de/schildbach/pte/OntarioProvider.java | 2 +- enabler/src/de/schildbach/pte/OregonProvider.java | 2 +- enabler/src/de/schildbach/pte/ParisProvider.java | 2 +- enabler/src/de/schildbach/pte/PlNavitiaProvider.java | 2 +- enabler/src/de/schildbach/pte/QuebecProvider.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/enabler/src/de/schildbach/pte/BritishColumbiaProvider.java b/enabler/src/de/schildbach/pte/BritishColumbiaProvider.java index e333ea58..455973f4 100644 --- a/enabler/src/de/schildbach/pte/BritishColumbiaProvider.java +++ b/enabler/src/de/schildbach/pte/BritishColumbiaProvider.java @@ -23,7 +23,7 @@ import okhttp3.HttpUrl; * @author Stephane Berube */ public class BritishColumbiaProvider extends AbstractNavitiaProvider { - private static String API_REGION = "ca-bc"; + private static final String API_REGION = "ca-bc"; public BritishColumbiaProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.BRITISHCOLUMBIA, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/FranceNorthEastProvider.java b/enabler/src/de/schildbach/pte/FranceNorthEastProvider.java index 0f5905b2..1961604d 100644 --- a/enabler/src/de/schildbach/pte/FranceNorthEastProvider.java +++ b/enabler/src/de/schildbach/pte/FranceNorthEastProvider.java @@ -28,7 +28,7 @@ import okhttp3.HttpUrl; * @author Stéphane Guillou */ public class FranceNorthEastProvider extends AbstractNavitiaProvider { - private static String API_REGION = "fr-ne"; + private static final String API_REGION = "fr-ne"; // dataset available at: https://navitia.opendatasoft.com/explore/dataset/fr-ne/ public FranceNorthEastProvider(final HttpUrl apiBase, final String authorization) { diff --git a/enabler/src/de/schildbach/pte/FranceNorthWestProvider.java b/enabler/src/de/schildbach/pte/FranceNorthWestProvider.java index b5926ad7..53ad9b5a 100644 --- a/enabler/src/de/schildbach/pte/FranceNorthWestProvider.java +++ b/enabler/src/de/schildbach/pte/FranceNorthWestProvider.java @@ -23,7 +23,7 @@ import okhttp3.HttpUrl; * @author Patrick Kanzler */ public class FranceNorthWestProvider extends AbstractNavitiaProvider { - private static String API_REGION = "fr-nw"; + private static final String API_REGION = "fr-nw"; public FranceNorthWestProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.FRANCENORTHWEST, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/FranceSouthEastProvider.java b/enabler/src/de/schildbach/pte/FranceSouthEastProvider.java index 3ac6be9e..448e7fe5 100644 --- a/enabler/src/de/schildbach/pte/FranceSouthEastProvider.java +++ b/enabler/src/de/schildbach/pte/FranceSouthEastProvider.java @@ -27,7 +27,7 @@ import okhttp3.HttpUrl; * @author Anthony Chaput */ public class FranceSouthEastProvider extends AbstractNavitiaProvider { - private static String API_REGION = "fr-se"; + private static final String API_REGION = "fr-se"; public FranceSouthEastProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.FRANCESOUTHEAST, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/FranceSouthWestProvider.java b/enabler/src/de/schildbach/pte/FranceSouthWestProvider.java index caab0635..eab42e17 100644 --- a/enabler/src/de/schildbach/pte/FranceSouthWestProvider.java +++ b/enabler/src/de/schildbach/pte/FranceSouthWestProvider.java @@ -27,7 +27,7 @@ import okhttp3.HttpUrl; * @author Nicolas Derive */ public class FranceSouthWestProvider extends AbstractNavitiaProvider { - private static String API_REGION = "fr-sw"; + private static final String API_REGION = "fr-sw"; public FranceSouthWestProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.FRANCESOUTHWEST, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/GhanaProvider.java b/enabler/src/de/schildbach/pte/GhanaProvider.java index 3b24301b..e1f151aa 100644 --- a/enabler/src/de/schildbach/pte/GhanaProvider.java +++ b/enabler/src/de/schildbach/pte/GhanaProvider.java @@ -20,7 +20,7 @@ package de.schildbach.pte; import okhttp3.HttpUrl; public class GhanaProvider extends AbstractNavitiaProvider { - private static String API_REGION = "gh"; + private static final String API_REGION = "gh"; public GhanaProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.GHANA, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/ItalyProvider.java b/enabler/src/de/schildbach/pte/ItalyProvider.java index 2ce35def..982be3a8 100644 --- a/enabler/src/de/schildbach/pte/ItalyProvider.java +++ b/enabler/src/de/schildbach/pte/ItalyProvider.java @@ -25,7 +25,7 @@ import okhttp3.HttpUrl; * @author Antonio El Khoury */ public class ItalyProvider extends AbstractNavitiaProvider { - private static String API_REGION = "it"; + private static final String API_REGION = "it"; public ItalyProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.IT, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/OntarioProvider.java b/enabler/src/de/schildbach/pte/OntarioProvider.java index c43a8518..b27bf347 100644 --- a/enabler/src/de/schildbach/pte/OntarioProvider.java +++ b/enabler/src/de/schildbach/pte/OntarioProvider.java @@ -23,7 +23,7 @@ import okhttp3.HttpUrl; * @author Stephane Berube */ public class OntarioProvider extends AbstractNavitiaProvider { - private static String API_REGION = "ca-on"; + private static final String API_REGION = "ca-on"; public OntarioProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.ONTARIO, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/OregonProvider.java b/enabler/src/de/schildbach/pte/OregonProvider.java index 72bac79a..5808cfbd 100644 --- a/enabler/src/de/schildbach/pte/OregonProvider.java +++ b/enabler/src/de/schildbach/pte/OregonProvider.java @@ -20,7 +20,7 @@ package de.schildbach.pte; import okhttp3.HttpUrl; public class OregonProvider extends AbstractNavitiaProvider { - private static String API_REGION = "us-or"; + private static final String API_REGION = "us-or"; public OregonProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.OREGON, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/ParisProvider.java b/enabler/src/de/schildbach/pte/ParisProvider.java index b3049e98..c58e5f78 100644 --- a/enabler/src/de/schildbach/pte/ParisProvider.java +++ b/enabler/src/de/schildbach/pte/ParisProvider.java @@ -28,7 +28,7 @@ import okhttp3.HttpUrl; * @author Antonio El Khoury */ public class ParisProvider extends AbstractNavitiaProvider { - private static String API_REGION = "fr-idf"; + private static final String API_REGION = "fr-idf"; public ParisProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.PARIS, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/PlNavitiaProvider.java b/enabler/src/de/schildbach/pte/PlNavitiaProvider.java index 8be7fc72..f454c6e5 100644 --- a/enabler/src/de/schildbach/pte/PlNavitiaProvider.java +++ b/enabler/src/de/schildbach/pte/PlNavitiaProvider.java @@ -23,7 +23,7 @@ import okhttp3.HttpUrl; * @author Michel Le Bihan */ public class PlNavitiaProvider extends AbstractNavitiaProvider { - private static String API_REGION = "pl"; + private static final String API_REGION = "pl"; public PlNavitiaProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.PLNAVITIA, apiBase, authorization); diff --git a/enabler/src/de/schildbach/pte/QuebecProvider.java b/enabler/src/de/schildbach/pte/QuebecProvider.java index d52b6918..327b289a 100644 --- a/enabler/src/de/schildbach/pte/QuebecProvider.java +++ b/enabler/src/de/schildbach/pte/QuebecProvider.java @@ -23,7 +23,7 @@ import okhttp3.HttpUrl; * @author Stephane Berube */ public class QuebecProvider extends AbstractNavitiaProvider { - private static String API_REGION = "ca-qc"; + private static final String API_REGION = "ca-qc"; public QuebecProvider(final HttpUrl apiBase, final String authorization) { super(NetworkId.QUEBEC, apiBase, authorization);