Merge branch 'master' into pr/1093

# Conflicts: # portability-spi-transfer/src/main/java/org/datatransferproject/spi/transfer/idempotentexecutor/IdempotentImportExecutor.java # portability-spi-transfer/src/main/java/org/datatransferproject/spi/transfer/idempotentexecutor/ItemImportResult.java # portability-types-common/src/main/java/org/datatransferproject/types/common/models/photos/PhotoModel.java
dtinit · Jun 18, 2022 · 911e96f · 911e96f
2 parents 019a615 + 1fdf324
commit 911e96f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ava/org/datatransferproject/spi/transfer/idempotentexecutor/IdempotentImportExecutor.java b/...ava/org/datatransferproject/spi/transfer/idempotentexecutor/IdempotentImportExecutor.java
@@ -47,7 +47,7 @@ default <T extends ImportableItem, R extends Serializable> R importAndSwallowIOE
   }
 
   default <T extends ImportableItem, R extends Serializable>
-      List<R> importBatchAnsSwallowIOExceptions(
+      List<R> importBatchAndSwallowIOExceptions(
           List<T> items, ImportFunction<List<T>, List<R>> function) {
 
     // The general idea is:

diff --git a/...c/main/java/org/datatransferproject/spi/transfer/idempotentexecutor/ItemImportResult.java b/...c/main/java/org/datatransferproject/spi/transfer/idempotentexecutor/ItemImportResult.java
@@ -5,8 +5,7 @@
 
 public class ItemImportResult<T> {
   /**
-   * The caching executor will keep it the cache. Nonnull in case of success. Null in case of
-   * failure.
+   * Internal cache of successfully imported data, or Null in case of failure.
    */
   private final T data;