Commit Graph

2863 Commits

Author SHA1 Message Date
Marcin Grzejszczak
869e644740 Fixed resolution of content type when working with WireMock stubs 2019-07-09 17:48:08 +02:00
Marcin Grzejszczak
7f351f8b80 Fixed support for line indentations and line endings 2019-07-09 17:47:43 +02:00
Marcin Grzejszczak
f48895c189 Added back support for interacting with a running broker via stub runner 2019-07-09 17:46:51 +02:00
Marcin Grzejszczak
ce4140a9ff Bumped boot to 2.2.0.M4 2019-07-09 10:10:37 +02:00
Marcin Grzejszczak
d99d9e12f3 Merge branch '2.1.x' 2019-07-08 17:50:03 +02:00
Marcin Grzejszczak
a1f308b0cf Fixed unnecessary file renaming for scenarios when converting to yaml; fixes gh-1132 2019-07-08 17:06:24 +02:00
Marcin Grzejszczak
89c213f593 Convert to yaml will use query params; fixes gh-1086 2019-07-08 16:34:29 +02:00
Marcin Grzejszczak
93c520ba0f Merge branch '2.1.x' 2019-07-08 15:48:30 +02:00
Marcin Grzejszczak
ba95b57f94 Added a guard for versions without a dot; fixes gh-1115 2019-07-08 15:48:21 +02:00
Marcin Grzejszczak
bdc69c2523 Merge branch '2.1.x' 2019-07-08 15:39:40 +02:00
Marcin Grzejszczak
03ce42294c Ensures that execute(...) is resolved properly for YAML conversion; fixes gh-1129 2019-07-08 15:38:56 +02:00
Marcin Grzejszczak
6b9e377487 Rewriting to java (#1131)
* Rewritting to java

- rewritten a lot of Spring Cloud Contract Spec module to Java
- extracted all Groovy stuff to a separate package
- will now continue writing extension modules
- spring-cloud-contract-spec will be written purely in java
- spring-cloud-contract-spec-groovy will have Groovy extensions

fixes gh-1130
2019-07-08 14:15:21 +02:00
Marcin Grzejszczak
1e11e99dac Bumped Gradle 5.5 in the docker image 2019-07-05 10:20:41 +02:00
Spencer Gibb
7f3f37c5cb Revert "Temporarily remove guides module"
This reverts commit 96469906
2019-07-03 16:40:48 -04:00
buildmaster
1d56bdd1d7 Going back to snapshots 2019-07-03 20:38:29 +00:00
buildmaster
880c7bdb54 Update SNAPSHOT to 2.2.0.M1 2019-07-03 20:31:51 +00:00
Spencer Gibb
96469906cc Temporarily remove guides module 2019-07-03 16:17:09 -04:00
Marcin Grzejszczak
78e3c08c32 Bumps Groovy to 2.5.7 and Gradle to 5.5; fixes gh-1046 2019-07-03 10:42:28 +02:00
Marcin Grzejszczak
b48dd4905f Upgraded Rest Assured to 4.0.0; fixes gh-1122 2019-07-02 14:50:20 +02:00
Marcin Grzejszczak
59d3f0d075 Fixed the broken build 2019-07-01 18:31:33 +02:00
Marcin Grzejszczak
b18445ff3f Converted to java 2019-07-01 16:03:22 +02:00
Marcin Grzejszczak
93f2044ef6 Converted to java 2019-07-01 15:48:52 +02:00
Marcin Grzejszczak
8f0db8ffe2 Merge branch 'custom_stubs_classifier' of https://github.com/Dominick1993/spring-cloud-contract into Dominick1993-custom_stubs_classifier 2019-07-01 13:58:22 +02:00
Marcin Grzejszczak
783a7a67bf Upgraded Gradle to 5.5; fixes gh-1124 2019-07-01 13:56:25 +02:00
Marcin Grzejszczak
58f318437c Downgrading autoamaton 2019-07-01 12:50:36 +02:00
Marcin Grzejszczak
ec68535ddd Bumped automaton to 1.12-1 2019-07-01 12:43:00 +02:00
Marcin Grzejszczak
c5c44a57f7 Bumped libs
fixes gh-1123
fixes gh-1121
fixes gh-1120
fixes gh-1119
2019-07-01 10:57:17 +02:00
Marcin Grzejszczak
a18df67ae8 Added suppresswarnings for all generated tests; fixes gh-1074 2019-07-01 10:49:27 +02:00
Spencer Gibb
8949bae485 Moves back to StaticContext from NoContext
NoContext doesn't exist.
2019-06-28 14:51:10 -04:00
Marcin Grzejszczak
d739efc50b Bumped pact to 3.6.7; fixes gh-1099 2019-06-28 17:17:32 +02:00
Marcin Grzejszczak
9c9b19b388 Bumped moco; fixes gh-1117 2019-06-28 14:58:16 +02:00
Marcin Grzejszczak
ebd8555a88 Bumped groovy to 2.4.17; fixes gh-1096 2019-06-28 14:58:16 +02:00
Marcin Grzejszczak
b6cefd6a5e Bumped jgit to 5.3.1; fixes gh-1097 2019-06-28 14:57:59 +02:00
Marcin Grzejszczak
5037f5222b Bumped activemq to 5.15.9; fixes gh-1089 2019-06-28 14:57:59 +02:00
Marcin Grzejszczak
1f249cd840 Bumped Camel to 2.24.0; fixes gh-1090 2019-06-28 14:57:59 +02:00
Marcin Grzejszczak
8fcb454415 Bumped moco; fixes gh-1117 2019-06-28 14:39:29 +02:00
Marcin Grzejszczak
ebd3037d67 Bumped groovy to 2.4.17; fixes gh-1096 2019-06-28 14:25:41 +02:00
Marcin Grzejszczak
e0303fcec6 Bumped jgit to 5.3.1; fixes gh-1097 2019-06-28 14:24:58 +02:00
Marcin Grzejszczak
0dbb331a1c Bumped activemq to 5.15.9; fixes gh-1089 2019-06-28 14:08:32 +02:00
Marcin Grzejszczak
167a5dbc17 Bumped Camel to 2.24.0; fixes gh-1090 2019-06-28 13:51:42 +02:00
Marcin Grzejszczak
ad0cba8bec Merge branch '2.1.x' 2019-06-28 13:24:59 +02:00
Marcin Grzejszczak
92076e9cce Publishing to gradle plugins portal for central profile; fixes gh-1114 2019-06-28 13:24:44 +02:00
Olga Maciaszek-Sharma
9ab4a83cd8 Fix failing test. Remove unused assignment. 2019-06-28 11:27:57 +02:00
Marcin Grzejszczak
e792670c7b Fixing wrong json imports 2019-06-28 09:36:43 +02:00
Marcin Grzejszczak
972a50265f Refactored class and method generation (#1116)
following two event storming sessions with @pilloPl and @OlgaMaciaszek and the Spring Cloud Contract community we've decided to refactor the core modules of Spring Cloud Contract Verifier.

The main idea is that the current `JavaTestGenerator`'s implementation no longer uses complex logic to generate classes and methods.

We've introduced abstractions such as:

-    class body builder (to build classes)
-    groovy and java class metadata
-    imports (for various frameworks)
-    default setup for json, xml, restassured, jaxrs
-    class annotations for spock, junit and junit5
-    field insertion e.g. for messaging
2019-06-27 23:01:37 +02:00
Olga Maciaszek-Sharma
954ddfb3d5 Merge branch '2.1.x'
# Conflicts:
#	docker/pom.xml
#	docker/spring-cloud-contract-docker/pom.xml
#	docker/spring-cloud-contract-docker/project/gradle.properties
#	docker/spring-cloud-contract-stub-runner-docker/pom.xml
#	docs/pom.xml
#	pom.xml
#	samples/pom.xml
#	samples/standalone/contracts/com/example/server/pom.xml
#	samples/standalone/dsl/http-client/pom.xml
#	samples/standalone/dsl/http-server/gradle.properties
#	samples/standalone/dsl/http-server/pom.xml
#	samples/standalone/dsl/pom.xml
#	samples/standalone/messaging/pom.xml
#	samples/standalone/messaging/stream-sink/gradle.properties
#	samples/standalone/messaging/stream-sink/pom.xml
#	samples/standalone/messaging/stream-source/gradle.properties
#	samples/standalone/messaging/stream-source/pom.xml
#	samples/standalone/pact/pact-http-client/pom.xml
#	samples/standalone/pact/pact-http-server/gradle.properties
#	samples/standalone/pact/pact-http-server/pom.xml
#	samples/standalone/pact/pom.xml
#	samples/standalone/pom.xml
#	samples/standalone/restdocs/http-client/gradle.properties
#	samples/standalone/restdocs/http-client/pom.xml
#	samples/standalone/restdocs/http-server/gradle.properties
#	samples/standalone/restdocs/http-server/pom.xml
#	samples/standalone/restdocs/pom.xml
#	samples/standalone/webclient/http-client/gradle.properties
#	samples/standalone/webclient/http-client/pom.xml
#	samples/standalone/webclient/http-server/gradle.properties
#	samples/standalone/webclient/http-server/pom.xml
#	samples/standalone/webclient/pom.xml
#	samples/standalone/yml/http-client/pom.xml
#	samples/standalone/yml/http-server/gradle.properties
#	samples/standalone/yml/http-server/pom.xml
#	samples/standalone/yml/pom.xml
#	samples/wiremock-jetty/pom.xml
#	samples/wiremock-native/pom.xml
#	samples/wiremock-tomcat/pom.xml
#	samples/wiremock-undertow-ssl/pom.xml
#	samples/wiremock-undertow/pom.xml
#	samples/wiremock/pom.xml
#	spring-cloud-contract-dependencies/pom.xml
#	spring-cloud-contract-shade/pom.xml
#	spring-cloud-contract-spec/pom.xml
#	spring-cloud-contract-starters/pom.xml
#	spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml
#	spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml
#	spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
#	spring-cloud-contract-stub-runner-boot/pom.xml
#	spring-cloud-contract-stub-runner/pom.xml
#	spring-cloud-contract-tools/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml
#	spring-cloud-contract-verifier/pom.xml
#	spring-cloud-contract-wiremock/pom.xml
#	tests/pom.xml
#	tests/samples-messaging-amqp/pom.xml
#	tests/samples-messaging-camel/pom.xml
#	tests/samples-messaging-integration/pom.xml
#	tests/samples-messaging-stream/pom.xml
#	tests/spring-cloud-contract-stub-runner-amqp/pom.xml
#	tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml
#	tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml
#	tests/spring-cloud-contract-stub-runner-camel/pom.xml
#	tests/spring-cloud-contract-stub-runner-context-path/pom.xml
#	tests/spring-cloud-contract-stub-runner-integration/pom.xml
#	tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml
#	tests/spring-cloud-contract-stub-runner-moco/pom.xml
#	tests/spring-cloud-contract-stub-runner-stream/pom.xml
2019-06-27 15:26:56 +02:00
Artem Ptushkin
de70cd1ef6 Matching strategy at body and contentType issue (#1113)
* Created test for equalToXml and bodyMatchers with xml content type - Failed

* Fixed equalToXml at stub for the equalToXml body and xml content type

* Fixed equalToJson at stub for the equalToJson body and explicit json content type.
If body has matching strategy then it has be used for stub generation.
2019-06-27 15:00:56 +02:00
Spencer Gibb
8de9c96abf Bumps spring cloud build to 2.1.7.BUILD-SNAPSHOT
Also other spring deps
2019-06-21 12:57:38 -04:00
buildmaster
c9af98eccd Bumping versions to 2.1.3.BUILD-SNAPSHOT after release 2019-06-21 11:25:33 +00:00
buildmaster
d13773adc8 Going back to snapshots 2019-06-21 11:25:32 +00:00