Deadlock fix and clean up AbstractFeed, add onFeedSocketException

The 'onFeedSocketException()' and 'onFeedSocketClose()' methods are used to notify any listeners or CompletableFutures that there was an exception thrown by the underlying Socket in the AbstractFeed instance. This fixes forever-waiting SingleMessageFutures and MultiMessageAccumulators

Author: Petersoj

src/main/java/net/jacobpeterson/iqfeed4j/IQFeed4j.java

@@ -149,7 +149,7 @@ public void stopIQConnect() {
     }
 
     /**
-     * Starts the {@link Level1Feed} instance, or does nothing it it's already started.
+     * Starts the {@link Level1Feed} instance, or does nothing if it's already started.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -159,7 +159,7 @@ public void startLevel1Feed() throws IOException, InterruptedException {
     }
 
     /**
-     * Stops the {@link Level1Feed} instance, or does nothing it it's already stopped.
+     * Stops the {@link Level1Feed} instance, or does nothing if it's already stopped.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -170,7 +170,7 @@ public void stopLevel1Feed() throws IOException, InterruptedException {
     }
 
     /**
-     * Starts the {@link DerivativeFeed} instance, or does nothing it it's already started.
+     * Starts the {@link DerivativeFeed} instance, or does nothing if it's already started.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -181,7 +181,7 @@ public void startDerivativeFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Stops the {@link DerivativeFeed} instance, or does nothing it it's already stopped.
+     * Stops the {@link DerivativeFeed} instance, or does nothing if it's already stopped.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -192,7 +192,7 @@ public void stopDerivativeFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Starts the {@link AdminFeed} instance, or does nothing it it's already started.
+     * Starts the {@link AdminFeed} instance, or does nothing if it's already started.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -202,7 +202,7 @@ public void startAdminFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Stops the {@link AdminFeed} instance, or does nothing it it's already stopped.
+     * Stops the {@link AdminFeed} instance, or does nothing if it's already stopped.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -213,7 +213,7 @@ public void stopAdminFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Starts the {@link HistoricalFeed} instance, or does nothing it it's already started.
+     * Starts the {@link HistoricalFeed} instance, or does nothing if it's already started.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -223,7 +223,7 @@ public void startHistoricalFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Stops the {@link HistoricalFeed} instance, or does nothing it it's already stopped.
+     * Stops the {@link HistoricalFeed} instance, or does nothing if it's already stopped.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -234,7 +234,7 @@ public void stopHistoricalFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Starts the {@link MarketSummaryFeed} instance, or does nothing it it's already started.
+     * Starts the {@link MarketSummaryFeed} instance, or does nothing if it's already started.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -245,7 +245,7 @@ public void startMarketSummaryFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Stops the {@link MarketSummaryFeed} instance, or does nothing it it's already stopped.
+     * Stops the {@link MarketSummaryFeed} instance, or does nothing if it's already stopped.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -256,7 +256,7 @@ public void stopMarketSummaryFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Starts the {@link NewsFeed} instance, or does nothing it it's already started.
+     * Starts the {@link NewsFeed} instance, or does nothing if it's already started.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -266,7 +266,7 @@ public void startNewsFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Stops the {@link NewsFeed} instance, or does nothing it it's already stopped.
+     * Stops the {@link NewsFeed} instance, or does nothing if it's already stopped.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -277,7 +277,7 @@ public void stopNewsFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Starts the {@link OptionChainsFeed} instance, or does nothing it it's already started.
+     * Starts the {@link OptionChainsFeed} instance, or does nothing if it's already started.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -288,7 +288,7 @@ public void startOptionChainsFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Stops the {@link OptionChainsFeed} instance, or does nothing it it's already stopped.
+     * Stops the {@link OptionChainsFeed} instance, or does nothing if it's already stopped.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -299,7 +299,7 @@ public void stopOptionChainsFeed() throws IOException, InterruptedException {
     }
 
     /**
-     * Starts the {@link SymbolMarketInfoFeed} instance, or does nothing it it's already started.
+     * Starts the {@link SymbolMarketInfoFeed} instance, or does nothing if it's already started.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -310,7 +310,7 @@ public void startSymbolMarketInfoFeed() throws IOException, InterruptedException
     }
 
     /**
-     * Stops the {@link SymbolMarketInfoFeed} instance, or does nothing it it's already stopped.
+     * Stops the {@link SymbolMarketInfoFeed} instance, or does nothing if it's already stopped.
      *
      * @throws IOException          thrown for {@link IOException}s
      * @throws InterruptedException thrown for {@link InterruptedException}s
@@ -329,11 +329,9 @@ public void stopSymbolMarketInfoFeed() throws IOException, InterruptedException
      *
      * @return the started {@link AbstractFeed}
      *
-     * @throws IOException          thrown for {@link IOException}s
-     * @throws InterruptedException thrown for {@link InterruptedException}s
+     * @throws IOException thrown for {@link IOException}s
      */
-    private <F extends AbstractFeed> F startFeed(F feed, Supplier<F> feedInstantiator)
-            throws IOException, InterruptedException {
+    private <F extends AbstractFeed> F startFeed(F feed, Supplier<F> feedInstantiator) throws IOException {
         if (feed == null) {
             feed = feedInstantiator.get();
             feed.start();
@@ -352,10 +350,9 @@ private <F extends AbstractFeed> F startFeed(F feed, Supplier<F> feedInstantiato
      * @param <F>  the {@link AbstractFeed} type parameter
      * @param feed the {@link AbstractFeed}
      *
-     * @throws IOException          thrown for {@link IOException}s
-     * @throws InterruptedException thrown for {@link InterruptedException}s
+     * @throws IOException thrown for {@link IOException}s
      */
-    private <F extends AbstractFeed> void stopFeed(F feed) throws IOException, InterruptedException {
+    private <F extends AbstractFeed> void stopFeed(F feed) throws IOException {
         if (feed != null) {
             feed.stop();
         }

src/main/java/net/jacobpeterson/iqfeed4j/executable/ExecutablePollingFeed.java

@@ -24,4 +24,10 @@ public ExecutablePollingFeed(String hostname, int port) {
 
     @Override
     protected void onMessageReceived(String[] csv) {}
+
+    @Override
+    protected void onFeedSocketException(Exception exception) {}
+
+    @Override
+    protected void onFeedSocketClose() {}
 }

src/main/java/net/jacobpeterson/iqfeed4j/executable/IQConnectExecutable.java

@@ -193,7 +193,7 @@ public int waitForConnection(long timeoutMillis) throws TimeoutException {
      * @param pollingInterval the time to wait between connection attempts
      * @param timoutMillis    the timeout time in milliseconds
      *
-     * @return the number of attempts it took to connect
+     * @return the number of attempts it took to connect, or <code>-1</code> if waiting for connection was interrupted
      *
      * @throws TimeoutException thrown when <code>timoutMillis</code> have elapsed without a successful connection
      */
@@ -216,7 +216,7 @@ public int waitForConnection(String hostname, int port, int pollingInterval, lon
 
                 return attempts;
             } catch (InterruptedException interruptedException) {
-                return 0;
+                return -1;
             } catch (IOException ignored) {}
         }