diff --git a/spring-cloud-contract-maven-plugin/apidocs/allclasses-frame.html b/spring-cloud-contract-maven-plugin/apidocs/allclasses-frame.html
index d9449c9bba..2bb5fdb14d 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/allclasses-frame.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>All Classes (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/allclasses-noframe.html b/spring-cloud-contract-maven-plugin/apidocs/allclasses-noframe.html
index 873588042a..9f1af60de2 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/allclasses-noframe.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>All Classes (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/constant-values.html b/spring-cloud-contract-maven-plugin/apidocs/constant-values.html
index 605f66760e..ed96303a3d 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/constant-values.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/constant-values.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Constant Field Values (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/deprecated-list.html b/spring-cloud-contract-maven-plugin/apidocs/deprecated-list.html
index 8052d1c6d9..d49af02087 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/deprecated-list.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/deprecated-list.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Deprecated List (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/help-doc.html b/spring-cloud-contract-maven-plugin/apidocs/help-doc.html
index 0dd327b00c..52162f8768 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/help-doc.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/help-doc.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>API Help (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/index-all.html b/spring-cloud-contract-maven-plugin/apidocs/index-all.html
index 6b8034ca9e..2040f001b7 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/index-all.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/index-all.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Index (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/index.html b/spring-cloud-contract-maven-plugin/apidocs/index.html
index 431b46b7f9..e0cc7ea0e2 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/index.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API</title>
 <script type="text/javascript">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/BaseClassMapping.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/BaseClassMapping.html
index 887203c250..ca5f33e1c3 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/BaseClassMapping.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/BaseClassMapping.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>BaseClassMapping (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/ConvertMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/ConvertMojo.html
index b6f5559958..7f871ef3d7 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/ConvertMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/ConvertMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>ConvertMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.html
index 844a798a6f..f9af410452 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GenerateStubsMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.html
index 021cf1ad3a..071d5345ef 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/GenerateTestsMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>GenerateTestsMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/HelpMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/HelpMojo.html
index b526081e31..6988efd902 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/HelpMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/HelpMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>HelpMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.html
index 60105cb41a..a2605ab614 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/PushStubsToScmMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>PushStubsToScmMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/RunMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/RunMojo.html
index de5b974563..4cc61e5842 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/RunMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/RunMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>RunMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/BaseClassMapping.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/BaseClassMapping.html
index edcfee7dab..a01a91a952 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/BaseClassMapping.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/BaseClassMapping.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.BaseClassMapping (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/ConvertMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/ConvertMojo.html
index af317df16c..68a21cc5da 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/ConvertMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/ConvertMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.ConvertMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/GenerateStubsMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/GenerateStubsMojo.html
index 47054190a4..a8b9089e6f 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/GenerateStubsMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/GenerateStubsMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.GenerateStubsMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/GenerateTestsMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/GenerateTestsMojo.html
index a2e8ff485a..03036d1208 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/GenerateTestsMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/GenerateTestsMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.GenerateTestsMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/HelpMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/HelpMojo.html
index 81f310248d..e90e137562 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/HelpMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/HelpMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.HelpMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/PushStubsToScmMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/PushStubsToScmMojo.html
index 95221ef312..5e6c620827 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/PushStubsToScmMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/PushStubsToScmMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.PushStubsToScmMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/RunMojo.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/RunMojo.html
index cf02a27ca5..4a16c04699 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/RunMojo.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/class-use/RunMojo.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.RunMojo (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-frame.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-frame.html
index 8a3f153944..33d8392733 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-frame.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>org.springframework.cloud.contract.maven.verifier (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-summary.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-summary.html
index f761968efb..bb830934b1 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-summary.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>org.springframework.cloud.contract.maven.verifier (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-tree.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-tree.html
index 1a1c2ad695..6aab46f8b5 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-tree.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>org.springframework.cloud.contract.maven.verifier Class Hierarchy (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-use.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-use.html
index 443724c5b6..55cd21b4ef 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-use.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/package-use.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.springframework.cloud.contract.maven.verifier (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/AetherStubDownloaderFactory.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/AetherStubDownloaderFactory.html
index 60a7bb34be..091172c2df 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/AetherStubDownloaderFactory.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/AetherStubDownloaderFactory.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>AetherStubDownloaderFactory (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/LocalStubRunner.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/LocalStubRunner.html
index a20573ac84..2e0c70e49a 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/LocalStubRunner.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/LocalStubRunner.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>LocalStubRunner (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.html
index 5ad75bfe84..5e71f570d9 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/RemoteStubRunner.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>RemoteStubRunner (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/AetherStubDownloaderFactory.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/AetherStubDownloaderFactory.html
index 1abf3dac78..3057d8b040 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/AetherStubDownloaderFactory.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/AetherStubDownloaderFactory.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.stubrunner.AetherStubDownloaderFactory (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/LocalStubRunner.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/LocalStubRunner.html
index 4d062dcac7..5481be7898 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/LocalStubRunner.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/LocalStubRunner.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.stubrunner.LocalStubRunner (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/RemoteStubRunner.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/RemoteStubRunner.html
index 2338bfd7d5..58b6d4b3f0 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/RemoteStubRunner.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/class-use/RemoteStubRunner.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Class org.springframework.cloud.contract.maven.verifier.stubrunner.RemoteStubRunner (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-frame.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-frame.html
index 79a0a8be22..940c5ee198 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-frame.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>org.springframework.cloud.contract.maven.verifier.stubrunner (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-summary.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-summary.html
index 95f9004ea6..ea7a84c539 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-summary.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>org.springframework.cloud.contract.maven.verifier.stubrunner (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-tree.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-tree.html
index a2a16cb02a..0c4c8cf929 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-tree.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>org.springframework.cloud.contract.maven.verifier.stubrunner Class Hierarchy (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-use.html b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-use.html
index 123aad596c..18d91368a2 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-use.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/org/springframework/cloud/contract/maven/verifier/stubrunner/package-use.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Uses of Package org.springframework.cloud.contract.maven.verifier.stubrunner (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/overview-frame.html b/spring-cloud-contract-maven-plugin/apidocs/overview-frame.html
index 3b39047a19..4b6670fa69 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/overview-frame.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/overview-frame.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Overview List (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/overview-summary.html b/spring-cloud-contract-maven-plugin/apidocs/overview-summary.html
index d39771bcc5..26684dd422 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/overview-summary.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/overview-summary.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Overview (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract-maven-plugin/apidocs/overview-tree.html b/spring-cloud-contract-maven-plugin/apidocs/overview-tree.html
index c3e0b6e1e0..6db6ed6f74 100644
--- a/spring-cloud-contract-maven-plugin/apidocs/overview-tree.html
+++ b/spring-cloud-contract-maven-plugin/apidocs/overview-tree.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 13:48:36 UTC 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Thu Jun 27 21:50:20 UTC 2019 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Class Hierarchy (Spring Cloud Contract Maven Plugin 2.2.0.BUILD-SNAPSHOT API)</title>
 <meta name="date" content="2019-06-27">
diff --git a/spring-cloud-contract.html b/spring-cloud-contract.html
index 37d3575a9b..5eacd82a64 100644
--- a/spring-cloud-contract.html
+++ b/spring-cloud-contract.html
@@ -937,6 +937,7 @@ was sent, the message body, and the header).</p>
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">			def contractDsl = Contract.make {
+				name "foo"
 				label 'some_label'
 				input {
 					messageFrom('jms:delete')
@@ -5845,6 +5846,7 @@ it is resolved as a channel name. For <strong>Camel</strong>, that&#8217;s a cer
 <div class="title">Groovy DSL</div>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">			def contractDsl = Contract.make {
+				name "foo"
 				label 'some_label'
 				input {
 					triggeredBy('bookReturnedTriggered()')
@@ -5880,20 +5882,52 @@ outputMessage:
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''
- // when:
-  bookReturnedTriggered();
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''\
+package com.example;
+
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
+import org.junit.Test;
+import org.junit.Rule;
+import javax.inject.Inject;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging;
+
+import static org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat;
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.*;
+import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson;
+import static org.springframework.cloud.contract.verifier.messaging.util.ContractVerifierMessagingUtil.headers;
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.fileToBytes;
+
+public class FooTest {
+\t@Inject ContractVerifierMessaging contractVerifierMessaging;
+\t@Inject ContractVerifierObjectMapper contractVerifierObjectMapper;
+
+\t@Test
+\tpublic void validate_foo() throws Exception {
+\t\t// when:
+\t\t\tbookReturnedTriggered();
+
+\t\t// then:
+\t\t\tContractVerifierMessage response = contractVerifierMessaging.receive("activemq:output");
+\t\t\tassertThat(response).isNotNull();
+
+\t\t// and:
+\t\t\tassertThat(response.getHeader("BOOK-NAME")).isNotNull();
+\t\t\tassertThat(response.getHeader("BOOK-NAME").toString()).isEqualTo("foo");
+\t\t\tassertThat(response.getHeader("contentType")).isNotNull();
+\t\t\tassertThat(response.getHeader("contentType").toString()).isEqualTo("application/json");
+
+\t\t// and:
+\t\t\tDocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()));
+\t\t\tassertThatJson(parsedJson).field("['bookName']").isEqualTo("foo");
+\t}
+
+}
 
- // then:
-  ContractVerifierMessage response = contractVerifierMessaging.receive("activemq:output");
-  assertThat(response).isNotNull();
-  assertThat(response.getHeader("BOOK-NAME")).isNotNull();
-  assertThat(response.getHeader("BOOK-NAME").toString()).isEqualTo("foo");
-  assertThat(response.getHeader("contentType")).isNotNull();
-  assertThat(response.getHeader("contentType").toString()).isEqualTo("application/json");
- // and:
-  DocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()));
-  assertThatJson(parsedJson).field("bookName").isEqualTo("foo");
 '''</code></pre>
 </div>
 </div>
@@ -5902,18 +5936,49 @@ outputMessage:
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''
- when:
-  bookReturnedTriggered()
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''\
+package com.example
 
- then:
-  ContractVerifierMessage response = contractVerifierMessaging.receive('activemq:output')
-  assert response != null
-  response.getHeader('BOOK-NAME')?.toString()  == 'foo'
-  response.getHeader('contentType')?.toString()  == 'application/json'
- and:
-  DocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.payload))
-  assertThatJson(parsedJson).field("bookName").isEqualTo("foo")
+import org.junit.FixMethodOrder
+import org.junit.runners.MethodSorters
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import spock.lang.Specification
+import javax.inject.Inject
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging
+
+import static org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.*
+import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson
+import static org.springframework.cloud.contract.verifier.messaging.util.ContractVerifierMessagingUtil.headers
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.fileToBytes
+
+class FooSpec extends Specification {
+\t@Inject ContractVerifierMessaging contractVerifierMessaging
+\t@Inject ContractVerifierObjectMapper contractVerifierObjectMapper
+
+\tdef validate_foo() throws Exception {
+\t\twhen:
+\t\t\tbookReturnedTriggered()
+
+\t\tthen:
+\t\t\tContractVerifierMessage response = contractVerifierMessaging.receive("activemq:output")
+\t\t\tresponse != null
+
+\t\tand:
+\t\t\tresponse.getHeader("BOOK-NAME") != null
+\t\t\tresponse.getHeader("BOOK-NAME").toString() == 'foo'
+\t\t\tresponse.getHeader("contentType") != null
+\t\t\tresponse.getHeader("contentType").toString() == 'application/json'
+
+\t\tand:
+\t\t\tDocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()))
+\t\t\tassertThatJson(parsedJson).field("['bookName']").isEqualTo("foo")
+\t}
+
+}
 
 '''</code></pre>
 </div>
@@ -5928,6 +5993,7 @@ outputMessage:
 <div class="title">Groovy DSL</div>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">			def contractDsl = Contract.make {
+				name "foo"
 				label 'some_label'
 				input {
 					messageFrom('jms:input')
@@ -5973,24 +6039,57 @@ outputMessage:
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''
-// given:
- ContractVerifierMessage inputMessage = contractVerifierMessaging.create(
-  "{\\"bookName\\":\\"foo\\"}"
-, headers()
-  .header("sample", "header"));
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''\
+package com.example;
 
-// when:
- contractVerifierMessaging.send(inputMessage, "jms:input");
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
+import org.junit.Test;
+import org.junit.Rule;
+import javax.inject.Inject;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging;
+
+import static org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat;
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.*;
+import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson;
+import static org.springframework.cloud.contract.verifier.messaging.util.ContractVerifierMessagingUtil.headers;
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.fileToBytes;
+
+public class FooTest {
+\t@Inject ContractVerifierMessaging contractVerifierMessaging;
+\t@Inject ContractVerifierObjectMapper contractVerifierObjectMapper;
+
+\t@Test
+\tpublic void validate_foo() throws Exception {
+\t\t// given:
+\t\t\tContractVerifierMessage inputMessage = contractVerifierMessaging.create(
+\t\t\t\t\t"{\\"bookName\\":\\"foo\\"}"
+\t\t\t\t\t\t, headers()
+\t\t\t\t\t\t\t.header("sample", "header")
+\t\t\t);
+
+\t\t// when:
+\t\t\tcontractVerifierMessaging.send(inputMessage, "jms:input");
+
+\t\t// then:
+\t\t\tContractVerifierMessage response = contractVerifierMessaging.receive("jms:output");
+\t\t\tassertThat(response).isNotNull();
+
+\t\t// and:
+\t\t\tassertThat(response.getHeader("BOOK-NAME")).isNotNull();
+\t\t\tassertThat(response.getHeader("BOOK-NAME").toString()).isEqualTo("foo");
+
+\t\t// and:
+\t\t\tDocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()));
+\t\t\tassertThatJson(parsedJson).field("['bookName']").isEqualTo("foo");
+\t}
+
+}
 
-// then:
- ContractVerifierMessage response = contractVerifierMessaging.receive("jms:output");
- assertThat(response).isNotNull();
- assertThat(response.getHeader("BOOK-NAME")).isNotNull();
- assertThat(response.getHeader("BOOK-NAME").toString()).isEqualTo("foo");
-// and:
- DocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()));
- assertThatJson(parsedJson).field("bookName").isEqualTo("foo");
 '''</code></pre>
 </div>
 </div>
@@ -6000,22 +6099,54 @@ outputMessage:
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					"""\
-given:
-   ContractVerifierMessage inputMessage = contractVerifierMessaging.create(
-    '''{"bookName":"foo"}''',
-    ['sample': 'header']
-  )
+package com.example
 
-when:
-   contractVerifierMessaging.send(inputMessage, 'jms:input')
+import org.junit.FixMethodOrder
+import org.junit.runners.MethodSorters
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import spock.lang.Specification
+import javax.inject.Inject
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging
+
+import static org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.*
+import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson
+import static org.springframework.cloud.contract.verifier.messaging.util.ContractVerifierMessagingUtil.headers
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.fileToBytes
+
+class FooSpec extends Specification {
+\t@Inject ContractVerifierMessaging contractVerifierMessaging
+\t@Inject ContractVerifierObjectMapper contractVerifierObjectMapper
+
+\tdef validate_foo() throws Exception {
+\t\tgiven:
+\t\t\tContractVerifierMessage inputMessage = contractVerifierMessaging.create(
+\t\t\t\t\t'''{"bookName":"foo"}'''
+\t\t\t\t\t\t, headers()
+\t\t\t\t\t\t\t.header("sample", "header")
+\t\t\t)
+
+\t\twhen:
+\t\t\tcontractVerifierMessaging.send(inputMessage, "jms:input")
+
+\t\tthen:
+\t\t\tContractVerifierMessage response = contractVerifierMessaging.receive("jms:output")
+\t\t\tresponse != null
+
+\t\tand:
+\t\t\tresponse.getHeader("BOOK-NAME") != null
+\t\t\tresponse.getHeader("BOOK-NAME").toString() == 'foo'
+
+\t\tand:
+\t\t\tDocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.getPayload()))
+\t\t\tassertThatJson(parsedJson).field("['bookName']").isEqualTo("foo")
+\t}
+
+}
 
-then:
-   ContractVerifierMessage response = contractVerifierMessaging.receive('jms:output')
-   assert response !- null
-   response.getHeader('BOOK-NAME')?.toString()  == 'foo'
-and:
-   DocumentContext parsedJson = JsonPath.parse(contractVerifierObjectMapper.writeValueAsString(response.payload))
-   assertThatJson(parsedJson).field("bookName").isEqualTo("foo")
 """</code></pre>
 </div>
 </div>
@@ -6029,6 +6160,7 @@ and:
 <div class="title">Groovy DSL</div>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">			def contractDsl = Contract.make {
+				name "foo"
 				label 'some_label'
 				input {
 					messageFrom('jms:delete')
@@ -6061,19 +6193,48 @@ input:
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''
-// given:
- ContractVerifierMessage inputMessage = contractVerifierMessaging.create(
-	"{\\"bookName\\":\\"foo\\"}"
-, headers()
-	.header("sample", "header"));
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					"""\
+package com.example;
 
-// when:
- contractVerifierMessaging.send(inputMessage, "jms:delete");
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
+import org.junit.Test;
+import org.junit.Rule;
+import javax.inject.Inject;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage;
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging;
 
-// then:
- bookWasDeleted();
-'''</code></pre>
+import static org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat;
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.*;
+import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson;
+import static org.springframework.cloud.contract.verifier.messaging.util.ContractVerifierMessagingUtil.headers;
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.fileToBytes;
+
+public class FooTest {
+\t@Inject ContractVerifierMessaging contractVerifierMessaging;
+\t@Inject ContractVerifierObjectMapper contractVerifierObjectMapper;
+
+\t@Test
+\tpublic void validate_foo() throws Exception {
+\t\t// given:
+\t\t\tContractVerifierMessage inputMessage = contractVerifierMessaging.create(
+\t\t\t\t\t"{\\"bookName\\":\\"foo\\"}"
+\t\t\t\t\t\t, headers()
+\t\t\t\t\t\t\t.header("sample", "header")
+\t\t\t);
+
+\t\t// when:
+\t\t\tcontractVerifierMessaging.send(inputMessage, "jms:delete");
+\t\t\tbookWasDeleted();
+
+\t}
+
+}
+
+"""</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6081,20 +6242,47 @@ input:
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''
-given:
-	 ContractVerifierMessage inputMessage = contractVerifierMessaging.create(
-		\'\'\'{"bookName":"foo"}\'\'\',
-		['sample': 'header']
-	)
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					"""\
+package com.example
 
-when:
-	 contractVerifierMessaging.send(inputMessage, 'jms:delete')
+import org.junit.FixMethodOrder
+import org.junit.runners.MethodSorters
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import spock.lang.Specification
+import javax.inject.Inject
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage
+import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging
 
-then:
-	 noExceptionThrown()
-	 bookWasDeleted()
-'''</code></pre>
+import static org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.*
+import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson
+import static org.springframework.cloud.contract.verifier.messaging.util.ContractVerifierMessagingUtil.headers
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.fileToBytes
+
+class FooSpec extends Specification {
+\t@Inject ContractVerifierMessaging contractVerifierMessaging
+\t@Inject ContractVerifierObjectMapper contractVerifierObjectMapper
+
+\tdef validate_foo() throws Exception {
+\t\tgiven:
+\t\t\tContractVerifierMessage inputMessage = contractVerifierMessaging.create(
+\t\t\t\t\t'''{"bookName":"foo"}'''
+\t\t\t\t\t\t, headers()
+\t\t\t\t\t\t\t.header("sample", "header")
+\t\t\t)
+
+\t\twhen:
+\t\t\tcontractVerifierMessaging.send(inputMessage, "jms:delete")
+\t\t\tbookWasDeleted()
+
+\t\tthen:
+\t\t\tnoExceptionThrown()
+\t}
+
+}
+"""</code></pre>
 </div>
 </div>
 </div>
@@ -10422,6 +10610,7 @@ T anyOf(String... values)</code></pre>
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">Contract contractDsl = Contract.make {
+	name "foo"
 	label 'trigger_event'
 	input {
 		triggeredBy('toString()')
@@ -10521,6 +10710,7 @@ optional parameters only for the following:</p>
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">org.springframework.cloud.contract.spec.Contract.make {
 	priority 1
+	name "optionals"
 	request {
 		method 'POST'
 		url '/users/password'
@@ -10553,22 +10743,44 @@ expression that must be present 0 or more times.</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					"""
- given:
-  def request = given()
-    .header("Content-Type", "application/json")
-    .body('''{"email":"abc@abc.com","callback_url":"https://partners.com"}''')
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					"""\
+package com.example
 
- when:
-  def response = given().spec(request)
-    .post("/users/password")
+import org.junit.FixMethodOrder
+import org.junit.runners.MethodSorters
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import spock.lang.Specification
+import io.restassured.module.mockmvc.specification.MockMvcRequestSpecification
+import io.restassured.response.ResponseOptions
 
- then:
-  response.statusCode == 404
-  response.header('Content-Type')  == 'application/json'
- and:
-  DocumentContext parsedJson = JsonPath.parse(response.body.asString())
-  assertThatJson(parsedJson).field("['code']").matches("(123123)?")
+import static org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.*
+import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson
+import static io.restassured.module.mockmvc.RestAssuredMockMvc.*
+
+class FooSpec extends Specification {
+
+\tdef validate_optionals() throws Exception {
+\t\tgiven:
+\t\t\tMockMvcRequestSpecification request = given()
+\t\t\t\t\t.header("Content-Type", "application/json")
+\t\t\t\t\t.body('''{"email":"abc@abc.com","callback_url":"https://partners.com"}''')
+
+\t\twhen:
+\t\t\tResponseOptions response = given().spec(request)
+\t\t\t\t\t.post("/users/password")
+
+\t\tthen:
+\t\t\tresponse.statusCode() == 404
+\t\t\tresponse.header("Content-Type") == 'application/json'
+
+\t\tand:
+\t\t\tDocumentContext parsedJson = JsonPath.parse(response.body.asString())
+\t\t\tassertThatJson(parsedJson).field("['code']").matches("(123123)?")
+\t}
+
+}
 """</code></pre>
 </div>
 </div>
@@ -10628,27 +10840,7 @@ following code shows an example of the contract portion of the test case:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">org.springframework.cloud.contract.spec.Contract.make {
-	request {
-		method 'PUT'
-		url $(consumer(regex('^/api/[0-9]{2}$')), producer('/api/12'))
-		headers {
-			header 'Content-Type': 'application/json'
-		}
-		body '''\
-			[{
-				"text": "Gonna see you at Warsaw"
-			}]
-		'''
-	}
-	response {
-		body(
-				path: $(consumer('/api/12'), producer(regex('^/api/[0-9]{2}$'))),
-				correlationId: $(consumer('1223456'), producer(execute('isProperCorrelationId($it)')))
-		)
-		status OK()
-	}
-}</code></pre>
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy"></code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -11939,29 +12131,56 @@ content type set. Otherwise, the default of <code>application/octet-stream</code
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					'''
- // when:
-  Response response = webTarget
-    .path("/users")
-    .queryParam("limit", "10")
-    .queryParam("offset", "20")
-    .queryParam("filter", "email")
-    .queryParam("sort", "name")
-    .queryParam("search", "55")
-    .queryParam("age", "99")
-    .queryParam("name", "Denis.Stepanov")
-    .queryParam("email", "bob@email.com")
-    .request()
-    .method("GET");
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					"""\
+package com.example;
 
-  String responseAsString = response.readEntity(String.class);
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
+import org.junit.Test;
+import org.junit.Rule;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.Response;
 
- // then:
-  assertThat(response.getStatus()).isEqualTo(200);
- // and:
-  DocumentContext parsedJson = JsonPath.parse(responseAsString);
-  assertThatJson(parsedJson).field("['property1']").isEqualTo("a");
-'''</code></pre>
+import static org.springframework.cloud.contract.verifier.assertion.SpringCloudContractAssertions.assertThat;
+import static org.springframework.cloud.contract.verifier.util.ContractVerifierUtil.*;
+import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson;
+import static javax.ws.rs.client.Entity.*;
+
+public class FooTest {
+\tWebTarget webTarget;
+
+\t@Test
+\tpublic void validate_() throws Exception {
+
+\t\t// when:
+\t\t\tResponse response = webTarget
+\t\t\t\t\t\t\t.path("/users")
+\t\t\t\t\t\t\t.queryParam("limit", "10")
+\t\t\t\t\t\t\t.queryParam("offset", "20")
+\t\t\t\t\t\t\t.queryParam("filter", "email")
+\t\t\t\t\t\t\t.queryParam("sort", "name")
+\t\t\t\t\t\t\t.queryParam("search", "55")
+\t\t\t\t\t\t\t.queryParam("age", "99")
+\t\t\t\t\t\t\t.queryParam("name", "Denis.Stepanov")
+\t\t\t\t\t\t\t.queryParam("email", "bob@email.com")
+\t\t\t\t\t\t\t.request()
+\t\t\t\t\t\t\t.build("GET")
+\t\t\t\t\t\t\t.invoke();
+\t\t\tString responseAsString = response.readEntity(String.class);
+
+\t\t// then:
+\t\t\tassertThat(response.getStatus()).isEqualTo(200);
+
+\t\t// and:
+\t\t\tDocumentContext parsedJson = JsonPath.parse(responseAsString);
+\t\t\tassertThatJson(parsedJson).field("['property1']").isEqualTo("a");
+\t}
+
+}
+
+"""</code></pre>
 </div>
 </div>
 </div>
@@ -12286,7 +12505,7 @@ and the appropriate <code>MatchingType</code> as second. All the body matchers a
 &lt;/test&gt;"""
 							bodyMatchers {
 								xPath('/test/duck/text()', byRegex("[0-9]{3}"))
-								xPath('/test/duck/text()', byCommand('test($it)'))
+								xPath('/test/duck/text()', byCommand('equals($it)'))
 								xPath('/test/duck/xxx', byNull())
 								xPath('/test/duck/text()', byEquality())
 								xPath('/test/alpha/text()', byRegex(onlyAlphaUnicode()))
@@ -12524,6 +12743,7 @@ parts):</p>
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">					Contract.make {
+				name "foo"
 						label 'some_label'
 						input {
 							messageFrom value(consumer('jms:output'), producer('jms:input'))
@@ -13531,72 +13751,80 @@ following code listing shows the <code>SingleTestGenerator</code> interface:</p>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">package org.springframework.cloud.contract.verifier.builder
+<pre class="highlightjs highlight"><code class="language-groovy hljs" data-lang="groovy">package org.springframework.cloud.contract.verifier.builder;
 
+import java.nio.file.Path;
+import java.util.Collection;
 
-import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
-import org.springframework.cloud.contract.verifier.file.ContractMetadata
+import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties;
+import org.springframework.cloud.contract.verifier.file.ContractMetadata;
 
 /**
  * Builds a single test.
  *
  * @since 1.1.0
  */
-trait SingleTestGenerator {
+public interface SingleTestGenerator {
 
 	/**
-	 * Creates contents of a single test class in which all test scenarios from
-	 * the contract metadata should be placed.
-	 *
+	 * Creates contents of a single test class in which all test scenarios from the
+	 * contract metadata should be placed.
 	 * @param properties - properties passed to the plugin
 	 * @param listOfFiles - list of parsed contracts with additional metadata
 	 * @param className - the name of the generated test class
-	 * @param classPackage - the name of the package in which the test class should be stored
+	 * @param classPackage - the name of the package in which the test class should be
+	 * stored
 	 * @param includedDirectoryRelativePath - relative path to the included directory
 	 * @return contents of a single test class
 	 * @deprecated use{@link SingleTestGenerator#buildClass(ContractVerifierConfigProperties, Collection, String, GeneratedClassData)}
 	 */
 	@Deprecated
-	abstract String buildClass(ContractVerifierConfigProperties properties,
-			Collection&lt;ContractMetadata&gt; listOfFiles, String className, String classPackage, String includedDirectoryRelativePath)
+	String buildClass(ContractVerifierConfigProperties properties,
+			Collection&lt;ContractMetadata&gt; listOfFiles, String className,
+			String classPackage, String includedDirectoryRelativePath);
 
 	/**
-	 * Creates contents of a single test class in which all test scenarios from
-	 * the contract metadata should be placed.
-	 *
+	 * Creates contents of a single test class in which all test scenarios from the
+	 * contract metadata should be placed.
 	 * @param properties - properties passed to the plugin
 	 * @param listOfFiles - list of parsed contracts with additional metadata
 	 * @param generatedClassData - information about the generated class
 	 * @param includedDirectoryRelativePath - relative path to the included directory
 	 * @return contents of a single test class
 	 */
-	String buildClass(ContractVerifierConfigProperties properties,
-			Collection&lt;ContractMetadata&gt; listOfFiles, String includedDirectoryRelativePath, GeneratedClassData generatedClassData) {
-		String className = generatedClassData.className
-		String classPackage = generatedClassData.classPackage
-		String path = includedDirectoryRelativePath
-		return buildClass(properties, listOfFiles, className, classPackage, path)
+	default String buildClass(ContractVerifierConfigProperties properties,
+			Collection&lt;ContractMetadata&gt; listOfFiles,
+			String includedDirectoryRelativePath, GeneratedClassData generatedClassData) {
+		String className = generatedClassData.className;
+		String classPackage = generatedClassData.classPackage;
+		String path = includedDirectoryRelativePath;
+		return buildClass(properties, listOfFiles, className, classPackage, path);
 	}
 
 	/**
-	 * Extension that should be appended to the generated test class. E.g. {@code .java} or {@code .php}
-	 *
+	 * Extension that should be appended to the generated test class. E.g. {@code .java}
+	 * or {@code .php}
 	 * @param properties - properties passed to the plugin
 	 */
-	abstract String fileExtension(ContractVerifierConfigProperties properties)
+	String fileExtension(ContractVerifierConfigProperties properties);
 
-	static class GeneratedClassData {
-		public final String className
-		public final String classPackage
-		public final java.nio.file.Path testClassPath
+	class GeneratedClassData {
 
-		GeneratedClassData(String className, String classPackage,
-				java.nio.file.Path testClassPath) {
-			this.className = className
-			this.classPackage = classPackage
-			this.testClassPath = testClassPath
+		public final String className;
+
+		public final String classPackage;
+
+		public final Path testClassPath;
+
+		public GeneratedClassData(String className, String classPackage,
+				Path testClassPath) {
+			this.className = className;
+			this.classPackage = classPackage;
+			this.testClassPath = testClassPath;
 		}
+
 	}
+
 }</code></pre>
 </div>
 </div>
