Sukreet | SHR-1216 | Throwing proper exceptions.

Author: sukreet

src/main/java/org/sharedhealth/datasense/client/FacilityWebClient.java

@@ -71,7 +71,8 @@ private String getResponse(String facilityId) throws URISyntaxException, IOExcep
         try {
             response = new WebClient().get(facilityUrl, headers);
         } catch (ConnectionException e) {
-            log.error("Could not fetch facility");
+            String message = "Could not fetch facility";
+            log.error(message);
             if (e.getErrorCode() == 401)
                 log.error("Unauthorized");
         }

src/main/java/org/sharedhealth/datasense/client/MciWebClient.java

@@ -38,7 +38,7 @@ public Patient identifyPatient(String healthId) throws URISyntaxException, IOExc
 
     public String get(URI url) throws URISyntaxException, IOException {
         log.info("Reading from " + url);
-            Map<String, String> headers = getHrmAccessTokenHeaders(identityServiceClient.getOrCreateToken(), properties);
+        Map<String, String> headers = getHrmAccessTokenHeaders(identityServiceClient.getOrCreateToken(), properties);
         headers.put("Accept", "application/atom+xml");
         String response = null;
         try {
@@ -49,6 +49,7 @@ public String get(URI url) throws URISyntaxException, IOException {
                 log.error("Unauthorized, clearing token.");
                 identityServiceClient.clearToken();
             }
+            throw new IOException("Could not fetch from url" + url, e);
         }
         return response;
     }
@@ -62,11 +63,13 @@ private String getResponse(final String healthId) throws URISyntaxException, IOE
         try {
             response = new WebClient().get(mciURI, headers);
         } catch (ConnectionException e) {
-            log.error(String.format("Could not identify patient with healthId [%s]", healthId), e);
+            String message = String.format("Could not identify patient with healthId [%s]", healthId);
+            log.error(message, e);
             if (e.getErrorCode() == 401) {
                 log.error("Unauthorized, clearing token.");
                 identityServiceClient.clearToken();
             }
+            throw new IOException(message, e);
         }
         return response;
     }

src/main/java/org/sharedhealth/datasense/client/ProviderWebClient.java

@@ -58,9 +58,11 @@ private String getResponse(String facilityId) throws URISyntaxException, IOExcep
         try {
             response = new WebClient().get(providerUrl, headers);
         } catch (ConnectionException e) {
-            log.error("Could not fetch facility");
+            String message = "Could not fetch provider";
+            log.error(message);
             if (e.getErrorCode() == 401)
                 log.error("Unauthorized.");
+            throw new IOException(message);
         }
         return response;
     }

src/main/java/org/sharedhealth/datasense/client/ShrWebClient.java

@@ -39,8 +39,6 @@ public String getEncounterFeedContent(URI uri) throws IOException {
                 log.error("Unauthorized, clearing token.");
                 identityServiceClient.clearToken();
             }
-            throw new IOException(e);
-        } catch (Exception e) {
             log.error(String.format("Could not fetch feed for URI [%s]", uri.toString()), e);
             throw new IOException(e);
         }

src/main/java/org/sharedhealth/datasense/client/TrWebClient.java

@@ -47,7 +47,7 @@ public String getResponse(URI uri) throws IOException, URISyntaxException {
         String response;
         try {
             response = new WebClient().get(uri, headers);
-        } catch (Exception e) {
+        } catch (ConnectionException e) {
             log.error(String.format("Could not fetch feed for URI [%s] ", uri), e);
             throw new IOException(e);
         }

src/main/java/org/sharedhealth/datasense/feeds/patients/PatientUpdateEventWorker.java

@@ -44,6 +44,7 @@ public void process(Event event) {
             patientDao.update(patientUpdate);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage());
         }
     }