Merge pull request #31 from eu-digital-green-certificates/fix/depende…

…ncies clean dependencies
eu-digital-green-certificates · Oct 14, 2021 · 7464c6a · 7464c6a
2 parents 5440496 + 3196bfa
commit 7464c6a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 45 deletions.
diff --git a/pom.xml b/pom.xml
@@ -35,10 +35,7 @@
     	<bcpkix.version>1.68</bcpkix.version>
     	<okhttp.version>4.9.1</okhttp.version>
     	<shedlock.version>4.25.0</shedlock.version>
-        <nimbusds.version>9.9.2</nimbusds.version>
         <dgc.lib.version>1.1.3</dgc.lib.version>
-        <dgc-certlogic.version>0.0.0-3834d93</dgc-certlogic.version>
-        <dgc-decoder.version>0.1</dgc-decoder.version>
         <!-- plugins -->
         <plugin.checkstyle.version>3.1.2</plugin.checkstyle.version>
         <plugin.sonar.version>3.9.0.2155</plugin.sonar.version>
@@ -213,16 +210,6 @@
             <artifactId>spring-security-web</artifactId>
             <version>${spring.security.version}</version><!--$NO-MVN-MAN-VER$-->
         </dependency>
-        <dependency>
-            <groupId>eu.europa.ec.dgc</groupId>
-            <artifactId>dgc-certlogic</artifactId>
-            <version>${dgc-certlogic.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.europa.ec.dgc</groupId>
-            <artifactId>dgc-decoder</artifactId>
-            <version>${dgc-decoder.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
@@ -236,11 +223,6 @@
             <groupId>com.sap.hcp.cf.logging</groupId>
             <artifactId>cf-java-logging-support-logback</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.nimbusds</groupId>
-            <artifactId>nimbus-jose-jwt</artifactId>
-            <version>${nimbusds.version}</version><!--$NO-MVN-MAN-VER$-->
-        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>

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
@@ -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);
-    }
 }