review remarks: renames; imports

HLTech · Dec 5, 2019 · f61690c · f61690c
1 parent a1164a3
commit f61690c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/judge-d-server/src/main/java/dev/hltech/dredd/domain/JudgeD.java b/judge-d-server/src/main/java/dev/hltech/dredd/domain/JudgeD.java
@@ -32,7 +32,7 @@ public JudgeD(EnvironmentRepository environmentRepository, ServiceContractsRepos
     }
 
     public <C, E> EnvironmentValidatorResult validateServiceAgainstEnvironments(
-        ServiceContracts validatedService,
+        ServiceContracts contractsToValidate,
         List<String> environments,
         InterfaceContractValidator<C, E> validator
     ) {
@@ -43,11 +43,11 @@ public <C, E> EnvironmentValidatorResult validateServiceAgainstEnvironments(
             .map(Optional::get)
             .collect(toList());
 
-        return getValidatorResult(validatedService, environmentContracts, validator);
+        return getValidatorResult(contractsToValidate, environmentContracts, validator);
     }
 
     public <C, E> Map<ServiceVersion, EnvironmentValidatorResult> validatedServicesAgainstEnvironment(
-        List<ServiceContracts> validatedContracts,
+        List<ServiceContracts> contractToValidate,
         String env,
         InterfaceContractValidator<C, E> validator
     ){
@@ -60,7 +60,7 @@ public <C, E> Map<ServiceVersion, EnvironmentValidatorResult> validatedServicesA
             .collect(toList());
 
         // replace environment contracts with validated ones
-        validatedContracts.forEach(validatedContract -> {
+        contractToValidate.forEach(validatedContract -> {
             Iterator<ServiceContracts> iterator = environmentContracts.iterator();
             while (iterator.hasNext()) {
                 if (iterator.next().getName().equals(validatedContract.getId().getName())) {
@@ -71,7 +71,7 @@ public <C, E> Map<ServiceVersion, EnvironmentValidatorResult> validatedServicesA
         });
 
         Map<ServiceVersion, EnvironmentValidatorResult> hashMap = Maps.newHashMap();
-        for (ServiceContracts sc : validatedContracts) {
+        for (ServiceContracts sc : contractToValidate) {
             hashMap.put(sc.getId(), getValidatorResult(sc, environmentContracts, validator));
         }
         return hashMap;

diff --git a/judge-d-server/src/test/groovy/dev/hltech/dredd/domain/validation/JudgeDUT.groovy b/judge-d-server/src/test/groovy/dev/hltech/dredd/domain/validation/JudgeDUT.groovy
@@ -10,7 +10,7 @@ import dev.hltech.dredd.domain.validation.ping.PingContractValidator
 import org.springframework.http.MediaType
 import spock.lang.Specification
 
-import static dev.hltech.dredd.domain.contracts.ServiceContracts.*
+import static dev.hltech.dredd.domain.contracts.ServiceContracts.Contract
 import static org.assertj.core.util.Lists.newArrayList
 
 class JudgeDUT extends Specification {