Parcourir la source

More concise handling of optional `migratedFromId` in test

Shane Kilkelly il y a 7 ans
Parent
commit
8cb715014c

+ 13 - 22
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/servermock/state/SnapshotAPIStateBuilder.java

@@ -83,30 +83,21 @@ public class SnapshotAPIStateBuilder {
             String projectName,
             String projectName,
             JsonObject jsonGetDoc
             JsonObject jsonGetDoc
     ) {
     ) {
+        String migratedFromId = null;
         if (jsonGetDoc.has("migratedFromId")) {
         if (jsonGetDoc.has("migratedFromId")) {
-            getDoc.put(
-                    projectName,
-                    new GetDocResult(
-                            jsonGetDoc.get("error"),
-                            jsonGetDoc.get("versionID").getAsInt(),
-                            jsonGetDoc.get("createdAt").getAsString(),
-                            jsonGetDoc.get("email").getAsString(),
-                            jsonGetDoc.get("name").getAsString(),
-                            jsonGetDoc.get("migratedFromId").getAsString()
-                    )
-            );
-        } else {
-            getDoc.put(
-                    projectName,
-                    new GetDocResult(
-                            jsonGetDoc.get("error"),
-                            jsonGetDoc.get("versionID").getAsInt(),
-                            jsonGetDoc.get("createdAt").getAsString(),
-                            jsonGetDoc.get("email").getAsString(),
-                            jsonGetDoc.get("name").getAsString()
-                    )
-            );
+            migratedFromId = jsonGetDoc.get("migratedFromId").getAsString();
         }
         }
+        getDoc.put(
+                projectName,
+                new GetDocResult(
+                        jsonGetDoc.get("error"),
+                        jsonGetDoc.get("versionID").getAsInt(),
+                        jsonGetDoc.get("createdAt").getAsString(),
+                        jsonGetDoc.get("email").getAsString(),
+                        jsonGetDoc.get("name").getAsString(),
+                        migratedFromId
+                )
+        );
     }
     }
 
 
     private void addGetSavedVersForProject(
     private void addGetSavedVersForProject(