Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: revocation-list controller disabled. #80

Merged
merged 5 commits into from
Nov 30, 2023
Merged

feat: revocation-list controller disabled. #80

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1e2b92
feat: revocation-list controller disabled.
karaeth Nov 29, 2023
5b2a2d1
feat: revocation-list test disabled.
karaeth Nov 29, 2023
cd72074
Merge branch 'main' into feat/disable_revocation_endpoint
ascheibal Nov 29, 2023
42e54c0
Move revocation.enabled to DgcProperties.
karaeth Nov 30, 2023
0704303
Tests for revocation disabled with condition.
karaeth Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<shedlock.version>5.2.0</shedlock.version>
<h2.version>2.2.220</h2.version>
<!-- plugins -->
<plugin.maven-surefire.version>3.1.2</plugin.maven-surefire.version>
<plugin.maven-assembly.version>3.4.2</plugin.maven-assembly.version>
<plugin.checkstyle.version>3.2.1</plugin.checkstyle.version>
<plugin.sonar.version>3.9.1.2184</plugin.sonar.version>
Expand Down Expand Up @@ -385,6 +386,17 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>${plugin.maven-assembly.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${plugin.maven-surefire.version}</version>
<configuration>
<excludes>
<exclude>eu.europa.ec.dgc.gateway.restapi.controller/CertificateRevocationListIntegrationTest.java</exclude>
<exclude>eu.europa.ec.dgc.gateway.service/CertificateRevocationListCleanupTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
2 changes: 2 additions & 0 deletions ...java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import java.time.ZonedDateTime;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
Expand All @@ -69,6 +70,7 @@
@RequiredArgsConstructor
@Validated
@Slf4j
@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
public class CertificateRevocationListController {

private final RevocationListService revocationListService;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListCleanUpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

@Service
@RequiredArgsConstructor
@Slf4j
@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
public class RevocationListCleanUpService {

private final RevocationBatchRepository revocationBatchRepository;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/eu/europa/ec/dgc/gateway/service/RevocationListService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.bouncycastle.cert.X509CertificateHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
import org.springframework.validation.BeanPropertyBindingResult;
Expand All @@ -57,6 +58,7 @@
@Service
@Slf4j
@RequiredArgsConstructor
@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
public class RevocationListService {

private static final int MAX_BATCH_LIST_SIZE = 1000;
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,7 @@ dgc:
springdoc:
api-docs:
enabled: false

revocation-list:
controller:
enabled: false