#71 solved null pointer exception (#72)

* #71 solved null pointer exception * #71 fixed test refs * #71 changed greetings yml * #71 changed greetings workflow
sngular · Oct 6, 2022 · b2b785b · b2b785b
1 parent c05b018
commit b2b785b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -35,7 +35,7 @@ After you have these installed, you need to add the Spring Cloud Contract Maven
     <dependency>
       <groupId>net.coru</groupId>
       <artifactId>scc-multiapi-converter</artifactId>
-      <version>2.7.1</version>
+      <version>3.0.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>net.coru</groupId>
   <artifactId>scc-multiapi-converter</artifactId>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <name>SCC-MultiApi-Converter</name>
   <description>Generates Spring Cloud Contracts based on an OpenApi and AsyncApi document</description>
   <url>https://github.com/corunet/scc-multiapi-converter</url>

diff --git 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<Object, BodyMatchers> 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
@@ -205,6 +205,7 @@ void testRef() {
     assertThat(contract).isNotNull();
     assertThat(contract.getRequest()).isNotNull();
     assertThat(contract.getResponse()).isNotNull();
+    assertThat(contract.getResponse().getBodyMatchers()).isNotNull();
     Map<String, Object> bodyServerValueMap = (Map<String, Object>) 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
@@ -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";