eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-25 06:58:39 +00:00
Code Activity

improve error handling for Igtimi wind import; see bug 2002

Browse Source
This commit is contained in:
Axel Uhl
2014-09-22 16:04:51 +02:00
parent cea8bc3ddc
commit 733e7ea470
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/impl/IgtimiConnectionImpl.java
+17
View File
@@ -45,6 +45,17 @@ import com.sap.sse.common.Util;
public class IgtimiConnectionImpl implements IgtimiConnection {
private static final Logger logger = Logger.getLogger(IgtimiConnectionImpl.class.getName());
/**
* name of the JSON property indicating an error reason in a response document
*/
private static final String REASON = "reason";
/**
* name of the JSON property indicating an error condition in a response document
*/
private static final String ERROR = "error";
private final Account account;
private final IgtimiConnectionFactoryImpl connectionFactory;
private final LiveDataConnectionFactory liveDataConnectionFactory;
@@ -149,6 +160,12 @@ public class IgtimiConnectionImpl implements IgtimiConnection {
HttpClient client = connectionFactory.getHttpClient();
HttpGet getResourceData = new HttpGet(connectionFactory.getResourceDataUrl(startTime, endTime, deviceSerialNumbers, typeAndCompression, account));
JSONObject resourceDataJson = ConnectivityUtils.getJsonFromResponse(client.execute(getResourceData));
String error = (String) resourceDataJson.get(ERROR);
if (error != null) {
String reason = (String) resourceDataJson.get(REASON);
throw new ClientProtocolException("Error trying to obtain Igtimi resource data from "+startTime+" to "+endTime+
" from devices "+deviceSerialNumbers+": "+error+(reason==null?"":". Reason: "+reason));
}
return new FixFactory().createFixes(resourceDataJson);
}