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

Refactor GooglePhotosExporter to take in an instance of JobStore #1316

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Refactor GooglePhotosExporter to take in an instance of JobStore #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
238aaa0
Refactor GooglePhotosExporter to take in an instance of JobStore
osamahan999 Dec 7, 2023
d510324
Merge branch 'master' into refactor-photosExporter-jobstore
osamahan999 Dec 8, 2023
e4e7411
Merge branch 'master' into refactor-photosExporter-jobstore
osamahan999 Dec 11, 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
8 changes: 4 additions & 4 deletions ...rc/main/java/org/datatransferproject/datatransfer/google/photos/GooglePhotosExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.datatransferproject.datatransfer.google.mediaModels.GoogleAlbum;
import org.datatransferproject.datatransfer.google.mediaModels.GoogleMediaItem;
import org.datatransferproject.datatransfer.google.mediaModels.MediaItemSearchResponse;
import org.datatransferproject.spi.cloud.storage.TemporaryPerJobDataStore;
import org.datatransferproject.spi.cloud.storage.JobStore;
import org.datatransferproject.spi.transfer.provider.ExportResult;
import org.datatransferproject.spi.transfer.provider.ExportResult.ResultType;
import org.datatransferproject.spi.transfer.provider.Exporter;
Expand Down Expand Up @@ -67,15 +67,15 @@ public class GooglePhotosExporter
static final String PHOTO_TOKEN_PREFIX = "media:";

private final GoogleCredentialFactory credentialFactory;
private final TemporaryPerJobDataStore jobStore;
private final JobStore jobStore;
private final JsonFactory jsonFactory;
private volatile GooglePhotosInterface photosInterface;

private final Monitor monitor;

public GooglePhotosExporter(
GoogleCredentialFactory credentialFactory,
TemporaryPerJobDataStore jobStore,
JobStore jobStore,
JsonFactory jsonFactory,
Monitor monitor) {
this.credentialFactory = credentialFactory;
Expand All @@ -87,7 +87,7 @@ public GooglePhotosExporter(
@VisibleForTesting
GooglePhotosExporter(
GoogleCredentialFactory credentialFactory,
TemporaryPerJobDataStore jobStore,
JobStore jobStore,
JsonFactory jsonFactory,
GooglePhotosInterface photosInterface,
Monitor monitor) {
Expand Down
5 changes: 3 additions & 2 deletions ...est/java/org/datatransferproject/datatransfer/google/photos/GooglePhotosExporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.datatransferproject.datatransfer.google.mediaModels.MediaItemSearchResponse;
import org.datatransferproject.datatransfer.google.mediaModels.MediaMetadata;
import org.datatransferproject.datatransfer.google.mediaModels.Photo;
import org.datatransferproject.spi.cloud.storage.JobStore;
import org.datatransferproject.spi.cloud.storage.TemporaryPerJobDataStore;
import org.datatransferproject.spi.cloud.storage.TemporaryPerJobDataStore.InputStreamWrapper;
import org.datatransferproject.spi.transfer.provider.ExportResult;
Expand Down Expand Up @@ -76,7 +77,7 @@ public class GooglePhotosExporterTest {
private UUID uuid = UUID.randomUUID();

private GooglePhotosExporter googlePhotosExporter;
private TemporaryPerJobDataStore jobStore;
private JobStore jobStore;
private GooglePhotosInterface photosInterface;

private MediaItemSearchResponse mediaItemSearchResponse;
Expand All @@ -86,7 +87,7 @@ public class GooglePhotosExporterTest {
public void setup()
throws IOException, InvalidTokenException, PermissionDeniedException, UploadErrorException {
GoogleCredentialFactory credentialFactory = mock(GoogleCredentialFactory.class);
jobStore = mock(TemporaryPerJobDataStore.class);
jobStore = mock(JobStore.class);
when(jobStore.getStream(any(), anyString())).thenReturn(mock(InputStreamWrapper.class));
photosInterface = mock(GooglePhotosInterface.class);

Expand Down
Loading