Refactored: moved array looping logic up to UpgradeOrderDecider

solita · Nov 1, 2012 · 3e61e18 · 3e61e18
1 parent 59a67f3
commit 3e61e18
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 44 deletions.
diff --git a/src/main/java/fi/solita/jsonmigraine/ArrayUpgrader.java b/src/main/java/fi/solita/jsonmigraine/ArrayUpgrader.java
diff --git a/src/main/java/fi/solita/jsonmigraine/UpgradeOrderDecider.java b/src/main/java/fi/solita/jsonmigraine/UpgradeOrderDecider.java
@@ -5,7 +5,7 @@
 package fi.solita.jsonmigraine;
 
 import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.node.ObjectNode;
+import org.codehaus.jackson.node.*;
 
 import java.util.List;
 
@@ -33,7 +33,26 @@ public JsonNode upgrade(JsonNode data, DataVersions from, HowToUpgrade how) {
             } else {
                 ObjectNode obj = (ObjectNode) data;
                 String fieldName = path.get(0);
-                JsonNode upgraded = upgrade(obj.get(fieldName), dataVersion, upgrader);
+                JsonNode original = obj.get(fieldName);
+
+                JsonNode upgraded;
+                if (original instanceof ArrayNode) {
+                    ArrayNode values = (ArrayNode) original;
+                    ArrayNode result = JsonNodeFactory.instance.arrayNode();
+
+                    for (JsonNode value : values) {
+                        try {
+                            result.add(upgrade(value, dataVersion, upgrader));
+                        } catch (ValueRemovedException e) {
+                            // removed
+                        }
+                    }
+
+                    upgraded = result;
+                } else {
+                    upgraded = upgrade(original, dataVersion, upgrader);
+                }
+
                 obj.put(fieldName, upgraded);  // XXX: not tested
                 data = obj;
             }

diff --git a/src/test/java/fi/solita/jsonmigraine/endToEnd/UpgradeableFieldsTest.java b/src/test/java/fi/solita/jsonmigraine/endToEnd/UpgradeableFieldsTest.java
@@ -7,7 +7,7 @@
 import fi.solita.jsonmigraine.*;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.node.*;
+import org.codehaus.jackson.node.JsonNodeFactory;
 import org.junit.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -70,38 +70,24 @@ public JsonNode upgrade(JsonNode data, int version) {
         }
     }
 
-    static class EnumUpgraderV2 extends ArrayUpgrader {
+    static class EnumUpgraderV2 implements Upgrader {
 
         @Override
         public int version() {
             return 2;
         }
 
         @Override
-        public ArrayNode upgrade(ArrayNode data, int version) {
-            // TODO: move this loop higher
-            ArrayNode result = JsonNodeFactory.instance.arrayNode();
-            for (JsonNode value : data) {
-                try {
-                    JsonNode upgraded = upgradeValue(value, version);
-                    result.add(upgraded);
-                } catch (ValueRemovedException e) {
-                    // removed
-                }
-            }
-            return result;
-        }
-
-        private JsonNode upgradeValue(JsonNode value, int version) {
+        public JsonNode upgrade(JsonNode data, int version) {
             if (version == 1) {
-                if (value.asText().equals("BAR")) {
+                if (data.asText().equals("BAR")) {
                     throw new ValueRemovedException();
                 }
-                if (value.asText().equals("FOO")) {
+                if (data.asText().equals("FOO")) {
                     return JsonNodeFactory.instance.textNode("FOO_RENAMED");
                 }
             }
-            return value;
+            return data;
         }
     }