*/
package jalview.ext.paradise;
+import jalview.util.JSONUtils;
import jalview.util.MessageManager;
import jalview.ws.HttpClientUtils;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
import org.json.simple.parser.ContentHandler;
import org.json.simple.parser.ParseException;
}
+ /**
+ * @param respons
+ * @return
+ * @throws Exception
+ */
public static Iterator<Reader> processJsonResponseFor(Reader respons)
throws Exception
{
- org.json.simple.parser.JSONParser jp = new org.json.simple.parser.JSONParser();
+ // BH 2019 never called?
try
{
- final JSONArray responses = (JSONArray) jp.parse(respons);
- final Iterator rvals = responses.iterator();
+ @SuppressWarnings("unchecked")
+ final Iterator<Object> rvals = ((List<Object>) JSONUtils.parse(respons)).iterator();
return new Iterator<Reader>()
{
@Override
return rvals.hasNext();
}
- @Override
+ @SuppressWarnings("unchecked")
+ @Override
public Reader next()
{
- JSONObject val = (JSONObject) rvals.next();
+ Map<String, Object> val = (Map<String, Object>) rvals.next();
Object sval = null;
try
sval = "";
}
- return new StringReader((sval instanceof JSONObject)
- ? ((JSONObject) sval).toString()
- : sval.toString());
+ return new StringReader(sval.toString());
}