|
|
|
@ -277,7 +277,7 @@ public class RepositoryServiceImpl implements RepositoryService {
|
|
|
|
|
|
|
|
|
|
LOGGER.debug("Searching registered repositories");
|
|
|
|
|
|
|
|
|
|
List<RepositorySnippet> resultSet = new ArrayList<>();
|
|
|
|
|
Paging<RepositorySnippet> snippets = null;
|
|
|
|
|
ObjectMapper mapper = new ObjectMapper();
|
|
|
|
|
|
|
|
|
|
UriComponents uriComponents = searchRegisteredDatasource(requestSortBy, order, Integer.toString(page), Integer.toString(pageSize));
|
|
|
|
@ -290,15 +290,23 @@ public class RepositoryServiceImpl implements RepositoryService {
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
String rs = restTemplate.postForObject(uriComponents.toUri(), requestFilter, String.class);
|
|
|
|
|
JSONArray jsonArray = (JSONArray) new JSONObject(rs).get("datasourceInfo");
|
|
|
|
|
|
|
|
|
|
resultSet.addAll(mapper.readValue(String.valueOf(jsonArray), mapper.getTypeFactory().constructCollectionType(List.class, RepositorySnippet.class)));
|
|
|
|
|
if (rs == null) {
|
|
|
|
|
LOGGER.error(String.format("DSM response is null : [url=%s]", uriComponents.toUri()));
|
|
|
|
|
} else {
|
|
|
|
|
JSONObject response = new JSONObject(rs);
|
|
|
|
|
JSONArray jsonArray = (JSONArray) response.get("datasourceInfo");
|
|
|
|
|
Header header = mapper.readValue(response.get("header").toString(), Header.class);
|
|
|
|
|
snippets = Paging.of(header,
|
|
|
|
|
mapper.readValue(
|
|
|
|
|
String.valueOf(jsonArray),
|
|
|
|
|
mapper.getTypeFactory().constructCollectionType(List.class, RepositorySnippet.class)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return resultSet;
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
LOGGER.error("Error searching registered datasources", e);
|
|
|
|
|
throw e;
|
|
|
|
|
}
|
|
|
|
|
return snippets != null ? snippets.getResults() : null; // TODO: return paging when ui is compatible
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|