Rename notification utils to client (#6074)

airbytehq · Apr 21, 2023 · dde4bc7 · dde4bc7
1 parent 4310e5b
commit dde4bc7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/...e/commons/temporal/NotificationUtils.java → .../commons/temporal/NotificationClient.java b/...e/commons/temporal/NotificationUtils.java → .../commons/temporal/NotificationClient.java
@@ -26,12 +26,12 @@
  */
 @Singleton
 @Slf4j
-public class NotificationUtils {
+public class NotificationClient {
 
   private final FeatureFlagClient featureFlagClient;
   private final WorkflowClient client;
 
-  public NotificationUtils(final FeatureFlagClient featureFlagClient, WorkflowClient client) {
+  public NotificationClient(final FeatureFlagClient featureFlagClient, WorkflowClient client) {
     this.featureFlagClient = featureFlagClient;
     this.client = client;
   }

diff --git a/airbyte-commons-temporal/src/main/java/io/airbyte/commons/temporal/TemporalClient.java b/airbyte-commons-temporal/src/main/java/io/airbyte/commons/temporal/TemporalClient.java
@@ -73,22 +73,22 @@ public class TemporalClient {
   private final WorkflowServiceStubs service;
   private final StreamResetPersistence streamResetPersistence;
   private final ConnectionManagerUtils connectionManagerUtils;
-  private final NotificationUtils notificationUtils;
+  private final NotificationClient notificationClient;
   private final StreamResetRecordsHelper streamResetRecordsHelper;
 
   public TemporalClient(@Named("workspaceRootTemporal") final Path workspaceRoot,
                         final WorkflowClient client,
                         final WorkflowServiceStubs service,
                         final StreamResetPersistence streamResetPersistence,
                         final ConnectionManagerUtils connectionManagerUtils,
-                        final NotificationUtils notificationUtils,
+                        final NotificationClient notificationClient,
                         final StreamResetRecordsHelper streamResetRecordsHelper) {
     this.workspaceRoot = workspaceRoot;
     this.client = client;
     this.service = service;
     this.streamResetPersistence = streamResetPersistence;
     this.connectionManagerUtils = connectionManagerUtils;
-    this.notificationUtils = notificationUtils;
+    this.notificationClient = notificationClient;
     this.streamResetRecordsHelper = streamResetRecordsHelper;
   }
 
@@ -533,7 +533,7 @@ public void forceDeleteWorkflow(final UUID connectionId) {
   }
 
   public void sendSchemaChangeNotification(final UUID connectionId, final String url, final boolean containsBreakingChange) {
-    notificationUtils.sendSchemaChangeNotification(connectionId, url, containsBreakingChange);
+    notificationClient.sendSchemaChangeNotification(connectionId, url, containsBreakingChange);
   }
 
   /**

diff --git a/...mmons/temporal/NotificationUtilsTest.java → ...mons/temporal/NotificationClientTest.java b/...mmons/temporal/NotificationUtilsTest.java → ...mons/temporal/NotificationClientTest.java
@@ -28,7 +28,7 @@
 /**
  * Test the notificationUtils.
  */
-class NotificationUtilsTest {
+class NotificationClientTest {
 
   private static final String WEBHOOK_URL = "url";
 
@@ -37,7 +37,7 @@ class NotificationUtilsTest {
   private final FeatureFlagClient featureFlagClient = mock(TestClient.class);
   private final WorkflowClient workflowClient = mock(WorkflowClient.class);
 
-  private final NotificationUtils notificationUtils = spy(new NotificationUtils(featureFlagClient, workflowClient));
+  private final NotificationClient notificationClient = spy(new NotificationClient(featureFlagClient, workflowClient));
 
   @Test
   void testCallNewNotifyWorkflow() {
@@ -47,7 +47,7 @@ void testCallNewNotifyWorkflow() {
     when(workflowClient.newWorkflowStub(NotificationWorkflow.class, TemporalWorkflowUtils.buildWorkflowOptions(TemporalJobType.NOTIFY)))
         .thenReturn(notificationWorkflow);
 
-    notificationUtils.sendSchemaChangeNotification(connectionId, "", false);
+    notificationClient.sendSchemaChangeNotification(connectionId, "", false);
 
     verify(notificationWorkflow).sendNotification(eq(connectionId), any(), any(), any());
   }
@@ -60,12 +60,12 @@ void testCallRightTemplate() throws IOException {
     when(workflowClient.newWorkflowStub(NotificationWorkflow.class, TemporalWorkflowUtils.buildWorkflowOptions(TemporalJobType.NOTIFY)))
         .thenReturn(notificationWorkflow);
 
-    notificationUtils.sendSchemaChangeNotification(connectionId, WEBHOOK_URL, false);
-    verify(notificationUtils).renderTemplate("slack/non_breaking_schema_change_slack_notification_template.txt", connectionId.toString(),
+    notificationClient.sendSchemaChangeNotification(connectionId, WEBHOOK_URL, false);
+    verify(notificationClient).renderTemplate("slack/non_breaking_schema_change_slack_notification_template.txt", connectionId.toString(),
         WEBHOOK_URL);
 
-    notificationUtils.sendSchemaChangeNotification(connectionId, WEBHOOK_URL, true);
-    verify(notificationUtils).renderTemplate("slack/breaking_schema_change_slack_notification_template.txt", connectionId.toString(), WEBHOOK_URL);
+    notificationClient.sendSchemaChangeNotification(connectionId, WEBHOOK_URL, true);
+    verify(notificationClient).renderTemplate("slack/breaking_schema_change_slack_notification_template.txt", connectionId.toString(), WEBHOOK_URL);
   }
 
   @Test
@@ -76,7 +76,7 @@ void testCallOldNotifyWorkflow() throws JsonValidationException, ConfigNotFoundE
     when(workflowClient.newWorkflowStub(ConnectionNotificationWorkflow.class, TemporalWorkflowUtils.buildWorkflowOptions(TemporalJobType.NOTIFY)))
         .thenReturn(connectionNotificationWorkflow);
 
-    notificationUtils.sendSchemaChangeNotification(connectionId, WEBHOOK_URL, false);
+    notificationClient.sendSchemaChangeNotification(connectionId, WEBHOOK_URL, false);
 
     verify(connectionNotificationWorkflow).sendSchemaChangeNotification(connectionId, WEBHOOK_URL);
   }

diff --git a/airbyte-commons-temporal/src/test/java/io/airbyte/commons/temporal/TemporalClientTest.java b/airbyte-commons-temporal/src/test/java/io/airbyte/commons/temporal/TemporalClientTest.java
@@ -108,7 +108,7 @@ public class TemporalClientTest {
   private WorkflowServiceBlockingStub workflowServiceBlockingStub;
   private StreamResetPersistence streamResetPersistence;
   private ConnectionManagerUtils connectionManagerUtils;
-  private NotificationUtils notificationUtils;
+  private NotificationClient notificationClient;
   private StreamResetRecordsHelper streamResetRecordsHelper;
   private Path workspaceRoot;
 
@@ -127,26 +127,28 @@ void setup() throws IOException {
     streamResetPersistence = mock(StreamResetPersistence.class);
     mockWorkflowStatus(WorkflowExecutionStatus.WORKFLOW_EXECUTION_STATUS_RUNNING);
     connectionManagerUtils = spy(new ConnectionManagerUtils());
-    notificationUtils = spy(new NotificationUtils(featureFlagClient, workflowClient));
+    notificationClient = spy(new NotificationClient(featureFlagClient, workflowClient));
     streamResetRecordsHelper = mock(StreamResetRecordsHelper.class);
     temporalClient =
-        spy(new TemporalClient(workspaceRoot, workflowClient, workflowServiceStubs, streamResetPersistence, connectionManagerUtils, notificationUtils,
+        spy(new TemporalClient(workspaceRoot, workflowClient, workflowServiceStubs, streamResetPersistence, connectionManagerUtils,
+            notificationClient,
             streamResetRecordsHelper));
   }
 
   @Nested
   class RestartPerStatus {
 
     private ConnectionManagerUtils mConnectionManagerUtils;
-    private NotificationUtils mNotificationUtils;
+    private NotificationClient mNotificationClient;
 
     @BeforeEach
     void init() {
       mConnectionManagerUtils = mock(ConnectionManagerUtils.class);
-      mNotificationUtils = mock(NotificationUtils.class);
+      mNotificationClient = mock(NotificationClient.class);
 
       temporalClient = spy(
-          new TemporalClient(workspaceRoot, workflowClient, workflowServiceStubs, streamResetPersistence, mConnectionManagerUtils, mNotificationUtils,
+          new TemporalClient(workspaceRoot, workflowClient, workflowServiceStubs, streamResetPersistence, mConnectionManagerUtils,
+              mNotificationClient,
               streamResetRecordsHelper));
     }