feat: add correlationId to ContractAgreementVerificationMessage and C…

…ontractNegotiationEventMessage
eclipse-edc · Mar 22, 2023 · c1175c8 · c1175c8
1 parent d407174
commit c1175c8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/...rg/eclipse/edc/connector/contract/negotiation/ConsumerContractNegotiationManagerImpl.java b/...rg/eclipse/edc/connector/contract/negotiation/ConsumerContractNegotiationManagerImpl.java
@@ -311,6 +311,7 @@ private boolean processConsumerVerifying(ContractNegotiation negotiation) {
         var message = ContractAgreementVerificationMessage.Builder.newInstance()
                 .protocol(negotiation.getProtocol())
                 .connectorAddress(negotiation.getCounterPartyAddress())
+                .correlationId(negotiation.getId())
                 .build();
 
         return entityRetryProcessFactory.doAsyncProcess(negotiation, () -> dispatcherRegistry.send(Object.class, message))

diff --git a/...rg/eclipse/edc/connector/contract/negotiation/ProviderContractNegotiationManagerImpl.java b/...rg/eclipse/edc/connector/contract/negotiation/ProviderContractNegotiationManagerImpl.java
@@ -323,6 +323,7 @@ private boolean processProviderFinalizing(ContractNegotiation negotiation) {
                 .type(ContractNegotiationEventMessage.Type.FINALIZED)
                 .protocol(negotiation.getProtocol())
                 .connectorAddress(negotiation.getCounterPartyAddress())
+                .correlationId(negotiation.getCorrelationId())
                 .build();
 
         return entityRetryProcessFactory.doAsyncProcess(negotiation, () -> dispatcherRegistry.send(Object.class, message))

diff --git a/...ipse/edc/connector/contract/spi/types/agreement/ContractAgreementVerificationMessage.java b/...ipse/edc/connector/contract/spi/types/agreement/ContractAgreementVerificationMessage.java
@@ -22,6 +22,7 @@ public class ContractAgreementVerificationMessage implements RemoteMessage {
 
     private String protocol;
     private String connectorAddress;
+    private String correlationId;
 
     @Override
     public String getProtocol() {
@@ -33,6 +34,10 @@ public String getConnectorAddress() {
         return connectorAddress;
     }
 
+    public String getCorrelationId() {
+        return correlationId;
+    }
+
     public static class Builder {
         private final ContractAgreementVerificationMessage message;
 
@@ -54,9 +59,15 @@ public Builder connectorAddress(String connectorAddress) {
             return this;
         }
 
+        public Builder correlationId(String correlationId) {
+            this.message.correlationId = correlationId;
+            return this;
+        }
+
         public ContractAgreementVerificationMessage build() {
             Objects.requireNonNull(message.protocol, "protocol");
             Objects.requireNonNull(message.connectorAddress, "connectorAddress");
+            Objects.requireNonNull(message.correlationId, "correlationId");
             return message;
         }
     }

diff --git a/...g/eclipse/edc/connector/contract/spi/types/agreement/ContractNegotiationEventMessage.java b/...g/eclipse/edc/connector/contract/spi/types/agreement/ContractNegotiationEventMessage.java
@@ -22,6 +22,7 @@ public class ContractNegotiationEventMessage implements RemoteMessage {
 
     private String protocol;
     private String connectorAddress;
+    private String correlationId;
     private Type type;
 
     @Override
@@ -34,6 +35,10 @@ public String getConnectorAddress() {
         return connectorAddress;
     }
 
+    public String getCorrelationId() {
+        return correlationId;
+    }
+
     public Type getType() {
         return type;
     }
@@ -59,6 +64,11 @@ public Builder connectorAddress(String connectorAddress) {
             return this;
         }
 
+        public Builder correlationId(String correlationId) {
+            this.message.correlationId = correlationId;
+            return this;
+        }
+
         public Builder type(Type type) {
             this.message.type = type;
             return this;
@@ -67,6 +77,7 @@ public Builder type(Type type) {
         public ContractNegotiationEventMessage build() {
             Objects.requireNonNull(message.protocol, "protocol");
             Objects.requireNonNull(message.connectorAddress, "connectorAddress");
+            Objects.requireNonNull(message.correlationId, "correlationId");
             Objects.requireNonNull(message.type, "type");
             return message;
         }