From f4fef09eb6e453b400f59dabd5f2016740065769 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 13 Aug 2019 12:19:24 +0200
Subject: [PATCH] Throw an exception when Java can't be parsed

---
 .../verifier/util/ContractVerifierDslConverter.groovy | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy
index f5590a8159..e2841d49d6 100644
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy
@@ -128,19 +128,16 @@ class ContractVerifierDslConverter implements ContractConverter<Collection<Contr
 	private static Object toObject(ClassLoader cl, File rootFolder, File dsl) {
 		if (isJava(dsl)) {
 			try {
-				return parseJavaFile(cl, dsl)
+				return parseJavaFile(dsl)
 			}
 			catch (Exception ex) {
-				if (log.isWarnEnabled()) {
-					log.warn("Exception occurred while trying to parse the file [" + dsl + "] as a contract. Will not parse it.", ex)
-				}
-				return null
+				throw new DslParseException("Exception occurred while trying to parse the file [" + dsl + "] as a contract. Will not parse it.", ex)
 			}
 		}
 		return groovyShell(cl, rootFolder).evaluate(dsl)
 	}
 
-	private static Object parseJavaFile(ClassLoader cl, File dsl) {
+	private static Object parseJavaFile(File dsl) {
 		Constructor<?> constructor = classConstructor(dsl)
 		Object newInstance = constructor.newInstance()
 		if (!newInstance instanceof Supplier) {
@@ -161,7 +158,7 @@ class ContractVerifierDslConverter implements ContractConverter<Collection<Contr
 		if (!compilationResult.wasSuccessful()) {
 			throw new IllegalStateException("Exceptions occurred while trying to compile the file " + compilationResult.compilationMessages)
 		}
-		Class<?> clazz = compilationResult.compiledClasses.find { it.name == fqn}
+		Class<?> clazz = compilationResult.compiledClasses.find { it.name == fqn }
 		if (clazz == null) {
 			throw new IllegalStateException("Class with name [" + fqn + "] not found")
 		}