Revision 52781
Added by Panagiotis Kanakakis almost 6 years ago
Converter.java | ||
---|---|---|
29 | 29 |
|
30 | 30 |
JSONObject datasource = repositoryObject.getJSONObject("datasource"); |
31 | 31 |
|
32 |
if( datasource.equals(null)) |
|
33 |
return null; |
|
32 |
//if( datasource.equals(null))
|
|
33 |
// return null;
|
|
34 | 34 |
|
35 | 35 |
repository.setId(datasource.get("id").toString()); |
36 | 36 |
repository.setOfficialName(datasource.get("officialname").toString()); |
... | ... | |
321 | 321 |
public static List<AggregationDetails> getAggregationHistoryFromJson(JSONObject datasourceInfo) throws JSONException { |
322 | 322 |
|
323 | 323 |
|
324 |
if(datasourceInfo.get("aggregationHistory").toString().equals("[]")) |
|
325 |
return null; |
|
324 |
// if(datasourceInfo.get("aggregationHistory").toString().equals("[]"))
|
|
325 |
// return null;
|
|
326 | 326 |
|
327 | 327 |
JSONArray rs = new JSONArray(datasourceInfo.get("aggregationHistory").toString()); |
328 | 328 |
List<AggregationDetails> aggregationDetailsList = new ArrayList<>(); |
Also available in: Unified diff
1. Dockerize service
2. Add authorization checks
3. Handle exceptions ( controller advice, exception package)
4. Login-logout operations bug fixes