diff --git a/pom.xml b/pom.xml
index 2f0620c..80e04bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.adriens.github.opt.tempsattente
tempsattente-sdk
- 1.0
+ 1.1
jar
UTF-8
diff --git a/src/main/java/com/github/adriens/opt/tempsattente/sdk/Agences.java b/src/main/java/com/github/adriens/opt/tempsattente/sdk/Agences.java
index fcf42fa..eba1442 100644
--- a/src/main/java/com/github/adriens/opt/tempsattente/sdk/Agences.java
+++ b/src/main/java/com/github/adriens/opt/tempsattente/sdk/Agences.java
@@ -36,6 +36,154 @@ public class Agences {
*/
public static final String BASE_URL = "https://open-data.opt.nc/agences/_search?size=1000";
+ enum Commune {
+ BOULOUPARIS,
+ MOINDOU,
+ NOUMEA,
+ HOUAILOU,
+ KONE,
+ KAALA_GOMEN,
+ POUEBO,
+ THIO,
+ TADINE,
+ MONT_DORE,
+ KOUAOUA,
+ POYA,
+ BELEP,
+ ILE_DES_PINS,
+ DUMBEA,
+ BOURAIL,
+ CANALA,
+ FAYAOUE,
+ POUM,
+ TOUHO,
+ POUEMBOUT,
+ KOUMAC,
+ PAITA,
+ SARRAMEA,
+ LIFOU,
+ OUEGOA,
+ YATE,
+ LA_FOA,
+ HIENGHENE,
+ MARE,
+ POINDIMIE,
+ PONERIHOUEN,
+ VOH;
+
+ private String url;
+
+ public String getUrl() {
+ return this.url;
+ }
+
+ public void setUrl(Commune commune) {
+ switch (commune) {
+ case BOULOUPARIS:
+ this.url = "&q=localiteRefloc:(BOULOUPARIS)";
+ break;
+ case MOINDOU:
+ this.url = "&q=localiteRefloc:(MOINDOU)";
+ break;
+ case NOUMEA:
+ this.url = "&q=localiteRefloc:(NOUMEA)";
+ break;
+ case HOUAILOU:
+ this.url = "&q=localiteRefloc:(HOUAILOU)";
+ break;
+ case KONE:
+ this.url = "&q=localiteRefloc:(KONE)";
+ break;
+ case KAALA_GOMEN:
+ this.url = "&q=localiteRefloc:(KAALA-GOMEN)";
+ break;
+ case POUEBO:
+ this.url = "&q=localiteRefloc:(POUEBO)";
+ break;
+ case THIO:
+ this.url = "&q=localiteRefloc:(THIO)";
+ break;
+ case TADINE:
+ this.url = "&q=localiteRefloc:(TADINE)";
+ break;
+ case MONT_DORE:
+ this.url = "&q=localiteRefloc:(MONT-DORE)";
+ break;
+ case KOUAOUA:
+ this.url = "&q=localiteRefloc:(KOUAOUA)";
+ break;
+ case POYA:
+ this.url = "&q=localiteRefloc:(POYA)";
+ break;
+ case BELEP:
+ this.url = "&q=localiteRefloc:(BELEP)";
+ break;
+ case ILE_DES_PINS:
+ this.url = "&q=localiteRefloc:(ILE%20AND%20DES%20AND%20PINS)";
+ break;
+ case DUMBEA:
+ this.url = "&q=localiteRefloc:(DUMBEA)";
+ break;
+ case BOURAIL:
+ this.url = "&q=localiteRefloc:(BOURAIL)";
+ break;
+ case CANALA:
+ this.url = "&q=localiteRefloc:(CANALA)";
+ break;
+ case FAYAOUE:
+ this.url = "&q=localiteRefloc:(FAYAOUE)";
+ break;
+ case POUM:
+ this.url = "&q=localiteRefloc:(POUM)";
+ break;
+ case TOUHO:
+ this.url = "&q=localiteRefloc:(TOUHO)";
+ break;
+ case POUEMBOUT:
+ this.url = "&q=localiteRefloc:(POUEMBOUT)";
+ break;
+ case KOUMAC:
+ this.url = "&q=localiteRefloc:(KOUMAC)";
+ break;
+ case PAITA:
+ this.url = "&q=localiteRefloc:(PAITA)";
+ break;
+ case SARRAMEA:
+ this.url = "&q=localiteRefloc:(SARRAMEA)";
+ break;
+ case LIFOU:
+ this.url = "&q=localiteRefloc:(LIFOU)%20OR%20localiteRefloc:(WE)";
+ break;
+ case OUEGOA:
+ this.url = "&q=localiteRefloc:(OUEGOA)";
+ break;
+ case YATE:
+ this.url = "&q=localiteRefloc:(YATE)";
+ break;
+ case LA_FOA:
+ this.url = "&q=localiteRefloc:(LA%20AND%20FOA)";
+ break;
+ case HIENGHENE:
+ this.url = "&q=localiteRefloc:(HIENGHENE)";
+ break;
+ case MARE:
+ this.url = "&q=localiteRefloc:(MARE)";
+ break;
+ case POINDIMIE:
+ this.url = "&q=localiteRefloc:(POINDIMIE)";
+ break;
+ case PONERIHOUEN:
+ this.url = "&q=localiteRefloc:(PONERIHOUEN)";
+ break;
+ case VOH:
+ this.url = "&q=localiteRefloc:(VOH)";
+ break;
+ }
+ }
+
+ }
+
+
/**
* Return the list of all the agencies.
*
@@ -62,12 +210,14 @@ public static ArrayList getAgences() throws IOException {
*/
public static ArrayList getAgences(Commune commune) throws IOException {
- logger.info("------------------------------------------------------------");;
+ logger.info("------------------------------------------------------------");
+
ArrayList listeAgences = new ArrayList<>();
ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
logger.info("Recherche de l'URL : ");
- URL url = new URL("" + BASE_URL + commune.url);
+ commune.setUrl(commune);
+ URL url = new URL("" + BASE_URL + commune.getUrl());
logger.info("Recupération des données des agences : ");
JsonNode jsonNode = mapper.readValue(url, JsonNode.class);
diff --git a/src/main/java/com/github/adriens/opt/tempsattente/sdk/Commune.java b/src/main/java/com/github/adriens/opt/tempsattente/sdk/Commune.java
deleted file mode 100644
index 503994e..0000000
--- a/src/main/java/com/github/adriens/opt/tempsattente/sdk/Commune.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.github.adriens.opt.tempsattente.sdk;
-
-/**
- *
- * @author meilie
- */
-
-public enum Commune {
-
- BOULOUPARIS("&q=localiteRefloc:(BOULOUPARIS)"),
- MOINDOU("&q=localiteRefloc:(MOINDOU)"),
- NOUMEA("&q=localiteRefloc:(NOUMEA)"),
- HOUAILOU("&q=localiteRefloc:(HOUAILOU)"),
- KONE("&q=localiteRefloc:(KONE)"),
- KAALA_GOMEN("&q=localiteRefloc:(KAALA-GOMEN)"),
- POUEBO("&q=localiteRefloc:(POUEBO)"),
- THIO("&q=localiteRefloc:(THIO)"),
- TADINE("&q=localiteRefloc:(TADINE)"),
- MONT_DORE("&q=localiteRefloc:(MONT-DORE)"),
- KOUAOUA("&q=localiteRefloc:(KOUAOUA)"),
- POYA("&q=localiteRefloc:(POYA)"),
- BELEP("&q=localiteRefloc:(BELEP)"),
- ILE_DES_PINS("&q=localiteRefloc:(ILE%20AND%20DES%20AND%20PINS)"),
- DUMBEA("&q=localiteRefloc:(DUMBEA)"),
- BOURAIL("&q=localiteRefloc:(BOURAIL)"),
- CANALA("&q=localiteRefloc:(CANALA)"),
- FAYAOUE("&q=localiteRefloc:(FAYAOUE)"),
- POUM("&q=localiteRefloc:(POUM)"),
- TOUHO("&q=localiteRefloc:(TOUHO)"),
- POUEMBOUT("&q=localiteRefloc:(POUEMBOUT)"),
- KOUMAC("&q=localiteRefloc:(KOUMAC)"),
- PAITA("&q=localiteRefloc:(PAITA)"),
- SARRAMEA("&q=localiteRefloc:(SARRAMEA)"),
- LIFOU("&q=localiteRefloc:(LIFOU)%20OR%20localiteRefloc:(WE)"),
- OUEGOA("&q=localiteRefloc:(OUEGOA)"),
- YATE("&q=localiteRefloc:(YATE)"),
- LA_FOA("&q=localiteRefloc:(LA%20AND%20FOA)"),
- HIENGHENE("&q=localiteRefloc:(HIENGHENE)"),
- MARE("&q=localiteRefloc:(MARE)"),
- POINDIMIE("&q=localiteRefloc:(POINDIMIE)"),
- PONERIHOUEN("&q=localiteRefloc:(PONERIHOUEN)"),
- VOH("&q=localiteRefloc:(VOH)");
-
- public final String url;
-
- Commune(String url) {
- this.url = url;
- }
-
-}
diff --git a/src/test/java/com/github/adriens/opt/tempsattente/sdk/AgencesTest.java b/src/test/java/com/github/adriens/opt/tempsattente/sdk/AgencesTest.java
index 9f5455d..18ea8b5 100644
--- a/src/test/java/com/github/adriens/opt/tempsattente/sdk/AgencesTest.java
+++ b/src/test/java/com/github/adriens/opt/tempsattente/sdk/AgencesTest.java
@@ -35,7 +35,7 @@ public void testGetAgences() {
System.out.println("\ngetAgences(Commune)_TEST");
try {
- assertEquals(17, Agences.getAgences(Commune.NOUMEA).size(), "Longueur de listes différentes");
+ assertEquals(17, Agences.getAgences(Agences.Commune.NOUMEA).size(), "Longueur de listes différentes");
} catch (IOException ex) {
Logger.getLogger(AgencesTest.class.getName()).log(Level.SEVERE, null, ex);
@@ -87,9 +87,9 @@ public void testDemo() {
try {
System.out.println("<" + Agences.getAgences().size() + "> agences trouvées");
- System.out.println("<" + Agences.getAgences(Commune.NOUMEA).size() + "> agences trouvées pour <" + Commune.NOUMEA + ">");
+ System.out.println("<" + Agences.getAgences(Agences.Commune.NOUMEA).size() + "> agences trouvées pour <" + Agences.Commune.NOUMEA + ">");
- assertEquals(17, Agences.getAgences(Commune.NOUMEA).size(), "La liste est vide.");
+ assertEquals(17, Agences.getAgences(Agences.Commune.NOUMEA).size(), "La liste est vide.");
assertEquals(65, Agences.getAgences().size(), "La liste est vide.");
} catch (IOException e) {