From d0c98ca85e6c61d6d2c8f7a521bcfe1b00af1d69 Mon Sep 17 00:00:00 2001 From: Patrick Ehlert Date: Mon, 17 Feb 2025 10:05:43 +0100 Subject: [PATCH 1/5] EA-40999 Fix AnnoSync (add 1 to page number since Annotation API page numbering now starts with 1) --- .../batch/reader/AnnotationItemReader.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/annosync/src/main/java/eu/europeana/fulltext/annosync/batch/reader/AnnotationItemReader.java b/annosync/src/main/java/eu/europeana/fulltext/annosync/batch/reader/AnnotationItemReader.java index 5f3c249b..cabe2a53 100644 --- a/annosync/src/main/java/eu/europeana/fulltext/annosync/batch/reader/AnnotationItemReader.java +++ b/annosync/src/main/java/eu/europeana/fulltext/annosync/batch/reader/AnnotationItemReader.java @@ -9,9 +9,12 @@ import eu.europeana.fulltext.service.AnnotationApiRestService; import eu.europeana.fulltext.subtitles.external.AnnotationItem; +/** + * Reads pages of items from Annotation API based on "from" and "to" date + */ public class AnnotationItemReader extends AbstractPaginatedDataItemReader { - private static final Logger logger = LogManager.getLogger(AnnotationItemReader.class); + private static final Logger LOG = LogManager.getLogger(AnnotationItemReader.class); private final AnnotationApiRestService annotationsRestService; private final Instant from; @@ -34,16 +37,16 @@ String getClassName() { @Override protected Iterator doPageRead() { - // page is incremented in parent class every time this method is invoked - List searchResponse = - annotationsRestService.getAnnotations(page, pageSize, from, to); + // Page is incremented in parent class every time this method is invoked. By default it starts with 0 but in + // Annotation API it starts with 1 so we add 1 + List searchResponse = annotationsRestService.getAnnotations(page + 1, pageSize, from, to); if (searchResponse == null || searchResponse.isEmpty()) { - logger.info("No results found in page:{} , pageSize:{}, from: {}, to: {} ", page, pageSize, from, to); + LOG.info("No results found in page:{} , pageSize:{}, from: {}, to: {} ", page + 1, pageSize, from, to); return null; } - logger.info("Fetched Annotations ids - {} ", searchResponse.size()); + LOG.info("Fetched Annotations ids - {} ", searchResponse.size()); return searchResponse.iterator(); } From ee33bfb370544fb671d7e64008f8cb86004ccad1 Mon Sep 17 00:00:00 2001 From: srishti Date: Mon, 17 Feb 2025 11:55:05 +0100 Subject: [PATCH 2/5] EA-4099 added backoffLimit: 1 in cron jobs --- k8s/overlays/cloud/cronjob.yaml.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/k8s/overlays/cloud/cronjob.yaml.template b/k8s/overlays/cloud/cronjob.yaml.template index 258a7c5a..3db89487 100644 --- a/k8s/overlays/cloud/cronjob.yaml.template +++ b/k8s/overlays/cloud/cronjob.yaml.template @@ -8,6 +8,7 @@ spec: concurrencyPolicy: Forbid jobTemplate: spec: + backoffLimit: 1 ttlSecondsAfterFinished: ${CRON_TTL_AFTER_FINISHED} template: metadata: @@ -61,6 +62,7 @@ spec: concurrencyPolicy: Forbid jobTemplate: spec: + backoffLimit: 1 ttlSecondsAfterFinished: ${CRON_TTL_AFTER_FINISHED} template: metadata: @@ -119,6 +121,7 @@ spec: concurrencyPolicy: Forbid jobTemplate: spec: + backoffLimit: 1 ttlSecondsAfterFinished: ${CRON_TTL_AFTER_FINISHED} template: metadata: From 66a76b5e16a89aee7e42de9775efb140dee14531 Mon Sep 17 00:00:00 2001 From: srishti Date: Mon, 17 Feb 2025 11:58:45 +0100 Subject: [PATCH 3/5] EA-4099 update cache verion to v4 in github actions --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 794b0ce4..9a13cee7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,7 +23,7 @@ jobs: repositories: '[{ "id": "europeana-libs-release", "url": "https://artifactory.eanadev.org/artifactory/libs-release"}, { "id": "europeana-libs-snapshot", "url": "https://artifactory.eanadev.org/artifactory/libs-snapshot", "snapshots": { "enabled": "true" }}]' plugin_repositories: '[{ "id": "europeana-plugins-release", "url": "https://artifactory.eanadev.org/artifactory/plugins-release" }, { "id": "europeana-plugins-snapshot", "url": "https://artifactory.eanadev.org/artifactory/plugins-snapshot", "snapshots": { "enabled": "true" }}]' - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} From fc698377dd3320ee3be23ec0a95b7c9095bbdd08 Mon Sep 17 00:00:00 2001 From: srishti Date: Mon, 17 Feb 2025 12:49:59 +0100 Subject: [PATCH 4/5] EA-4099 adding javax servlet api dependency --- common/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/pom.xml b/common/pom.xml index 16a1a436..534d0afb 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -124,6 +124,13 @@ 4.5.14 + + + javax.servlet + javax.servlet-api + 4.0.1 + + net.sf.saxon From 8351a4708778463684a80334b263274e72f661d2 Mon Sep 17 00:00:00 2001 From: srishti Date: Mon, 17 Feb 2025 15:43:35 +0100 Subject: [PATCH 5/5] EA-4099 adding maven resource plugin --- api/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/api/pom.xml b/api/pom.xml index 35ce4f7e..83066419 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -24,6 +24,7 @@ 1.12.0 2.4.13 2.22.2 + 3.1.0 @@ -300,6 +301,16 @@ ${maven-surefire.version} + + + org.apache.maven.plugins + maven-resources-plugin + ${maven.resource.version} + + org.springframework.boot spring-boot-maven-plugin