lsmyrnaios
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'support of the new research.fi apis' (#515) from update_researchfi_plugin into beta 

Reviewed-on: D-Net/dnet-hadoop#515
This commit is contained in:
Miriam Baglioni 2024-12-04 13:53:01 +01:00
parent 4034da7579 65902a87e3
commit 89b7bc84f2
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/researchfi/ResearchFiIterator.java
View File

@ -6,7 +6,7 @@ import java.util.Queue;
import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.PriorityBlockingQueue;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.http.Header; import org.apache.http.Header;
@ -27,25 +27,25 @@ public class ResearchFiIterator implements Iterator<String> {
private final String baseUrl; private final String baseUrl;
private final String authToken; private final String authToken;
private int currPage; private String nextUrl;
private int nPages; private int nCalls = 0;
private final Queue<String> queue = new PriorityBlockingQueue<>(); private final Queue<String> queue = new PriorityBlockingQueue<>();
public ResearchFiIterator(final String baseUrl, final String authToken) { public ResearchFiIterator(final String baseUrl, final String authToken) {
this.baseUrl = baseUrl; this.baseUrl = baseUrl;
this.authToken = authToken; this.authToken = authToken;
this.currPage = 0; this.nextUrl = null;
this.nPages = 0;
} }
private void verifyStarted() { private void verifyStarted() {
if (this.currPage == 0) {
try { try {
nextCall(); if (this.nCalls == 0) {
} catch (final CollectorException e) { this.nextUrl = invokeUrl(this.baseUrl);
throw new IllegalStateException(e);
} }
} catch (final CollectorException e) {
throw new IllegalStateException(e);
} }
} }
@ -62,9 +62,9 @@ public class ResearchFiIterator implements Iterator<String> {
synchronized (this.queue) { synchronized (this.queue) {
verifyStarted(); verifyStarted();
final String res = this.queue.poll(); final String res = this.queue.poll();
while (this.queue.isEmpty() && (this.currPage < this.nPages)) { while (this.queue.isEmpty() && StringUtils.isNotBlank(this.nextUrl)) {
try { try {
nextCall(); this.nextUrl = invokeUrl(this.nextUrl);
} catch (final CollectorException e) { } catch (final CollectorException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
@ -73,18 +73,11 @@ public class ResearchFiIterator implements Iterator<String> {
} }
} }
private void nextCall() throws CollectorException { private String invokeUrl(final String url) throws CollectorException {
this.currPage += 1; this.nCalls += 1;
String next = null;
final String url;
if (!this.baseUrl.contains("?")) {
url = String.format("%s?PageNumber=%d&PageSize=%d", this.baseUrl, this.currPage, PAGE_SIZE);
} else if (!this.baseUrl.contains("PageSize=")) {
url = String.format("%s&PageNumber=%d&PageSize=%d", this.baseUrl, this.currPage, PAGE_SIZE);
} else {
url = String.format("%s&PageNumber=%d", this.baseUrl, this.currPage);
}
log.info("Calling url: " + url); log.info("Calling url: " + url);
try (final CloseableHttpClient client = HttpClients.createDefault()) { try (final CloseableHttpClient client = HttpClients.createDefault()) {
@ -94,11 +87,15 @@ public class ResearchFiIterator implements Iterator<String> {
try (final CloseableHttpResponse response = client.execute(req)) { try (final CloseableHttpResponse response = client.execute(req)) {
for (final Header header : response.getAllHeaders()) { for (final Header header : response.getAllHeaders()) {
log.debug("HEADER: " + header.getName() + " = " + header.getValue()); log.debug("HEADER: " + header.getName() + " = " + header.getValue());
if ("x-page-count".equals(header.getName())) { if ("link".equals(header.getName())) {
final int totalPages = NumberUtils.toInt(header.getValue()); final String s = StringUtils.substringBetween(header.getValue(), "<", ">");
if (this.nPages != totalPages) { final String token = StringUtils
this.nPages = NumberUtils.toInt(header.getValue()); .substringBefore(StringUtils.substringAfter(s, "NextPageToken="), "&");
log.info("Total pages: " + totalPages);
if (this.baseUrl.contains("?")) {
next = this.baseUrl + "&NextPageToken=" + token;
} else {
next = this.baseUrl + "?NextPageToken=" + token;
} }
} }
} }
@ -108,6 +105,9 @@ public class ResearchFiIterator implements Iterator<String> {
jsonArray.forEach(obj -> this.queue.add(JsonUtils.convertToXML(obj.toString()))); jsonArray.forEach(obj -> this.queue.add(JsonUtils.convertToXML(obj.toString())));
} }
return next;
} catch (final Throwable e) { } catch (final Throwable e) {
log.warn("Error calling url: " + url, e); log.warn("Error calling url: " + url, e);
throw new CollectorException("Error calling url: " + url, e); throw new CollectorException("Error calling url: " + url, e);