Skip to content

Commit

Permalink
Classe Commune n'est pas publique #6
Browse files Browse the repository at this point in the history 
Fixed #6
  • Loading branch information
@meilie389
meilie389 committed Mar 11, 2020
1 parent 3bf27cc commit b98b7b8
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 61 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.adriens.github.opt.tempsattente</groupId>
<artifactId>tempsattente-sdk</artifactId>
<version>1.0</version>
<version>1.1</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
154 changes: 152 additions & 2 deletions src/main/java/com/github/adriens/opt/tempsattente/sdk/Agences.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -62,12 +210,14 @@ public static ArrayList<Agence> getAgences() throws IOException {
*/
public static ArrayList<Agence> getAgences(Commune commune) throws IOException {

logger.info("------------------------------------------------------------");;
logger.info("------------------------------------------------------------");

ArrayList<Agence> 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);
Expand Down
55 changes: 0 additions & 55 deletions src/main/java/com/github/adriens/opt/tempsattente/sdk/Commune.java
View file

This file was deleted.

6 changes: 3 additions & 3 deletions src/test/java/com/github/adriens/opt/tempsattente/sdk/AgencesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit b98b7b8

Please sign in to comment.