Revision 50845
Added by Panagiotis Kanakakis about 6 years ago
| RepositoryApiImpl.java | ||
|---|---|---|
| 199 | 199 |
|
| 200 | 200 |
List<Repository> reps = new ArrayList<>(); |
| 201 | 201 |
for (Repository r : rs) {
|
| 202 |
LOGGER.debug(r.getCollectedFrom()); |
|
| 203 | 202 |
if (r.getCollectedFrom() != null && r.getCollectedFrom().equals(mode)) |
| 204 | 203 |
reps.add(r); |
| 205 | 204 |
} |
| ... | ... | |
| 216 | 215 |
RequestFilter requestFilter = new RequestFilter(); |
| 217 | 216 |
requestFilter.setRegisteredby(userEmail); |
| 218 | 217 |
String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class); |
| 219 |
LOGGER.debug(rs); |
|
| 218 |
|
|
| 220 | 219 |
List<Repository> repos = Converter.jsonToRepositoryList(new JSONObject(rs)); |
| 221 | 220 |
for (Repository r : repos) |
| 222 | 221 |
this.getRepositoryInfo(r); |
| ... | ... | |
| 227 | 226 |
@Override |
| 228 | 227 |
public Repository getRepositoryById(@PathVariable("id") String id) throws JSONException {
|
| 229 | 228 |
|
| 230 |
UriComponents uriComponents = UriComponentsBuilder
|
|
| 231 |
.fromHttpUrl(baseAddress + "/ds/get/")
|
|
| 232 |
.path("/{id}/")
|
|
| 233 |
.build().expand(id).encode();
|
|
| 234 |
|
|
| 235 |
String rs = restTemplate.getForObject(uriComponents.toUri(), String.class);
|
|
| 236 |
Repository repo = Converter.jsonToRepositoryObject(new JSONObject(rs));
|
|
| 229 |
LOGGER.debug("Retreiving repositories with id : " + id );
|
|
| 230 |
UriComponents uriComponents = searchDatasource("0","100");
|
|
| 231 |
RequestFilter requestFilter = new RequestFilter();
|
|
| 232 |
requestFilter.setId(id);
|
|
| 233 |
String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class); |
|
| 234 |
JSONArray jsonArray = (JSONArray) new JSONObject(rs).get("datasourceInfo");
|
|
| 235 |
Repository repo = Converter.jsonToRepositoryObject(jsonArray.getJSONObject(0));
|
|
| 237 | 236 |
if (repo != null) |
| 238 | 237 |
getRepositoryInfo(repo); |
| 239 | 238 |
return repo; |
| ... | ... | |
| 243 | 242 |
@Override |
| 244 | 243 |
public Aggregations getRepositoryAggregations(@PathVariable("id") String id) throws JSONException {
|
| 245 | 244 |
|
| 246 |
UriComponents uriComponents = UriComponentsBuilder |
|
| 247 |
.fromHttpUrl(baseAddress + "/ds/get/") |
|
| 248 |
.path("/{id}/")
|
|
| 249 |
.build().expand(id).encode(); |
|
| 250 |
|
|
| 251 |
String rs = restTemplate.getForObject(uriComponents.toUri(), String.class); |
|
| 245 |
LOGGER.debug("Retreiving aggregations for repository with id : " + id );
|
|
| 246 |
UriComponents uriComponents = searchDatasource("0","100");
|
|
| 247 |
RequestFilter requestFilter = new RequestFilter(); |
|
| 248 |
requestFilter.setId(id); |
|
| 249 |
String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class); |
|
| 252 | 250 |
JSONObject repository = new JSONObject(rs); |
| 253 | 251 |
|
| 254 | 252 |
Aggregations aggregations = new Aggregations(); |
| 255 | 253 |
|
| 256 | 254 |
try {
|
| 257 |
aggregations.setAggregationHistory(Converter.getAggregationHistoryFromJson(repository)); |
|
| 258 |
aggregations.setLastCollection(Converter.getLastCollectionFromJson(repository)); |
|
| 259 |
aggregations.setLastTransformation(Converter.getLastTransformationFromJson(repository)); |
|
| 255 |
LOGGER.debug(repository.getJSONArray("datasourceInfo").getJSONObject(0));
|
|
| 256 |
aggregations.setAggregationHistory(Converter.getAggregationHistoryFromJson(repository.getJSONArray("datasourceInfo").getJSONObject(0)));
|
|
| 257 |
aggregations.setLastCollection(Converter.getLastCollectionFromJson(repository.getJSONArray("datasourceInfo").getJSONObject(0)));
|
|
| 258 |
aggregations.setLastTransformation(Converter.getLastTransformationFromJson(repository.getJSONArray("datasourceInfo").getJSONObject(0)));
|
|
| 260 | 259 |
return aggregations; |
| 261 | 260 |
} catch (JSONException e) {
|
| 262 | 261 |
LOGGER.debug("JSON aggregation exception ", e);
|
| ... | ... | |
| 269 | 268 |
public List<Repository> getRepositoriesByName(@PathVariable("name") String name,
|
| 270 | 269 |
@PathVariable("page") String page,
|
| 271 | 270 |
@PathVariable("size") String size) throws JSONException {
|
| 272 |
UriComponents uriComponents = UriComponentsBuilder |
|
| 273 |
.fromHttpUrl(baseAddress + "/ds/search/name/") |
|
| 274 |
.path("/{page}/{size}")
|
|
| 275 |
.queryParam("name", name)
|
|
| 276 |
.build().expand(page, size).encode(); |
|
| 277 | 271 |
|
| 278 |
String rs = restTemplate.getForObject(uriComponents.toUri(), String.class); |
|
| 272 |
LOGGER.debug("Retreiving repositories with official name : " + name );
|
|
| 273 |
UriComponents uriComponents = searchDatasource("0","100");
|
|
| 274 |
RequestFilter requestFilter = new RequestFilter(); |
|
| 275 |
requestFilter.setOfficialname(name); |
|
| 276 |
String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class); |
|
| 277 |
|
|
| 279 | 278 |
List<Repository> repos = Converter.jsonToRepositoryList(new JSONObject(rs)); |
| 280 | 279 |
for (Repository r : repos) |
| 281 | 280 |
getRepositoryInfo(r); |
Also available in: Unified diff
1. Fix new dev api
2. Fix bugs on validator / broker / piwik api.
3. JSON changes on convert file for dev api
4. Add new class RequestFilter on utils package for search queries.