Merge branch 'release-1.0.3.2'

adorsys · Nov 26, 2020 · 6c3aeac · 6c3aeac
2 parents 89fe24e + 8dd65e5
commit 6c3aeac
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/datasafe-migration-shaded-0.6.1/pom.xml b/datasafe-migration-shaded-0.6.1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datasafe-migration-root</artifactId>
         <groupId>de.adorsys</groupId>
-        <version>1.0.3.1</version>
+        <version>1.0.3.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-migration-shaded-1.0.3/pom.xml b/datasafe-migration-shaded-1.0.3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datasafe-migration-root</artifactId>
         <groupId>de.adorsys</groupId>
-        <version>1.0.3.1</version>
+        <version>1.0.3.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-migration-silent/pom.xml b/datasafe-migration-silent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datasafe-migration-root</artifactId>
         <groupId>de.adorsys</groupId>
-        <version>1.0.3.1</version>
+        <version>1.0.3.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-migration-silent/src/main/java/de/adorsys/datasafemigration/MigrationLogic.java b/datasafe-migration-silent/src/main/java/de/adorsys/datasafemigration/MigrationLogic.java
@@ -35,7 +35,8 @@ public class MigrationLogic {
     private Set<String> migratedUsers = new HashSet<>();
 
     // this file has to exist for every user
-    private static DocumentFQN MIGRATION_CONFIRMATION = new DocumentFQN("DATASAFE_FORMAT_1_0_3");
+    private static final DocumentFQN MIGRATION_CONFIRMATION = new DocumentFQN("DATASAFE_FORMAT_1_0_3");
+    private static final DocumentFQN MIGRATION_CONFIRMATION_1_0_1 = new DocumentFQN("DATASAFE_FORMAT_1_0_1");
 
     private final DistributedLocker distributedLocker;
     private final GetStorage.SystemRootAndStorageService oldStorage;
@@ -123,13 +124,15 @@ public boolean checkMigration(UserIDAuth userIDAuth) {
 
         // before now accessing a lock to work eclusivly, we can check if user is already migrated
         if (withIntermediateFolder) {
-            if (DirectDFSAccess.doesDocumentExistInUsersRootDir(finalStorage, userIDAuth.getUserID(), MIGRATION_CONFIRMATION)) {
+            if (DirectDFSAccess.doesDocumentExistInUsersRootDir(finalStorage, userIDAuth.getUserID(), MIGRATION_CONFIRMATION_1_0_1) ||
+                    DirectDFSAccess.doesDocumentExistInUsersRootDir(finalStorage, userIDAuth.getUserID(), MIGRATION_CONFIRMATION)) {
                 log.debug("user {} is already migrated, found version file in finalStorage", username);
                 migratedUsers.add(username);
                 return true;
             }
         } else {
-            if (DirectDFSAccess.doesDocumentExistInUsersRootDir(newStorage, userIDAuth.getUserID(), MIGRATION_CONFIRMATION)) {
+            if (DirectDFSAccess.doesDocumentExistInUsersRootDir(newStorage, userIDAuth.getUserID(), MIGRATION_CONFIRMATION_1_0_1) ||
+                    DirectDFSAccess.doesDocumentExistInUsersRootDir(newStorage, userIDAuth.getUserID(), MIGRATION_CONFIRMATION)) {
                 log.debug("user {} is already migrated, found version file in newStorage", username);
                 migratedUsers.add(username);
                 return true;

diff --git a/datasafe-migration/pom.xml b/datasafe-migration/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.adorsys</groupId>
         <artifactId>datasafe-migration-root</artifactId>
-        <version>1.0.3.1</version>
+        <version>1.0.3.2</version>
     </parent>
 
     <artifactId>datasafe-migration</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.adorsys</groupId>
     <artifactId>datasafe-migration-root</artifactId>
-    <version>1.0.3.1</version>
+    <version>1.0.3.2</version>
 
     <name>datasafe-migration-root</name>
     <description>simple datasafe adapter with silent migration under the hood</description>