Bug/91 fix VersionControlChangeType deserialization (#91)

Author: Davide Santonocito

azd/src/main/java/org/azd/abstractions/serializer/VersionControlChangeTypeDeserializer.java

@@ -0,0 +1,30 @@
+package org.azd.abstractions.serializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.azd.enums.VersionControlChangeType;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VersionControlChangeTypeDeserializer extends JsonDeserializer<List<VersionControlChangeType>> {
+
+    @Override
+    public List<VersionControlChangeType> deserialize(JsonParser p, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        String text = p.getText();
+        String[] parts = text.split(",");
+        List<VersionControlChangeType> types = new ArrayList<>();
+        for (String part : parts) {
+            try {
+                types.add(VersionControlChangeType.valueOf(part.trim().toUpperCase().replace(" ", "_")));
+            } catch (IllegalArgumentException e) {
+                // Unknown type, skip or log
+            }
+        }
+        return types;
+    }
+}

azd/src/main/java/org/azd/enums/VersionControlChangeType.java

@@ -7,10 +7,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * None
  **/
+@JsonFormat(shape = JsonFormat.Shape.STRING)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public enum VersionControlChangeType {
     @JsonProperty("add")

azd/src/main/java/org/azd/git/types/GitChange.java

@@ -7,9 +7,13 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.azd.abstractions.serializer.SerializableEntity;
+import org.azd.abstractions.serializer.VersionControlChangeTypeDeserializer;
 import org.azd.enums.VersionControlChangeType;
 
+import java.util.List;
+
 /**
  * None
  **/
@@ -24,7 +28,8 @@ public class GitChange extends SerializableEntity {
      * The type of change that was made to the item.
      **/
     @JsonProperty("changeType")
-    private VersionControlChangeType changeType;
+    @JsonDeserialize(using = VersionControlChangeTypeDeserializer.class)
+    private List<VersionControlChangeType> changeType;
     /**
      * Current version.
      **/
@@ -64,12 +69,12 @@ public void setChangeId(Integer changeId) {
         this.changeId = changeId;
     }
 
-    public VersionControlChangeType getChangeType() {
+    public List<VersionControlChangeType> getChangeType() {
         return changeType;
     }
 
-    public void setChangeType(VersionControlChangeType changeType) {
-        this.changeType = changeType;
+    public void setChangeType(List<VersionControlChangeType> changeType) {
+        this.changeType = List.copyOf(changeType);
     }
 
     public GitItem getItem() {

azd/src/test/java/org/azd/unittests/VersionControlChangeTypeTest.java

@@ -0,0 +1,70 @@
+package org.azd.unittests;
+
+import org.azd.enums.VersionControlChangeType;
+import org.azd.exceptions.AzDException;
+import org.azd.git.types.GitCommitChanges;
+import org.azd.abstractions.serializer.JsonSerializer;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class VersionControlChangeTypeTest {
+
+    @Test
+    public void shouldDeserialiseSingleAndMultiValueChangeTypes() throws AzDException {
+        String mockJson =
+                "{\n" +
+                        "  \"changeCounts\": {\n" +
+                        "    \"Edit\": 1,\n" +
+                        "    \"Delete, SourceRename\": 1\n" +
+                        "  },\n" +
+                        "  \"changes\": [\n" +
+                        "    {\n" +
+                        "      \"item\": {\n" +
+                        "        \"objectId\": \"abc123\",\n" +
+                        "        \"originalObjectId\": \"abc123\",\n" +
+                        "        \"gitObjectType\": \"blob\",\n" +
+                        "        \"commitId\": \"deadbeef\",\n" +
+                        "        \"path\": \"../deleted-file.xml\",\n" +
+                        "        \"url\": \"http://example.com\"\n" +
+                        "      },\n" +
+                        "      \"changeType\": \"delete, sourceRename\"\n" +
+                        "    },\n" +
+                        "    {\n" +
+                        "      \"item\": {\n" +
+                        "        \"objectId\": \"def456\",\n" +
+                        "        \"originalObjectId\": \"def456\",\n" +
+                        "        \"gitObjectType\": \"blob\",\n" +
+                        "        \"commitId\": \"cafebabe\",\n" +
+                        "        \"path\": \"../edited-file.xml\",\n" +
+                        "        \"url\": \"http://example.com\"\n" +
+                        "      },\n" +
+                        "      \"changeType\": \"edit\"\n" +
+                        "    }\n" +
+                        "  ]\n" +
+                        "}";
+
+        JsonSerializer serializer = new JsonSerializer();
+        GitCommitChanges changes = serializer.deserialize(mockJson, GitCommitChanges.class);
+
+        assertNotNull(changes);
+        assertEquals(2, changes.getChanges().size());
+
+        // Check multi-value change type
+        List<VersionControlChangeType> multiTypes = changes.getChanges().get(0).getChangeType();
+        assertNotNull(multiTypes);
+        assertEquals(2, multiTypes.size());
+        assertTrue(multiTypes.contains(VersionControlChangeType.DELETE));
+        assertTrue(multiTypes.contains(VersionControlChangeType.SOURCERENAME));
+
+        // Check single-value change type
+        List<VersionControlChangeType> singleTypes = changes.getChanges().get(1).getChangeType();
+        assertNotNull(singleTypes);
+        assertEquals(1, singleTypes.size());
+        assertTrue(singleTypes.contains(VersionControlChangeType.EDIT));
+    }
+}