@@ -87,18 +87,34 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
|
|
||||||
List<YandexSearchResponse.ImageResult> allYandexImages = searchImageService.getAllImagesWithoutPagination(
|
List<YandexSearchResponse.ImageResult> allYandexImages = searchImageService.getAllImagesWithoutPagination(
|
||||||
searchResponseYandex, "visual_matches");
|
searchResponseYandex, "visual_matches");
|
||||||
|
log.info("GET ALL YANDEX IMAGES!");
|
||||||
|
log.info("GET ALL YANDEX IMAGES!");
|
||||||
|
log.info("GET ALL YANDEX IMAGES!");
|
||||||
|
log.info("GET ALL YANDEX IMAGES!");
|
||||||
List<YandexSearchResponse.ImageResult> allGoogleImages = searchImageService.getAllImagesWithoutPagination(
|
List<YandexSearchResponse.ImageResult> allGoogleImages = searchImageService.getAllImagesWithoutPagination(
|
||||||
searchResponseGoogle, "exact_matches");
|
searchResponseGoogle, "exact_matches");
|
||||||
|
|
||||||
List<YandexSearchResponse.ImageResult> allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages,
|
List<YandexSearchResponse.ImageResult> allUniqueImages = searchImageService.removeDuplicateUrls(allYandexImages,
|
||||||
allGoogleImages);
|
allGoogleImages);
|
||||||
|
|
||||||
|
log.info("GET ALL GOOGLE IMAGES!");
|
||||||
|
log.info("GET ALL GOOGLE IMAGES!");
|
||||||
|
log.info("GET ALL GOOGLE IMAGES!");
|
||||||
|
log.info("GET ALL GOOGLE IMAGES!");
|
||||||
|
|
||||||
int page = imageSearchRequest.getPage() != null ? imageSearchRequest.getPage() : 1;
|
int page = imageSearchRequest.getPage() != null ? imageSearchRequest.getPage() : 1;
|
||||||
int pageSize = 5;
|
int pageSize = 5;
|
||||||
|
|
||||||
List<YandexSearchResponse.ImageResult> pagedResults = searchImageService.paginateResults(allUniqueImages, page,
|
List<YandexSearchResponse.ImageResult> pagedResults = searchImageService.paginateResults(allUniqueImages, page,
|
||||||
pageSize * 2);
|
pageSize * 2);
|
||||||
|
|
||||||
|
log.info("GET ALL pagedResults IMAGES!");
|
||||||
|
log.info("GET ALL pagedResults IMAGES!");
|
||||||
|
log.info("GET ALL pagedResults IMAGES!");
|
||||||
|
log.info("GET ALL pagedResults IMAGES!");
|
||||||
|
log.info("GET ALL pagedResults IMAGES!");
|
||||||
|
log.info("GET ALL pagedResults IMAGES!");
|
||||||
|
|
||||||
YandexSearchResponse finalResponse = new YandexSearchResponse();
|
YandexSearchResponse finalResponse = new YandexSearchResponse();
|
||||||
finalResponse.setImages(pagedResults);
|
finalResponse.setImages(pagedResults);
|
||||||
finalResponse.setPage(page);
|
finalResponse.setPage(page);
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class DaDataService {
|
|||||||
private String apiKey ;
|
private String apiKey ;
|
||||||
|
|
||||||
@Value("${dadata.url}")
|
@Value("${dadata.url}")
|
||||||
private String url ;
|
private String dadataUrl;
|
||||||
|
|
||||||
private final OkHttpClient httpClient;
|
private final OkHttpClient httpClient;
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ public class DaDataService {
|
|||||||
String jsonBody = String.format("{\"query\": \"%s\"}", inn);
|
String jsonBody = String.format("{\"query\": \"%s\"}", inn);
|
||||||
|
|
||||||
Request request = new Request.Builder()
|
Request request = new Request.Builder()
|
||||||
.url("https://suggestions.dadata.ru/suggestions/api/4_1/rs/findById/party")
|
.url(dadataUrl)
|
||||||
.post(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), jsonBody))
|
.post(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), jsonBody))
|
||||||
.header("Accept", "application/json")
|
.header("Accept", "application/json")
|
||||||
.header("Authorization", "Token " + apiKey)
|
.header("Authorization", "Token " + apiKey)
|
||||||
@@ -52,6 +52,7 @@ public class DaDataService {
|
|||||||
|
|
||||||
try (Response response = httpClient.newCall(request).execute()) {
|
try (Response response = httpClient.newCall(request).execute()) {
|
||||||
ResponseBody body = response.body();
|
ResponseBody body = response.body();
|
||||||
|
|
||||||
if (body == null) {
|
if (body == null) {
|
||||||
throw new IOException("Empty response body");
|
throw new IOException("Empty response body");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user