Revision 56636
Added by Antonis Lempesis over 4 years ago
Converter.java | ||
---|---|---|
368 | 368 |
} |
369 | 369 |
|
370 | 370 |
public static List<AggregationDetails> getAggregationHistoryFromJson(JSONObject datasourceInfo) throws JSONException { |
371 |
JSONArray rs; |
|
372 |
List<AggregationDetails> aggregationDetailsList = new ArrayList<>(); |
|
371 | 373 |
|
372 |
JSONArray rs = new JSONArray(datasourceInfo.get("aggregationHistory").toString()); |
|
373 |
List<AggregationDetails> aggregationDetailsList = new ArrayList<>(); |
|
374 |
for(int i=0;i<rs.length();i++) |
|
375 |
aggregationDetailsList.add(jsonToAggregationDetails(rs.getJSONObject(i))); |
|
374 |
if (datasourceInfo.get("aggregationHistory") != null && !datasourceInfo.get("aggregationHistory").toString().equals("null")) { |
|
375 |
rs = new JSONArray(datasourceInfo.get("aggregationHistory").toString()); |
|
376 |
|
|
377 |
for (int i = 0; i < rs.length(); i++) |
|
378 |
aggregationDetailsList.add(jsonToAggregationDetails(rs.getJSONObject(i))); |
|
379 |
} |
|
380 |
|
|
376 | 381 |
return aggregationDetailsList; |
377 | 382 |
} |
378 | 383 |
|
... | ... | |
422 | 427 |
return null; |
423 | 428 |
} |
424 | 429 |
|
425 |
} |
|
430 |
} |
Also available in: Unified diff
Merged dev-api branch to trunk. merge -r54925:HEAD https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-repository-manager-service/branches/dev-api