Add roda-api-tests E2E module and fix IndexService NPE

.github/workflows/development.yml

@@ -44,7 +44,7 @@ jobs:
           mkdir -p /tmp/roda-jar
           cp roda-ui/roda-wui/target/roda-wui-*.jar /tmp/roda-jar/
       - name: Upload JAR artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: roda-jar
           path: /tmp/roda-jar/
@@ -66,7 +66,7 @@ jobs:
       - name: Prepare platform tag
         run: echo "platform_tag=$(echo "${{ matrix.platform }}" | tr '/' '-')" >> $GITHUB_ENV
       - name: Download JAR artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: roda-jar
           path: docker/target
@@ -99,7 +99,7 @@ jobs:
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
       - name: Upload digest
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: digests-${{ env.platform_tag }}
           path: /tmp/digests/*
@@ -111,7 +111,7 @@ jobs:
     needs: docker
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: /tmp/digests
           pattern: digests-*

.github/workflows/jekyll-gh-pages.yml

@@ -36,7 +36,7 @@ jobs:
           source: ./
           destination: ./_site
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v5
 
   # Deployment job
   deploy:

.github/workflows/latest.yml

@@ -43,7 +43,7 @@ jobs:
           mkdir -p /tmp/roda-jar
           cp roda-ui/roda-wui/target/roda-wui-*.jar /tmp/roda-jar/
       - name: Upload JAR artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: roda-jar
           path: /tmp/roda-jar/
@@ -65,7 +65,7 @@ jobs:
       - name: Prepare platform tag
         run: echo "platform_tag=$(echo "${{ matrix.platform }}" | tr '/' '-')" >> $GITHUB_ENV
       - name: Download JAR artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: roda-jar
           path: docker/target
@@ -98,7 +98,7 @@ jobs:
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
       - name: Upload digest
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: digests-${{ env.platform_tag }}
           path: /tmp/digests/*
@@ -110,7 +110,7 @@ jobs:
     needs: docker
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: /tmp/digests
           pattern: digests-*

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
           mkdir -p /tmp/roda-jar
           cp roda-ui/roda-wui/target/roda-wui-${{ steps.get_version.outputs.release_version }}.jar /tmp/roda-jar/
       - name: Upload JAR artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: roda-jar
           path: /tmp/roda-jar/
@@ -73,7 +73,7 @@ jobs:
       - name: Prepare platform tag
         run: echo "platform_tag=$(echo "${{ matrix.platform }}" | tr '/' '-')" >> $GITHUB_ENV
       - name: Download JAR artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: roda-jar
           path: docker/target
@@ -106,7 +106,7 @@ jobs:
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
       - name: Upload digest
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: digests-${{ env.platform_tag }}
           path: /tmp/digests/*
@@ -118,7 +118,7 @@ jobs:
     needs: [build, docker]
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: /tmp/digests
           pattern: digests-*
@@ -164,7 +164,7 @@ jobs:
       - name: Inspect image
         run: docker buildx imagetools inspect ghcr.io/keeps/roda:${{ steps.meta.outputs.version }}
       - name: Download JAR artifact for release
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: roda-jar
       - name: Upload artifact to release

.github/workflows/staging.yml

@@ -40,7 +40,7 @@ jobs:
           mkdir -p /tmp/roda-jar
           cp roda-ui/roda-wui/target/roda-wui-*.jar /tmp/roda-jar/
       - name: Upload JAR artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: roda-jar
           path: /tmp/roda-jar/
@@ -62,7 +62,7 @@ jobs:
       - name: Prepare platform tag
         run: echo "platform_tag=$(echo "${{ matrix.platform }}" | tr '/' '-')" >> $GITHUB_ENV
       - name: Download JAR artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: roda-jar
           path: docker/target
@@ -95,7 +95,7 @@ jobs:
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
       - name: Upload digest
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: digests-${{ env.platform_tag }}
           path: /tmp/digests/*
@@ -107,7 +107,7 @@ jobs:
     needs: docker
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: /tmp/digests
           pattern: digests-*

.gitignore

@@ -8,6 +8,7 @@ roda-installer/roda-installer_v*
 **/.DS_Store
 roda-core/roda-core/velocity.log.1
 .idea/
+.claude/
 *.iml
 independent_plugin_script.sh
 compile_plugin.sh

deploys/standalone/docker-compose-e2e.yaml

@@ -0,0 +1,109 @@
+services:
+
+  zoo:
+    image: docker.io/zookeeper:3.9-jre-17
+    restart: unless-stopped
+    environment:
+      - ZOO_4LW_COMMANDS_WHITELIST=mntr,conf,ruok
+    volumes:
+      - zookeeper_data:/data
+      - zookeeper_datalog:/datalog
+
+  solr:
+    image: docker.io/solr:9.8.1
+    restart: unless-stopped
+    ports:
+      - "8983:8983"
+    environment:
+      SOLR_HEAP: 2g
+      ZK_HOST: zoo:2181
+    command: -c
+    volumes:
+      - solr_data:/var/solr
+
+  clamd:
+    image: docker.io/clamav/clamav:1.4
+    restart: unless-stopped
+    volumes:
+      - clam_data:/var/lib/clamav
+      - roda_data:/roda/data/
+
+  siegfried:
+    image: ghcr.io/keeps/siegfried:v1.11.0
+    restart: unless-stopped
+    environment:
+      SIEGFRIED_HOST: 0.0.0.0
+      SIEGFRIED_PORT: 5138
+    volumes:
+      - siegfried_data:/root/siegfried/
+      - roda_data:/roda/data/
+
+  mailpit:
+    image: axllent/mailpit:v1.24
+    restart: unless-stopped
+    ports:
+      - "1025:1025"
+      - "8025:8025"
+
+  openldap:
+    image: docker.io/bitnamilegacy/openldap:2.6
+    restart: unless-stopped
+    user: 1001:root
+    ports:
+      - "1389:1389"
+      - "1636:1636"
+    environment:
+      - BITNAMI_DEBUG=true
+      - LDAP_ROOT=dc=roda,dc=org
+      - LDAP_SKIP_DEFAULT_TREE=yes
+      - LDAP_ADMIN_USERNAME=admin
+      - LDAP_ADMIN_PASSWORD=roda
+      - LDAP_EXTRA_SCHEMAS=cosine,inetorgperson,nis,pbkdf2
+    volumes:
+      - ./ldap/ldif/pbkdf2.ldif:/opt/bitnami/openldap/etc/schema/pbkdf2.ldif
+
+  roda:
+    image: docker.io/keeps/roda:development
+    restart: unless-stopped
+    ports:
+      - "8080:8080"
+    depends_on:
+      - solr
+      - clamd
+      - siegfried
+      - postgres
+    volumes:
+      - roda_data:/roda/data/
+      - ./roda/config/roda-core.properties:/roda/config/roda-core.properties:ro
+    environment:
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/roda_core_db
+      - RODA_CORE_SOLR_TYPE=CLOUD
+      - RODA_CORE_SOLR_CLOUD_URLS=zoo:2181
+      - SOLR_NUM_SHARDS=4
+      - SOLR_REPLICATION_FACTOR=1
+      - SIEGFRIED_SERVER_URL=http://siegfried:5138
+      - CLAMD_TCPADDR=clamd
+      - CLAMD_TCPSOCKET=3310
+      - SMTP_HOST=mailpit
+      - SMTP_PORT=1025
+
+  postgres:
+    image: docker.io/postgres:17
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: admin
+      POSTGRES_PASSWORD: roda
+      POSTGRES_DB: roda_core_db
+    ports:
+      - "5432:5432"
+    volumes:
+      - pg_data:/var/lib/postgresql/data
+
+volumes:
+  zookeeper_data:
+  zookeeper_datalog:
+  solr_data:
+  clam_data:
+  siegfried_data:
+  roda_data:
+  pg_data:

pom.xml

@@ -112,7 +112,7 @@
         <cas.client.version>4.1.0</cas.client.version>
         <swagger.version>2.2.41</swagger.version>
         <jackson.version>2.20.1</jackson.version>
-        <spring.version>6.2.17</spring.version>
+        <spring.version>6.2.18</spring.version>
         <solr.version>9.10.0</solr.version>
         <pekko.version>1.4.0</pekko.version>
         <httpcomponents.version>5.5</httpcomponents.version>
@@ -200,6 +200,14 @@
                 <module>roda-core/roda-core-tests</module>
             </modules>
         </profile>
+        <profile>
+            <!-- Black-box E2E API tests. Run with: mvn test -Pe2e
+                 Requires Docker with Compose V2 and docker.io/keeps/roda:development. -->
+            <id>e2e</id>
+            <modules>
+                <module>roda-api-tests</module>
+            </modules>
+        </profile>
     </profiles>
     <build>
         <plugins>