diff --git a/pom.xml b/pom.xml index d79bbcc..1bc7554 100644 --- a/pom.xml +++ b/pom.xml @@ -35,10 +35,7 @@ 1.68 4.9.1 4.25.0 - 9.9.2 1.1.3 - 0.0.0-3834d93 - 0.1 3.1.2 3.9.0.2155 @@ -213,16 +210,6 @@ spring-security-web ${spring.security.version} - - eu.europa.ec.dgc - dgc-certlogic - ${dgc-certlogic.version} - - - eu.europa.ec.dgc - dgc-decoder - ${dgc-decoder.version} - io.jsonwebtoken jjwt @@ -236,11 +223,6 @@ com.sap.hcp.cf.logging cf-java-logging-support-logback - - com.nimbusds - nimbus-jose-jwt - ${nimbusds.version} - org.bouncycastle bcpkix-jdk15on diff --git a/src/main/java/eu/europa/ec/dgc/validation/decorator/config/DccVerificationConfig.java b/src/main/java/eu/europa/ec/dgc/validation/decorator/config/DccVerificationConfig.java index 2baed9e..b11ad8e 100644 --- a/src/main/java/eu/europa/ec/dgc/validation/decorator/config/DccVerificationConfig.java +++ b/src/main/java/eu/europa/ec/dgc/validation/decorator/config/DccVerificationConfig.java @@ -20,17 +20,8 @@ package eu.europa.ec.dgc.validation.decorator.config; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import dgca.verifier.app.decoder.JsonSchemaKt; -import dgca.verifier.app.engine.AffectedFieldsDataRetriever; -import dgca.verifier.app.engine.CertLogicEngine; -import dgca.verifier.app.engine.DefaultAffectedFieldsDataRetriever; -import dgca.verifier.app.engine.DefaultCertLogicEngine; -import dgca.verifier.app.engine.DefaultJsonLogicValidator; -import dgca.verifier.app.engine.JsonLogicValidator; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -50,22 +41,4 @@ public ObjectMapper objectMapper() { objectMapper.registerModule(new JavaTimeModule()); return objectMapper; } - - @Bean - public AffectedFieldsDataRetriever affectedFieldsDataRetriever(ObjectMapper objectMapper) - throws JsonProcessingException { - JsonNode jsonNode = objectMapper.readTree(JsonSchemaKt.JSON_SCHEMA_V1); - return new DefaultAffectedFieldsDataRetriever(jsonNode, objectMapper); - } - - @Bean - public JsonLogicValidator jsonLogicValidator() { - return new DefaultJsonLogicValidator(); - } - - @Bean - public CertLogicEngine certLogicEngine(AffectedFieldsDataRetriever affectedFieldsDataRetriever, - JsonLogicValidator jsonLogicValidator) { - return new DefaultCertLogicEngine(affectedFieldsDataRetriever, jsonLogicValidator); - } }