Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix formatting #15706

Merged
merged 2 commits into from
Aug 16, 2022
Merged

fix formatting #15706

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeb01d1
fix formatting
lmossman Aug 16, 2022
62b639a
fix slack notification client test
lmossman Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...s/bases/base-java/src/main/java/io/airbyte/integrations/util/MySqlSslConnectionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
}
Expand All @@ -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)) {
Expand Down
12 changes: 10 additions & 2 deletions airbyte-notification/src/main/java/io/airbyte/notification/CustomerioNotificationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
12 changes: 10 additions & 2 deletions airbyte-notification/src/main/java/io/airbyte/notification/SlackNotificationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down