Fix/disposition not deserializing default field (#342)

* fix(ffprobe): Correctly deserialize dispositions

* chore: Add missing @OverRide annotation

* chore: Check if element is primitive before converting

* test: Add explicit tests for string based boolean

Author: Euklios

src/main/java/net/bramp/ffmpeg/FFmpegUtils.java

@@ -14,8 +14,6 @@
 import net.bramp.commons.lang3.math.gson.FractionAdapter;
 import net.bramp.ffmpeg.adapter.FFmpegPacketsAndFramesAdapter;
 import net.bramp.ffmpeg.gson.LowercaseEnumTypeAdapterFactory;
-import net.bramp.ffmpeg.gson.NamedBitsetAdapter;
-import net.bramp.ffmpeg.probe.FFmpegDisposition;
 import net.bramp.ffmpeg.probe.FFmpegFrameOrPacket;
 import org.apache.commons.lang3.math.Fraction;
 
@@ -132,8 +130,6 @@ private static Gson setupGson() {
     builder.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());
     builder.registerTypeAdapter(Fraction.class, new FractionAdapter());
     builder.registerTypeAdapter(FFmpegFrameOrPacket.class, new FFmpegPacketsAndFramesAdapter());
-    builder.registerTypeAdapter(
-        FFmpegDisposition.class, new NamedBitsetAdapter<>(FFmpegDisposition.class));
 
     return builder.create();
   }

src/main/java/net/bramp/ffmpeg/adapter/BooleanTypeAdapter.java

@@ -0,0 +1,26 @@
+package net.bramp.ffmpeg.adapter;
+
+import java.lang.reflect.Type;
+import com.google.gson.*;
+
+public class BooleanTypeAdapter implements JsonDeserializer<Boolean> {
+    @Override
+    public Boolean deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        if (json.isJsonPrimitive() && json.getAsJsonPrimitive().isBoolean()) {
+            return json.getAsBoolean();
+        }
+
+        if (json.isJsonPrimitive() && json.getAsJsonPrimitive().isString()) {
+            String jsonValue = json.getAsString();
+            if (jsonValue.equalsIgnoreCase("true")) {
+                return true;
+            } else if (jsonValue.equalsIgnoreCase("false")) {
+                return false;
+            } else {
+                return null;
+            }
+        }
+
+        return json.getAsInt() != 0;
+    }
+}

src/main/java/net/bramp/ffmpeg/gson/NamedBitsetAdapter.java

@@ -1,25 +1,56 @@
 package net.bramp.ffmpeg.probe;
 
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.bramp.ffmpeg.adapter.BooleanTypeAdapter;
 
 /** Represents the AV_DISPOSITION_* fields */
 @SuppressFBWarnings(
     value = {"UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"},
     justification = "POJO objects where the fields are populated by gson")
 public class FFmpegDisposition {
+  @SerializedName("default")
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean _default;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean dub;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean original;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean comment;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean lyrics;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean karaoke;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean forced;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean hearing_impaired;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean visual_impaired;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean clean_effects;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean attached_pic;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean captions;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean descriptions;
+
+  @JsonAdapter(BooleanTypeAdapter.class)
   public boolean metadata;
 
   public boolean isDefault() {

src/main/java/net/bramp/ffmpeg/probe/FFmpegDisposition.java

@@ -0,0 +1,66 @@
+package net.bramp.ffmpeg.adapter;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.JsonAdapter;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+public class BooleanTypeAdapterTest {
+    static class Set {
+        @JsonAdapter(BooleanTypeAdapter.class)
+        public boolean a;
+    }
+
+    static Gson gson;
+
+    @BeforeClass
+    public static void setupGson() {
+        gson = new GsonBuilder().create();
+    }
+
+    @Test
+    public void testReadTrue() {
+        Set s  = gson.fromJson("{\"a\":true}", Set.class);
+        assertTrue(s.a);
+    }
+
+    @Test
+    public void testReadFalse() {
+        Set s  = gson.fromJson("{\"a\":false}", Set.class);
+        assertFalse(s.a);
+    }
+
+    @Test
+    public void testReadStringTrue() {
+        Set s  = gson.fromJson("{\"a\":\"true\"}", Set.class);
+        assertTrue(s.a);
+    }
+
+    @Test
+    public void testReadStringFalse() {
+        Set s  = gson.fromJson("{\"a\":\"false\"}", Set.class);
+        assertFalse(s.a);
+    }
+
+    @Test
+    public void testRead1() {
+        Set s  = gson.fromJson("{\"a\":1}", Set.class);
+        assertTrue(s.a);
+    }
+
+    @Test
+    public void testRead0() {
+        Set s  = gson.fromJson("{\"a\":0}", Set.class);
+        assertFalse(s.a);
+    }
+
+    @Test
+    public void testReadNull() {
+        Set s = gson.fromJson("{\"a\":null}", Set.class);
+        assertFalse(s.a);
+    }
+}