Merge 9c268fb into 60fd5a1

HLTech · Dec 1, 2019 · f0240ad · f0240ad
2 parents 60fd5a1 + 9c268fb
commit f0240ad
Show file tree

Hide file tree

Showing 18 changed files with 92 additions and 75 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
@@ -28,7 +28,7 @@ public JudgeD(EnvironmentRepository environmentRepository, ServiceContractsRepos
     public <C, E> EnvironmentValidatorResult validateServiceAgainstEnvironments(ServiceContracts validatedService, List<String> environments, InterfaceContractValidator<C, E> validator) {
         List<ServiceContracts> environmentContracts = environments.stream()
             .flatMap(env -> this.environmentRepository.get(env).getAllServices().stream())
-            .map(sv -> this.serviceContractsRepository.find(sv.getName(), sv.getVersion()))
+            .map(sv -> this.serviceContractsRepository.findOne(sv))
             .filter(Optional::isPresent)
             .map(Optional::get)
             .collect(toList());

diff --git a/judge-d-server/src/main/java/dev/hltech/dredd/domain/ServiceVersion.java b/judge-d-server/src/main/java/dev/hltech/dredd/domain/ServiceVersion.java
@@ -0,0 +1,28 @@
+package dev.hltech.dredd.domain;
+
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.Embeddable;
+
+import java.io.Serializable;
+
+import static lombok.AccessLevel.PROTECTED;
+
+@Embeddable
+@Getter
+@EqualsAndHashCode
+@AllArgsConstructor
+@NoArgsConstructor(access = PROTECTED)
+@Access(AccessType.FIELD)
+public class ServiceVersion implements Serializable {
+
+    private String name;
+    private String version;
+
+}
diff --git a/...server/src/main/java/dev/hltech/dredd/domain/contracts/JpaServiceContractsRepository.java b/...server/src/main/java/dev/hltech/dredd/domain/contracts/JpaServiceContractsRepository.java
@@ -1,5 +1,6 @@
 package dev.hltech.dredd.domain.contracts;
 
+import dev.hltech.dredd.domain.ServiceVersion;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -25,8 +26,11 @@ public ServiceContracts persist(ServiceContracts serviceContracts) {
     }
 
     @Override
-    public Optional<ServiceContracts> find(String name, String version) {
-        return ofNullable(entityManager.find(ServiceContracts.class, new ServiceContracts.ServiceContractsId(name, version)));
+    public Optional<ServiceContracts> findOne(ServiceVersion serviceVersion) {
+        return ofNullable(entityManager.find(
+            ServiceContracts.class,
+            new ServiceVersion(serviceVersion.getName(), serviceVersion.getVersion())
+        ));
     }
 
     @Override
@@ -38,7 +42,7 @@ public String getService(String name) {
     }
 
     @Override
-    public List<ServiceContracts> find(String name) {
+    public List<ServiceContracts> findAllByServiceName(String name) {
         return entityManager
             .createQuery("select o from " + ServiceContracts.class.getName() + " o where o.id.name = :name", ServiceContracts.class)
             .setParameter("name", name)

diff --git a/judge-d-server/src/main/java/dev/hltech/dredd/domain/contracts/ServiceContracts.java b/judge-d-server/src/main/java/dev/hltech/dredd/domain/contracts/ServiceContracts.java
@@ -1,5 +1,6 @@
 package dev.hltech.dredd.domain.contracts;
 
+import dev.hltech.dredd.domain.ServiceVersion;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -22,7 +23,7 @@
 public class ServiceContracts {
 
     @EmbeddedId
-    private ServiceContractsId id;
+    private ServiceVersion id;
 
     @ElementCollection(fetch = FetchType.EAGER)
     @MapKeyColumn(name = "protocol")
@@ -43,7 +44,7 @@ protected ServiceContracts() {
     }
 
     public ServiceContracts(String name, String version, Map<String, Contract> capabilitiesPerProtocol, Map<String, Map<String, Contract>> expectationsPerProvider) {
-        this.id = new ServiceContractsId(name, version);
+        this.id = new ServiceVersion(name, version);
         this.capabilitiesPerProtocol = capabilitiesPerProtocol;
         this.expectations = newHashMap();
         for (Entry<String, Map<String, Contract>> expectationsPerProviderEntry : expectationsPerProvider.entrySet()) {
@@ -88,16 +89,6 @@ public <E> Map<String, E> getMappedExpectations(String communicationInterface, F
             ));
     }
 
-    @Getter
-    @Embeddable
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Access(AccessType.FIELD)
-    static class ServiceContractsId implements Serializable {
-        private String name;
-        private String version;
-    }
-
     @Getter
     @Embeddable
     @AllArgsConstructor

diff --git a/...-d-server/src/main/java/dev/hltech/dredd/domain/contracts/ServiceContractsRepository.java b/...-d-server/src/main/java/dev/hltech/dredd/domain/contracts/ServiceContractsRepository.java
@@ -3,15 +3,17 @@
 import java.util.List;
 import java.util.Optional;
 
+import dev.hltech.dredd.domain.ServiceVersion;
+
 public interface ServiceContractsRepository {
 
     ServiceContracts persist(ServiceContracts serviceContracts);
 
-    Optional<ServiceContracts> find(String name, String version);
+    Optional<ServiceContracts> findOne(ServiceVersion serviceVersion);
 
-    String getService(String name);
+    List<ServiceContracts> findAllByServiceName(String serviceName);
 
-    List<ServiceContracts> find(String name);
+    String getService(String name);
 
     List<String> getServiceNames();
 

diff --git a/judge-d-server/src/main/java/dev/hltech/dredd/domain/environment/EnvironmentAggregate.java b/judge-d-server/src/main/java/dev/hltech/dredd/domain/environment/EnvironmentAggregate.java
@@ -2,14 +2,13 @@
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import lombok.*;
+import dev.hltech.dredd.domain.ServiceVersion;
 
 import javax.persistence.*;
 import java.util.Set;
 
 import static com.google.common.collect.Sets.newHashSet;
 import static java.util.stream.Collectors.toSet;
-import static lombok.AccessLevel.PROTECTED;
 
 @Entity
 @Table(name = "environments")
@@ -45,20 +44,6 @@ public static EnvironmentAggregate empty(String environmentName) {
         return new EnvironmentAggregate(environmentName, newHashSet());
     }
 
-    @Embeddable
-    @Getter
-    @EqualsAndHashCode
-    @AllArgsConstructor
-    @NoArgsConstructor(access = PROTECTED)
-    @Access(AccessType.FIELD)
-    @ToString
-    public static class ServiceVersion {
-
-        private String name;
-        private String version;
-
-    }
-
     public static EnvironmentAggregateBuilder builder(String name) {
         return new EnvironmentAggregateBuilder(name);
     }

diff --git a/...-server/src/main/java/dev/hltech/dredd/interfaces/rest/contracts/ContractsController.java b/...-server/src/main/java/dev/hltech/dredd/interfaces/rest/contracts/ContractsController.java
@@ -2,6 +2,7 @@
 
 import dev.hltech.dredd.domain.contracts.ServiceContracts;
 import dev.hltech.dredd.domain.contracts.ServiceContractsRepository;
+import dev.hltech.dredd.domain.ServiceVersion;
 import dev.hltech.dredd.interfaces.rest.ResourceNotFoundException;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -87,7 +88,7 @@ void notFound() { }
         @ApiResponse(code = 400, message = "Bad Request"),
         @ApiResponse(code = 500, message = "Failure")})
     public List<String> getAllServiceVersions(@PathVariable(name = "serviceName") String serviceName) {
-        return serviceContractsRepository.find(serviceName)
+        return serviceContractsRepository.findAllByServiceName(serviceName)
             .stream()
             .map(ServiceContracts::getVersion).sorted()
             .collect(toList());
@@ -100,7 +101,7 @@ public List<String> getAllServiceVersions(@PathVariable(name = "serviceName") St
         @ApiResponse(code = 400, message = "Bad Request"),
         @ApiResponse(code = 500, message = "Failure")})
     public ServiceContractsDto getContracts(@PathVariable(name = "serviceName") String serviceName, @PathVariable(name = "version") String version) {
-        return mapper.toDto(this.serviceContractsRepository.find(serviceName, version).orElseThrow(ResourceNotFoundException::new));
+        return mapper.toDto(this.serviceContractsRepository.findOne(new ServiceVersion(serviceName, version)).orElseThrow(ResourceNotFoundException::new));
     }
 
     @PostMapping(value = "services/{serviceName}/versions/{version:.+}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -128,7 +129,7 @@ public ServiceContractsDto registerContract(@PathVariable(name = "serviceName")
         @ApiResponse(code = 400, message = "Bad Request"),
         @ApiResponse(code = 500, message = "Failure")})
     public List<String> getServiceVersions(@PathVariable(name = "serviceName") String serviceName) {
-        return serviceContractsRepository.find(serviceName)
+        return serviceContractsRepository.findAllByServiceName(serviceName)
             .stream()
             .map(ServiceContracts::getVersion).sorted()
             .collect(toList());
@@ -142,7 +143,7 @@ public List<String> getServiceVersions(@PathVariable(name = "serviceName") Strin
         @ApiResponse(code = 400, message = "Bad Request"),
         @ApiResponse(code = 500, message = "Failure")})
     public ServiceContractsDto get(@PathVariable(name = "provider") String provider, @PathVariable(name = "version") String version) {
-        return mapper.toDto(this.serviceContractsRepository.find(provider, version).orElseThrow(ResourceNotFoundException::new));
+        return mapper.toDto(this.serviceContractsRepository.findOne(new ServiceVersion(provider, version)).orElseThrow(ResourceNotFoundException::new));
     }
 
 }
diff --git a/.../java/dev/hltech/dredd/interfaces/rest/interrelationship/InterrelationshipController.java b/.../java/dev/hltech/dredd/interfaces/rest/interrelationship/InterrelationshipController.java
@@ -2,8 +2,8 @@
 
 import dev.hltech.dredd.domain.contracts.ServiceContracts;
 import dev.hltech.dredd.domain.contracts.ServiceContractsRepository;
-import dev.hltech.dredd.domain.environment.EnvironmentAggregate;
 import dev.hltech.dredd.domain.environment.EnvironmentRepository;
+import dev.hltech.dredd.domain.ServiceVersion;
 import dev.hltech.dredd.interfaces.rest.contracts.ContractsMapper;
 import dev.hltech.dredd.interfaces.rest.contracts.ServiceContractsDto;
 import io.swagger.annotations.ApiOperation;
@@ -53,8 +53,8 @@ public InterrelationshipDto getInterrelationship (@PathVariable("environment") S
         return new InterrelationshipDto(env, serviceContractsSet);
     }
 
-    private ServiceContracts getServiceContracts(EnvironmentAggregate.ServiceVersion service) {
-        return serviceContractsRepository.find(service.getName(), service.getVersion())
+    private ServiceContracts getServiceContracts(ServiceVersion service) {
+        return serviceContractsRepository.findOne(service)
             .orElseGet(() ->
                 new ServiceContracts(service.getName(), service.getVersion(), new HashMap<>(), new HashMap<>()));
     }

diff --git a/judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/validation/Converters.java b/judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/validation/Converters.java
@@ -1,6 +1,7 @@
 package dev.hltech.dredd.interfaces.rest.validation;
 
 import com.google.common.collect.Ordering;
+import dev.hltech.dredd.domain.ServiceVersion;
 import dev.hltech.dredd.domain.validation.EnvironmentValidatorResult;
 
 import java.util.Comparator;
@@ -15,15 +16,15 @@ public class Converters {
     private Converters() {
     }
 
-    public static List<ContractValidationReportDto> toDtos(List<EnvironmentValidatorResult> validationResults, String serviceName, String serviceVersion) {
+    public static List<ContractValidationReportDto> toDtos(List<EnvironmentValidatorResult> validationResults, ServiceVersion serviceVersion) {
         Map<ConsumerAndProviderDto, ContractValidationReportDto> result = newHashMap();
         validationResults
             .stream()
             .forEach(environmentValidatorResult -> {
                 environmentValidatorResult.getCapabilitiesValidationResults()
                     .stream()
                     .forEach(cvr -> {
-                        ConsumerAndProviderDto key = new ConsumerAndProviderDto(cvr.getConsumerName(), cvr.getConsumerVersion(), serviceName, serviceVersion);
+                        ConsumerAndProviderDto key = new ConsumerAndProviderDto(cvr.getConsumerName(), cvr.getConsumerVersion(), serviceVersion.getName(), serviceVersion.getVersion());
                         if (!result.containsKey(key)) {
                             result.put(
                                 key,
@@ -45,7 +46,7 @@ public static List<ContractValidationReportDto> toDtos(List<EnvironmentValidator
                 environmentValidatorResult.getExpectationValidationResults()
                     .stream()
                     .forEach(evr -> {
-                        ConsumerAndProviderDto key = new ConsumerAndProviderDto(serviceName, serviceVersion, evr.getProviderName(), evr.getProviderVersion());
+                        ConsumerAndProviderDto key = new ConsumerAndProviderDto(serviceVersion.getName(), serviceVersion.getVersion(), evr.getProviderName(), evr.getProviderVersion());
                         if (!result.containsKey(key)) {
                             result.put(
                                 key,

diff --git a/...erver/src/main/java/dev/hltech/dredd/interfaces/rest/validation/ValidationController.java b/...erver/src/main/java/dev/hltech/dredd/interfaces/rest/validation/ValidationController.java
@@ -3,6 +3,7 @@
 import dev.hltech.dredd.domain.JudgeD;
 import dev.hltech.dredd.domain.contracts.ServiceContracts;
 import dev.hltech.dredd.domain.contracts.ServiceContractsRepository;
+import dev.hltech.dredd.domain.ServiceVersion;
 import dev.hltech.dredd.domain.validation.EnvironmentValidatorResult;
 import dev.hltech.dredd.domain.validation.InterfaceContractValidator;
 import dev.hltech.dredd.interfaces.rest.ResourceNotFoundException;
@@ -47,11 +48,12 @@ public ValidationController(
         @ApiResponse(code = 404, message = "Service not found")
     })
     public List<ContractValidationReportDto> validateAgainstEnvironments(
-        @PathVariable("serviceName") String serviceName,
-        @PathVariable("serviceVersion") String serviceVersion,
+        @PathVariable("serviceName") String name,
+        @PathVariable("serviceVersion") String version,
         @RequestParam("environment") List<String> environments
     ) {
-        ServiceContracts validatedServiceContracts = this.serviceContractsRepository.find(serviceName, serviceVersion)
+        ServiceVersion serviceVersion = new ServiceVersion(name, version);
+        ServiceContracts validatedServiceContracts = this.serviceContractsRepository.findOne(serviceVersion)
             .orElseThrow(ResourceNotFoundException::new);
 
         List<EnvironmentValidatorResult> collect = this.validators.stream()
@@ -62,6 +64,6 @@ public List<ContractValidationReportDto> validateAgainstEnvironments(
                     validator
                 ))
             .collect(Collectors.toList());
-        return toDtos(collect, serviceName, serviceVersion);
+        return toDtos(collect, serviceVersion);
     }
 }
diff --git a/...c/test/groovy/dev/hltech/dredd/domain/contracts/InMemoryServiceContractsRepository.groovy b/...c/test/groovy/dev/hltech/dredd/domain/contracts/InMemoryServiceContractsRepository.groovy
@@ -1,24 +1,23 @@
 package dev.hltech.dredd.domain.contracts
 
 import com.google.common.collect.Maps
-import dev.hltech.dredd.domain.environment.EnvironmentAggregate
+import dev.hltech.dredd.domain.ServiceVersion
 
-import javax.persistence.EntityNotFoundException
 import javax.persistence.NoResultException
 
 class InMemoryServiceContractsRepository implements ServiceContractsRepository {
 
-    private Map<EnvironmentAggregate.ServiceVersion, ServiceContracts> storage = Maps.newHashMap()
+    private Map<ServiceVersion, ServiceContracts> storage = Maps.newHashMap()
 
     @Override
     ServiceContracts persist(ServiceContracts service) {
-        storage.put(new EnvironmentAggregate.ServiceVersion(service.name, service.version), service)
+        storage.put(new ServiceVersion(service.name, service.version), service)
         return service;
     }
 
     @Override
-    Optional<ServiceContracts> find(String name, String version) {
-        return Optional.ofNullable(storage.get(new EnvironmentAggregate.ServiceVersion(name, version)))
+    Optional<ServiceContracts> findOne(ServiceVersion serviceVersion) {
+        return Optional.ofNullable(storage.get(serviceVersion))
     }
 
     @Override
@@ -35,7 +34,7 @@ class InMemoryServiceContractsRepository implements ServiceContractsRepository {
     }
 
     @Override
-    List<ServiceContracts> find(String name) {
+    List<ServiceContracts> findAllByServiceName(String name) {
         return storage.entrySet()
             .stream()
             .filter { it -> it.getKey().name == name }

diff --git a/.../src/test/groovy/dev/hltech/dredd/domain/contracts/JpaServiceContractsRepositoryIT.groovy b/.../src/test/groovy/dev/hltech/dredd/domain/contracts/JpaServiceContractsRepositoryIT.groovy
@@ -1,5 +1,6 @@
 package dev.hltech.dredd.domain.contracts
 
+import dev.hltech.dredd.domain.ServiceVersion
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.http.MediaType
@@ -31,7 +32,7 @@ class JpaServiceContractsRepositoryIT extends Specification {
             )
             repository.persist(serviceContracts)
         when:
-            def retrieved = repository.find(serviceContracts.name, serviceContracts.version)
+            def retrieved = repository.findOne(new ServiceVersion(serviceContracts.name, serviceContracts.version))
         then:
             retrieved.get().id.name == 'provider'
             retrieved.get().id.version == '1.0'
@@ -59,7 +60,7 @@ class JpaServiceContractsRepositoryIT extends Specification {
             def s1 = repository.persist(new ServiceContracts(serviceName, randomAlphabetic(5), [:], [:]))
             def s2 = repository.persist(new ServiceContracts(serviceName, randomAlphabetic(5), [:], [:]))
         when:
-            def serviceContracts = repository.find(serviceName)
+            def serviceContracts = repository.findAllByServiceName(serviceName)
         then:
             serviceContracts.size() == 2
             serviceContracts.contains(s1)

diff --git a/...ver/src/test/groovy/dev/hltech/dredd/domain/environment/JPAEnvironmentRepositoryIT.groovy b/...ver/src/test/groovy/dev/hltech/dredd/domain/environment/JPAEnvironmentRepositoryIT.groovy
@@ -1,11 +1,11 @@
 package dev.hltech.dredd.domain.environment
 
+import dev.hltech.dredd.domain.ServiceVersion
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.context.ActiveProfiles
 import spock.lang.Specification
 
-import static dev.hltech.dredd.domain.environment.EnvironmentAggregate.ServiceVersion
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT