Revision 54745
Added by Panagiotis Kanakakis about 5 years ago
| RepositoryServiceImpl.java | ||
|---|---|---|
| 281 | 281 |
try {
|
| 282 | 282 |
String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class); |
| 283 | 283 |
JSONObject repository = new JSONObject(rs); |
| 284 |
|
|
| 285 |
if(repository.getJSONArray("datasourceInfo").length() == 0)
|
|
| 286 |
return aggregationHistory; |
|
| 284 | 287 |
aggregationHistory.addAll(Converter.getAggregationHistoryFromJson(repository.getJSONArray("datasourceInfo").getJSONObject(0)));
|
| 285 | 288 |
return aggregationHistory.size() == 0? aggregationHistory : aggregationHistory.stream() |
| 286 | 289 |
.sorted(Comparator.comparing(AggregationDetails::getDate).reversed()) |
| ... | ... | |
| 306 | 309 |
try {
|
| 307 | 310 |
String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class); |
| 308 | 311 |
JSONObject repository = new JSONObject(rs); |
| 312 |
|
|
| 313 |
if(repository.getJSONArray("datasourceInfo").length() == 0)
|
|
| 314 |
return aggregationByYear; |
|
| 315 |
|
|
| 309 | 316 |
aggregationHistory.addAll(Converter.getAggregationHistoryFromJson(repository.getJSONArray("datasourceInfo").getJSONObject(0)));
|
| 310 | 317 |
return aggregationHistory.size() == 0? aggregationByYear:createYearMap(aggregationHistory); |
| 311 | 318 |
|
Also available in: Unified diff
1. Repository service bug fixes
2. Stats controller bug fix