Merge 1905a3e into 4b94de8

HLTech · Jan 13, 2022 · c12156b · c12156b
2 parents 4b94de8 + 1905a3e
commit c12156b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jdbcVersion = '5.3.14'
         liquidbaseVersion = '4.6.2'
         openApiVersion = '1.6.4'
-        requestValidatorPactVersion = '2.22.0'
+        requestValidatorPactVersion = '2.23.0'
         postgresVersion = '42.3.1'
         kubernetesClientVersion = '5.11.2'
         httpClientVersion = '4.5.13'

diff --git a/.../src/main/java/com/hltech/judged/server/domain/validation/rest/RestContractValidator.java b/.../src/main/java/com/hltech/judged/server/domain/validation/rest/RestContractValidator.java
@@ -1,7 +1,8 @@
 package com.hltech.judged.server.domain.validation.rest;
 
-import au.com.dius.pact.model.RequestResponseInteraction;
-import au.com.dius.pact.model.RequestResponsePact;
+import au.com.dius.pact.core.model.DefaultPactReader;
+import au.com.dius.pact.core.model.RequestResponseInteraction;
+import au.com.dius.pact.core.model.RequestResponsePact;
 import com.atlassian.oai.validator.OpenApiInteractionValidator;
 import com.atlassian.oai.validator.pact.PactResponse;
 import com.atlassian.oai.validator.report.ValidationReport;
@@ -11,7 +12,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static au.com.dius.pact.model.PactReader.loadPact;
 import static com.atlassian.oai.validator.pact.PactRequest.of;
 import static com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationResult.fail;
 import static com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationResult.success;
@@ -62,7 +62,7 @@ public String asCapabilities(String rawCapabilities) {
 
     @Override
     public RequestResponsePact asExpectations(String rawExpectations) {
-        return (RequestResponsePact) loadPact(rawExpectations);
+        return (RequestResponsePact) DefaultPactReader.INSTANCE.loadPact(rawExpectations);
     }
 
 }
diff --git a/.../src/main/java/com/hltech/judged/server/infrastructure/container/JudgeDConfiguration.java b/.../src/main/java/com/hltech/judged/server/infrastructure/container/JudgeDConfiguration.java
@@ -1,5 +1,7 @@
 package com.hltech.judged.server.infrastructure.container;
 
+import au.com.dius.pact.core.model.DefaultPactReader;
+import au.com.dius.pact.core.model.PactReader;
 import com.hltech.judged.server.domain.JudgeDApplicationService;
 import com.hltech.judged.server.domain.contracts.ServiceContractsRepository;
 import com.hltech.judged.server.domain.environment.EnvironmentRepository;

diff --git a/judge-d-server/src/test/unit/com/hltech/judged/server/ArchUnitUT.groovy b/judge-d-server/src/test/unit/com/hltech/judged/server/ArchUnitUT.groovy
@@ -19,7 +19,7 @@ class ArchUnitUT {
     private static final LOMBOK_PACKAGE = 'lombok..'
     private static final CORE_JAVA_PACKAGE = 'java..'
     private static final VAUNT_PACKAGE = 'com.hltech.vaunt..'
-    private static final PACT_MODEL_PACKAGE = 'au.com.dius.pact.model..'
+    private static final PACT_MODEL_PACKAGE = 'au.com.dius.pact.core.model..'
     private static final SWAGGER_PACT_VALIDATOR_PACKAGE = 'com.atlassian.oai.validator..'
     private static final GOOGLE_COMMON_PACKAGE = 'com.google.common..'
 

diff --git a/.../test/unit/com/hltech/judged/server/domain/validation/rest/RestContractValidatorUT.groovy b/.../test/unit/com/hltech/judged/server/domain/validation/rest/RestContractValidatorUT.groovy
@@ -1,19 +1,19 @@
 package com.hltech.judged.server.domain.validation.rest
 
-import au.com.dius.pact.model.RequestResponsePact
+import au.com.dius.pact.core.model.DefaultPactReader
+import au.com.dius.pact.core.model.RequestResponsePact
 import spock.lang.Specification
 
-import static au.com.dius.pact.model.PactReader.loadPact
 import static com.google.common.io.ByteStreams.toByteArray
 import static com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationStatus.FAILED
 import static com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationStatus.OK
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric
 
 class RestContractValidatorUT extends Specification {
 
-    RestContractValidator validator = new RestContractValidator()
+    def validator = new RestContractValidator()
 
-    def "should convert rawExpectations to pact"() {
+    def 'should convert rawExpectations to pact'() {
         given:
             def pactAsString = new String(toByteArray(getClass().getResourceAsStream("/pact-frontend-to-backend-provider.json")))
         when:
@@ -23,7 +23,7 @@ class RestContractValidatorUT extends Specification {
 
     }
 
-    def "should return rawCapabilities as Capabilities"() {
+    def 'should return rawCapabilities as Capabilities'() {
         given:
             def rawCapabilities = randomAlphanumeric(100)
         when:
@@ -80,4 +80,8 @@ class RestContractValidatorUT extends Specification {
                     result.errors.get(0) == "[Path '/0'] Object instance has properties which are not allowed by the schema: [\"gyyigi\"]"
             }
     }
+
+    private def loadPact(Object pactAsString) {
+        DefaultPactReader.INSTANCE.loadPact(pactAsString)
+    }
 }