Merge pull request #373 from kit-data-manager/development

PR for v1.5.8

Author: ThomasJejkal

.github/workflows/docker-publish.yml

@@ -56,7 +56,7 @@ jobs:
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
       - name: Build and push Docker image
-        uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
         with:
           context: .
           push: true

CHANGELOG.md

@@ -14,6 +14,25 @@ Fixed
 
 Security
 
+## [1.5.8] - 2025-01-27
+Changed
+* ACL information no longer removed for Non-Administrator Users by @github-actions in https://github.com/kit-data-manager/base-repo/pull/381
+* Resources with state GONE are now visible to owners and administrators (introduced in repo-core v1.2.5)
+
+Fixed
+
+Security
+* Update dependency org.springframework.data:spring-data-elasticsearch to v5.4.2 by @renovate in https://github.com/kit-data-manager/base-repo/pull/372
+* Update plugin org.owasp.dependencycheck to v12.0.1 by @renovate in https://github.com/kit-data-manager/base-repo/pull/374
+* Update docker/build-push-action digest to ca877d9 by @renovate in https://github.com/kit-data-manager/base-repo/pull/378
+* Update plugin io.freefair.maven-publish-java to v8.12 by @renovate in https://github.com/kit-data-manager/base-repo/pull/377
+* Update plugin io.freefair.lombok to v8.12 by @renovate in https://github.com/kit-data-manager/base-repo/pull/376
+* Update dependency gradle to v8.12.1 by @renovate in https://github.com/kit-data-manager/base-repo/pull/379
+* Update plugin org.springframework.boot to v3.4.2 by @renovate in https://github.com/kit-data-manager/base-repo/pull/375
+* Update springDocVersion to v2.8.4 by @renovate in https://github.com/kit-data-manager/base-repo/pull/382
+* Update repo-core to v1.2.5
+
+
 ## [1.5.7] - 2025-01-17
 Fixed
 * Fixed ignored Elastic configuration in https://github.com/kit-data-manager/base-repo/pull/367
@@ -308,7 +327,8 @@ Added
 
 - First public version
 
-[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.7...HEAD
+[Unreleased]: https://github.com/kit-data-manager/base-repo/compare/v1.5.8...HEAD
+[1.5.8]: https://github.com/kit-data-manager/base-repo/compare/v1.5.7...v1.5.8
 [1.5.7]: https://github.com/kit-data-manager/base-repo/compare/v1.5.6...v1.5.7
 [1.5.6]: https://github.com/kit-data-manager/base-repo/compare/v1.5.5...v1.5.6
 [1.5.5]: https://github.com/kit-data-manager/base-repo/compare/v1.5.4...v1.5.5

build.gradle

@@ -1,9 +1,9 @@
 plugins { 
-    id 'org.springframework.boot' version '3.4.1'
+    id 'org.springframework.boot' version '3.4.2'
     id 'io.spring.dependency-management' version '1.1.7'
-    id 'io.freefair.lombok' version '8.11'
-    id 'io.freefair.maven-publish-java' version '8.11'
-    id 'org.owasp.dependencycheck' version '12.0.0'
+    id 'io.freefair.lombok' version '8.12'
+    id 'io.freefair.maven-publish-java' version '8.12'
+    id 'org.owasp.dependencycheck' version '12.0.1'
     id 'org.asciidoctor.jvm.convert' version '4.0.4'
     id 'net.researchgate.release' version '3.1.0'
     id 'com.gorylenko.gradle-git-properties' version '2.4.2'
@@ -30,7 +30,7 @@ repositories {
 ext {
     set('javersVersion', "7.7.0")
     set('springBootVersion', "3.2.1")
-    set('springDocVersion', "2.8.3")
+    set('springDocVersion', "2.8.4")
     set('keycloakVersion', "19.0.0")
 
     // directory for generated code snippets during tests
@@ -60,7 +60,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-mail"
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
-    implementation 'org.springframework.data:spring-data-elasticsearch:5.4.1'
+    implementation 'org.springframework.data:spring-data-elasticsearch:5.4.2'
 
     implementation "org.springframework:spring-messaging:6.2.2"
 
@@ -75,7 +75,7 @@ dependencies {
     implementation "org.springdoc:springdoc-openapi-starter-common:${springDocVersion}"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-api:${springDocVersion}"
 
-    implementation "edu.kit.datamanager:repo-core:1.2.4"
+    implementation "edu.kit.datamanager:repo-core:1.2.5"
     implementation "edu.kit.datamanager:service-base:1.3.3"
 
     //implementation "com.github.victools:jsonschema-generator:4.23.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/edu/kit/datamanager/repo/web/impl/DataResourceController.java

@@ -203,7 +203,8 @@ public ResponseEntity<TabulatorLocalPagination> findAllForTabulator(@RequestPara
         response.addHeader(CONTENT_RANGE_HEADER, ControllerUtils.getContentRangeHeader(page.getNumber(), pageRequest.getPageSize(), page.getTotalElements()));
         TabulatorLocalPagination tabulatorLocalPagination = TabulatorLocalPagination.builder()
                 .lastPage(page.getTotalPages())
-                .data(DataResourceUtils.filterResources(page.getContent()))
+                //.data(DataResourceUtils.filterResources(page.getContent()))
+                .data(page.getContent())
                 .build();
         return ResponseEntity.ok().body(tabulatorLocalPagination);
     }
@@ -222,7 +223,8 @@ public ResponseEntity<List<DataResource>> findByExample(@RequestBody DataResourc
         //set content-range header for react-admin (index_start-index_end/total
         PageRequest request = ControllerUtils.checkPaginationInformation(pgbl);
         response.addHeader(CONTENT_RANGE_HEADER, ControllerUtils.getContentRangeHeader(page.getNumber(), request.getPageSize(), page.getTotalElements()));
-        return ResponseEntity.ok().body(DataResourceUtils.filterResources(page.getContent()));
+       // return ResponseEntity.ok().body(DataResourceUtils.filterResources(page.getContent()));
+        return ResponseEntity.ok().body(page.getContent());
     }
 
     @Override
@@ -276,9 +278,11 @@ public ResponseEntity put(@PathVariable("id") final String identifier,
 
         if (currentVersion > 0) {
             //trigger response creation and set etag...the response body is set automatically
-            return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").header(VERSION_HEADER, Long.toString(currentVersion)).body(DataResourceUtils.filterResource(result));
+            //return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").header(VERSION_HEADER, Long.toString(currentVersion)).body(DataResourceUtils.filterResource(result));
+            return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").header(VERSION_HEADER, Long.toString(currentVersion)).body(result);
         } else {
-            return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").body(DataResourceUtils.filterResource(result));
+            //return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").body(DataResourceUtils.filterResource(result));
+            return ResponseEntity.ok().eTag("\"" + result.getEtag() + "\"").body(result);
         }
     }
 

src/test/java/edu/kit/datamanager/repo/test/integration/DataResourceControllerTest.java

@@ -798,9 +798,9 @@ public void testDeleteResourceAsAdmin() throws Exception {
 
         this.mockMvc.perform(delete("/api/v1/dataresources/" + sampleResource.getId()).header("If-Match", etag).header(HttpHeaders.AUTHORIZATION,
                 "Bearer " + adminToken).contentType("application/json")).andExpect(status().isNoContent());
-        //from now on, the resource should be in state GONE...HTTP GET should fail
+        //from now on, the resource should be in state GONE...HTTP GET still succeeds as admin (since repo-core 1.2.5)
         this.mockMvc.perform(get("/api/v1/dataresources/" + sampleResource.getId()).header(HttpHeaders.AUTHORIZATION,
-                "Bearer " + adminToken)).andDo(print()).andExpect(status().isNotFound());
+                "Bearer " + adminToken)).andDo(print()).andExpect(status().isOk());
 
     }
 

src/test/java/edu/kit/datamanager/repo/test/integration/DataResourceControllerTestWithoutVersioning.java

@@ -800,9 +800,9 @@ public void testDeleteResourceAsAdmin() throws Exception {
 
     this.mockMvc.perform(delete("/api/v1/dataresources/" + sampleResource.getId()).header("If-Match", etag).header(HttpHeaders.AUTHORIZATION,
             "Bearer " + adminToken).contentType("application/json")).andExpect(status().isNoContent());
-    //from now on, the resource should be in state GONE...HTTP GET should fail
+    //from now on, the resource should be in state GONE...HTTP GET still succeeds as admin (since repo-core 1.2.5)
     this.mockMvc.perform(get("/api/v1/dataresources/" + sampleResource.getId()).header(HttpHeaders.AUTHORIZATION,
-            "Bearer " + adminToken)).andDo(print()).andExpect(status().isNotFound());
+            "Bearer " + adminToken)).andDo(print()).andExpect(status().isOk());
 
   }
 

src/test/java/edu/kit/datamanager/repo/test/integration/DataResourceControllerTestWithoutVersioningAndAudit.java

@@ -801,9 +801,9 @@ public void testDeleteResourceAsAdmin() throws Exception {
 
     this.mockMvc.perform(delete("/api/v1/dataresources/" + sampleResource.getId()).header("If-Match", etag).header(HttpHeaders.AUTHORIZATION,
             "Bearer " + adminToken).contentType("application/json")).andExpect(status().isNoContent());
-    //from now on, the resource should be in state GONE...HTTP GET should fail
+    //from now on, the resource should be in state GONE...HTTP GET still succeeds as admin (since repo-core 1.2.5)
     this.mockMvc.perform(get("/api/v1/dataresources/" + sampleResource.getId()).header(HttpHeaders.AUTHORIZATION,
-            "Bearer " + adminToken)).andDo(print()).andExpect(status().isNotFound());
+            "Bearer " + adminToken)).andDo(print()).andExpect(status().isOk());
 
   }