CF-638: modification of the WatchListScanIdentityMatchesData.java

server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/INotificationListener.java

@@ -291,11 +291,8 @@ default void watchedIdentityTransaction(String terminalSerialNumber, String iden
     default void watchlistScanBan(String terminalSerialNumber) {}
 
     /**
-     * Deprecated since 1.6.4, use {@link INotificationListener#watchlistScanIdentityMatches(WatchListScanIdentityMatchesData)} instead.
-     *
-     * @param identityPublicId Public ID of Identity.
+     * There is a match for Identity on a Watchlist
      */
-    @Deprecated
     default void watchlistScanIdentityMatches(String identityPublicId) {}
 
     /**

server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/watchlist/WatchListScanIdentityMatchesData.java

@@ -17,70 +17,86 @@
  ************************************************************************************/
 package com.generalbytes.batm.server.extensions.watchlist;
 
-public class WatchListScanIdentityMatchesData {
+import java.io.Serializable;
+
+public class WatchListScanIdentityMatchesData implements Serializable {
 
     /**
-     * Public ID of identity. Can be null.
+     * Public ID of identity.
      */
-    private final String identityPublicId;
+    private String identityPublicId;
+
     /**
-     * Message body.
+     * Code of WatchList.
      */
-    private final String messageBody;
+    private String watchListCode;
+
     /**
-     * Type of WatchList trigger.
+     * Unique identifier of the matching entity.
      */
-    private final WatchListTrigger trigger;
+    private String partyId;
+
     /**
-     * Terminal serial number. Can be null.
+     * Type of WatchList trigger.
      */
-    private final String terminalSerialNumber;
+    private WatchListTrigger trigger;
+
     /**
-     * Match score by WatchList provider. Can be null.
+     * Result of scan.
      */
-    private final Integer matchScore;
+    private WatchListScanResult scanResult;
+
     /**
-     * Result of scan.
+     * Terminal serial number. It is available if the trigger is {@link WatchListTrigger#PRE_TRANSACTION}, otherwise null.
      */
-    private final WatchListScanResult scanResult;
-
-    public WatchListScanIdentityMatchesData(String identityPublicId,
-                                            String messageBody,
-                                            WatchListTrigger trigger,
-                                            String terminalSerialNumber,
-                                            Integer matchScore,
-                                            WatchListScanResult scanResult
-    ) {
-        this.identityPublicId = identityPublicId;
-        this.messageBody = messageBody;
-        this.trigger = trigger;
-        this.terminalSerialNumber = terminalSerialNumber;
-        this.matchScore = matchScore;
-        this.scanResult = scanResult;
-    }
+    private String terminalSerialNumber;
 
     public String getIdentityPublicId() {
         return identityPublicId;
     }
 
-    public String getMessageBody() {
-        return messageBody;
+    public void setIdentityPublicId(String identityPublicId) {
+        this.identityPublicId = identityPublicId;
     }
 
-    public WatchListTrigger getTrigger() {
-        return trigger;
+    public String getWatchListCode() {
+        return watchListCode;
     }
 
-    public String getTerminalSerialNumber() {
-        return terminalSerialNumber;
+    public void setWatchListCode(String watchListCode) {
+        this.watchListCode = watchListCode;
     }
 
-    public Integer getMatchScore() {
-        return matchScore;
+    public String getPartyId() {
+        return partyId;
+    }
+
+    public void setPartyId(String partyId) {
+        this.partyId = partyId;
+    }
+
+    public WatchListTrigger getTrigger() {
+        return trigger;
+    }
+
+    public void setTrigger(WatchListTrigger trigger) {
+        this.trigger = trigger;
     }
 
     public WatchListScanResult getScanResult() {
         return scanResult;
     }
 
+    public void setScanResult(WatchListScanResult scanResult) {
+        this.scanResult = scanResult;
+    }
+
+    public String getTerminalSerialNumber() {
+        return terminalSerialNumber;
+    }
+
+    public void setTerminalSerialNumber(String terminalSerialNumber) {
+        this.terminalSerialNumber = terminalSerialNumber;
+    }
+
 }

server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/watchlist/WatchListScanResult.java

@@ -19,18 +19,8 @@
 
 public enum WatchListScanResult {
 
-    NO_MATCH("OK"),
-    PARTIAL_MATCH("Partial Match"),
-    FULL_MATCH("Full Match");
-
-    private final String title;
-
-    WatchListScanResult(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
+    NO_MATCH,
+    PARTIAL_MATCH,
+    FULL_MATCH
 
 }

server_extensions_api/src/main/java/com/generalbytes/batm/server/extensions/watchlist/WatchListTrigger.java

@@ -19,19 +19,9 @@
 
 public enum WatchListTrigger {
 
-    MANUAL("Manual"),
-    PRE_TRANSACTION("Pre-Transaction"),
-    PERIODIC("Periodic"),
-    EXTENSION("Extension");
-
-    private final String title;
-
-    WatchListTrigger(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
+    MANUAL,
+    PRE_TRANSACTION,
+    PERIODIC,
+    EXTENSION
 
 }