Added new errors handlers for Http requests
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/89672bdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/89672bdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/89672bdd Branch: refs/heads/master Commit: 89672bddacbbc372dad4ae8ce8ff93ab9d6bb629 Parents: b2b1b31 Author: Dinesh <[email protected]> Authored: Thu Nov 23 18:36:02 2017 +0100 Committer: Dinesh <[email protected]> Committed: Thu Nov 23 18:36:02 2017 +0100 ---------------------------------------------------------------------- .../org/apache/unomi/mailchimp/services/HttpUtils.java | 10 +++++----- .../mailchimp/services/internal/MailChimpServiceImpl.java | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/89672bdd/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/HttpUtils.java ---------------------------------------------------------------------- diff --git a/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/HttpUtils.java b/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/HttpUtils.java index 9b71dca..03c1e4a 100644 --- a/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/HttpUtils.java +++ b/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/HttpUtils.java @@ -84,7 +84,7 @@ public class HttpUtils { return executeRequest(httpClient, request); } catch (UnsupportedEncodingException e) { - logger.error(e.getMessage(), e); + logger.error("The subDomain or the ApiKey were wrong {}", e.getMessage()); return null; } } @@ -95,7 +95,7 @@ public class HttpUtils { return extractResponse(response); } catch (IOException e) { - logger.error(e.getMessage(), e); + logger.error("The subDomain or the ApiKey were wrong {}", e.getMessage()); return null; } } @@ -114,7 +114,7 @@ public class HttpUtils { try { responseString = EntityUtils.toString(response.getEntity()); } catch (IOException e) { - logger.error("Error when retrieving entity response", e); + logger.error("Error when retrieving entity response {}", e.getMessage()); return null; } } @@ -129,13 +129,13 @@ public class HttpUtils { try { response.close(); } catch (IOException e) { - logger.error("Error when trying to close response", e); + logger.error("Error when trying to close response {}", e.getMessage()); } } return jsonNode; } catch (IOException e) { - logger.error("Error when parsing response with ObjectMapper", e); + logger.error("Error when parsing response with ObjectMapper {}", e.getMessage()); return null; } } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/89672bdd/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/internal/MailChimpServiceImpl.java ---------------------------------------------------------------------- diff --git a/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/internal/MailChimpServiceImpl.java b/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/internal/MailChimpServiceImpl.java index ad2da2a..4da5b00 100644 --- a/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/internal/MailChimpServiceImpl.java +++ b/extensions/unomi-mailchimp/services/src/main/java/org/apache/unomi/mailchimp/services/internal/MailChimpServiceImpl.java @@ -44,7 +44,7 @@ public class MailChimpServiceImpl implements MailChimpService { @Override public List<HashMap<String, String>> getAllLists() { List<HashMap<String, String>> mcLists = new ArrayList<>(); - if (isMailChimpConnectorConfigured() && isMailChimpServerOnline()) { + if (isMailChimpConnectorConfigured()) { JsonNode response = HttpUtils.executeGetRequest(httpClient, getBaseUrl() + "/lists", getHeaders()); if (response != null) { if (response.has("lists") && response.get("lists").size() > 0) { @@ -91,6 +91,7 @@ public class MailChimpServiceImpl implements MailChimpService { return MailChimpResult.NO_CHANGE; } } + JSONObject nameStruct = new JSONObject(); nameStruct.put("FNAME", profile.getProperty("firstName").toString()); nameStruct.put("LNAME", profile.getProperty("lastName").toString()); @@ -108,9 +109,6 @@ public class MailChimpServiceImpl implements MailChimpService { body.put("members", dataMember); - // BEFORE DOING THAT CHECK IF THE USER IS NOT ALREADY IN THE LIST - // THEN IF THE USER IS ALREADY IN THE LIST CHECK IF HE IS SUBSCRIBE OR UNSUBSCRIBE - // IF UNSUBSCRIBE SHOULD WE CHANGE IT TO SUBSCRIBE ? JsonNode response = HttpUtils.executePostRequest(httpClient, getBaseUrl() + "/lists/" + listIdentifier, getHeaders(), body.toString()); if (response != null) { if (response.has("errors") && response.get("errors").elements().hasNext() && response.get("errors") @@ -199,6 +197,7 @@ public class MailChimpServiceImpl implements MailChimpService { return false; } + //This method is not use yet, it can be used in the future private boolean isMailChimpServerOnline() { JsonNode response = HttpUtils.executeGetRequest(httpClient, getBaseUrl() + "/ping", getHeaders()); if (response != null) {
