Revision 50631
Added by Panagiotis Kanakakis about 6 years ago
| RepositoryApiImpl.java | ||
|---|---|---|
| 150 | 150 |
LOGGER.debug("Getting repositories by country!");
|
| 151 | 151 |
int page = 0; |
| 152 | 152 |
int size = 100; |
| 153 |
List<Repository> resultSet = new ArrayList<>(); |
|
| 153 | 154 |
|
| 154 | 155 |
String countryCode = countriesMap.get(country); |
| 155 | 156 |
String filterKey = "UNKNOWN"; |
| ... | ... | |
| 163 | 164 |
|
| 164 | 165 |
LOGGER.debug("Country code equals : " + countryCode);
|
| 165 | 166 |
LOGGER.debug("Filter mode equals : " + filterKey);
|
| 166 |
UriComponents uriComponents = UriComponentsBuilder |
|
| 167 |
.fromHttpUrl(baseAddress + "/ds/search/country/") |
|
| 168 |
.path("/{page}/{size}/")
|
|
| 169 |
.queryParam("country", countryCode)
|
|
| 170 |
.queryParam("managed", managed)
|
|
| 171 |
.build().expand(page, size).encode(); |
|
| 167 |
UriComponents uriComponents = searchDatasource(String.valueOf(page),String.valueOf(size)); |
|
| 168 |
RequestFilter requestFilter = new RequestFilter(); |
|
| 169 |
requestFilter.setCountry(countryCode); |
|
| 172 | 170 |
|
| 173 |
String rs = restTemplate.getForObject(uriComponents.toUri(), String.class);
|
|
| 171 |
String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class);
|
|
| 174 | 172 |
JSONArray jsonArray = (JSONArray) new JSONObject(rs).get("datasourceInfo");
|
| 175 |
|
|
| 176 |
List<Repository> resultSet = new ArrayList<>(); |
|
| 177 | 173 |
while (jsonArray.length() > 0 ) {
|
| 178 | 174 |
List<Repository> rep = Converter.jsonToRepositoryList(new JSONObject(rs)); |
| 179 | 175 |
|
| ... | ... | |
| 181 | 177 |
resultSet.addAll(repos); |
| 182 | 178 |
|
| 183 | 179 |
page += 1; |
| 184 |
uriComponents = UriComponentsBuilder |
|
| 185 |
.fromHttpUrl(baseAddress + "/ds/search/country/") |
|
| 186 |
.path("/{page}/{size}/")
|
|
| 187 |
.queryParam("country", countryCode)
|
|
| 188 |
.queryParam("managed", managed)
|
|
| 189 |
.build().expand(page, size).encode(); |
|
| 190 |
rs = restTemplate.getForObject(uriComponents.toUri(), String.class); |
|
| 180 |
uriComponents = searchDatasource(String.valueOf(page),String.valueOf(size)); |
|
| 181 |
|
|
| 182 |
rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class); |
|
| 191 | 183 |
jsonArray = (JSONArray) new JSONObject(rs).get("datasourceInfo");
|
| 192 | 184 |
} |
| 193 | 185 |
for (Repository r : resultSet) |
| ... | ... | |
| 207 | 199 |
|
| 208 | 200 |
List<Repository> reps = new ArrayList<>(); |
| 209 | 201 |
for (Repository r : rs) {
|
| 210 |
if (r.getCollectedFrom().equals(mode)) |
|
| 202 |
LOGGER.debug(r.getCollectedFrom()); |
|
| 203 |
if (r.getCollectedFrom() != null && r.getCollectedFrom().equals(mode)) |
|
| 211 | 204 |
reps.add(r); |
| 212 | 205 |
} |
| 213 | 206 |
return reps; |
| ... | ... | |
| 219 | 212 |
@PathVariable("size") String size) throws JSONException {
|
| 220 | 213 |
|
| 221 | 214 |
LOGGER.debug("Retreiving repositories of user : " + userEmail );
|
| 222 |
UriComponents uriComponents = UriComponentsBuilder |
|
| 223 |
.fromHttpUrl(baseAddress + "/ds/search/") |
|
| 224 |
.path("/{page}/{size}/")
|
|
| 225 |
.queryParam("requestSortBy","id")
|
|
| 226 |
.queryParam("order","ASCENDING")
|
|
| 227 |
.build().expand(page, size).encode(); |
|
| 228 |
|
|
| 215 |
UriComponents uriComponents = searchDatasource(page,size); |
|
| 229 | 216 |
RequestFilter requestFilter = new RequestFilter(); |
| 230 | 217 |
requestFilter.setRegisteredby(userEmail); |
| 231 |
|
|
| 232 | 218 |
String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class); |
| 233 |
|
|
| 219 |
LOGGER.debug(rs); |
|
| 234 | 220 |
List<Repository> repos = Converter.jsonToRepositoryList(new JSONObject(rs)); |
| 235 | 221 |
for (Repository r : repos) |
| 236 | 222 |
this.getRepositoryInfo(r); |
| ... | ... | |
| 305 | 291 |
.build().expand(id).encode(); |
| 306 | 292 |
|
| 307 | 293 |
String rs = restTemplate.getForObject(uriComponents.toUri(), String.class); |
| 308 |
return Converter.jsonToRepositoryInterfaceList(new JSONArray(rs));
|
|
| 294 |
return Converter.jsonToRepositoryInterfaceList(new JSONObject(rs));
|
|
| 309 | 295 |
} |
| 310 | 296 |
|
| 311 | 297 |
@Override |
| ... | ... | |
| 828 | 814 |
return null; |
| 829 | 815 |
} |
| 830 | 816 |
|
| 817 |
private UriComponents searchDatasource(String page,String size){
|
|
| 831 | 818 |
|
| 819 |
return UriComponentsBuilder |
|
| 820 |
.fromHttpUrl(baseAddress + "/ds/search/") |
|
| 821 |
.path("/{page}/{size}/")
|
|
| 822 |
.queryParam("requestSortBy","id")
|
|
| 823 |
.queryParam("order","ASCENDING")
|
|
| 824 |
.build().expand(page, size).encode(); |
|
| 825 |
} |
|
| 826 |
|
|
| 827 |
|
|
| 832 | 828 |
} |
Also available in: Unified diff
Changes for new api.