SD-1887 No more NPE after error handling response from adopter system

dcsaorg · Dec 13, 2024 · f9a3c0a · f9a3c0a
1 parent 8ea8632
commit f9a3c0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/core/src/main/java/org/dcsa/conformance/core/check/ActionCheck.java b/core/src/main/java/org/dcsa/conformance/core/check/ActionCheck.java
@@ -55,11 +55,11 @@ protected final void doCheck(Function<UUID, ConformanceExchange> getExchangeByUu
       switch (httpMessageType) {
         case REQUEST -> {
           if (isRelevantForRole(exchange.getRequest().message().sourcePartyRole()))
-            this.addResult(ConformanceResult.forSourceParty(exchange, conformanceErrors));
+            this.addResult(ConformanceResult.forSourceParty(conformanceErrors));
         }
         case RESPONSE -> {
           if (isRelevantForRole(exchange.getRequest().message().targetPartyRole()))
-            this.addResult(ConformanceResult.forTargetParty(exchange, conformanceErrors));
+            this.addResult(ConformanceResult.forTargetParty(conformanceErrors));
         }
       }
     }

diff --git a/core/src/main/java/org/dcsa/conformance/core/check/ConformanceResult.java b/core/src/main/java/org/dcsa/conformance/core/check/ConformanceResult.java
@@ -2,34 +2,24 @@
 
 import java.util.*;
 import lombok.Getter;
-import org.dcsa.conformance.core.traffic.ConformanceExchange;
 
 @Getter
 public class ConformanceResult {
-  private final String checkedPartyName;
-  private final LinkedList<ConformanceExchange> checkedExchanges;
   private final boolean conformant;
   private final Set<String> errors;
 
   private ConformanceResult(
-      String checkedPartyName,
-      ConformanceExchange checkedExchange,
       boolean conformant,
       Set<String> errors) {
-    this.checkedPartyName = checkedPartyName;
-    this.checkedExchanges = new LinkedList<>(List.of(checkedExchange));
     this.conformant = conformant;
     this.errors = Collections.unmodifiableSet(errors);
   }
 
-  public static ConformanceResult forSourceParty(ConformanceExchange exchange, Set<String> errors) {
-    return new ConformanceResult(
-        exchange.getRequest().message().sourcePartyName(), exchange, errors.isEmpty(), errors);
+  public static ConformanceResult forSourceParty(Set<String> errors) {
+    return new ConformanceResult(errors.isEmpty(), errors);
   }
 
-  public static ConformanceResult forTargetParty(ConformanceExchange exchange, Set<String> errors) {
-    return new ConformanceResult(
-        exchange.getRequest().message().targetPartyName(), exchange, errors.isEmpty(), errors);
+  public static ConformanceResult forTargetParty(Set<String> errors) {
+    return new ConformanceResult(errors.isEmpty(), errors);
   }
-
 }
diff --git a/core/src/main/java/org/dcsa/conformance/core/scenario/ConformanceAction.java b/core/src/main/java/org/dcsa/conformance/core/scenario/ConformanceAction.java
@@ -197,7 +197,6 @@ protected void doCheck(
                           Function<UUID, ConformanceExchange> getExchangeByUuid) {
                         addResult(
                             ConformanceResult.forSourceParty(
-                                getExchangeByUuid.apply(matchedExchangeUuid),
                                 Set.of(exchangeHandlingExceptionMessage)));
                       }
                     },
@@ -209,7 +208,6 @@ protected void doCheck(
                           Function<UUID, ConformanceExchange> getExchangeByUuid) {
                         addResult(
                             ConformanceResult.forTargetParty(
-                                getExchangeByUuid.apply(matchedNotificationExchangeUuid),
                                 Set.of(notificationHandlingExceptionMessage)));
                       }
                     },