Add customizeProperty API as maintained

naver · Sep 11, 2024 · 19a9d4b · 19a9d4b
1 parent 9295cc3
commit 19a9d4b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/...nkey-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyExtensions.kt b/...nkey-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyExtensions.kt
@@ -20,6 +20,8 @@ package com.navercorp.fixturemonkey.kotlin
 
 import com.navercorp.fixturemonkey.ArbitraryBuilder
 import com.navercorp.fixturemonkey.FixtureMonkey
+import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary
+import com.navercorp.fixturemonkey.api.experimental.TypedPropertySelector
 import com.navercorp.fixturemonkey.api.instantiator.Instantiator
 import com.navercorp.fixturemonkey.api.property.PropertySelector
 import com.navercorp.fixturemonkey.api.type.TypeReference
@@ -229,6 +231,11 @@ class KotlinTypeDefaultArbitraryBuilder<T>(
     ): KotlinTypeDefaultArbitraryBuilder<T> =
         this.apply { delegate.instantiate(type, instantiator) }
 
+    override fun <U : Any?> customizeProperty(
+        propertySelector: TypedPropertySelector<U>,
+        combinableArbitraryCustomizer: Function<CombinableArbitrary<out U>, CombinableArbitrary<out U>>
+    ): ArbitraryBuilder<T> = this.apply { delegate.customizeProperty(propertySelector, combinableArbitraryCustomizer) }
+
     override fun build(): Arbitrary<T> = delegate.build()
 
     override fun sample(): T = delegate.sample()

diff --git a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/ArbitraryBuilder.java b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/ArbitraryBuilder.java
@@ -36,6 +36,8 @@
 import net.jqwik.api.Combinators.F3;
 import net.jqwik.api.Combinators.F4;
 
+import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary;
+import com.navercorp.fixturemonkey.api.experimental.TypedPropertySelector;
 import com.navercorp.fixturemonkey.api.instantiator.Instantiator;
 import com.navercorp.fixturemonkey.api.property.PropertySelector;
 import com.navercorp.fixturemonkey.api.type.TypeReference;
@@ -554,4 +556,22 @@ <R> ArbitraryBuilder<R> zipWith(
 	ArbitraryBuilder<T> instantiate(Class<?> type, Instantiator instantiator);
 
 	ArbitraryBuilder<T> instantiate(TypeReference<?> type, Instantiator instantiator);
+
+	/**
+	 * Customizes the arbitrary value generated from selected properties.
+	 * It can be called several times and nested. It has an order dependency.
+	 * <p>
+	 * Without any set APIs, it customizes the arbitrary value.
+	 * With set APIs, it customizes the last value in set APIs.
+	 *
+	 * @param propertySelector              the property selector with type
+	 * @param combinableArbitraryCustomizer
+	 * @param <U>                           the type of the properties selected by {@code propertySelector}.
+	 * @return a customized {@link ArbitraryBuilder}
+	 */
+	@API(since = "1.0.9", status = Status.MAINTAINED)
+	<U> ArbitraryBuilder<T> customizeProperty(
+		TypedPropertySelector<U> propertySelector,
+		Function<CombinableArbitrary<? extends U>, CombinableArbitrary<? extends U>> combinableArbitraryCustomizer
+	);
 }
diff --git a/...rc/main/java/com/navercorp/fixturemonkey/builder/JavaTypeDefaultTypeArbitraryBuilder.java b/...rc/main/java/com/navercorp/fixturemonkey/builder/JavaTypeDefaultTypeArbitraryBuilder.java
@@ -38,6 +38,8 @@
 
 import com.navercorp.fixturemonkey.ArbitraryBuilder;
 import com.navercorp.fixturemonkey.JavaTypeArbitraryBuilder;
+import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary;
+import com.navercorp.fixturemonkey.api.experimental.TypedPropertySelector;
 import com.navercorp.fixturemonkey.api.instantiator.Instantiator;
 import com.navercorp.fixturemonkey.api.property.PropertySelector;
 import com.navercorp.fixturemonkey.api.type.TypeReference;
@@ -335,4 +337,13 @@ public JavaTypeArbitraryBuilder<T> instantiate(TypeReference<?> type, Instantiat
 		delegate.instantiate(type, instantiator);
 		return this;
 	}
+
+	@Override
+	public <U> ArbitraryBuilder<T> customizeProperty(
+		TypedPropertySelector<U> propertySelector,
+		Function<CombinableArbitrary<? extends U>, CombinableArbitrary<? extends U>> combinableArbitraryCustomizer
+	) {
+		delegate.customizeProperty(propertySelector, combinableArbitraryCustomizer);
+		return this;
+	}
 }
diff --git a/.../src/main/java/com/navercorp/fixturemonkey/experimental/ExperimentalArbitraryBuilder.java b/.../src/main/java/com/navercorp/fixturemonkey/experimental/ExperimentalArbitraryBuilder.java
@@ -18,20 +18,11 @@
 
 package com.navercorp.fixturemonkey.experimental;
 
-import java.util.function.Function;
-
 import org.apiguardian.api.API;
 import org.apiguardian.api.API.Status;
 
 import com.navercorp.fixturemonkey.ArbitraryBuilder;
-import com.navercorp.fixturemonkey.api.arbitrary.CombinableArbitrary;
-import com.navercorp.fixturemonkey.api.experimental.TypedPropertySelector;
 
 @API(since = "0.6.12", status = Status.MAINTAINED)
 public interface ExperimentalArbitraryBuilder<T> extends ArbitraryBuilder<T> {
-	@API(since = "1.0.9", status = Status.EXPERIMENTAL)
-	<U> ExperimentalArbitraryBuilder<T> customizeProperty(
-		TypedPropertySelector<U> propertySelector,
-		Function<CombinableArbitrary<? extends U>, CombinableArbitrary<? extends U>> combinableArbitraryCustomizer
-	);
 }