Judge-d server package name improved

judge-d-server/pom.xml

@@ -196,7 +196,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${springBootVersion}</version>
                 <configuration>
-                    <mainClass>dev.hltech.dredd.App</mainClass>
+                    <mainClass>com.hltech.judged.server.App</mainClass>
                 </configuration>
                 <executions>
                     <execution>

judge-d-server/src/main/java/dev/hltech/dredd/App.java → judge-d-server/src/main/java/com/hltech/judged/server/App.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd;
+package com.hltech.judged.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

judge-d-server/src/main/java/dev/hltech/dredd/config/BeanFactory.java → judge-d-server/src/main/java/com/hltech/judged/server/config/BeanFactory.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.config;
+package com.hltech.judged.server.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.context.annotation.Bean;

judge-d-server/src/main/java/dev/hltech/dredd/domain/JudgeD.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/JudgeD.java

@@ -1,12 +1,12 @@
-package dev.hltech.dredd.domain;
+package com.hltech.judged.server.domain;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Maps;
-import dev.hltech.dredd.domain.contracts.ServiceContracts;
-import dev.hltech.dredd.domain.contracts.ServiceContractsRepository;
-import dev.hltech.dredd.domain.environment.EnvironmentRepository;
-import dev.hltech.dredd.domain.validation.EnvironmentValidatorResult;
-import dev.hltech.dredd.domain.validation.InterfaceContractValidator;
+import com.hltech.judged.server.domain.environment.EnvironmentRepository;
+import com.hltech.judged.server.domain.contracts.ServiceContracts;
+import com.hltech.judged.server.domain.contracts.ServiceContractsRepository;
+import com.hltech.judged.server.domain.validation.EnvironmentValidatorResult;
+import com.hltech.judged.server.domain.validation.InterfaceContractValidator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -16,7 +16,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
 
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;

judge-d-server/src/main/java/dev/hltech/dredd/domain/ServiceVersion.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/ServiceVersion.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.domain;
+package com.hltech.judged.server.domain;
 
 
 import lombok.*;

judge-d-server/src/main/java/dev/hltech/dredd/domain/contracts/JpaServiceContractsRepository.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/contracts/JpaServiceContractsRepository.java

@@ -1,6 +1,6 @@
-package dev.hltech.dredd.domain.contracts;
+package com.hltech.judged.server.domain.contracts;
 
-import dev.hltech.dredd.domain.ServiceVersion;
+import com.hltech.judged.server.domain.ServiceVersion;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

judge-d-server/src/main/java/dev/hltech/dredd/domain/contracts/ServiceContracts.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/contracts/ServiceContracts.java

@@ -1,6 +1,6 @@
-package dev.hltech.dredd.domain.contracts;
+package com.hltech.judged.server.domain.contracts;
 
-import dev.hltech.dredd.domain.ServiceVersion;
+import com.hltech.judged.server.domain.ServiceVersion;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

judge-d-server/src/main/java/dev/hltech/dredd/domain/contracts/ServiceContractsRepository.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/contracts/ServiceContractsRepository.java

@@ -1,9 +1,9 @@
-package dev.hltech.dredd.domain.contracts;
+package com.hltech.judged.server.domain.contracts;
 
 import java.util.List;
 import java.util.Optional;
 
-import dev.hltech.dredd.domain.ServiceVersion;
+import com.hltech.judged.server.domain.ServiceVersion;
 
 public interface ServiceContractsRepository {
 

judge-d-server/src/main/java/dev/hltech/dredd/domain/environment/EnvironmentAggregate.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/environment/EnvironmentAggregate.java

@@ -1,7 +1,7 @@
-package dev.hltech.dredd.domain.environment;
+package com.hltech.judged.server.domain.environment;
 
 import com.google.common.collect.Multimap;
-import dev.hltech.dredd.domain.ServiceVersion;
+import com.hltech.judged.server.domain.ServiceVersion;
 
 import javax.persistence.*;
 import java.util.Set;

judge-d-server/src/main/java/dev/hltech/dredd/domain/environment/EnvironmentRepository.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/environment/EnvironmentRepository.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.domain.environment;
+package com.hltech.judged.server.domain.environment;
 
 import java.util.Set;
 

judge-d-server/src/main/java/dev/hltech/dredd/domain/environment/JPAEnvironmentRepository.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/environment/JPAEnvironmentRepository.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.domain.environment;
+package com.hltech.judged.server.domain.environment;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

judge-d-server/src/main/java/dev/hltech/dredd/domain/environment/SpaceServiceVersion.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/environment/SpaceServiceVersion.java

@@ -1,6 +1,6 @@
-package dev.hltech.dredd.domain.environment;
+package com.hltech.judged.server.domain.environment;
 
-import dev.hltech.dredd.domain.ServiceVersion;
+import com.hltech.judged.server.domain.ServiceVersion;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

judge-d-server/src/main/java/dev/hltech/dredd/domain/environment/SpringDataEnvironmentRepository.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/environment/SpringDataEnvironmentRepository.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.domain.environment;
+package com.hltech.judged.server.domain.environment;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

judge-d-server/src/main/java/com/hltech/judged/server/domain/validation/EnvironmentValidatorResult.java

@@ -0,0 +1,23 @@
+package com.hltech.judged.server.domain.validation;
+
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class EnvironmentValidatorResult {
+
+    private final String communicationInterface;
+    private final List<InterfaceContractValidator.CapabilitiesValidationResult> capabilitiesValidationResults;
+    private final List<InterfaceContractValidator.ExpectationValidationResult> expectationValidationResults;
+
+    public EnvironmentValidatorResult(
+        String communicationInterface,
+        List<InterfaceContractValidator.CapabilitiesValidationResult> capabilitiesValidationResults,
+        List<InterfaceContractValidator.ExpectationValidationResult> expectationValidationResults
+    ) {
+        this.communicationInterface = communicationInterface;
+        this.capabilitiesValidationResults = capabilitiesValidationResults;
+        this.expectationValidationResults = expectationValidationResults;
+    }
+}

judge-d-server/src/main/java/dev/hltech/dredd/domain/validation/InterfaceContractValidator.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/validation/InterfaceContractValidator.java

@@ -1,6 +1,6 @@
-package dev.hltech.dredd.domain.validation;
+package com.hltech.judged.server.domain.validation;
 
-import dev.hltech.dredd.domain.contracts.ServiceContracts;
+import com.hltech.judged.server.domain.contracts.ServiceContracts;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -12,8 +12,8 @@
 import java.util.stream.Stream;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static dev.hltech.dredd.domain.validation.InterfaceContractValidator.InteractionValidationStatus.FAILED;
-import static dev.hltech.dredd.domain.validation.InterfaceContractValidator.InteractionValidationStatus.OK;
+import static com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationStatus.FAILED;
+import static com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationStatus.OK;
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
 

judge-d-server/src/main/java/dev/hltech/dredd/domain/validation/jms/JmsContractValidator.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/validation/jms/JmsContractValidator.java

@@ -1,10 +1,10 @@
-package dev.hltech.dredd.domain.validation.jms;
+package com.hltech.judged.server.domain.validation.jms;
 
 import com.hltech.vaunt.core.VauntSerializer;
 import com.hltech.vaunt.core.domain.model.Contract;
 import com.hltech.vaunt.validator.ValidationResult;
 import com.hltech.vaunt.validator.VauntValidator;
-import dev.hltech.dredd.domain.validation.InterfaceContractValidator;
+import com.hltech.judged.server.domain.validation.InterfaceContractValidator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

judge-d-server/src/main/java/dev/hltech/dredd/domain/validation/mq/MqInterfaceContractValidator.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/validation/mq/MqInterfaceContractValidator.java

@@ -1,7 +1,7 @@
-package dev.hltech.dredd.domain.validation.mq;
+package com.hltech.judged.server.domain.validation.mq;
 
 import com.google.common.collect.ImmutableList;
-import dev.hltech.dredd.domain.validation.InterfaceContractValidator;
+import com.hltech.judged.server.domain.validation.InterfaceContractValidator;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

judge-d-server/src/main/java/dev/hltech/dredd/domain/validation/rest/RestContractValidator.java → judge-d-server/src/main/java/com/hltech/judged/server/domain/validation/rest/RestContractValidator.java

@@ -1,11 +1,11 @@
-package dev.hltech.dredd.domain.validation.rest;
+package com.hltech.judged.server.domain.validation.rest;
 
 import au.com.dius.pact.model.RequestResponseInteraction;
 import au.com.dius.pact.model.RequestResponsePact;
 import com.atlassian.oai.validator.OpenApiInteractionValidator;
 import com.atlassian.oai.validator.pact.PactResponse;
 import com.atlassian.oai.validator.report.ValidationReport;
-import dev.hltech.dredd.domain.validation.InterfaceContractValidator;
+import com.hltech.judged.server.domain.validation.InterfaceContractValidator;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -14,8 +14,8 @@
 
 import static au.com.dius.pact.model.PactReader.loadPact;
 import static com.atlassian.oai.validator.pact.PactRequest.of;
-import static dev.hltech.dredd.domain.validation.InterfaceContractValidator.InteractionValidationResult.fail;
-import static dev.hltech.dredd.domain.validation.InterfaceContractValidator.InteractionValidationResult.success;
+import static com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationResult.fail;
+import static com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationResult.success;
 import static java.util.function.Function.identity;
 
 @Component

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/RequestValidationException.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/RequestValidationException.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.interfaces.rest;
+package com.hltech.judged.server.interfaces.rest;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/ResourceNotFoundException.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/ResourceNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.interfaces.rest;
+package com.hltech.judged.server.interfaces.rest;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/contracts/ContractsController.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/contracts/ContractsController.java

@@ -1,9 +1,9 @@
-package dev.hltech.dredd.interfaces.rest.contracts;
+package com.hltech.judged.server.interfaces.rest.contracts;
 
-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 com.hltech.judged.server.domain.contracts.ServiceContracts;
+import com.hltech.judged.server.domain.contracts.ServiceContractsRepository;
+import com.hltech.judged.server.domain.ServiceVersion;
+import com.hltech.judged.server.interfaces.rest.ResourceNotFoundException;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/contracts/ContractsMapper.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/contracts/ContractsMapper.java

@@ -1,6 +1,6 @@
-package dev.hltech.dredd.interfaces.rest.contracts;
+package com.hltech.judged.server.interfaces.rest.contracts;
 
-import dev.hltech.dredd.domain.contracts.ServiceContracts;
+import com.hltech.judged.server.domain.contracts.ServiceContracts;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/contracts/ServiceContractsDto.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/contracts/ServiceContractsDto.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.interfaces.rest.contracts;
+package com.hltech.judged.server.interfaces.rest.contracts;
 
 import lombok.Data;
 

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/contracts/ServiceContractsForm.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/contracts/ServiceContractsForm.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.interfaces.rest.contracts;
+package com.hltech.judged.server.interfaces.rest.contracts;
 
 import lombok.Data;
 

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/environment/EnvironmentController.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/environment/EnvironmentController.java

@@ -1,10 +1,10 @@
-package dev.hltech.dredd.interfaces.rest.environment;
+package com.hltech.judged.server.interfaces.rest.environment;
 
 import com.google.common.collect.ImmutableSet;
-import dev.hltech.dredd.domain.ServiceVersion;
-import dev.hltech.dredd.domain.environment.EnvironmentAggregate;
-import dev.hltech.dredd.domain.environment.EnvironmentAggregate.EnvironmentAggregateBuilder;
-import dev.hltech.dredd.domain.environment.EnvironmentRepository;
+import com.hltech.judged.server.domain.ServiceVersion;
+import com.hltech.judged.server.domain.environment.EnvironmentAggregate;
+import com.hltech.judged.server.domain.environment.EnvironmentAggregate.EnvironmentAggregateBuilder;
+import com.hltech.judged.server.domain.environment.EnvironmentRepository;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
@@ -16,7 +16,7 @@
 import java.util.Set;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static dev.hltech.dredd.domain.environment.EnvironmentAggregate.DEFAULT_NAMESPACE;
+import static com.hltech.judged.server.domain.environment.EnvironmentAggregate.DEFAULT_NAMESPACE;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/environment/ServiceDto.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/environment/ServiceDto.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.interfaces.rest.environment;
+package com.hltech.judged.server.interfaces.rest.environment;
 
 import lombok.Builder;
 import lombok.Data;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/environment/ServiceForm.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/environment/ServiceForm.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.interfaces.rest.environment;
+package com.hltech.judged.server.interfaces.rest.environment;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/interrelationship/InterrelationshipController.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/interrelationship/InterrelationshipController.java

@@ -1,11 +1,11 @@
-package dev.hltech.dredd.interfaces.rest.interrelationship;
-
-import dev.hltech.dredd.domain.contracts.ServiceContracts;
-import dev.hltech.dredd.domain.contracts.ServiceContractsRepository;
-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;
+package com.hltech.judged.server.interfaces.rest.interrelationship;
+
+import com.hltech.judged.server.interfaces.rest.contracts.ServiceContractsDto;
+import com.hltech.judged.server.domain.contracts.ServiceContracts;
+import com.hltech.judged.server.domain.contracts.ServiceContractsRepository;
+import com.hltech.judged.server.domain.environment.EnvironmentRepository;
+import com.hltech.judged.server.domain.ServiceVersion;
+import com.hltech.judged.server.interfaces.rest.contracts.ContractsMapper;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/interrelationship/InterrelationshipDto.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/interrelationship/InterrelationshipDto.java

@@ -1,6 +1,6 @@
-package dev.hltech.dredd.interfaces.rest.interrelationship;
+package com.hltech.judged.server.interfaces.rest.interrelationship;
 
-import dev.hltech.dredd.interfaces.rest.contracts.ServiceContractsDto;
+import com.hltech.judged.server.interfaces.rest.contracts.ServiceContractsDto;
 import lombok.Data;
 
 import java.util.Set;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/validation/BatchValidationReportDto.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/validation/BatchValidationReportDto.java

@@ -1,6 +1,6 @@
-package dev.hltech.dredd.interfaces.rest.validation;
+package com.hltech.judged.server.interfaces.rest.validation;
 
-import dev.hltech.dredd.interfaces.rest.environment.ServiceDto;
+import com.hltech.judged.server.interfaces.rest.environment.ServiceDto;
 import lombok.Builder;
 import lombok.Data;
 

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/validation/ConsumerAndProviderDto.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/validation/ConsumerAndProviderDto.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.interfaces.rest.validation;
+package com.hltech.judged.server.interfaces.rest.validation;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/validation/ContractValidationReportDto.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/validation/ContractValidationReportDto.java

@@ -1,4 +1,4 @@
-package dev.hltech.dredd.interfaces.rest.validation;
+package com.hltech.judged.server.interfaces.rest.validation;
 
 import com.google.common.collect.Lists;
 import lombok.Getter;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/validation/Converters.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/validation/Converters.java

@@ -1,8 +1,8 @@
-package dev.hltech.dredd.interfaces.rest.validation;
+package com.hltech.judged.server.interfaces.rest.validation;
 
 import com.google.common.collect.Ordering;
-import dev.hltech.dredd.domain.ServiceVersion;
-import dev.hltech.dredd.domain.validation.EnvironmentValidatorResult;
+import com.hltech.judged.server.domain.ServiceVersion;
+import com.hltech.judged.server.domain.validation.EnvironmentValidatorResult;
 
 import java.util.Collection;
 import java.util.Comparator;

judge-d-server/src/main/java/dev/hltech/dredd/interfaces/rest/validation/InteractionValidationReportDto.java → judge-d-server/src/main/java/com/hltech/judged/server/interfaces/rest/validation/InteractionValidationReportDto.java

@@ -1,6 +1,6 @@
-package dev.hltech.dredd.interfaces.rest.validation;
+package com.hltech.judged.server.interfaces.rest.validation;
 
-import dev.hltech.dredd.domain.validation.InterfaceContractValidator.InteractionValidationStatus;
+import com.hltech.judged.server.domain.validation.InterfaceContractValidator.InteractionValidationStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;