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

Jump to bottom

DC-839: Move references back to datarepo-client; Upgrade to latest #175

Merged
merged 2 commits into from
Mar 4, 2024
Merged

DC-839: Move references back to datarepo-client; Upgrade to latest #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ad7e2f
move back to datarepo-client
snf2ye Mar 4, 2024
440ac0c
one more argument for enumerate snapshots
snf2ye Mar 4, 2024
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
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/bio.terra.catalog.java-common-conventions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
implementation 'bio.terra:terra-common-lib:0.1.9-SNAPSHOT'
// guava is depended on by terra-common-lib, https://broadworkbench.atlassian.net/browse/DC-798
implementation 'com.google.guava:guava:31.1-jre'
implementation 'bio.terra:datarepo-jakarta-client:1.563.0-SNAPSHOT'
implementation 'bio.terra:datarepo-client:2.13.0-SNAPSHOT'
}

tasks.named('test') {
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/bio/terra/catalog/datarepo/DatarepoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public Map<String, StorageSystemInformation> getDatasets() {
EnumerateSnapshotModel response =
datarepoClient
.snapshotsApi()
.enumerateSnapshots(null, MAX_DATASETS, null, null, null, null, null, null);
.enumerateSnapshots(null, MAX_DATASETS, null, null, null, null, null, null, null);
Map<String, List<String>> roleMap = response.getRoleMap();

return response.getItems().stream()
Expand Down
6 changes: 4 additions & 2 deletions common/src/test/java/bio/terra/catalog/datarepo/DatarepoServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ void getSnapshots() throws Exception {
new EnumerateSnapshotModel()
.items(List.of(new SnapshotSummaryModel().id(snapshotId).phsId("1234")))
.roleMap(items);
when(snapshotsApi.enumerateSnapshots(any(), any(), any(), any(), any(), any(), any(), any()))
when(snapshotsApi.enumerateSnapshots(
any(), any(), any(), any(), any(), any(), any(), any(), any()))
.thenReturn(esm);
var returnedItems = datarepoService.getDatasets();
assertThat(returnedItems, is(expectedItems));
Expand All @@ -99,7 +100,8 @@ void getSnapshot() throws Exception {
@Test
void getSnapshotsException() throws Exception {
mockSnapshots();
when(snapshotsApi.enumerateSnapshots(any(), any(), any(), any(), any(), any(), any(), any()))
when(snapshotsApi.enumerateSnapshots(
any(), any(), any(), any(), any(), any(), any(), any(), any()))
.thenThrow(new ApiException());
assertThrows(DatarepoException.class, () -> datarepoService.getDatasets());
}
Expand Down
Loading