- Add check for null or empty id or url.

- Code cleanup.
This commit is contained in:
Lampros Smyrnaios 2022-01-28 03:47:46 +02:00
parent a428b1d1e6
commit 2e4c1323a3
2 changed files with 7 additions and 5 deletions

View File

@ -1,4 +0,0 @@
#!/usr/bin/env bash
set -x
cd ../
./gradlew bootrun

View File

@ -9,7 +9,6 @@ import eu.openaire.publications_retriever.util.url.DataToBeLogged;
import eu.openaire.publications_retriever.util.url.LoaderAndChecker;
import eu.openaire.publications_retriever.util.url.UrlUtils;
import eu.openaire.urls_worker.UrlsWorkerApplication;
import eu.openaire.urls_worker.components.ScheduledTasks;
import eu.openaire.urls_worker.models.Assignment;
import eu.openaire.urls_worker.models.Error;
import eu.openaire.urls_worker.models.Payload;
@ -87,6 +86,13 @@ public class PublicationsRetrieverPlugin {
String id = assignment.getId();
String url = assignment.getOriginalUrl();
if ( (id == null) || id.isEmpty() || (url == null) || url.isEmpty() ) {
String errorMsg = "Got null or empty pair! ID=" + id + " , url=" + url;
logger.warn(errorMsg);
UrlUtils.logOutputData(id, url, null, "unreachable", "Discarded at loading time, due to input problems. " + errorMsg, null, true, "true", "false", "false", "false", "false", null, null);
return false;
}
if ( (url = LoaderAndChecker.handleUrlChecks(id, url)) == null ) {
return false;
} // The "url" might have changed (inside "handleUrlChecks()").