Add caching properties to improve performance

naver · Sep 28, 2024 · 8668639 · 8668639
1 parent f508987
commit 8668639
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 20 deletions.
diff --git a/...src/main/java/com/navercorp/fixturemonkey/api/introspector/BeanArbitraryIntrospector.java b/...src/main/java/com/navercorp/fixturemonkey/api/introspector/BeanArbitraryIntrospector.java
@@ -19,7 +19,7 @@
 package com.navercorp.fixturemonkey.api.introspector;
 
 import static com.navercorp.fixturemonkey.api.exception.Exceptions.throwAsUnchecked;
-import static com.navercorp.fixturemonkey.api.property.DefaultPropertyGenerator.FIELD_PROPERTY_GENERATOR;
+import static com.navercorp.fixturemonkey.api.property.DefaultPropertyGenerator.CACHED_ANNOTATED_FIELD_PROPERTY_GENERATOR;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
@@ -122,6 +122,6 @@ private Function<Map<ArbitraryProperty, Object>, Object> combine(
 
 	@Override
 	public PropertyGenerator getRequiredPropertyGenerator(Property property) {
-		return FIELD_PROPERTY_GENERATOR;
+		return CACHED_ANNOTATED_FIELD_PROPERTY_GENERATOR;
 	}
 }
diff --git a/...va/com/navercorp/fixturemonkey/api/introspector/FieldReflectionArbitraryIntrospector.java b/...va/com/navercorp/fixturemonkey/api/introspector/FieldReflectionArbitraryIntrospector.java
@@ -18,7 +18,7 @@
 package com.navercorp.fixturemonkey.api.introspector;
 
 import static com.navercorp.fixturemonkey.api.exception.Exceptions.throwAsUnchecked;
-import static com.navercorp.fixturemonkey.api.property.DefaultPropertyGenerator.FIELD_PROPERTY_GENERATOR;
+import static com.navercorp.fixturemonkey.api.property.DefaultPropertyGenerator.CACHED_ANNOTATED_FIELD_PROPERTY_GENERATOR;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -126,6 +126,6 @@ private Function<Map<ArbitraryProperty, Object>, Object> combine(
 
 	@Override
 	public PropertyGenerator getRequiredPropertyGenerator(Property property) {
-		return FIELD_PROPERTY_GENERATOR;
+		return CACHED_ANNOTATED_FIELD_PROPERTY_GENERATOR;
 	}
 }
diff --git a/...-api/src/main/java/com/navercorp/fixturemonkey/api/property/DefaultPropertyGenerator.java b/...-api/src/main/java/com/navercorp/fixturemonkey/api/property/DefaultPropertyGenerator.java
@@ -28,28 +28,43 @@
 
 @API(since = "0.5.3", status = Status.MAINTAINED)
 public final class DefaultPropertyGenerator implements PropertyGenerator {
-	public static final PropertyGenerator FIELD_PROPERTY_GENERATOR = new CompositePropertyGenerator(
-		Arrays.asList(
-			new FieldPropertyGenerator(
-				it -> true,
-				it -> true
-			),
-			new JavaBeansPropertyGenerator(
-				it -> it.getReadMethod() != null && it.getWriteMethod() != null,
-				it -> true
-			)
+	public static final PropertyGenerator CACHED_DEFAULT_FIELD_PROPERTY_GENERATOR = new LazyPropertyGenerator(
+		new FieldPropertyGenerator(
+			it -> true,
+			it -> true
 		)
 	);
 
-	private static final CompositePropertyGenerator COMPOSITE_PROPERTY_GENERATOR =
+	public static final PropertyGenerator CACHED_DEFAULT_JAVA_BEANS_PROPERTY_GENERATOR = new LazyPropertyGenerator(
+		new JavaBeansPropertyGenerator(
+			it -> it.getReadMethod() != null && it.getWriteMethod() != null,
+			it -> true
+		)
+	);
+
+	public static final PropertyGenerator CACHED_CONSTRUCTOR_PROPERTY_GENERATOR =
+		new LazyPropertyGenerator(ConstructorPropertiesArbitraryIntrospector.PROPERTY_GENERATOR);
+
+	public static final PropertyGenerator CACHED_ANNOTATED_FIELD_PROPERTY_GENERATOR = new LazyPropertyGenerator(
 		new CompositePropertyGenerator(
 			Arrays.asList(
-				ConstructorPropertiesArbitraryIntrospector.PROPERTY_GENERATOR,
-				FIELD_PROPERTY_GENERATOR
+				CACHED_DEFAULT_FIELD_PROPERTY_GENERATOR,
+				CACHED_DEFAULT_JAVA_BEANS_PROPERTY_GENERATOR
+			)
+		)
+	);
+
+	private static final PropertyGenerator CACHED_COMPOSITE_PROPERTY_GENERATOR =
+		new LazyPropertyGenerator(
+			new CompositePropertyGenerator(
+				Arrays.asList(
+					CACHED_CONSTRUCTOR_PROPERTY_GENERATOR,
+					CACHED_ANNOTATED_FIELD_PROPERTY_GENERATOR
+				)
 			)
 		);
 
 	public List<Property> generateChildProperties(Property property) {
-		return COMPOSITE_PROPERTY_GENERATOR.generateChildProperties(property);
+		return CACHED_COMPOSITE_PROPERTY_GENERATOR.generateChildProperties(property);
 	}
 }
diff --git a/...om/navercorp/fixturemonkey/kotlin/property/KotlinConstructorParameterPropertyGenerator.kt b/...om/navercorp/fixturemonkey/kotlin/property/KotlinConstructorParameterPropertyGenerator.kt
@@ -20,7 +20,7 @@ package com.navercorp.fixturemonkey.kotlin.property
 
 import com.navercorp.fixturemonkey.api.container.ConcurrentLruCache
 import com.navercorp.fixturemonkey.api.property.CompositeProperty
-import com.navercorp.fixturemonkey.api.property.FieldPropertyGenerator
+import com.navercorp.fixturemonkey.api.property.DefaultPropertyGenerator.CACHED_DEFAULT_FIELD_PROPERTY_GENERATOR
 import com.navercorp.fixturemonkey.api.property.Property
 import com.navercorp.fixturemonkey.api.property.PropertyGenerator
 import org.apiguardian.api.API
@@ -66,6 +66,6 @@ internal class KotlinConstructorParameterPropertyGenerator(
         }
 
     companion object {
-        private val JAVA_FIELD_PROPERTY_GENERATOR = FieldPropertyGenerator({ true }) { true }
+        private val JAVA_FIELD_PROPERTY_GENERATOR = CACHED_DEFAULT_FIELD_PROPERTY_GENERATOR
     }
 }