Skip to content

Commit 0e622d8

Browse files
authored
Fix/signercertificate update (#80)
* removed deprecated special handling for btp * fix data provisioning for signercertificateUpdate endpoint * Update dependencies
1 parent 2068d8b commit 0e622d8

File tree

5 files changed

+8
-214
lines changed

5 files changed

+8
-214
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2626
<!-- dependencies -->
2727
<owasp.version>6.5.2</owasp.version>
28-
<spring.boot.version>2.6.6</spring.boot.version>
28+
<spring.boot.version>2.6.7</spring.boot.version>
2929
<spring.cloud.version>2021.0.1</spring.cloud.version>
30-
<spring.test.version>5.3.12</spring.test.version>
30+
<spring.test.version>5.3.19</spring.test.version>
3131
<spring.security.version>5.6.2</spring.security.version>
3232
<lombok.version>1.18.22</lombok.version>
3333
<liquibase.version>4.9.1</liquibase.version>

src/main/java/eu/europa/ec/dgc/verifier/repository/SignerInformationRepository.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,8 @@ public interface SignerInformationRepository extends JpaRepository<SignerInforma
5757
List<SignerInformationEntity> findAllByUpdatedAtAfterOrderByIdAsc(ZonedDateTime ifModifiedDateTime);
5858

5959
List<SignerInformationEntity> findAllByKidIn(List<String> kids);
60+
61+
Optional<SignerInformationEntity> findFirstByIdIsNotNullAndDeletedOrderByIdAsc(boolean deleted);
62+
63+
Optional<SignerInformationEntity> findFirstByIdGreaterThanAndDeletedOrderByIdAsc(Long resumeToken, boolean deleted);
6064
}

src/main/java/eu/europa/ec/dgc/verifier/service/SignerCertificateDownloadBtpServiceImpl.java

Lines changed: 0 additions & 206 deletions
This file was deleted.

src/main/java/eu/europa/ec/dgc/verifier/service/SignerInformationService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public class SignerInformationService {
5454
*/
5555
public Optional<SignerInformationEntity> getCertificate(Long resumeToken) {
5656
if (resumeToken == null) {
57-
return signerInformationRepository.findFirstByIdIsNotNullOrderByIdAsc();
57+
return signerInformationRepository.findFirstByIdIsNotNullAndDeletedOrderByIdAsc(false);
5858
} else {
59-
return signerInformationRepository.findFirstByIdGreaterThanOrderByIdAsc(resumeToken);
59+
return signerInformationRepository.findFirstByIdGreaterThanAndDeletedOrderByIdAsc(resumeToken, false);
6060
}
6161
}
6262

src/main/resources/application-btp.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)