mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid breaking json-io updates

This commit is contained in:
Reinhard Pointner 2016-03-06 09:17:42 +00:00
parent 9311a870e0
commit cf2a4f306b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -28,7 +28,7 @@
<classpathentry kind="lib" path="lib/ivy/jar/commons-vfs2.jar"/> <classpathentry kind="lib" path="lib/ivy/jar/commons-vfs2.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/commons-logging.jar"/> <classpathentry kind="lib" path="lib/ivy/jar/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/sevenzipjbinding.jar"/> <classpathentry kind="lib" path="lib/ivy/jar/sevenzipjbinding.jar"/>
<classpathentry kind="lib" path="lib/ivy/bundle/json-io.jar"/> <classpathentry kind="lib" path="lib/ivy/bundle/json-io.jar" sourcepath="lib/ivy/source/json-io.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/jna-platform.jar"/> <classpathentry kind="lib" path="lib/ivy/jar/jna-platform.jar"/>
<classpathentry kind="lib" path="lib/ivy/jar/language-detector.jar"/> <classpathentry kind="lib" path="lib/ivy/jar/language-detector.jar"/>
<classpathentry kind="lib" path="lib/ivy/bundle/guava.jar"/> <classpathentry kind="lib" path="lib/ivy/bundle/guava.jar"/>

2
ivy.xml
View File

@ -11,7 +11,7 @@
<dependency org="com.ibm.icu" name="icu4j" rev="56.+" /> <dependency org="com.ibm.icu" name="icu4j" rev="56.+" />
<dependency org="org.jsoup" name="jsoup" rev="1.+" /> <dependency org="org.jsoup" name="jsoup" rev="1.+" />
<dependency org="org.tukaani" name="xz" rev="1.+" /> <dependency org="org.tukaani" name="xz" rev="1.+" />
<dependency org="com.cedarsoftware" name="json-io" rev="4.+" /> <dependency org="com.cedarsoftware" name="json-io" rev="4.3.+" />
<dependency org="com.googlecode.json-simple" name="json-simple" rev="1.+" /> <dependency org="com.googlecode.json-simple" name="json-simple" rev="1.+" />
<dependency org="commons-io" name="commons-io" rev="2.+" /> <dependency org="commons-io" name="commons-io" rev="2.+" />
<dependency org="commons-net" name="commons-net" rev="3.+" /> <dependency org="commons-net" name="commons-net" rev="3.+" />

4
source/net/filebot/util/JsonUtilities.java
View File

@ -1,5 +1,7 @@
package net.filebot.util; package net.filebot.util;
import static java.util.Collections.*;
import java.util.Map; import java.util.Map;
import com.cedarsoftware.util.io.JsonReader; import com.cedarsoftware.util.io.JsonReader;
@ -7,7 +9,7 @@ import com.cedarsoftware.util.io.JsonReader;
public class JsonUtilities { public class JsonUtilities {
public static Map<?, ?> readJson(String json) { public static Map<?, ?> readJson(String json) {
return JsonReader.jsonToMaps(json); return (Map<?, ?>) JsonReader.jsonToJava(json, singletonMap(JsonReader.USE_MAPS, true));
} }
public static Object[] getArray(Object node, String key) { public static Object[] getArray(Object node, String key) {