reorder the other constructor

dtinit · Dec 1, 2023 · 1e9b11d · 1e9b11d
1 parent 37c540a
commit 1e9b11d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.../src/main/java/org/datatransferproject/datatransfer/google/media/GoogleMediaExporter.java b/.../src/main/java/org/datatransferproject/datatransfer/google/media/GoogleMediaExporter.java
@@ -85,8 +85,8 @@ public GoogleMediaExporter(
         credentialFactory,
         jobStore,
         jsonFactory,
-        /* photosInterface= */ null,
-        monitor
+        monitor,
+        /* photosInterface= */ null
     );
   }
 
@@ -95,8 +95,9 @@ public GoogleMediaExporter(
       GoogleCredentialFactory credentialFactory,
       TemporaryPerJobDataStore jobStore,
       JsonFactory jsonFactory,
-      @Nullable GooglePhotosInterface photosInterface,
-      Monitor monitor) {
+      Monitor monitor, @Nullable
+      GooglePhotosInterface photosInterface
+  ) {
     this(
         credentialFactory,
         jobStore,

diff --git a/.../test/java/org/datatransferproject/datatransfer/google/media/GoogleMediaExporterTest.java b/.../test/java/org/datatransferproject/datatransfer/google/media/GoogleMediaExporterTest.java
@@ -25,14 +25,12 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.api.client.json.gson.GsonFactory;
-import com.google.api.services.drive.Drive.Files.Export;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.io.InputStream;
@@ -72,7 +70,6 @@
 import org.datatransferproject.types.common.models.media.MediaAlbum;
 import org.datatransferproject.types.common.models.media.MediaContainerResource;
 import org.datatransferproject.types.transfer.auth.TokensAndUrlAuthData;
-import org.datatransferproject.types.transfer.errors.ErrorDetail;
 import org.datatransferproject.types.transfer.retry.RetryStrategyLibrary;
 import org.datatransferproject.types.transfer.retry.UniformRetryStrategy;
 import org.junit.jupiter.api.BeforeEach;
@@ -120,7 +117,7 @@ public void setup()
 
     googleMediaExporter =
         new GoogleMediaExporter(
-            credentialFactory, jobStore, GsonFactory.getDefaultInstance(), photosInterface, monitor);
+            credentialFactory, jobStore, GsonFactory.getDefaultInstance(), monitor, photosInterface);
 
     retryingGoogleMediaExporter = new GoogleMediaExporter(
         credentialFactory, jobStore, GsonFactory.getDefaultInstance(), monitor, photosInterface,