Module rearange and add kotlin benchmark

.github/workflows/benchmark.yml

@@ -17,11 +17,20 @@ jobs:
         uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: jmh
-      - name: Read benchmark result
+      - name: Merge benchmark results
+        id: merge
+        run: |
+          echo "" > merged_results.csv
+          find ./fixture-monkey-benchmarks -name 'results.csv' | while read line; do
+            cat "$line" >> merged_results.csv
+            echo "" >> merged_results.csv
+          done
+          cat merged_results.csv
+      - name: Read merged benchmark result
         id: csv
         uses: juliangruber/read-file-action@v1
         with:
-          path: ./fixture-monkey/build/results/jmh/results.csv
+          path: merged_results.csv
       - name: Create Markdown table
         uses: petems/csv-to-md-table-action@master
         id: csv-table-output

fixture-monkey-benchmarks/build.gradle.kts

@@ -0,0 +1,31 @@
+plugins {
+    id("me.champeau.jmh") version "0.7.2"
+    `java-test-fixtures`
+}
+
+tasks.jmh{
+    enabled = false
+}
+
+subprojects {
+    tasks.filter { it.name != "jmh" && !it.name.startsWith("compile") && it.name != "jar" }
+        .forEach { it.enabled = false }
+
+    plugins.apply("me.champeau.jmh")
+    plugins.apply("java-test-fixtures")
+
+    dependencies {
+        jmhImplementation(project(":fixture-monkey-javax-validation"))
+        jmhImplementation(project(":fixture-monkey-jackson"))
+        jmhImplementation("org.openjdk.jmh:jmh-core:${Versions.JMH}")
+        jmhImplementation("org.openjdk.jmh:jmh-generator-annprocess:${Versions.JMH}")
+        jmhImplementation("org.projectlombok:lombok:${Versions.LOMBOK}")
+        jmhAnnotationProcessor("org.projectlombok:lombok:${Versions.LOMBOK}")
+
+        testFixturesApi(project(":fixture-monkey-javax-validation"))
+        testFixturesApi("org.openjdk.jmh:jmh-core:${Versions.JMH}")
+        testFixturesApi("org.openjdk.jmh:jmh-generator-annprocess:${Versions.JMH}")
+        testFixturesApi("org.projectlombok:lombok:${Versions.LOMBOK}")
+        testFixturesAnnotationProcessor("org.projectlombok:lombok:${Versions.LOMBOK}")
+    }
+}

fixture-monkey-benchmarks/fixture-monkey-benchmark-kotlin/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    id("org.jetbrains.kotlin.jvm") version Versions.KOTLIN
+    id("org.jlleitschuh.gradle.ktlint") version Versions.KTLINT
+    id("com.navercorp.fixturemonkey.gradle.plugin.maven-publish-conventions")
+}
+
+dependencies {
+    api(project(":fixture-monkey-kotlin"))
+    jmhImplementation(testFixtures(project(":fixture-monkey-benchmarks:fixture-monkey-benchmark")))
+}
+
+jmh {
+    fork = 1
+    warmupIterations = 3
+    iterations = 10
+    resultFormat = "CSV"
+}

fixture-monkey-benchmarks/fixture-monkey-benchmark-kotlin/src/jmh/kotlin/com/navercorp/fixturemonkey/kotlin/KotlinObjectGenerationBenchMark.kt

@@ -0,0 +1,51 @@
+package com.navercorp.fixturemonkey.kotlin
+
+import com.navercorp.fixturemonkey.OrderSheet
+import com.navercorp.fixturemonkey.FixtureMonkey
+import com.navercorp.fixturemonkey.api.introspector.BeanArbitraryIntrospector
+import com.navercorp.fixturemonkey.api.type.TypeCache
+import java.util.concurrent.TimeUnit
+import org.openjdk.jmh.annotations.Benchmark
+import org.openjdk.jmh.annotations.BenchmarkMode
+import org.openjdk.jmh.annotations.Level
+import org.openjdk.jmh.annotations.Mode
+import org.openjdk.jmh.annotations.OutputTimeUnit
+import org.openjdk.jmh.annotations.Scope
+import org.openjdk.jmh.annotations.Setup
+import org.openjdk.jmh.annotations.State
+import org.openjdk.jmh.infra.Blackhole
+
+private const val COUNT = 500
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@State(Scope.Benchmark)
+open class KotlinObjectGenerationBenchMark {
+    @Setup(value = Level.Iteration)
+    fun setUp() {
+        TypeCache.clearCache()
+    }
+
+    @Benchmark
+    fun beanGenerateJavaOrderSheetWithFixtureMonkey(blackhole: Blackhole) {
+        val fixtureMonkey = FixtureMonkey.builder()
+            .plugin(KotlinPlugin())
+            .objectIntrospector(BeanArbitraryIntrospector.INSTANCE)
+            .build()
+        blackhole.consume(generateJavaOrderSheet(fixtureMonkey))
+    }
+
+    private fun generateJavaOrderSheet(fixtureMonkey: FixtureMonkey): List<OrderSheet> =
+        List(COUNT) { fixtureMonkey.giveMeOne(OrderSheet::class.java) }
+
+    @Benchmark
+    fun beanGenerateKotlinOrderSheetWithFixtureMonkey(blackhole: Blackhole) {
+        val fixtureMonkey = FixtureMonkey.builder()
+            .plugin(KotlinPlugin())
+            .build()
+        blackhole.consume(generateKotlinOrderSheet(fixtureMonkey))
+    }
+
+    private fun generateKotlinOrderSheet(fixtureMonkey: FixtureMonkey): List<KotlinOrderSheet> =
+        List(COUNT) { fixtureMonkey.giveMeOne(KotlinOrderSheet::class.java) }
+}

fixture-monkey-benchmarks/fixture-monkey-benchmark-kotlin/src/jmh/kotlin/com/navercorp/fixturemonkey/kotlin/KotlinOrderSheet.kt

@@ -0,0 +1,109 @@
+package com.navercorp.fixturemonkey.kotlin
+
+import java.math.BigDecimal
+import java.time.Instant
+import javax.validation.constraints.Size
+
+data class KotlinOrderSheet(
+    val id: String,
+    val backUrl: String?,
+    val userNo: Long?,
+    @field:Size(min = 1, max = 1)
+    val products: List<OrderSheetProduct>,
+    val merchantsByMerchantNo: Map.Entry<Long, OrderSheetMerchant>?,
+    val registeredDateTime: Instant?,
+    @field:Size(min = 1, max = 1)
+    val bundleDeliveryFeesByDeliveryGroupKey: Map<String, OrderSheetBundleDeliveryFee>?
+) {
+    data class OrderSheetProduct(
+        val id: String,
+        val productName: String?,
+        val salePrice: BigDecimal?,
+        val ecMallProductId: String?,
+        @field:Size(min = 1, max = 1)
+        val items: List<OrderSheetItem>,
+        val deliveryPolicy: OrderSheetDeliveryPolicy?,
+        val merchantNo: Long,
+        val merchantCategoryItemTypeName: String?,
+        val wholeCategoryId: String?,
+        val naverBenefit: Boolean,
+        val deliveryFee: OrderSheetDeliveryFee?,
+        val rewardPointPolicy: OrderSheetRewardPointPolicy?
+    )
+
+    data class OrderSheetItem(
+        val id: String,
+        val itemNo: String?,
+        val price: BigDecimal?,
+        val quantity: Long?,
+        val orderAmount: BigDecimal?,
+        @field:Size(min = 1, max = 1)
+        val elements: List<OrderSheetElement>
+    )
+
+    data class OrderSheetElement(
+        val id: String,
+        val elementType: ElementType,
+        @field:Size(min = 1, max = 1)
+        val names: List<String>,
+        @field:Size(min = 1, max = 1)
+        val valueIds: List<String>,
+        @field:Size(min = 1, max = 1)
+        val texts: List<String>
+    )
+
+    data class OrderSheetMerchant(
+        val talkInterlockAccountId: String?,
+        val logeyeRequestId: String?,
+        val logeyeInflowPathName: String?,
+        val logeyePayAccumulation: Boolean?
+    )
+
+    data class OrderSheetDeliveryPolicy(
+        val deliveryMethodType: DeliveryMethodType,
+        val deliveryFeeClassType: DeliveryFeeClassType,
+        val deliveryFeePayType: DeliveryFeePayType,
+        val baseFee: BigDecimal?,
+        val bundlePolicy: OrderSheetDeliveryBundlePolicy?,
+        val freeConditionalAmount: BigDecimal?
+    )
+
+    data class OrderSheetDeliveryBundlePolicy(
+        val bundleGroupId: String?
+    )
+
+    data class OrderSheetDeliveryFee(
+        val deliveryFee: BigDecimal?,
+        val deliveryGroupKey: String?
+    )
+
+    data class OrderSheetBundleDeliveryFee(
+        val deliveryFee: BigDecimal?,
+        val type: BundleType
+    )
+
+    data class OrderSheetRewardPointPolicy(
+        val purchasePolicyNo: Long?,
+        val purchaseAccumulateAmount: BigDecimal?
+    )
+
+    enum class DeliveryMethodType {
+        DELIVERY, VISIT_RECEIPT, DIRECT_DELIVERY, QUICK_SVC, NOTHING
+    }
+
+    enum class ElementType {
+        OPTION, CUSTOM
+    }
+
+    enum class DeliveryFeeClassType {
+        CHARGE, FREE
+    }
+
+    enum class DeliveryFeePayType {
+        PRE_PAY, AFTER_PAY, FREE
+    }
+
+    enum class BundleType {
+        MANUALLY, IDENTICAL_PRODUCT
+    }
+}

fixture-monkey-benchmarks/fixture-monkey-benchmark/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    id("com.navercorp.fixturemonkey.gradle.plugin.java-conventions")
+}
+
+dependencies {
+    api(project(":fixture-monkey"))
+}
+
+jmh {
+    fork = 1
+    warmupIterations = 3
+    iterations = 10
+    resultFormat = "CSV"
+}

fixture-monkey/src/jmh/java/com/navercorp/fixturemonkey/BuilderOrderSheet.java → fixture-monkey-benchmarks/fixture-monkey-benchmark/src/jmh/java/com/navercorp/fixturemonkey/BuilderOrderSheet.java

@@ -174,4 +174,3 @@ public enum BundleType {
 		IDENTICAL_PRODUCT
 	}
 }
-

fixture-monkey/src/jmh/java/com/navercorp/fixturemonkey/OrderSheet.java → fixture-monkey-benchmarks/fixture-monkey-benchmark/src/testFixtures/java/com/navercorp/fixturemonkey/OrderSheet.java

@@ -180,4 +180,3 @@ public enum BundleType {
 		IDENTICAL_PRODUCT
 	}
 }
-

fixture-monkey-kotlin/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect:${Versions.KOTLIN}")
 
     testImplementation(project(":fixture-monkey-jackson"))
+    testImplementation(project(":fixture-monkey-javax-validation"))
     testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT_JUPITER}")
     testImplementation("org.junit.platform:junit-platform-engine:${Versions.JUNIT_ENGINE}")

fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/ExpressionGeneratorJavaTestSpecs.java → fixture-monkey-kotlin/src/test/java/com/navercorp/fixturemonkey/kotlin/spec/ExpressionGeneratorJavaTestSpecs.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.fixturemonkey.kotlin;
+package com.navercorp.fixturemonkey.kotlin.spec;
 
 import java.util.List;
 

fixture-monkey-kotlin/src/test/kotlin/com/navercorp/fixturemonkey/kotlin/ExpressionGeneratorsTest.kt

@@ -18,8 +18,8 @@
 
 package com.navercorp.fixturemonkey.kotlin
 
-import com.navercorp.fixturemonkey.kotlin.ExpressionGeneratorJavaTestSpecs.DogJava
-import com.navercorp.fixturemonkey.kotlin.ExpressionGeneratorJavaTestSpecs.PersonJava
+import com.navercorp.fixturemonkey.kotlin.spec.ExpressionGeneratorJavaTestSpecs.DogJava
+import com.navercorp.fixturemonkey.kotlin.spec.ExpressionGeneratorJavaTestSpecs.PersonJava
 import org.assertj.core.api.BDDAssertions.then
 import org.junit.jupiter.api.Test
 

fixture-monkey/build.gradle.kts

@@ -1,5 +1,4 @@
 plugins {
-    id("me.champeau.jmh") version "0.7.2"
     id("com.navercorp.fixturemonkey.gradle.plugin.java-conventions")
     id("com.navercorp.fixturemonkey.gradle.plugin.maven-publish-conventions")
 }
@@ -18,18 +17,4 @@ dependencies {
     testImplementation("org.assertj:assertj-core:${Versions.ASSERTJ}")
     testImplementation("org.projectlombok:lombok:${Versions.LOMBOK}")
     testAnnotationProcessor("org.projectlombok:lombok:${Versions.LOMBOK}")
-
-    jmhImplementation(project(":fixture-monkey-javax-validation"))
-    jmhImplementation(project(":fixture-monkey-jackson"))
-    jmhImplementation("org.openjdk.jmh:jmh-core:${Versions.JMH}")
-    jmhImplementation("org.openjdk.jmh:jmh-generator-annprocess:${Versions.JMH}")
-    jmhImplementation("org.projectlombok:lombok:${Versions.LOMBOK}")
-    jmhAnnotationProcessor("org.projectlombok:lombok:${Versions.LOMBOK}")
-}
-
-jmh {
-    fork = 1
-    warmupIterations = 3
-    iterations = 10
-    resultFormat = "CSV"
 }

settings.gradle

@@ -32,6 +32,9 @@ include(
         "fixture-monkey-tests:java-tests",
         "fixture-monkey-tests:java-concurrent-tests",
         "fixture-monkey-tests:kotlin-concurrent-tests",
-        "fixture-monkey-kotest"
+        "fixture-monkey-kotest",
+        "fixture-monkey-benchmarks",
+        "fixture-monkey-benchmarks:fixture-monkey-benchmark",
+        "fixture-monkey-benchmarks:fixture-monkey-benchmark-kotlin",
 )