Only use interface for Java code

collect_app/src/main/java/org/odk/collect/android/formmanagement/FormsDataService.kt

@@ -14,9 +14,7 @@ import org.odk.collect.android.state.DataKeys
 import org.odk.collect.androidshared.data.AppState
 import org.odk.collect.androidshared.data.DataService
 import org.odk.collect.forms.Form
-import org.odk.collect.forms.FormSource
 import org.odk.collect.forms.FormSourceException
-import org.odk.collect.forms.FormsRepository
 import org.odk.collect.projects.ProjectDependencyFactory
 import org.odk.collect.settings.keys.ProjectKeys
 import java.io.File
@@ -160,14 +158,7 @@ class FormsDataService(
                 val formDownloader = formDownloader(projectDependencies, clock)
 
                 val serverFormsSynchronizer = ServerFormsSynchronizer(
-                    object : ServerFormsDetailsFetcher {
-                        override fun fetchFormDetails(
-                            repository: FormsRepository,
-                            source: FormSource
-                        ): List<ServerFormDetails> {
-                            return ServerFormUseCases.fetchFormDetails(repository, source)
-                        }
-                    },
+                    { repository, source -> ServerFormUseCases.fetchFormDetails(repository, source) },
                     projectDependencies.formsRepository,
                     projectDependencies.instancesRepository,
                     formDownloader,

collect_app/src/main/java/org/odk/collect/android/formmanagement/matchexactly/ServerFormsSynchronizer.java

@@ -2,7 +2,6 @@
 
 import org.odk.collect.android.formmanagement.LocalFormUseCases;
 import org.odk.collect.android.formmanagement.ServerFormDetails;
-import org.odk.collect.android.formmanagement.ServerFormsDetailsFetcher;
 import org.odk.collect.android.formmanagement.download.FormDownloadException;
 import org.odk.collect.android.formmanagement.download.FormDownloader;
 import org.odk.collect.forms.Form;
@@ -56,4 +55,8 @@ public void synchronize() throws FormSourceException {
             throw new FormSourceException.FetchError();
         }
     }
+
+    public interface ServerFormsDetailsFetcher {
+        List<ServerFormDetails> fetchFormDetails(FormsRepository formsRepository, FormSource formSource) throws FormSourceException;
+    }
 }

collect_app/src/test/java/org/odk/collect/android/formmanagement/ServerFormsSynchronizerTest.java

@@ -1,5 +1,15 @@
 package org.odk.collect.android.formmanagement;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static java.util.Arrays.asList;
+
 import org.junit.Test;
 import org.odk.collect.android.formmanagement.download.FormDownloadException;
 import org.odk.collect.android.formmanagement.download.FormDownloader;
@@ -17,22 +27,12 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import static java.util.Arrays.asList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 public class ServerFormsSynchronizerTest {
 
     private final FormsRepository formsRepository = new InMemFormsRepository();
     private final InstancesRepository instancesRepository = new InMemInstancesRepository();
     private final RecordingFormDownloader formDownloader = new RecordingFormDownloader();
-    private final ServerFormsDetailsFetcher serverFormDetailsFetcher = mock(ServerFormsDetailsFetcher.class);
+    private final ServerFormsSynchronizer.ServerFormsDetailsFetcher serverFormDetailsFetcher = mock(ServerFormsSynchronizer.ServerFormsDetailsFetcher.class);
     private final FormSource formSource = mock(FormSource.class);
     private final ServerFormsSynchronizer synchronizer = new ServerFormsSynchronizer(serverFormDetailsFetcher, formsRepository, instancesRepository, formDownloader, formSource);