Output file roots and files

Author: labkey-adam

api/src/org/labkey/api/migration/DatabaseMigrationConfiguration.java

@@ -7,7 +7,10 @@
 import org.labkey.api.data.DbScope;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
+import org.labkey.api.util.GUID;
+import org.labkey.api.util.Pair;
 
+import java.io.PrintWriter;
 import java.util.Set;
 import java.util.function.Predicate;
 
@@ -21,4 +24,8 @@ default void beforeMigration(){}
     Predicate<String> getColumnNameFilter();
     @Nullable TableSelector getTableSelector(DbSchemaType schemaType, TableInfo sourceTable, TableInfo targetTable, Set<String> selectColumnNames, MigrationSchemaHandler schemaHandler, @Nullable MigrationTableHandler tableHandler);
     default void copyAttachments(DbSchema sourceSchema, DbSchema targetSchema, MigrationSchemaHandler schemaHandler){}
+    default @Nullable Pair<PrintWriter, Set<GUID>> initializeFilePathWriter()
+    {
+        return null;
+    }
 }

api/src/org/labkey/api/migration/DefaultMigrationSchemaHandler.java

@@ -34,6 +34,7 @@
 import org.labkey.api.util.StringUtilsLabKey;
 import org.labkey.api.util.logging.LogHelper;
 
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -311,10 +312,10 @@ public static void afterMigration() throws InterruptedException
         // Shut down the attachment JobRunner
         LOG.info("Waiting for attachments background transfer to complete");
         ATTACHMENT_JOB_RUNNER.shutdown();
-        if (ATTACHMENT_JOB_RUNNER.awaitTermination(1, TimeUnit.HOURS))
+        if (ATTACHMENT_JOB_RUNNER.awaitTermination(2, TimeUnit.HOURS))
             LOG.info("Attachments background transfer is complete");
         else
-            LOG.error("Attachments background transfer did not complete after one hour! Giving up.");
+            LOG.error("Attachments background transfer did not complete after two hours! Giving up.");
     }
 
     @Override
@@ -332,4 +333,9 @@ public void afterSchema(DatabaseMigrationConfiguration configuration, DbSchema s
     public void afterMigration(DatabaseMigrationConfiguration configuration)
     {
     }
+
+    @Override
+    public void writeFilePaths(PrintWriter writer, Set<GUID> guids)
+    {
+    }
 }

api/src/org/labkey/api/migration/MigrationSchemaHandler.java

@@ -12,6 +12,7 @@
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.util.GUID;
 
+import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -57,4 +58,6 @@ public interface MigrationSchemaHandler
     @NotNull Collection<AttachmentType> getAttachmentTypes();
 
     void afterMigration(DatabaseMigrationConfiguration configuration);
+
+    void writeFilePaths(PrintWriter writer, Set<GUID> guids);
 }