Skip to content

Commit

Permalink
Fix/signercertificate update (#80)
Browse files Browse the repository at this point in the history
* removed deprecated special handling for btp

* fix data provisioning for signercertificateUpdate endpoint

* Update dependencies
  • Loading branch information
slaurenz authored May 5, 2022
1 parent 2068d8b commit 0e622d8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 214 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- dependencies -->
<owasp.version>6.5.2</owasp.version>
<spring.boot.version>2.6.6</spring.boot.version>
<spring.boot.version>2.6.7</spring.boot.version>
<spring.cloud.version>2021.0.1</spring.cloud.version>
<spring.test.version>5.3.12</spring.test.version>
<spring.test.version>5.3.19</spring.test.version>
<spring.security.version>5.6.2</spring.security.version>
<lombok.version>1.18.22</lombok.version>
<liquibase.version>4.9.1</liquibase.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,8 @@ public interface SignerInformationRepository extends JpaRepository<SignerInforma
List<SignerInformationEntity> findAllByUpdatedAtAfterOrderByIdAsc(ZonedDateTime ifModifiedDateTime);

List<SignerInformationEntity> findAllByKidIn(List<String> kids);

Optional<SignerInformationEntity> findFirstByIdIsNotNullAndDeletedOrderByIdAsc(boolean deleted);

Optional<SignerInformationEntity> findFirstByIdGreaterThanAndDeletedOrderByIdAsc(Long resumeToken, boolean deleted);
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ public class SignerInformationService {
*/
public Optional<SignerInformationEntity> getCertificate(Long resumeToken) {
if (resumeToken == null) {
return signerInformationRepository.findFirstByIdIsNotNullOrderByIdAsc();
return signerInformationRepository.findFirstByIdIsNotNullAndDeletedOrderByIdAsc(false);
} else {
return signerInformationRepository.findFirstByIdGreaterThanOrderByIdAsc(resumeToken);
return signerInformationRepository.findFirstByIdGreaterThanAndDeletedOrderByIdAsc(resumeToken, false);
}
}

Expand Down
4 changes: 0 additions & 4 deletions src/main/resources/application-btp.yml

This file was deleted.

0 comments on commit 0e622d8

Please sign in to comment.