Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 753 → Rev 754

/trunk/src/org/tela_botanica/client/util/UtilDAO.java
17,34 → 17,42
* */
public class UtilDAO {
private static String baseUrl = ((Configuration) Registry.get(RegistreId.CONFIG)).getServiceBaseUrl();
private static String baseUrl = ((Configuration) Registry.get(RegistreId.CONFIG)).getServiceBaseUrl();
public static final String GET = "GET";
public static final String POST = "POST";
public static final String DELETE = "DELETE";
public static final String PUT = "PUT";
private static final String SEPARATEUR_CHEMIN = "/";
private static final String SEPARATEUR_CLE_VALEUR = "=";
private static final String SEPARATEUR_PARAMETRE = "&";
private static final String SEPARATEUR_CHEMIN_PARAMETRE = "?";
private static final String CONTENU_CHEMIN_VIDE = "*";
 
public static JsonRestRequestBuilder construireRequete(String nomService) {
return construireRequete(nomService, null, null, "GET");
}
public static JsonRestRequestBuilder construireRequetePost(String nomService) {
return construireRequete(nomService, null, null, "POST");
return construireRequete(nomService, null, null, POST);
}
public static JsonRestRequestBuilder construireRequete(String nomService, String parametre) {
String[] parametres = {parametre};
return construireRequete(nomService, parametres, null, "GET");
}
 
public static JsonRestRequestBuilder construireRequetePost(String nomService, String[] parametres) {
return construireRequete(nomService, parametres, null, "POST");
return construireRequete(nomService, parametres, null, POST);
}
 
public static JsonRestRequestBuilder construireRequete(String nomService) {
return construireRequete(nomService, null, null, GET);
}
public static JsonRestRequestBuilder construireRequete(String nomService, String[] parametres) {
return construireRequete(nomService, parametres, null, "GET");
return construireRequete(nomService, parametres, null, GET);
}
public static JsonRestRequestBuilder construireRequete(String nomService, HashMap<String, String> restrictions) {
return construireRequete(nomService, null, restrictions, "GET");
return construireRequete(nomService, null, restrictions, GET);
}
public static JsonRestRequestBuilder construireRequete(String nomService, String[] parametres, HashMap<String, String> restrictions) {
return construireRequete(nomService, parametres, restrictions, GET);
}
 
public static JsonRestRequestBuilder construireRequete(String nomService, String[] parametres, HashMap<String, String> restrictions, String typeRequete) {
private static JsonRestRequestBuilder construireRequete(String nomService, String[] parametres, HashMap<String, String> restrictions, String typeRequete) {
String restrictionsUrl = construireUrlParametres(restrictions);
String parametresUrl = construireUrlChemin(parametres);
52,7 → 60,7
String urlCompleteEncodee = URL.encode(urlComplete);
JsonRestRequestBuilder jrrb;
if (typeRequete.equals("GET")) {
if (typeRequete.equals(GET)) {
jrrb = new JsonRestRequestBuilder(JsonRestRequestBuilder.GET, urlCompleteEncodee);
} else {
jrrb = new JsonRestRequestBuilder(JsonRestRequestBuilder.POST, urlCompleteEncodee);
63,14 → 71,14
private static String construireUrlParametres(HashMap<String, String> parametres) {
String parametresUrl = "";
if (parametres != null && parametres.size() > 0) {
parametresUrl = "?";
parametresUrl = SEPARATEUR_CHEMIN_PARAMETRE;
Iterator<String> iterateur = parametres.keySet().iterator();
while (iterateur.hasNext()) {
String cle = iterateur.next();
parametresUrl += cle + "=" + parametres.get(cle);
parametresUrl += cle + SEPARATEUR_CLE_VALEUR + parametres.get(cle);
if (iterateur.hasNext()) {
parametresUrl = parametresUrl + "&";
parametresUrl = parametresUrl + SEPARATEUR_PARAMETRE;
}
}
}
80,9 → 88,9
private static String construireUrlChemin(String[] morceauxDuChemin) {
String cheminUrl = "";
if (morceauxDuChemin != null && morceauxDuChemin.length > 0) {
cheminUrl = "/";
cheminUrl = SEPARATEUR_CHEMIN;
for (int i = 0; i < morceauxDuChemin.length; i++) {
cheminUrl += (morceauxDuChemin[i] != null ? morceauxDuChemin[i] : "*") + "/";
cheminUrl += (morceauxDuChemin[i] != null ? morceauxDuChemin[i] : CONTENU_CHEMIN_VIDE) + SEPARATEUR_CHEMIN;
}
}
return cheminUrl;