Bumped JSON Assert to 0.2.1

- changed groupid
- changed code packages
- found a bug in jsonassert that was fixed in 0.2.1
- updated JSONPath to 2.2.0

fixes #200

accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy

@@ -15,8 +15,8 @@ import static io.codearte.accurest.util.NamesUtil.capitalize
 @Slf4j
 class SingleTestGenerator {
 
-	private static final String JSON_ASSERT_STATIC_IMPORT = 'com.blogspot.toomuchcoding.jsonassert.JsonAssertion.assertThatJson'
-	private static final String JSON_ASSERT_CLASS = 'com.blogspot.toomuchcoding.jsonassert.JsonAssertion'
+	private static final String JSON_ASSERT_STATIC_IMPORT = 'com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson'
+	private static final String JSON_ASSERT_CLASS = 'com.toomuchcoding.jsonassert.JsonAssertion'
 
 	private final AccurestConfigProperties configProperties
 

accurest-core/src/main/groovy/io/codearte/accurest/config/AccurestConfigProperties.groovy

@@ -35,7 +35,7 @@ class AccurestConfigProperties {
 	String ruleClassForTests
 
 	/**
-	 * Which version of JSON Assert (com.blogspot.toomuchcoding:jsonassert) to use
+	 * Which version of JSON Assert (com.toomuchcoding.jsonassert:jsonassert) to use
 	 */
 	String jsonAssertVersion = "+"
 

accurest-core/src/main/groovy/io/codearte/accurest/dsl/WireMockRequestStubStrategy.groovy

@@ -68,7 +68,7 @@ class WireMockRequestStubStrategy extends BaseWireMockStubStrategy {
 				requestPattern.bodyPatterns = [new ValuePattern(jsonCompareMode: org.skyscreamer.jsonassert.JSONCompareMode.LENIENT,
 						equalToJson: JsonOutput.toJson(getMatchingStrategy(request.body.clientValue).clientValue) ) ]
 			} else {
-				requestPattern.bodyPatterns = values.collect { new ValuePattern(matchesJsonPath: it.jsonPath()) } ?: null
+				requestPattern.bodyPatterns = values.collect { new ValuePattern(matchesJsonPath: it.jsonPath().replace("\\\\", "\\")) } ?: null
 			}
 		} else if (contentType == ContentType.XML) {
 			requestPattern.bodyPatterns = [new ValuePattern(equalToXml: getMatchingStrategy(request.body.clientValue).clientValue.toString())]

accurest-core/src/main/groovy/io/codearte/accurest/util/DelegatingJsonVerifiable.java

@@ -1,6 +1,6 @@
 package io.codearte.accurest.util;
 
-import com.blogspot.toomuchcoding.jsonassert.JsonVerifiable;
+import com.toomuchcoding.jsonassert.JsonVerifiable;
 
 import static org.apache.commons.lang3.StringEscapeUtils.escapeJava;
 

accurest-core/src/main/groovy/io/codearte/accurest/util/FinishedDelegatingJsonVerifiable.java

@@ -1,6 +1,6 @@
 package io.codearte.accurest.util;
 
-import com.blogspot.toomuchcoding.jsonassert.JsonVerifiable;
+import com.toomuchcoding.jsonassert.JsonVerifiable;
 
 /**
  * @author Marcin Grzejszczak

accurest-core/src/main/groovy/io/codearte/accurest/util/JsonToJsonPathsConverter.groovy

@@ -1,6 +1,6 @@
 package io.codearte.accurest.util
 
-import com.blogspot.toomuchcoding.jsonassert.JsonAssertion
+import com.toomuchcoding.jsonassert.JsonAssertion
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import io.codearte.accurest.dsl.internal.ExecutionProperty

accurest-core/src/main/groovy/io/codearte/accurest/util/MethodBufferingJsonVerifiable.java

@@ -1,6 +1,6 @@
 package io.codearte.accurest.util;
 
-import com.blogspot.toomuchcoding.jsonassert.JsonVerifiable;
+import com.toomuchcoding.jsonassert.JsonVerifiable;
 
 /**
  * @author Marcin Grzejszczak

accurest-core/src/test/groovy/io/codearte/accurest/SingleTestGeneratorSpec.groovy

@@ -19,13 +19,13 @@ class SingleTestGeneratorSpec extends Specification {
 
 	static List<String> jUnitClassStrings = ['package test;', 'import com.jayway.jsonpath.DocumentContext;', 'import com.jayway.jsonpath.JsonPath;',
 	                                         'import org.junit.FixMethodOrder;', 'import org.junit.Ignore;', 'import org.junit.Test;', 'import org.junit.runners.MethodSorters;',
-	                                         'import static com.blogspot.toomuchcoding.jsonassert.JsonAssertion.assertThatJson;', 'import static com.jayway.restassured.module.mockmvc.RestAssuredMockMvc.*;',
+	                                         'import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson;', 'import static com.jayway.restassured.module.mockmvc.RestAssuredMockMvc.*;',
 	                                         '@FixMethodOrder(MethodSorters.NAME_ASCENDING)', '@Test', '@Ignore', 'mport com.jayway.restassured.module.mockmvc.specification.MockMvcRequestSpecification;',
 																						'import com.jayway.restassured.response.ResponseOptions;', 'import static org.assertj.core.api.Assertions.assertThat;']
 
 	static List<String> spockClassStrings = ['package test', 'import com.jayway.jsonpath.DocumentContext', 'import com.jayway.jsonpath.JsonPath',
 	                                         'import spock.lang.Ignore', 'import spock.lang.Specification', 'import spock.lang.Stepwise',
-	                                         'import static com.blogspot.toomuchcoding.jsonassert.JsonAssertion.assertThatJson', 'import static com.jayway.restassured.module.mockmvc.RestAssuredMockMvc.*',
+	                                         'import static com.toomuchcoding.jsonassert.JsonAssertion.assertThatJson', 'import static com.jayway.restassured.module.mockmvc.RestAssuredMockMvc.*',
 	                                         '@Stepwise', '@Ignore']
 
 	def setup() {

accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy

@@ -29,7 +29,7 @@ class AccurestGradlePlugin implements Plugin<Project> {
 		createAndConfigureGenerateWireMockClientStubsFromDslTask(extension)
 		deprecatedCreateAndConfigureGenerateWiremockClientStubsFromDslTask()
 		project.dependencies.add("testCompile", "com.github.tomakehurst:wiremock:2.0.5-beta")
-		project.dependencies.add("testCompile", "com.blogspot.toomuchcoding:jsonassert:${extension.getJsonAssertVersion()}")
+		project.dependencies.add("testCompile", "com.toomuchcoding.jsonassert:jsonassert:${extension.getJsonAssertVersion()}")
 		project.dependencies.add("testCompile", "org.assertj:assertj-core:2.3.0")
 
 		project.afterEvaluate {

accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle

@@ -37,7 +37,7 @@ dependencies {
 	compile "org.springframework:spring-context-support:$springVersion"
 	compile "org.codehaus.groovy:groovy-all:2.4.5"
 	compile 'com.fasterxml.jackson.core:jackson-databind:2.4.4'
-	compile 'com.jayway.jsonpath:json-path-assert:2.0.0'
+	compile 'com.jayway.jsonpath:json-path-assert:2.2.0'
 
 	testCompile "com.github.tomakehurst:wiremock:2.0.5-beta"
 	testCompile "org.spockframework:spock-spring:1.0-groovy-2.4"

build.gradle

@@ -72,7 +72,7 @@ project(':accurest-core') {
 		compile 'com.fasterxml.jackson.core:jackson-databind:2.4.5'
 		compile 'asm:asm:3.3.1'
 		compile "com.github.tomakehurst:wiremock:$wiremockVersion"
-		compile "com.blogspot.toomuchcoding:jsonassert:$jsonassertVersion"
+		compile "com.toomuchcoding.jsonassert:jsonassert:$jsonassertVersion"
 		compile 'org.assertj:assertj-core:2.3.0'
 		testCompile 'cglib:cglib-nodep:2.2'
 		testCompile 'org.objenesis:objenesis:2.1'

gradle.properties

@@ -2,4 +2,4 @@ nexusUsername =
 nexusPassword =
 
 wiremockVersion = 2.0.5-beta
-jsonassertVersion = 0.1.2
+jsonassertVersion = 0.2.1