diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index b27abd9..c519d53 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -7,6 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/first-interaction@v1 + continue-on-error: true with: repo-token: ${{ secrets.GITHUB_TOKEN }} issue-message: "Thank you for collaborating with the project by giving us feedback!!" diff --git a/README.md b/README.md index bbe5cbb..b6d4388 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ After you have these installed, you need to add the Spring Cloud Contract Maven net.coru scc-multiapi-converter - 2.7.1 + 3.0.1 compile diff --git a/pom.xml b/pom.xml index 0d9b0e0..8d41382 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.coru scc-multiapi-converter - 3.0.0 + 3.0.1 SCC-MultiApi-Converter Generates Spring Cloud Contracts based on an OpenApi and AsyncApi document https://github.com/corunet/scc-multiapi-converter diff --git a/src/main/java/net/coru/multiapi/converter/openapi/OpenApiContractConverter.java b/src/main/java/net/coru/multiapi/converter/openapi/OpenApiContractConverter.java index 4466342..e3c227d 100644 --- a/src/main/java/net/coru/multiapi/converter/openapi/OpenApiContractConverter.java +++ b/src/main/java/net/coru/multiapi/converter/openapi/OpenApiContractConverter.java @@ -668,7 +668,7 @@ private Pair processComplexBodyAndMatchers(final String ob } else { final String type; type = getPropertyType(property); - final var prop = writeBodyMatcher(property, newObjectName, null, type); + final var prop = writeBodyMatcher(property, newObjectName, property.getValue(), type); propertyMap.put(property.getKey(), prop.getLeft()); bodyMatchers.matchers().addAll(prop.getRight().matchers()); } diff --git a/src/test/java/net/coru/multiapi/converter/openapi/OpenApiContractConverterTest.java b/src/test/java/net/coru/multiapi/converter/openapi/OpenApiContractConverterTest.java index d2a1b1a..ec6939d 100644 --- a/src/test/java/net/coru/multiapi/converter/openapi/OpenApiContractConverterTest.java +++ b/src/test/java/net/coru/multiapi/converter/openapi/OpenApiContractConverterTest.java @@ -205,6 +205,7 @@ void testRef() { assertThat(contract).isNotNull(); assertThat(contract.getRequest()).isNotNull(); assertThat(contract.getResponse()).isNotNull(); + assertThat(contract.getResponse().getBodyMatchers()).isNotNull(); Map bodyServerValueMap = (Map) contract.getResponse().getBody().getServerValue(); assertThat(bodyServerValueMap) .containsKey("player"); diff --git a/src/test/java/net/coru/multiapi/converter/openapi/OpenApiContractConverterTestFixtures.java b/src/test/java/net/coru/multiapi/converter/openapi/OpenApiContractConverterTestFixtures.java index 463faaf..a5ac120 100644 --- a/src/test/java/net/coru/multiapi/converter/openapi/OpenApiContractConverterTestFixtures.java +++ b/src/test/java/net/coru/multiapi/converter/openapi/OpenApiContractConverterTestFixtures.java @@ -82,6 +82,8 @@ public final class OpenApiContractConverterTestFixtures { static final String OPENAPI_TEST_SCHEMA_EXAMPLES_YML = "src/test/resources/openapi/testExamplesGlobal.yml"; + static final String OPENAPI_TEST_GENERATE_TESTS_YML = "src/test/resourcer/openapi/testGenerateTest.yml"; + static final String OPENAPI_TEST_SCHEMA_MULTI_EXAMPLES_YML = "src/test/resources/openapi/testMultiExamplesGlobal.yml"; static final String OPENAPI_TEST_SCHEMA_MAPS_YML = "src/test/resources/openapi/testSupportMaps.yml";