Separate P2P and Resend clients

config/src/main/java/com/quorum/tessera/config/util/IntervalPropertyHelper.java

@@ -11,15 +11,14 @@ public class IntervalPropertyHelper {
 
     private final Map<String, String> properties;
 
-    public IntervalPropertyHelper(Map<String, String> properties) {
+    public IntervalPropertyHelper(final Map<String, String> properties) {
         this.properties = properties;
     }
 
     public long partyInfoInterval() {
         try {
             return Long.parseLong(properties.getOrDefault("partyInfoInterval", "5000"));
-        }
-        catch (NumberFormatException ex) {
+        } catch (NumberFormatException ex) {
             LOGGER.warn("Not able to parse configured property. Will use default value instead");
             return 5000L;
         }
@@ -28,8 +27,7 @@ public long partyInfoInterval() {
     public long enclaveKeySyncInterval() {
         try {
             return Long.parseLong(properties.getOrDefault("enclaveKeySyncInterval", "2000"));
-        }
-        catch (NumberFormatException ex) {
+        } catch (NumberFormatException ex) {
             LOGGER.warn("Not able to parse configured property. Will use default value instead");
             return 2000L;
         }
@@ -38,10 +36,18 @@ public long enclaveKeySyncInterval() {
     public long syncInterval() {
         try {
             return Long.parseLong(properties.getOrDefault("syncInterval", "60000"));
-        }
-        catch (NumberFormatException ex) {
+        } catch (NumberFormatException ex) {
             LOGGER.warn("Not able to parse configured property. Will use default value instead");
             return 60000L;
         }
     }
+
+    public String resendWaitTime() {
+        try {
+            return Long.toString(Long.parseLong(properties.getOrDefault("resendWaitTime", "7200000"))); // 2 hours
+        } catch (NumberFormatException ex) {
+            LOGGER.warn("Not able to parse configured property. Will use default value instead");
+            return "7200000";
+        }
+    }
 }

config/src/test/java/com/quorum/tessera/config/util/IntervalPropertyHelperTest.java

@@ -1,45 +1,54 @@
 package com.quorum.tessera.config.util;
 
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class IntervalPropertyHelperTest {
 
     @Test
     public void testDefaultValues() {
-        IntervalPropertyHelper util = new IntervalPropertyHelper(Collections.emptyMap());
-        Assertions.assertThat(util.partyInfoInterval()).isEqualTo(5000);
-        Assertions.assertThat(util.enclaveKeySyncInterval()).isEqualTo(2000);
-        Assertions.assertThat(util.syncInterval()).isEqualTo(60000);
+        final IntervalPropertyHelper util = new IntervalPropertyHelper(Collections.emptyMap());
+
+        assertThat(util.partyInfoInterval()).isEqualTo(5000);
+        assertThat(util.enclaveKeySyncInterval()).isEqualTo(2000);
+        assertThat(util.syncInterval()).isEqualTo(60000);
+        assertThat(util.resendWaitTime()).isEqualTo("7200000");
     }
 
     @Test
     public void getValues() {
-        Map<String, String> props = new HashMap<>();
+        final Map<String, String> props = new HashMap<>();
         props.put("partyInfoInterval", "2000");
         props.put("enclaveKeySyncInterval", "3000");
         props.put("syncInterval", "4000");
-        IntervalPropertyHelper util = new IntervalPropertyHelper(props);
-        Assertions.assertThat(util.partyInfoInterval()).isEqualTo(2000);
-        Assertions.assertThat(util.enclaveKeySyncInterval()).isEqualTo(3000);
-        Assertions.assertThat(util.syncInterval()).isEqualTo(4000);
+        props.put("resendWaitTime", "4000");
+
+        final IntervalPropertyHelper util = new IntervalPropertyHelper(props);
+
+        assertThat(util.partyInfoInterval()).isEqualTo(2000);
+        assertThat(util.enclaveKeySyncInterval()).isEqualTo(3000);
+        assertThat(util.syncInterval()).isEqualTo(4000);
+        assertThat(util.resendWaitTime()).isEqualTo("4000");
     }
 
     @Test
     public void testExceptions() {
-        Map<String, String> props = new HashMap<>();
+        final Map<String, String> props = new HashMap<>();
         props.put("partyInfoInterval", null);
         props.put("enclaveKeySyncInterval", "abc");
         props.put("syncInterval", "4000L");
-        IntervalPropertyHelper util = new IntervalPropertyHelper(props);
-        Assertions.assertThat(util.partyInfoInterval()).isEqualTo(5000);
-        Assertions.assertThat(util.enclaveKeySyncInterval()).isEqualTo(2000);
-        Assertions.assertThat(util.syncInterval()).isEqualTo(60000);
-    }
+        props.put("resendWaitTime", "4000L");
+
+        final IntervalPropertyHelper util = new IntervalPropertyHelper(props);
 
+        assertThat(util.partyInfoInterval()).isEqualTo(5000);
+        assertThat(util.enclaveKeySyncInterval()).isEqualTo(2000);
+        assertThat(util.syncInterval()).isEqualTo(60000);
+        assertThat(util.resendWaitTime()).isEqualTo("7200000");
+    }
 }

tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/RestP2pClient.java

@@ -1,7 +1,6 @@
 package com.quorum.tessera.p2p;
 
 import com.quorum.tessera.partyinfo.P2pClient;
-import com.quorum.tessera.partyinfo.ResendRequest;
 import java.util.Objects;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Entity;
@@ -50,16 +49,4 @@ public boolean sendPartyInfo(String targetUrl, byte[] data) {
             return Objects.nonNull(response.readEntity(byte[].class));
         }
     }
-
-    @Override
-    public boolean makeResendRequest(String targetUrl, ResendRequest request) {
-        try (Response response =
-                client.target(targetUrl)
-                        .path("/resend")
-                        .request()
-                        .post(Entity.entity(request, MediaType.APPLICATION_JSON))) {
-
-            return Response.Status.OK.getStatusCode() == response.getStatus();
-        }
-    }
 }

tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/RestResendClient.java

@@ -0,0 +1,29 @@
+package com.quorum.tessera.p2p;
+
+import com.quorum.tessera.partyinfo.ResendRequest;
+import com.quorum.tessera.sync.ResendClient;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Objects;
+
+public class RestResendClient implements ResendClient {
+
+    private final Client client;
+
+    public RestResendClient(final Client client) {
+        this.client = Objects.requireNonNull(client);
+    }
+
+    @Override
+    public boolean makeResendRequest(final String targetUrl, final ResendRequest request) {
+        final Entity<ResendRequest> outboundEntity = Entity.entity(request, MediaType.APPLICATION_JSON);
+
+        try (Response response = client.target(targetUrl).path("/resend").request().post(outboundEntity)) {
+            return Response.Status.OK.getStatusCode() == response.getStatus();
+        }
+    }
+
+}

tessera-jaxrs/sync-jaxrs/src/main/java/com/quorum/tessera/p2p/RestResendClientFactory.java

@@ -0,0 +1,33 @@
+package com.quorum.tessera.p2p;
+
+import com.quorum.tessera.config.CommunicationType;
+import com.quorum.tessera.config.Config;
+import com.quorum.tessera.config.util.IntervalPropertyHelper;
+import com.quorum.tessera.jaxrs.client.ClientFactory;
+import com.quorum.tessera.ssl.context.ClientSSLContextFactory;
+import com.quorum.tessera.ssl.context.SSLContextFactory;
+import com.quorum.tessera.sync.ResendClient;
+import com.quorum.tessera.sync.ResendClientFactory;
+
+import javax.ws.rs.client.Client;
+
+public class RestResendClientFactory implements ResendClientFactory {
+
+    public ResendClient create(final Config config) {
+        final String resendWaitTime =
+                new IntervalPropertyHelper(config.getP2PServerConfig().getProperties()).resendWaitTime();
+
+        final SSLContextFactory clientSSLContextFactory = ClientSSLContextFactory.create();
+
+        final ClientFactory clientFactory = new ClientFactory(clientSSLContextFactory);
+        final Client client = clientFactory.buildFrom(config.getP2PServerConfig());
+
+        client.property("jersey.config.client.readTimeout", resendWaitTime);
+        return new RestResendClient(client);
+    }
+
+    @Override
+    public CommunicationType communicationType() {
+        return CommunicationType.REST;
+    }
+}

tessera-jaxrs/sync-jaxrs/src/main/resources/META-INF/services/com.quorum.tessera.sync.ResendClientFactory

@@ -0,0 +1 @@
+com.quorum.tessera.p2p.RestResendClientFactory