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 an npe on a sort fuction #21685

Merged
merged 3 commits into from
Jan 23, 2023
Merged

Fix an npe on a sort fuction #21685

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84bd983
Fix an npe on a sort fuction
benmoriceau Jan 21, 2023
b955faf
Format
benmoriceau Jan 21, 2023
d774e42
Fix build
benmoriceau Jan 23, 2023
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
10 changes: 7 additions & 3 deletions ...irbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import lombok.extern.slf4j.Slf4j;

@Slf4j
Expand Down Expand Up @@ -484,9 +486,11 @@ private void failNonTerminalJobs(final UUID connectionId) {
private static final Comparator<ReleaseStage> RELEASE_STAGE_COMPARATOR = Comparator.comparingInt(RELEASE_STAGE_ORDER::get);

private static List<ReleaseStage> orderByReleaseStageAsc(final List<ReleaseStage> releaseStages) {
final List<ReleaseStage> copiedList = new ArrayList<>(releaseStages);
copiedList.sort(RELEASE_STAGE_COMPARATOR);
return copiedList;
// Using collector to get a mutable list
return releaseStages.stream()
.filter(stage -> stage != null)
.sorted(RELEASE_STAGE_COMPARATOR)
.toList();
}

/**
Expand Down
10 changes: 10 additions & 0 deletions ...irbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import io.airbyte.config.persistence.ConfigNotFoundException;
import io.airbyte.config.persistence.ConfigRepository;
import io.airbyte.config.persistence.StreamResetPersistence;
import io.airbyte.db.instance.configs.jooq.generated.enums.ReleaseStage;
import io.airbyte.persistence.job.JobCreator;
import io.airbyte.persistence.job.JobNotifier;
import io.airbyte.persistence.job.JobPersistence;
Expand Down Expand Up @@ -535,4 +536,13 @@ void ensureCleanJobState() throws IOException {

}

@Test
void testReleaseStageOrdering() {
final List<ReleaseStage> input = List.of(ReleaseStage.alpha, ReleaseStage.custom, ReleaseStage.beta, ReleaseStage.generally_available);
final List<ReleaseStage> expected = List.of(ReleaseStage.custom, ReleaseStage.alpha, ReleaseStage.beta, ReleaseStage.generally_available);

Assertions.assertThat(JobCreationAndStatusUpdateActivityImpl.orderByReleaseStageAsc(input))
.containsExactlyElementsOf(expected);
}

}