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

remove the requirement on the activity #20311

Merged
merged 2 commits into from
Dec 9, 2022
Merged

remove the requirement on the activity #20311

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4a5b63
remove the requirement on the activity
benmoriceau Dec 9, 2022
2e27726
Remove unused import
benmoriceau Dec 9, 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
11 changes: 4 additions & 7 deletions .../main/java/io/airbyte/workers/temporal/scheduling/activities/ConfigFetchActivityImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import static io.airbyte.metrics.lib.ApmTraceConstants.Tags.CONNECTION_ID_KEY;

import datadog.trace.api.Trace;
import io.airbyte.commons.temporal.config.WorkerMode;
import io.airbyte.commons.temporal.exception.RetryableException;
import io.airbyte.config.Cron;
import io.airbyte.config.StandardSync;
Expand All @@ -21,7 +20,6 @@
import io.airbyte.persistence.job.JobPersistence;
import io.airbyte.persistence.job.models.Job;
import io.airbyte.validation.json.JsonValidationException;
import io.micronaut.context.annotation.Requires;
import io.micronaut.context.annotation.Value;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
Expand All @@ -41,7 +39,6 @@

@Slf4j
@Singleton
@Requires(env = WorkerMode.CONTROL_PLANE)
public class ConfigFetchActivityImpl implements ConfigFetchActivity {

private final static long MS_PER_SECOND = 1000L;
Expand Down Expand Up @@ -177,22 +174,22 @@ public GetMaxAttemptOutput getMaxAttempt() {
}

@Override
public Optional<UUID> getSourceId(UUID connectionId) {
public Optional<UUID> getSourceId(final UUID connectionId) {
try {
final StandardSync standardSync = getStandardSync(connectionId);
return Optional.ofNullable(standardSync.getSourceId());
} catch (JsonValidationException | ConfigNotFoundException | IOException e) {
} catch (final JsonValidationException | ConfigNotFoundException | IOException e) {
log.info("Encountered an error fetching the connection's Source ID: ", e);
return Optional.empty();
}
}

@Override
public Optional<Status> getStatus(UUID connectionId) {
public Optional<Status> getStatus(final UUID connectionId) {
try {
final StandardSync standardSync = getStandardSync(connectionId);
return Optional.ofNullable(standardSync.getStatus());
} catch (JsonValidationException | ConfigNotFoundException | IOException e) {
} catch (final JsonValidationException | ConfigNotFoundException | IOException e) {
log.info("Encountered an error fetching the connection's status: ", e);
return Optional.empty();
}
Expand Down