Fix set a recursive object (#1079)

naver · Nov 11, 2024 · f610f6d · f610f6d
1 parent b16f316
commit f610f6d
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 1 deletion.
diff --git a/docs/content/v1.1.x-kor/release-notes/_index.md b/docs/content/v1.1.x-kor/release-notes/_index.md
@@ -5,6 +5,12 @@ menu:
 docs:
 weight: 100
 ---
+sectionStart
+## v.1.1.1
+Fix set a recursive object
+
+sectionEnd
+
 sectionStart
 ## v.1.0.28
 Add support for `hashCode`, `equals`, `toString` in anonymous object

diff --git a/docs/content/v1.1.x/release-notes/_index.md b/docs/content/v1.1.x/release-notes/_index.md
@@ -5,6 +5,12 @@ menu:
 docs:
 weight: 100
 ---
+sectionStart
+## v.1.1.1
+Fix set a recursive object
+
+sectionEnd
+
 sectionStart
 ## v.1.0.28
 Add support for `hashCode`, `equals`, `toString` in anonymous object

diff --git a/...onkey-tests/java-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/JavaTest.java b/...onkey-tests/java-tests/src/test/java/com/navercorp/fixturemonkey/tests/java/JavaTest.java
@@ -774,6 +774,18 @@ void setNestedSelfRecursiveObjectList() {
 		then(actual).isEqualTo(expected);
 	}
 
+	@RepeatedTest(TEST_COUNT)
+	void setSelfRecursiveObject() {
+		SelfRecursiveObject actual = SUT.giveMeOne(SelfRecursiveObject.class);
+
+		SelfRecursiveObject expected = SUT.giveMeBuilder(SelfRecursiveObject.class)
+			.set("selfRecursiveObject", actual)
+			.sample()
+			.getSelfRecursiveObject();
+
+		then(actual).isEqualTo(expected);
+	}
+
 	@RepeatedTest(TEST_COUNT)
 	void thenApplyAndSizeMap() {
 		Map<String, String> actual = SUT.giveMeBuilder(new TypeReference<Map<String, Map<String, String>>>() {

diff --git a/...c/main/java/com/navercorp/fixturemonkey/customizer/NodeSetDecomposedValueManipulator.java b/...c/main/java/com/navercorp/fixturemonkey/customizer/NodeSetDecomposedValueManipulator.java
@@ -160,7 +160,7 @@ private void setValue(ObjectNode objectNode, @Nullable Object value) {
 					objectNode.setResolvedTypeDefinition(typeDefinition);
 				}
 
-				objectNode.expand(typeDefinition);
+				objectNode.forceExpand(typeDefinition);
 				for (ObjectNode child : objectNode.getChildren()) {
 					if (!typeDefinition.equals(child.getParent().getResolvedTypeDefinition())) {
 						continue;

diff --git a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/tree/ObjectNode.java b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/tree/ObjectNode.java
@@ -358,6 +358,28 @@ public void forceExpand() {
 		this.expandedTypeDefinition = resolvedTypeDefinition;
 	}
 
+	public void forceExpand(TypeDefinition typeDefinition) {
+		List<ObjectNode> newChildren;
+		if (this.getTreeProperty().isContainer()) {
+			newChildren = expandContainerNode(
+				typeDefinition,
+				this.traverseContext.withoutRecursiveTreeProperties()
+			)
+				.collect(Collectors.toList());
+		} else {
+			newChildren = this.generateChildrenNodes(
+				typeDefinition.getResolvedProperty(),
+				typeDefinition.getPropertyGenerator()
+					.generateChildProperties(typeDefinition.getResolvedProperty()),
+				this.nullInject,
+				this.traverseContext.withoutRecursiveTreeProperties()
+			);
+		}
+
+		this.setChildren(newChildren);
+		this.expandedTypeDefinition = resolvedTypeDefinition;
+	}
+
 	private Stream<ObjectNode> expandContainerNode(TypeDefinition typeDefinition, TraverseContext traverseContext) {
 		ContainerInfoManipulator appliedContainerInfoManipulator =
 			this.getAppliedContainerInfoManipulator();