From 482f000f721512d04564e7da83e965f49208614d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 3 Apr 2018 21:25:06 +0200 Subject: [PATCH] Added a guard to point to a missing type in YAML --- .../cloud/contract/maven/verifier/BaseClassMapping.java | 5 +++++ .../cloud/contract/maven/verifier/GenerateTestsMojo.java | 3 ++- .../contract/verifier/converter/YamlContractConverter.groovy | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/BaseClassMapping.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/BaseClassMapping.java index dc72724789..8b477ba69c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/BaseClassMapping.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/BaseClassMapping.java @@ -50,4 +50,9 @@ public class BaseClassMapping { result = 31 * result + (this.baseClassFQN != null ? this.baseClassFQN.hashCode() : 0); return result; } + + @Override public String toString() { + return "BaseClassMapping{" + "contractPackageRegex='" + this.contractPackageRegex + + '\'' + ", baseClassFQN='" + this.baseClassFQN + '\'' + '}'; + } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java index ee98821c09..4c466b7405 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.java @@ -248,7 +248,8 @@ public class GenerateTestsMojo extends AbstractMojo { + " added."); getLog().info("Using [" + config.getBaseClassForTests() + "] as base class for test classes, [" + config.getBasePackageForTests() + "] as base " - + "package for tests, [" + config.getPackageWithBaseClasses() + "] as package with base classes"); + + "package for tests, [" + config.getPackageWithBaseClasses() + "] as package with " + + "base classes, base class mappings " + this.baseClassMappings); } try { TestGenerator generator = new TestGenerator(config); diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy index 5bf961fd59..0fb1946040 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy @@ -293,6 +293,8 @@ class YamlContractConverter implements ContractConverter> { case StubMatcherType.by_equality: value = byEquality() break + default: + throw new UnsupportedOperationException("The type [" + matcher.type + "] is unsupported. Hint: If you're using remember to pass ") } jsonPath(matcher.path, value) } @@ -349,6 +351,8 @@ class YamlContractConverter implements ContractConverter> { case TestMatcherType.by_null: value = byNull() break + default: + throw new UnsupportedOperationException("The type [" + testMatcher.type + "] is unsupported. Hint: If you're using remember to pass ") } jsonPath(testMatcher.path, value) }