Simplify the EventService interface

stellar · Jun 28, 2023 · 9c2d9d2 · 9c2d9d2
1 parent a8bce9b
commit 9c2d9d2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 40 deletions.
diff --git a/core/src/main/java/org/stellar/anchor/event/EventService.java b/core/src/main/java/org/stellar/anchor/event/EventService.java
@@ -2,13 +2,7 @@
 
 import org.stellar.anchor.api.event.AnchorEvent;
 import org.stellar.anchor.api.exception.EventPublishException;
-import org.stellar.anchor.sep24.Sep24Transaction;
-import org.stellar.anchor.sep31.Sep31Transaction;
 
 public interface EventService {
-  void publish(Sep24Transaction txn, AnchorEvent.Type type);
-
-  void publish(Sep31Transaction txn, AnchorEvent.Type type);
-
   void publish(AnchorEvent event) throws EventPublishException;
 }
diff --git a/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java b/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java
@@ -20,6 +20,7 @@
 import java.net.URISyntaxException;
 import java.time.Instant;
 import java.util.*;
+import org.stellar.anchor.api.event.AnchorEvent;
 import org.stellar.anchor.api.exception.*;
 import org.stellar.anchor.api.sep.AssetInfo;
 import org.stellar.anchor.api.sep.sep24.*;
@@ -30,6 +31,7 @@
 import org.stellar.anchor.config.Sep24Config;
 import org.stellar.anchor.event.EventService;
 import org.stellar.anchor.util.GsonUtils;
+import org.stellar.anchor.util.TransactionHelper;
 import org.stellar.sdk.KeyPair;
 import org.stellar.sdk.Memo;
 
@@ -180,7 +182,14 @@ public InteractiveTransactionResponse withdraw(
 
     Sep24Transaction txn = builder.build();
     txnStore.save(txn);
-    eventService.publish(txn, TRANSACTION_CREATED);
+
+    eventService.publish(
+        AnchorEvent.builder()
+            .id(UUID.randomUUID().toString())
+            .sep("24")
+            .type(TRANSACTION_CREATED)
+            .transaction(TransactionHelper.toGetTransactionResponse(txn, assetService))
+            .build());
 
     infoF(
         "Saved withdraw transaction. from={}, amountIn={}, amountOut={}.",

diff --git a/core/src/main/java/org/stellar/anchor/sep31/Sep31Service.java b/core/src/main/java/org/stellar/anchor/sep31/Sep31Service.java
@@ -19,6 +19,7 @@
 import lombok.Data;
 import lombok.SneakyThrows;
 import org.stellar.anchor.api.callback.*;
+import org.stellar.anchor.api.event.AnchorEvent;
 import org.stellar.anchor.api.exception.*;
 import org.stellar.anchor.api.sep.AssetInfo;
 import org.stellar.anchor.api.sep.AssetInfo.Sep12Operation;
@@ -36,6 +37,7 @@
 import org.stellar.anchor.sep38.Sep38Quote;
 import org.stellar.anchor.sep38.Sep38QuoteStore;
 import org.stellar.anchor.util.Log;
+import org.stellar.anchor.util.TransactionHelper;
 
 public class Sep31Service {
   private final AppConfig appConfig;
@@ -178,7 +180,13 @@ public Sep31PostTransactionResponse postTransaction(
 
     updateDepositInfo();
 
-    eventService.publish(txn, TRANSACTION_CREATED);
+    eventService.publish(
+        AnchorEvent.builder()
+            .id(UUID.randomUUID().toString())
+            .sep("31")
+            .type(TRANSACTION_CREATED)
+            .transaction(TransactionHelper.toGetTransactionResponse(txn))
+            .build());
 
     return Sep31PostTransactionResponse.builder()
         .id(txn.getId())

diff --git a/platform/src/main/java/org/stellar/anchor/platform/event/DefaultEventService.java b/platform/src/main/java/org/stellar/anchor/platform/event/DefaultEventService.java
@@ -1,21 +1,15 @@
 package org.stellar.anchor.platform.event;
 
-import static org.stellar.anchor.api.event.AnchorEvent.Type.TRANSACTION_CREATED;
 import static org.stellar.anchor.util.Log.errorF;
 
 import io.micrometer.core.instrument.Metrics;
 import java.util.Map;
-import java.util.UUID;
-import lombok.SneakyThrows;
 import org.stellar.anchor.api.event.AnchorEvent;
 import org.stellar.anchor.api.exception.EventPublishException;
 import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.config.event.EventConfig;
 import org.stellar.anchor.event.EventPublisher;
 import org.stellar.anchor.event.EventService;
-import org.stellar.anchor.sep24.Sep24Transaction;
-import org.stellar.anchor.sep31.Sep31Transaction;
-import org.stellar.anchor.util.TransactionHelper;
 
 public class DefaultEventService implements EventService {
   private final EventConfig eventConfig;
@@ -30,32 +24,6 @@ public DefaultEventService(EventConfig eventConfig, AssetService assetService) {
     this.assetService = assetService;
   }
 
-  @Override
-  @SneakyThrows
-  public void publish(Sep24Transaction txn, AnchorEvent.Type type) {
-    AnchorEvent event =
-        AnchorEvent.builder()
-            .id(UUID.randomUUID().toString())
-            .sep("24")
-            .type(TRANSACTION_CREATED)
-            .transaction(TransactionHelper.toGetTransactionResponse(txn, assetService))
-            .build();
-    publish(event);
-  }
-
-  @Override
-  @SneakyThrows
-  public void publish(Sep31Transaction txn, AnchorEvent.Type type) {
-    AnchorEvent event =
-        AnchorEvent.builder()
-            .id(UUID.randomUUID().toString())
-            .sep("31")
-            .type(type)
-            .transaction(TransactionHelper.toGetTransactionResponse(txn))
-            .build();
-    publish(event);
-  }
-
   @Override
   public void publish(AnchorEvent event) throws EventPublishException {
     if (eventConfig.isEnabled()) {