Parse "no data" message on candle subscription

Use NoDataError exception on such errors.
sergluka · May 30, 2019 · 5dd5f5a · 5dd5f5a
1 parent 1a21ed4
commit 5dd5f5a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/main/java/com/finplant/ib/IbExceptions.java b/src/main/java/com/finplant/ib/IbExceptions.java
@@ -59,9 +59,13 @@ public DuplicatedRequestError(RequestKey key) {
         }
     }
 
-    public static class NoTicksError extends IbClientError {
-        public NoTicksError(int requestId) {
-            super(requestId, "Has no ticks");
+    public static class NoDataError extends IbClientError {
+        public NoDataError(int requestId) {
+            super(requestId, "Has no data");
+        }
+
+        public NoDataError(int requestId, String message) {
+            super(requestId, message);
         }
     }
 

diff --git a/src/main/java/com/finplant/ib/impl/TerminalErrorHandler.java b/src/main/java/com/finplant/ib/impl/TerminalErrorHandler.java
@@ -148,22 +148,24 @@ public void handle(int id, int code, String message) {
     private void onHistoricalDataError(int code, int id, String message) {
 
         final String HISTORICAL_DATA_MSG = "Historical Market Data Service error message";
+
         final String HISTORICAL_DATA_CANCEL_MSG = "API historical data query cancelled";
         final String HISTORICAL_DATA_NO_PERMISSIONS_MSG = "No market data permissions for";
+        final String HISTORICAL_DATA_NO_DATA_MSG = "HMDS query returned no data";
 
         if (!message.startsWith(HISTORICAL_DATA_MSG)) {
             log.error("Unexpected message for REQ_HISTORICAL_DATA: {}", message);
-            requests.onError(null, id,
-                             new IbExceptions.TerminalError(id, message, code));
+            requests.onError(null, id, new IbExceptions.TerminalError(id, message, code));
             return;
         }
 
         String messageInfo = message.substring(HISTORICAL_DATA_MSG.length() + 1);
+        //noinspection StatementWithEmptyBody Subscription canceling is not an error
         if (messageInfo.startsWith(HISTORICAL_DATA_CANCEL_MSG)) {
-            // Subscription canceling is not an error
         } else if (messageInfo.startsWith(HISTORICAL_DATA_NO_PERMISSIONS_MSG)) {
-            requests.onError(null, id,
-                             new IbExceptions.NoPermissions(id, messageInfo), true);
+            requests.onError(null, id, new IbExceptions.NoPermissions(id, messageInfo), true);
+        } else if (messageInfo.startsWith(HISTORICAL_DATA_NO_DATA_MSG)) {
+            requests.onError(null, id, new IbExceptions.NoDataError(id, messageInfo), true);
         } else {
             requests.onError(null, id, new IbExceptions.IbClientError(id, message), true);
         }

diff --git a/src/main/java/com/finplant/ib/impl/Wrapper.java b/src/main/java/com/finplant/ib/impl/Wrapper.java
@@ -428,7 +428,7 @@ public void tickSnapshotEnd(final int tickerId) {
         IbTick tick = cache.getTick(tickerId);
         if (tick == null) {
             log.info("No ticks for ticker {}", tickerId);
-            requests.onError(tickerId, new IbExceptions.NoTicksError(tickerId));
+            requests.onError(tickerId, new IbExceptions.NoDataError(tickerId));
             return;
         }