diff --git a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java index be25de0..2ae5e16 100644 --- a/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java @@ -91,8 +91,10 @@ public class ImageFoundRequestHandler implements RequestHandler { int page = imageSearchRequest.getPage() != null ? imageSearchRequest.getPage() : 1; - YandexSearchResponse yandexSearchResponse = mapper.mapToYandexResponse(searchResponseYandex, page, 5); - YandexSearchResponse googleSearchResponse = mapper.mapToYandexResponse(searchResponseGoogle, page, 5); + YandexSearchResponse yandexSearchResponse = mapper.mapToYandexResponse(searchResponseYandex, page, 5, + "visual_matches"); + YandexSearchResponse googleSearchResponse = mapper.mapToYandexResponse(searchResponseGoogle, page, 5, + "exact_matches"); List results = new ArrayList<>(); results.addAll(googleSearchResponse.getImages()); diff --git a/src/main/java/ru/soune/nocopy/service/search/SearchApiToYandexResponseMapper.java b/src/main/java/ru/soune/nocopy/service/search/SearchApiToYandexResponseMapper.java index 4c66a4d..59e2f7a 100644 --- a/src/main/java/ru/soune/nocopy/service/search/SearchApiToYandexResponseMapper.java +++ b/src/main/java/ru/soune/nocopy/service/search/SearchApiToYandexResponseMapper.java @@ -11,10 +11,10 @@ import java.util.List; public class SearchApiToYandexResponseMapper { private final ObjectMapper objectMapper = new ObjectMapper(); - public YandexSearchResponse mapToYandexResponse(String searchApiJson, int page, int pageSize) throws IOException { + public YandexSearchResponse mapToYandexResponse(String searchApiJson, int page, int pageSize, String findType) throws IOException { JsonNode root = objectMapper.readTree(searchApiJson); - JsonNode visualMatches = root.path("visual_matches"); + JsonNode visualMatches = root.path(findType); YandexSearchResponse response = new YandexSearchResponse(); List images = new ArrayList<>();