fix formatting (#15706)

* fix formatting * fix slack notification client test
airbytehq · Aug 16, 2022 · 27f8596 · 27f8596
1 parent f0a69c4
commit 27f8596
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/...s/bases/base-java/src/main/java/io/airbyte/integrations/util/MySqlSslConnectionUtils.java b/...s/bases/base-java/src/main/java/io/airbyte/integrations/util/MySqlSslConnectionUtils.java
@@ -5,7 +5,6 @@
 package io.airbyte.integrations.util;
 
 import com.fasterxml.jackson.databind.JsonNode;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -80,10 +79,10 @@ public static String checkOrCreatePassword(final JsonNode encryption) {
 
   private static String readFile(final File file) {
     try {
-    BufferedReader reader = new BufferedReader(new FileReader(file));
-    String currentLine = reader.readLine();
-    reader.close();
-    return currentLine;
+      BufferedReader reader = new BufferedReader(new FileReader(file));
+      String currentLine = reader.readLine();
+      reader.close();
+      return currentLine;
     } catch (final IOException e) {
       throw new RuntimeException("Failed to read file with encryption");
     }
@@ -93,9 +92,9 @@ private static Map<String, String> checkCertificatesAndObtainConnection(final Js
                                                                           final String mode,
                                                                           final String clientKeyPassword) {
     var clientCert = encryption.has(PARAM_CLIENT_CERTIFICATE) &&
-            !encryption.get(PARAM_CLIENT_CERTIFICATE).asText().isEmpty() ? encryption.get(PARAM_CLIENT_CERTIFICATE).asText() : null;
+        !encryption.get(PARAM_CLIENT_CERTIFICATE).asText().isEmpty() ? encryption.get(PARAM_CLIENT_CERTIFICATE).asText() : null;
     var clientKey = encryption.has(PARAM_CLIENT_KEY) &&
-            !encryption.get(PARAM_CLIENT_KEY).asText().isEmpty() ? encryption.get(PARAM_CLIENT_KEY).asText() : null;
+        !encryption.get(PARAM_CLIENT_KEY).asText().isEmpty() ? encryption.get(PARAM_CLIENT_KEY).asText() : null;
     if (Objects.nonNull(clientCert) && Objects.nonNull(clientKey)) {
       return obtainConnectionWithFullCertificatesOptions(encryption, mode, clientKeyPassword);
     } else if (Objects.isNull(clientCert) && Objects.isNull(clientKey)) {

diff --git a/airbyte-notification/src/main/java/io/airbyte/notification/CustomerioNotificationClient.java b/airbyte-notification/src/main/java/io/airbyte/notification/CustomerioNotificationClient.java
@@ -63,13 +63,21 @@ public CustomerioNotificationClient(final Notification notification,
   }
 
   @Override
-  public boolean notifyJobFailure(final String sourceConnector, final String destinationConnector, final String jobDescription, final String logUrl, final Long jobId)
+  public boolean notifyJobFailure(final String sourceConnector,
+                                  final String destinationConnector,
+                                  final String jobDescription,
+                                  final String logUrl,
+                                  final Long jobId)
       throws IOException, InterruptedException {
     throw new NotImplementedException();
   }
 
   @Override
-  public boolean notifyJobSuccess(final String sourceConnector, final String destinationConnector, final String jobDescription, final String logUrl, final Long jobId)
+  public boolean notifyJobSuccess(final String sourceConnector,
+                                  final String destinationConnector,
+                                  final String jobDescription,
+                                  final String logUrl,
+                                  final Long jobId)
       throws IOException, InterruptedException {
     throw new NotImplementedException();
   }

diff --git a/airbyte-notification/src/main/java/io/airbyte/notification/SlackNotificationClient.java b/airbyte-notification/src/main/java/io/airbyte/notification/SlackNotificationClient.java
@@ -44,7 +44,11 @@ public SlackNotificationClient(final Notification notification) {
   }
 
   @Override
-  public boolean notifyJobFailure(final String sourceConnector, final String destinationConnector, final String jobDescription, final String logUrl, final Long jobId)
+  public boolean notifyJobFailure(final String sourceConnector,
+                                  final String destinationConnector,
+                                  final String jobDescription,
+                                  final String logUrl,
+                                  final Long jobId)
       throws IOException, InterruptedException {
     return notifyFailure(renderTemplate(
         "slack/failure_slack_notification_template.txt",
@@ -56,7 +60,11 @@ public boolean notifyJobFailure(final String sourceConnector, final String desti
   }
 
   @Override
-  public boolean notifyJobSuccess(final String sourceConnector, final String destinationConnector, final String jobDescription, final String logUrl, final Long jobId)
+  public boolean notifyJobSuccess(final String sourceConnector,
+                                  final String destinationConnector,
+                                  final String jobDescription,
+                                  final String logUrl,
+                                  final Long jobId)
       throws IOException, InterruptedException {
     return notifySuccess(renderTemplate(
         "slack/success_slack_notification_template.txt",

diff --git a/airbyte-notification/src/test/java/io/airbyte/notification/SlackNotificationClientTest.java b/airbyte-notification/src/test/java/io/airbyte/notification/SlackNotificationClientTest.java
@@ -46,11 +46,15 @@ class SlackNotificationClientTest {
   private static final String EXPECTED_FAIL_MESSAGE = "Your connection from source-test to destination-test just failed...\n"
       + "This happened with job description\n"
       + "\n"
-      + "You can access its logs here: logUrl\n";
+      + "You can access its logs here: logUrl\n"
+      + "\n"
+      + "Job ID: 1";
   private static final String EXPECTED_SUCCESS_MESSAGE = "Your connection from source-test to destination-test succeeded\n"
       + "This was for job description\n"
       + "\n"
-      + "You can access its logs here: logUrl\n";
+      + "You can access its logs here: logUrl\n"
+      + "\n"
+      + "Job ID: 1";
   private HttpServer server;
 
   @BeforeEach