Preserve filenames when importing items (#1332)

Preserving filenames when importing items by populting filename field for SimpleMediaItem

Author: aksingh737

extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/media/GoogleMediaImporter.java

@@ -222,7 +222,7 @@ private long importPhotoBatch(
           String uploadToken = getOrCreatePhotosInterface(jobId, authData).uploadMediaContent(s,
               photo.getSha1());
           String description = GooglePhotosImportUtils.cleanDescription(photo.getDescription());
-          mediaItems.add(new NewMediaItem(description, uploadToken));
+          mediaItems.add(new NewMediaItem(description, uploadToken, photo.getTitle()));
           uploadTokenToDataId.put(uploadToken, photo);
           size = streamWrapper.getBytes();
           uploadTokenToLength.put(uploadToken, size);

extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/mediaModels/NewMediaItem.java

@@ -41,9 +41,9 @@ public NewMediaItem(String description, SimpleMediaItem simpleMediaItem) {
     this.simpleMediaItem = simpleMediaItem;
   }
 
-  public NewMediaItem(String description, String uploadToken) {
+  public NewMediaItem(String description, String uploadToken, String fileName) {
     this.description = description;
-    this.simpleMediaItem = new SimpleMediaItem(uploadToken);
+    this.simpleMediaItem = new SimpleMediaItem(uploadToken, fileName);
   }
 
   public SimpleMediaItem getSimpleMediaItem() {

extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/mediaModels/SimpleMediaItem.java

@@ -26,8 +26,12 @@ public class SimpleMediaItem {
   @JsonProperty("uploadToken")
   private String uploadToken;
 
-  SimpleMediaItem(String uploadToken) {
+  @JsonProperty("fileName")
+  private String fileName;
+
+  SimpleMediaItem(String uploadToken, String fileName) {
     this.uploadToken = uploadToken;
+    this.fileName = fileName;
   }
 
   public String getUploadToken() {

extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/photos/GooglePhotosImporter.java

@@ -237,7 +237,7 @@ private long importPhotoBatch(
           String uploadToken = getOrCreatePhotosInterface(jobId, authData).uploadMediaContent(s,
               photo.getSha1());
           String description = GooglePhotosImportUtils.cleanDescription(photo.getDescription());
-          mediaItems.add(new NewMediaItem(description, uploadToken));
+          mediaItems.add(new NewMediaItem(description, uploadToken, photo.getTitle()));
           uploadTokenToDataId.put(uploadToken, photo);
           size = streamWrapper.getBytes();
           uploadTokenToLength.put(uploadToken, size);