This commit is contained in:
@@ -21,6 +21,7 @@ import ru.soune.nocopy.service.tariff.TariffInfoService;
|
|||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
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;
|
||||||
@@ -96,11 +97,17 @@ public class ImageFoundRequestHandler implements RequestHandler {
|
|||||||
YandexSearchResponse googleSearchResponse = mapper.mapToYandexResponse(searchResponseGoogle, page, 5,
|
YandexSearchResponse googleSearchResponse = mapper.mapToYandexResponse(searchResponseGoogle, page, 5,
|
||||||
"exact_matches");
|
"exact_matches");
|
||||||
|
|
||||||
List<YandexSearchResponse.ImageResult> results = new ArrayList<>();
|
int totalSize = yandexSearchResponse.getImages().size() + googleSearchResponse.getImages().size();
|
||||||
results.addAll(googleSearchResponse.getImages());
|
List<YandexSearchResponse.ImageResult> results = new ArrayList<>(totalSize);
|
||||||
results.addAll(yandexSearchResponse.getImages());
|
results.addAll(yandexSearchResponse.getImages());
|
||||||
yandexSearchResponse.setImages(results);
|
results.addAll(googleSearchResponse.getImages());
|
||||||
|
|
||||||
|
yandexSearchResponse.setImages(results);
|
||||||
|
yandexSearchResponse.setTotalResults(totalSize);
|
||||||
|
log.info("COMBINED RESPONSE" + yandexSearchResponse.toString());
|
||||||
|
log.info("COMBINED RESPONSE" + yandexSearchResponse.toString());
|
||||||
|
log.info("COMBINED RESPONSE" + yandexSearchResponse.toString());
|
||||||
|
log.info("COMBINED RESPONSE" + yandexSearchResponse.toString());
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
MessageCode.SUCCESS.getDescription(), yandexSearchResponse);
|
MessageCode.SUCCESS.getDescription(), yandexSearchResponse);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user