Partyinfo communication-domain seperation

build.gradle

@@ -370,7 +370,7 @@ subprojects {
     }
 
     jacocoTestCoverageVerification.dependsOn jacocoTestReport
-    check.dependsOn checkstyleMain, checkstyleTest, dependencyCheckAnalyze, spotlessCheck, jacocoTestCoverageVerification
+    check.dependsOn checkstyleMain, checkstyleTest, spotlessCheck, jacocoTestCoverageVerification
 
 }
 

settings.gradle

@@ -49,8 +49,10 @@ include(':tessera-jaxrs:common-jaxrs')
 include(':tessera-jaxrs:thirdparty-jaxrs')
 include(':tessera-jaxrs:sync-jaxrs')
 include(':tessera-jaxrs:jaxrs-client')
+include(":tessera-jaxrs:partyinfo-model")
 include(':tessera-jaxrs')
 include(':tessera-data')
+
 project(':cli:cli-api').projectDir = file('cli/cli-api')
 project(':cli:config-cli').projectDir = file('cli/config-cli')
 project(':tests:acceptance-test').projectDir = file('tests/acceptance-test')
@@ -83,5 +85,6 @@ project(':tessera-jaxrs:common-jaxrs').projectDir = file('tessera-jaxrs/common-j
 project(':tessera-jaxrs:thirdparty-jaxrs').projectDir = file('tessera-jaxrs/thirdparty-jaxrs')
 project(':tessera-jaxrs:sync-jaxrs').projectDir = file('tessera-jaxrs/sync-jaxrs')
 project(':tessera-jaxrs:jaxrs-client').projectDir = file('tessera-jaxrs/jaxrs-client')
+project(':tessera-jaxrs:partyinfo-model').projectDir = file('tessera-jaxrs/partyinfo-model')
 include 'tessera-context'
 

tessera-core/src/main/java/com/quorum/tessera/transaction/ResendRequest.java

@@ -2,12 +2,16 @@
 
 import com.quorum.tessera.data.MessageHash;
 import com.quorum.tessera.encryption.PublicKey;
-import com.quorum.tessera.partyinfo.ResendRequestType;
 
 import java.util.Objects;
 
 public interface ResendRequest {
 
+    // FIXME: also defined in jaxrs module
+    enum ResendRequestType {
+        ALL,INDIVIDUAL
+    }
+
     PublicKey getRecipient();
 
     ResendRequestType getType();

tessera-core/src/main/java/com/quorum/tessera/transaction/TransactionManagerImpl.java

@@ -164,7 +164,7 @@ public SendResponse sendSignedTransaction(final SendSignedRequest sendRequest) {
     public ResendResponse resend(ResendRequest request) {
 
         final PublicKey recipientPublicKey = request.getRecipient();
-        if (request.getType() == ResendRequestType.ALL) {
+        if (request.getType() == ResendRequest.ResendRequestType.ALL) {
 
             int offset = 0;
 

tessera-core/src/test/java/com/quorum/tessera/transaction/TransactionManagerTest.java

@@ -10,7 +10,8 @@
 import com.quorum.tessera.encryption.EncryptorException;
 import com.quorum.tessera.encryption.Nonce;
 import com.quorum.tessera.encryption.PublicKey;
-import com.quorum.tessera.partyinfo.*;
+import com.quorum.tessera.partyinfo.PartyInfoService;
+import com.quorum.tessera.partyinfo.PublishPayloadException;
 import com.quorum.tessera.service.locator.ServiceLocator;
 import com.quorum.tessera.transaction.exception.KeyNotFoundException;
 import com.quorum.tessera.transaction.exception.TransactionNotFoundException;
@@ -385,7 +386,7 @@ public void resendAllWhereRequestedIsSenderAndRecipientExists() {
         when(enclave.unencryptTransaction(payload, recipientKey)).thenReturn(new byte[0]);
 
         final com.quorum.tessera.transaction.ResendRequest resendRequest =
-                ResendRequest.Builder.create().withRecipient(senderKey).withType(ResendRequestType.ALL).build();
+                ResendRequest.Builder.create().withRecipient(senderKey).withType(ResendRequest.ResendRequestType.ALL).build();
 
         ResendResponse result = transactionManager.resend(resendRequest);
 
@@ -415,7 +416,7 @@ public void resendAllWithNoValidTransactions() {
         when(payloadEncoder.decode(any(byte[].class))).thenReturn(payload);
 
         final ResendRequest resendRequest =
-                ResendRequest.Builder.create().withRecipient(recipientKey).withType(ResendRequestType.ALL).build();
+                ResendRequest.Builder.create().withRecipient(recipientKey).withType(ResendRequest.ResendRequestType.ALL).build();
 
         ResendResponse result = transactionManager.resend(resendRequest);
 
@@ -442,7 +443,8 @@ public void resendAllWhereRequestedIsRecipient() {
         when(payloadEncoder.forRecipient(payload, recipientKey)).thenReturn(payload);
 
         final ResendRequest resendRequest =
-                ResendRequest.Builder.create().withType(ResendRequestType.ALL).withRecipient(recipientKey).build();
+                ResendRequest.Builder.create()
+                    .withType(ResendRequest.ResendRequestType.ALL).withRecipient(recipientKey).build();
 
         ResendResponse result = transactionManager.resend(resendRequest);
 
@@ -487,7 +489,7 @@ public void resendAllWhereRequestedIsRecipientThenPublishedPayloadDoesNotContain
         when(payloadEncoder.forRecipient(payload, recipientKey)).thenReturn(prunedPayload);
 
         final ResendRequest resendRequest =
-                ResendRequest.Builder.create().withRecipient(recipientKey).withType(ResendRequestType.ALL).build();
+                ResendRequest.Builder.create().withRecipient(recipientKey).withType(ResendRequest.ResendRequestType.ALL).build();
 
         ResendResponse result = transactionManager.resend(resendRequest);
 
@@ -525,7 +527,7 @@ public void resendAllWhereRequestedIsSenderThenPublishedPayloadIsNotPruned() {
         when(enclave.getPublicKeys()).thenReturn(singleton(localKey));
 
         final com.quorum.tessera.transaction.ResendRequest resendRequest =
-                ResendRequest.Builder.create().withType(ResendRequestType.ALL).withRecipient(senderKey).build();
+                ResendRequest.Builder.create().withType(ResendRequest.ResendRequestType.ALL).withRecipient(senderKey).build();
 
         ResendResponse result = transactionManager.resend(resendRequest);
 
@@ -557,7 +559,7 @@ public void resendAllWhereRequestedIsSenderAndRecipientDoesntExist() {
         when(enclave.getPublicKeys()).thenReturn(emptySet());
 
         final ResendRequest resendRequest =
-                ResendRequest.Builder.create().withRecipient(senderKey).withType(ResendRequestType.ALL).build();
+                ResendRequest.Builder.create().withRecipient(senderKey).withType(ResendRequest.ResendRequestType.ALL).build();
 
         final Throwable throwable = catchThrowable(() -> transactionManager.resend(resendRequest));
 
@@ -593,7 +595,7 @@ public void resendAllWithOnePayloadAndOneRecipientThenPublishPayloadExceptionIsC
 
         ResendRequest resendRequest = mock(ResendRequest.class);
         when(resendRequest.getRecipient()).thenReturn(publicKey);
-        when(resendRequest.getType()).thenReturn(ResendRequestType.ALL);
+        when(resendRequest.getType()).thenReturn(ResendRequest.ResendRequestType.ALL);
 
         when(payloadEncoder.forRecipient(eq(encodedPayload), any(PublicKey.class))).thenReturn(encodedPayload);
 
@@ -634,7 +636,9 @@ public void resendAllIfTwoPayloadsAndFirstThrowsExceptionThenSecondIsStillPublis
         when(otherEncodedPayload.getRecipientKeys()).thenReturn(Collections.singletonList(publicKey));
 
         final ResendRequest resendRequest =
-                ResendRequest.Builder.create().withRecipient(publicKey).withType(ResendRequestType.ALL).build();
+                ResendRequest.Builder.create()
+                    .withRecipient(publicKey)
+                    .withType(ResendRequest.ResendRequestType.ALL).build();
 
         when(payloadEncoder.forRecipient(eq(encodedPayload), any(PublicKey.class))).thenReturn(encodedPayload);
         when(payloadEncoder.forRecipient(eq(otherEncodedPayload), any(PublicKey.class)))
@@ -681,7 +685,9 @@ public void resendAllTwoPayloadsAndTwoRecipientsAllThrowExceptionButAllStillPubl
         when(payloadEncoder.forRecipient(otherEncodedPayload, publicKey)).thenReturn(otherEncodedPayload);
 
         final ResendRequest resendRequest =
-                ResendRequest.Builder.create().withRecipient(publicKey).withType(ResendRequestType.ALL).build();
+                ResendRequest.Builder.create()
+                    .withRecipient(publicKey)
+                    .withType(ResendRequest.ResendRequestType.ALL).build();
 
         doThrow(new PublishPayloadException("msg")).when(partyInfoService).publishPayload(encodedPayload, publicKey);
 
@@ -717,7 +723,7 @@ public void resendIndividualNoExistingTransactionFound() {
                 ResendRequest.Builder.create()
                         .withRecipient(recipientKey)
                         .withHash(transactionHash)
-                        .withType(ResendRequestType.INDIVIDUAL)
+                        .withType(ResendRequest.ResendRequestType.INDIVIDUAL)
                         .build();
 
         try {
@@ -755,7 +761,7 @@ public void resendIndividual() {
                 ResendRequest.Builder.create()
                         .withRecipient(recipientKey)
                         .withHash(transactionHash)
-                        .withType(ResendRequestType.INDIVIDUAL)
+                        .withType(ResendRequest.ResendRequestType.INDIVIDUAL)
                         .build();
 
         ResendResponse result = transactionManager.resend(resendRequest);
@@ -798,7 +804,7 @@ public void resendIndividualAsSender() {
                 ResendRequest.Builder.create()
                         .withRecipient(senderKey)
                         .withHash(transactionHash)
-                        .withType(ResendRequestType.INDIVIDUAL)
+                        .withType(ResendRequest.ResendRequestType.INDIVIDUAL)
                         .build();
 
         final ResendResponse result = transactionManager.resend(resendRequest);

tessera-jaxrs/partyinfo-model/build.gradle

@@ -0,0 +1,5 @@
+
+dependencies {
+    implementation project(':tessera-partyinfo')
+    implementation project(':encryption:encryption-api')
+}

tessera-jaxrs/partyinfo-model/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.jpmorgan.quorum</groupId>
+        <artifactId>tessera-jaxrs</artifactId>
+        <version>0.10.7-SNAPSHOT</version>
+    </parent>
+    <artifactId>partyinfo-model</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.jpmorgan.quorum</groupId>
+            <artifactId>tessera-partyinfo</artifactId>
+        </dependency>
+    </dependencies>
+</project>

tessera-jaxrs/partyinfo-model/src/main/java/com/quorum/tessera/partyinfo/model/NodeInfoUtil.java

@@ -0,0 +1,29 @@
+package com.quorum.tessera.partyinfo.model;
+
+import com.quorum.tessera.partyinfo.node.NodeInfo;
+import com.quorum.tessera.partyinfo.node.Recipient;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public interface NodeInfoUtil {
+
+    static NodeInfo from(PartyInfo partyInfo, Collection<String> versions) {
+
+        List<Recipient> recipients = partyInfo.getRecipients().stream()
+            .map(r -> Recipient.of(r.getKey(),r.getUrl())).collect(Collectors.toList());
+
+        List<com.quorum.tessera.partyinfo.node.Party> parties = partyInfo.getParties().stream()
+            .map(Party::getUrl).map(com.quorum.tessera.partyinfo.node.Party::new).collect(Collectors.toList());
+
+        return NodeInfo.Builder.create()
+            .withUrl(partyInfo.getUrl())
+            .withRecipients(recipients)
+            .withParties(parties)
+            .withSupportedApiVersions(versions)
+            .build();
+
+    }
+
+}

tessera-jaxrs/partyinfo-model/src/main/java/com/quorum/tessera/partyinfo/model/Party.java

@@ -0,0 +1,39 @@
+package com.quorum.tessera.partyinfo.model;
+
+import com.quorum.tessera.partyinfo.URLNormalizer;
+import java.time.Instant;
+import java.util.Objects;
+
+/**
+ * Contains a URL of another known node on the network
+ */
+public class Party {
+
+    private final String url;
+
+    private Instant lastContacted;
+
+    public Party(final String url) {
+        this.url = URLNormalizer.create().normalize(url);
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    @Override
+    public final boolean equals(final Object o) {
+        return (o instanceof Party) && Objects.equals(url, ((Party) o).url);
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(url);
+    }
+
+    @Override
+    public String toString() {
+        return "Party{" + "url=" + url + '}';
+    }
+
+}

tessera-partyinfo/src/main/java/com/quorum/tessera/partyinfo/model/PartyInfo.java → tessera-jaxrs/partyinfo-model/src/main/java/com/quorum/tessera/partyinfo/model/PartyInfo.java

@@ -1,9 +1,9 @@
 package com.quorum.tessera.partyinfo.model;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
+import com.quorum.tessera.partyinfo.node.NodeInfo;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Contains all information that is transferred between two nodes on the
@@ -22,8 +22,8 @@ public class PartyInfo {
 
     public PartyInfo(final String url, final Set<Recipient> recipients, final Set<Party> parties) {
         this.url = Objects.requireNonNull(url);
-        this.recipients = Collections.unmodifiableSet(new HashSet<>(recipients));
-        this.parties = Collections.unmodifiableSet(new HashSet<>(parties));
+        this.recipients = Set.copyOf(recipients);
+        this.parties = Set.copyOf(parties);
     }
 
     public String getUrl() {
@@ -38,4 +38,18 @@ public Set<Party> getParties() {
         return parties;
     }
 
+
+    public static PartyInfo from(NodeInfo nodeInfo) {
+        Set<Recipient> recipients = nodeInfo.getRecipients().stream()
+            .map(r -> Recipient.of(r.getKey(), r.getUrl()))
+            .collect(Collectors.toUnmodifiableSet());
+
+        Set<Party> parties = nodeInfo.getParties().stream()
+            .map(com.quorum.tessera.partyinfo.node.Party::getUrl)
+            .map(Party::new)
+            .collect(Collectors.toUnmodifiableSet());
+
+        return new PartyInfo(nodeInfo.getUrl(),recipients,parties);
+    }
+
 }

tessera-jaxrs/partyinfo-model/src/test/java/com/quorum/tessera/partyinfo/model/NodeInfoUtilTest.java

@@ -0,0 +1,38 @@
+package com.quorum.tessera.partyinfo.model;
+
+import com.quorum.tessera.encryption.PublicKey;
+import com.quorum.tessera.partyinfo.node.NodeInfo;
+import com.quorum.tessera.partyinfo.node.VersionInfo;
+import org.junit.Test;
+
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class NodeInfoUtilTest {
+
+    @Test
+    public void from() {
+
+        PartyInfo partyInfo = mock(PartyInfo.class);
+        VersionInfo versionInfo = mock(VersionInfo.class);
+        Recipient recipient = Recipient.of(mock(PublicKey.class),"someurl");
+
+        when(partyInfo.getUrl()).thenReturn("someurl");
+        when(versionInfo.supportedApiVersions()).thenReturn(Set.of("v1","v3"));
+        when(partyInfo.getRecipients()).thenReturn(Set.of(recipient));
+
+
+        NodeInfo nodeInfo = NodeInfoUtil.from(partyInfo,Set.of("v1","v3"));
+
+        assertThat(nodeInfo).isNotNull();
+
+        assertThat(nodeInfo.getUrl()).isEqualTo("someurl");
+        assertThat(nodeInfo.supportedApiVersions()).isEqualTo(Set.of("v3","v1"));
+        assertThat(nodeInfo.getRecipients()).hasSize(1);
+        assertThat(nodeInfo.getRecipients().iterator().next().getUrl()).isEqualTo("someurl");
+
+    }
+}

tessera-jaxrs/partyinfo-model/src/test/java/com/quorum/tessera/partyinfo/model/PartyInfoTest.java

@@ -0,0 +1,41 @@
+package com.quorum.tessera.partyinfo.model;
+
+import com.quorum.tessera.partyinfo.node.NodeInfo;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+public class PartyInfoTest {
+
+    @Test
+    public void createSimple() {
+        String url = "someurl";
+        Set<Recipient> recipients = Set.of(mock(Recipient.class));
+        Set<Party> parties = Set.of(mock(Party.class));
+
+        PartyInfo partyInfo = new PartyInfo(url,recipients,parties);
+
+        assertThat(partyInfo.getParties()).isEqualTo(parties);
+        assertThat(partyInfo.getRecipients()).isEqualTo(recipients);
+        assertThat(partyInfo.getUrl()).isSameAs(url);
+
+    }
+
+    @Test
+    public void fromNodeInfo() {
+        com.quorum.tessera.partyinfo.node.Recipient recipient = mock(com.quorum.tessera.partyinfo.node.Recipient.class);
+
+        NodeInfo nodeInfo = NodeInfo.Builder.create()
+            .withUrl("url")
+            .withRecipients(List.of(recipient))
+            .build();
+
+        PartyInfo partyInfo = PartyInfo.from(nodeInfo);
+        assertThat(partyInfo.getUrl()).isEqualTo("url");
+    }
+
+}