Commit Graph

792 Commits

Author SHA1 Message Date
Marcin Grzejszczak
c04b110fe2 Merge branch '3.1.x' 2023-04-26 15:05:50 +02:00
Marcin Grzejszczak
b1f2d1f4a5 Does not include namespaces in body parsing
this PR iterates over child element nodes and checks for namespace attributes

Co-authored-by: @bensonbenny021 (https://github.com/spring-cloud/spring-cloud-contract/pull/1870)

fixes gh-1709
2023-04-26 15:05:40 +02:00
Marcin Grzejszczak
317aa651eb Merge branch '3.1.x' 2023-04-26 14:03:29 +02:00
Marcin Grzejszczak
a2444550d5 Does not do JSON assertions for byte payloads
without this change we're doing json assertions for payload that should read payloads as bytes

this is a workaround around the issues like https://github.com/spring-cloud/spring-cloud-contract/issues/1701 and https://github.com/spring-cloud/spring-cloud-contract/issues/1627 .

The problem is that due to the fact that we accept GString payloads where you can have complex json structures with consumer / producer parts, we are doing recursive analysis of that json structure. We're parsing the keys and values and then we're creating the final Json payload map. The issue is that sometimes the value is actually textual json which we shouldn't parse. We don't know that when the processing happens.

The workaround is about telling the framework to read the payload from a file as bytes and then simple equality check will happen without additional JSON assertions.

We will need to look into some better fixes for that in the future (e.g. 5.0.0).

fixes gh-1627
fixes gh-1701
2023-04-26 14:03:18 +02:00
Marcin Grzejszczak
548555484c Merge branch '3.1.x' 2023-04-26 12:58:31 +02:00
Benedict Roeser
ee52a9f6ae Do not escape quotes in IllegalStateException (#1895)
Now relativePath is logged correctly when resource is null.

fixes #1894
2023-04-26 12:58:07 +02:00
Marcin Grzejszczak
5f14f230d1 Merge branch '3.1.x' 2023-03-09 16:32:44 +01:00
Arseny Feytullaev
77b05b6a16 Fixes gh-1876 (#1877) 2023-03-09 16:06:47 +01:00
Marcin Grzejszczak
07bb994bed Merge branch '3.1.x' 2023-03-02 11:20:04 +01:00
Arseny Feytullaev
622aef7bd2 Fixes gh-1873 (#1874)
Co-authored-by: Фейтуллаев Арсений Валерьевич <avafeytullaev@sberbank.ru>
2023-03-02 11:19:17 +01:00
Marcin Grzejszczak
3f0fd7a004 Fixes java contract runtime compilation; fixes gh-1849 2022-11-21 18:32:32 +01:00
Marcin Grzejszczak
ff7cb6364a Fixed 2022-11-18 22:26:43 +01:00
Marcin Grzejszczak
a5b97e6175 Fixes messaging 2022-11-18 20:11:10 +01:00
Marcin Grzejszczak
65a6c5e95c Trying to fix bean types for messaging 2022-11-18 19:29:31 +01:00
Marcin Grzejszczak
b2809f8d77 NoOpStub messages is typed 2022-11-18 14:46:14 +01:00
Marcin Grzejszczak
1999066c5a Left 1 type of messaging contract - code triggers an output
we're removing 2 additional types of messaging contracts
we're removing any leftovers of rabbit and kafka support - users will need to provide their own message receiver and a message sender
2022-11-15 16:10:44 +01:00
Marcin Grzejszczak
fa51d6a076 Brings back Eureka support, updates samples, removes mocked kafka & rabbit samples 2022-11-15 12:20:56 +01:00
Marcin Grzejszczak
6de10e34df Fixed kafka API 2022-11-03 15:41:19 +01:00
buildmaster
e61ddb8f1c Bumping versions 2022-09-11 14:18:56 +00:00
Marcin Grzejszczak
2d1e2f9d4d Migrated to new autoconfiguration import boot approach (#1811) 2022-08-24 16:39:08 +02:00
Artem Makarov
9db7023ec7 Fix improperly accessed optional values; ServerDslProperty incorrectly wrapped by OptionalProperty (#1809)
Fixes gh-1808
2022-08-19 10:55:35 +02:00
Artem Makarov
c847d1951e Fix improperly accessed optional values; ServerDslProperty incorrectly wrapped by OptionalProperty (#1809)
Fixes gh-1808
2022-08-19 10:54:58 +02:00
Marcin Grzejszczak
52d5de16d4 Merge branch '3.1.x' 2022-07-01 14:21:56 +02:00
Marcin Grzejszczak
414cd9c545 Fixed broken docs 2022-07-01 14:02:32 +02:00
Marcin Grzejszczak
2a2dd92412 Merge branch '3.1.x' 2022-06-20 17:00:51 +02:00
Marcin Grzejszczak
60be47be07 Merge branch '3.0.x' into 3.1.x 2022-06-20 17:00:02 +02:00
Marcin Grzejszczak
a1947ba825 Merge branch '3.1.x' 2022-06-13 10:06:58 +02:00
arseniqueee
95153a0299 Add priority property to converted contract in yaml (#1797)
* Add priority property to converted contract in yaml

* Add test for convert priority property in yaml format

Co-authored-by: Фейтуллаев Арсений Валерьевич <avafeytullaev@sberbank.ru>
2022-06-10 22:44:52 +02:00
Marcin Grzejszczak
488d9adccc Removed the spring cloud function java compiler usage; fixes gh-1782 2022-05-25 12:11:06 +02:00
Marcin Grzejszczak
2a66444afb Uses RA 5.0.2-SNAPSHOT 2022-05-23 11:53:33 +02:00
Marcin Grzejszczak
84d1706933 Fixed compilation issues 2022-05-09 15:06:13 +02:00
buildmaster
b77ae2ca3e Bumping versions 2022-05-06 00:23:05 +00:00
Marcin Grzejszczak
44c37d5a4d Fixed samples 2022-05-05 15:42:09 +02:00
Marcin Grzejszczak
109ec516c2 Fixed broken tests 2022-05-05 14:24:31 +02:00
Maciej Zieliński
a71bad4d9a #1778 properly resole query parameters for url and urlPath property in YAML files (#1780)
Co-authored-by: maciezie <maciej.zielinski@idemia.com>
2022-05-05 10:49:44 +02:00
Maciej Zieliński
1304ccab0b #1778 properly resole query parameters for url and urlPath property in YAML files (#1780)
Co-authored-by: maciezie <maciej.zielinski@idemia.com>
2022-05-05 10:46:49 +02:00
Marcin Grzejszczak
251d4feb4d Fixed checkstyle 2022-05-04 14:47:17 +02:00
Marcin Grzejszczak
adc513b45b Bumped RestAssured to 6.0.0 2022-05-04 14:35:24 +02:00
Marcin Grzejszczak
1d8f2a5336 Merge branch '3.1.x' 2022-03-25 15:31:39 +01:00
Adrian E. Hjertstedt
ce03ee008b Harden detection of InaccessibleObjectException in MetadataUtil (#1766)
The immediate cause under JDK16+ is not always InaccessibleObjectException
meaning the fallback logic to copy properties does not kick in.

Additional logic is needed to harden the detection of the InaccessibleObjectException
to ensure it is catered for in the fallback logic.

Co-authored-by: Adrian Hjertstedt <adrian@adrianhj.com>
2022-03-25 15:30:25 +01:00
Marcin Grzejszczak
145cf4dd9e Upgraded Groovy to 4 and Rest Assured to 5 2022-03-25 13:29:45 +01:00
Koki Igarashi
9980eb0e9d fix #1656: Add missing support for JSON values inside arrays in WireMockStub (#1764)
Fixes #1656.
Currently, numbers, booleans and null inside arrays are double-quoted
when converting dsl into stub, which results in generating incorrect
json stubs for WireMock. This commit fixes it.
2022-03-24 14:53:47 +01:00
Koki Igarashi
5b7fef0f74 fix #1667: Add missing multipart support in Spock (#1763)
Currently, the multipart support for EXPLICIT and WEBCLIENTTEST
modes in Spock is missing. This commit adds the support.

Fixes #1667
2022-03-23 16:49:28 +01:00
spencergibb
21a60b8f0d Updates to use new TestSocketUtils from spring-cloud-test-support 2022-03-11 13:27:45 -05:00
spencergibb
792ad2e096 Ignores failing test.
See gh-1754
2022-02-25 14:02:13 -05:00
spencergibb
25b59cea56 Ignores failing test.
See gh-1754
2022-02-23 17:30:15 -05:00
spencergibb
173f4c4caa formatting 2022-01-26 16:44:43 -05:00
spencergibb
0b136e3783 Changes class to use to check presence of Spring Cloud Stream 2022-01-20 13:14:07 -05:00
Marcin Grzejszczak
1bedfd188e Makes the code compile 2022-01-18 10:38:46 +01:00
Marcin Grzejszczak
c3ce9f6326 Ignores 2 tests on jdk17 2021-11-29 10:02:34 +01:00