fix: Improve detection of self-refence properties and properly stop g…

…eneration after --selfReferenceDepth
Endava · Sep 17, 2024 · f937248 · f937248
1 parent 40568cd
commit f937248
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/endava/cats/model/generator/OpenAPIModelGenerator.java b/src/main/java/com/endava/cats/model/generator/OpenAPIModelGenerator.java
@@ -194,10 +194,16 @@ <T> Object formatExampleIfNeeded(Schema<T> property) {
 
     private Object resolveProperties(Schema<?> schema) {
         if (schema.getProperties() != null) {
+            String previousPropertyValue = currentProperty;
+
             Map<String, Object> result = new HashMap<>();
             for (Map.Entry<String, Schema> property : schema.getProperties().entrySet()) {
+                currentProperty = StringUtils.isBlank(previousPropertyValue) ? String.valueOf(property.getKey()) : previousPropertyValue + "#" + property.getKey();
                 result.put(property.getKey(), this.resolvePropertyToExample(property.getKey(), property.getValue()));
             }
+
+            currentProperty = previousPropertyValue;
+            schema.setExample(result);
             return result;
         }
         return schema.getExample();

diff --git a/src/test/java/com/endava/cats/factory/FuzzingDataFactoryTest.java b/src/test/java/com/endava/cats/factory/FuzzingDataFactoryTest.java
@@ -541,7 +541,7 @@ void shouldFilterDeprecatedOperations() throws Exception {
 
     @Test
     void shouldAvoidCyclicDependenciesOnAdditionalProperties() throws Exception {
-        Mockito.when(processingArguments.getSelfReferenceDepth()).thenReturn(5);
+        Mockito.when(processingArguments.getSelfReferenceDepth()).thenReturn(6);
         Mockito.when(processingArguments.getDefaultContentType()).thenReturn("application/json");
 
         List<FuzzingData> dataList = setupFuzzingData("/containers", "src/test/resources/petstore.yml");
@@ -551,8 +551,8 @@ void shouldAvoidCyclicDependenciesOnAdditionalProperties() throws Exception {
         Object existing = JsonUtils.getVariableFromJson(payload, "$.containers#key#containers#key#containers#key#containers#key#containers#key#containers#key");
         Object nonExisting = JsonUtils.getVariableFromJson(payload, "$.containers#key#containers#key#containers#key#containers#key#containers#key#containers#key#containers");
 
-        Assertions.assertThat(existing).doesNotHaveToString("{}");
-        Assertions.assertThat(nonExisting).hasToString("{}");
+        Assertions.assertThat(existing).hasToString("{}");
+        Assertions.assertThat(nonExisting).hasToString("NOT_SET");
     }
 
     @Test