heavily rework threads for more accurate timeouts and interupt checks

Author: CalebSLane

astm-http-lib/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.itech</groupId>
 	<artifactId>astm-http-lib</artifactId>
-	<version>2.3.1</version>
+	<version>2.3.2</version>
 
 	<properties>
 		<java.version>21</java.version>
@@ -38,4 +38,4 @@
 
 	</dependencies>
 
-</project>
+</project>

astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/ASTMHandler.java

@@ -1,6 +1,5 @@
 package org.itech.ahb.lib.astm.servlet;
 
-import org.itech.ahb.lib.astm.ASTMHandlerResponse;
 import org.itech.ahb.lib.common.ASTMMessage;
 
 public interface ASTMHandler {

astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/ASTMHandlerMarshaller.java

@@ -7,7 +7,6 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
-import org.itech.ahb.lib.astm.ASTMHandlerResponse;
 import org.itech.ahb.lib.common.ASTMMessage;
 import org.itech.ahb.lib.common.HandleStatus;
 

…ch/ahb/lib/astm/ASTMHandlerResponse.java …ib/astm/servlet/ASTMHandlerResponse.javaastm-http-lib/src/main/java/org/itech/ahb/lib/astm/ASTMHandlerResponse.java renamed to astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/ASTMHandlerResponse.java astm-http-lib/src/main/java/org/itech/ahb/lib/astm/ASTMHandlerResponse.java renamed to astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/ASTMHandlerResponse.java

@@ -1,10 +1,9 @@
-package org.itech.ahb.lib.astm;
+package org.itech.ahb.lib.astm.servlet;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import org.itech.ahb.lib.astm.servlet.ASTMHandler;
 import org.itech.ahb.lib.common.HandleStatus;
 import org.itech.ahb.lib.common.HandlerResponse;
 

astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/ASTMMarshallerResponse.java

@@ -4,7 +4,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
-import org.itech.ahb.lib.astm.ASTMHandlerResponse;
 import org.itech.ahb.lib.common.MarshallerResponse;
 
 @Data

astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/ASTMReceiveThread.java

@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.net.Socket;
+import java.net.SocketTimeoutException;
 import lombok.extern.slf4j.Slf4j;
-import org.itech.ahb.lib.astm.ASTMHandlerResponse;
 import org.itech.ahb.lib.common.ASTMMessage;
 import org.itech.ahb.lib.common.HandleStatus;
 import org.itech.ahb.lib.common.exception.ASTMCommunicationException;
@@ -51,6 +51,12 @@ public void run() {
       } catch (IllegalStateException | FrameParsingException | ASTMCommunicationException e) {
         log.error("an error occurred understanding what was received from the astm sender", e);
         return;
+      } catch (InterruptedException e) {
+        log.error("the thread was interrupted during receive protocol", e);
+        return;
+      } catch (SocketTimeoutException e) {
+        log.error("there was a timeout in the receive protocol at the socket level, abandoning message", e);
+        return;
       }
       ASTMMarshallerResponse response = astmHandlerMarshaller.handle(message);
       if (response.getResponses() == null || response.getResponses().size() == 0) {
@@ -77,4 +83,8 @@ public void run() {
       }
     }
   }
+
+  public boolean didReceiveEstablishmentSucceed() {
+    return communicator.didReceiveEstablishmentSucceed();
+  }
 }

astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/ASTMServlet.java

@@ -39,7 +39,7 @@ public void listen() {
         // Waiting for socket connection
         Socket s = serverSocket.accept();
         new ASTMReceiveThread(
-          new GeneralASTMCommunicator(astmInterpreterFactory, s.getInputStream(), s.getOutputStream(), astmVersion),
+          new GeneralASTMCommunicator(astmInterpreterFactory, s, astmVersion),
           s,
           astmMessageMarshaller
         ).start();

astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/Communicator.java

@@ -1,13 +1,25 @@
 package org.itech.ahb.lib.astm.servlet;
 
 import java.io.IOException;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import org.itech.ahb.lib.common.ASTMMessage;
 import org.itech.ahb.lib.common.exception.ASTMCommunicationException;
 import org.itech.ahb.lib.common.exception.FrameParsingException;
 
 public interface Communicator {
   String getID();
-  boolean sendProtocol(ASTMMessage message) throws ASTMCommunicationException, IOException;
+  SendResult sendProtocol(ASTMMessage message) throws ASTMCommunicationException, IOException, InterruptedException;
   ASTMMessage receiveProtocol(boolean lineWasContentious)
-    throws FrameParsingException, ASTMCommunicationException, IOException;
+    throws FrameParsingException, ASTMCommunicationException, IOException, InterruptedException;
+  boolean didReceiveEstablishmentSucceed();
+
+  @Data
+  @AllArgsConstructor
+  public class SendResult {
+
+    private boolean lineContention;
+
+    private boolean rejected;
+  }
 }

astm-http-lib/src/main/java/org/itech/ahb/lib/astm/servlet/DefaultForwardingASTMToHTTPHandler.java

@@ -8,7 +8,6 @@
 import java.net.http.HttpResponse;
 import java.util.Base64;
 import lombok.extern.slf4j.Slf4j;
-import org.itech.ahb.lib.astm.ASTMHandlerResponse;
 import org.itech.ahb.lib.common.ASTMMessage;
 import org.itech.ahb.lib.common.DefaultASTMMessage;
 import org.itech.ahb.lib.common.HandleStatus;