This commit is contained in:
@@ -20,6 +20,7 @@ import ru.soune.nocopy.service.tariff.TariffConstants;
|
|||||||
import ru.soune.nocopy.service.tariff.TariffInfoService;
|
import ru.soune.nocopy.service.tariff.TariffInfoService;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.TimeoutException;
|
import java.util.concurrent.TimeoutException;
|
||||||
@@ -93,8 +94,9 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
YandexSearchResponse yandexSearchResponse = mapper.mapToYandexResponse(searchResponseYandex, page, 5);
|
YandexSearchResponse yandexSearchResponse = mapper.mapToYandexResponse(searchResponseYandex, page, 5);
|
||||||
YandexSearchResponse googleSearchResponse = mapper.mapToYandexResponse(searchResponseGoogle, page, 5);
|
YandexSearchResponse googleSearchResponse = mapper.mapToYandexResponse(searchResponseGoogle, page, 5);
|
||||||
|
|
||||||
List<YandexSearchResponse.ImageResult> results = yandexSearchResponse.getImages();
|
List<YandexSearchResponse.ImageResult> results = new ArrayList<>();
|
||||||
results.addAll(googleSearchResponse.getImages());
|
results.addAll(googleSearchResponse.getImages());
|
||||||
|
results.addAll(yandexSearchResponse.getImages());
|
||||||
yandexSearchResponse.setImages(results);
|
yandexSearchResponse.setImages(results);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
|||||||
Reference in New Issue
Block a user