Merge timeseries into develop

build-logic/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/FileGenerator.kt

@@ -23,7 +23,7 @@ class FileGenerator(
 
     private val classGenerator = ClassGenerator(packageName, knownTypes)
     private val enumGenerator = EnumClassGenerator(packageName, knownTypes)
-    private val oneOfPrimitiveOptionGenerator = OneOfPrimitiveOptionGenerator(packageName)
+    private val oneOfPrimitiveOptionGenerator = OneOfPrimitiveOptionGenerator(packageName, knownTypes)
 
     private val multiClassGenerator = MultiClassGenerator(
         classGenerator = classGenerator,

build-logic/src/main/kotlin/com/datadog/gradle/plugin/jsonschema/generator/OneOfPrimitiveOptionGenerator.kt

@@ -21,10 +21,11 @@ import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.jvm.throws
 
 class OneOfPrimitiveOptionGenerator(
-    packageName: String
+    packageName: String,
+    knownTypes: MutableSet<KotlinTypeWrapper> = mutableSetOf()
 ) : TypeSpecGenerator<TypeDefinition.Primitive>(
     packageName,
-    mutableSetOf()
+    knownTypes
 ) {
     override fun generate(
         definition: TypeDefinition.Primitive,

build-logic/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/JsonSchemaReaderTest.kt

@@ -79,7 +79,10 @@ class JsonSchemaReaderTest {
                 arrayOf("one_of_nested", WeirdCombo),
                 arrayOf("required_for_other_all_of", RequiredForOtherAllOf),
                 arrayOf("path_array_with_integer", PathArrayWithInteger),
-                arrayOf("path_array_with_number", PathArrayWithNumber)
+                arrayOf("path_array_with_number", PathArrayWithNumber),
+                arrayOf("one_of_primitive_ref", OneOfPrimitiveRef),
+                arrayOf("cross_file_one_of_primitive_a", CrossFileOneOfPrimitiveA),
+                arrayOf("cross_file_one_of_primitive_b", CrossFileOneOfPrimitiveB)
             )
         }
     }

build-logic/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/ModelValidationTest.kt

@@ -211,7 +211,10 @@ class ModelValidationTest {
                 arrayOf("sets", OutputInfo("Video")),
                 arrayOf("one_of_nested", OutputInfo("WeirdCombo")),
                 arrayOf("path_array_with_integer", OutputInfo("PathArrayWithInteger")),
-                arrayOf("path_array_with_number", OutputInfo("PathArrayWithNumber"))
+                arrayOf("path_array_with_number", OutputInfo("PathArrayWithNumber")),
+                arrayOf("one_of_primitive_ref", OutputInfo("OneOfPrimitiveRef")),
+                arrayOf("cross_file_one_of_primitive_a", OutputInfo("CrossFileOneOfPrimitiveA")),
+                arrayOf("cross_file_one_of_primitive_b", OutputInfo("CrossFileOneOfPrimitiveB"))
             )
         }
     }

build-logic/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/TestDefinitions.kt

@@ -1112,3 +1112,47 @@ val PathArrayWithNumber = TypeDefinition.Class(
     ),
     required = setOf("path")
 )
+
+val OneOfPrimitivePath = TypeDefinition.OneOfClass(
+    name = "Path",
+    options = listOf(
+        TypeDefinition.OneOfClass.Option.Primitive(
+            primitive = TypeDefinition.Primitive(
+                type = JsonPrimitiveType.STRING,
+                description = "string element"
+            )
+        ),
+        TypeDefinition.OneOfClass.Option.Primitive(
+            primitive = TypeDefinition.Primitive(
+                type = JsonPrimitiveType.INTEGER,
+                description = "integer element"
+            )
+        )
+    ),
+    description = "This is a definition of a path"
+)
+
+val OneOfPrimitiveRef = TypeDefinition.Class(
+    name = "OneOfPrimitiveRef",
+    properties = listOf(
+        TypeProperty("from", OneOfPrimitivePath),
+        TypeProperty("to", OneOfPrimitivePath)
+    ),
+    required = setOf("from")
+)
+
+val CrossFileOneOfPrimitiveA = TypeDefinition.Class(
+    name = "CrossFileOneOfPrimitiveA",
+    properties = listOf(
+        TypeProperty("path", OneOfPrimitivePath)
+    ),
+    required = setOf("path")
+)
+
+val CrossFileOneOfPrimitiveB = TypeDefinition.Class(
+    name = "CrossFileOneOfPrimitiveB",
+    properties = listOf(
+        TypeProperty("path", OneOfPrimitivePath)
+    ),
+    required = setOf("path")
+)

build-logic/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/generator/FileGeneratorTest.kt

@@ -13,6 +13,8 @@ import com.datadog.gradle.plugin.jsonschema.Book
 import com.datadog.gradle.plugin.jsonschema.Comment
 import com.datadog.gradle.plugin.jsonschema.Company
 import com.datadog.gradle.plugin.jsonschema.Conflict
+import com.datadog.gradle.plugin.jsonschema.CrossFileOneOfPrimitiveA
+import com.datadog.gradle.plugin.jsonschema.CrossFileOneOfPrimitiveB
 import com.datadog.gradle.plugin.jsonschema.Customer
 import com.datadog.gradle.plugin.jsonschema.DateTime
 import com.datadog.gradle.plugin.jsonschema.Delivery
@@ -23,6 +25,7 @@ import com.datadog.gradle.plugin.jsonschema.Jacket
 import com.datadog.gradle.plugin.jsonschema.Location
 import com.datadog.gradle.plugin.jsonschema.Message
 import com.datadog.gradle.plugin.jsonschema.NoOpLogger
+import com.datadog.gradle.plugin.jsonschema.OneOfPrimitiveRef
 import com.datadog.gradle.plugin.jsonschema.Opus
 import com.datadog.gradle.plugin.jsonschema.Order
 import com.datadog.gradle.plugin.jsonschema.Paper
@@ -124,7 +127,10 @@ class FileGeneratorTest {
                 arrayOf(Video, "Video"),
                 arrayOf(WeirdCombo, "WeirdCombo"),
                 arrayOf(PathArrayWithInteger, "PathArrayWithInteger"),
-                arrayOf(PathArrayWithNumber, "PathArrayWithNumber")
+                arrayOf(PathArrayWithNumber, "PathArrayWithNumber"),
+                arrayOf(OneOfPrimitiveRef, "OneOfPrimitiveRef"),
+                arrayOf(CrossFileOneOfPrimitiveA, "CrossFileOneOfPrimitiveA"),
+                arrayOf(CrossFileOneOfPrimitiveB, "CrossFileOneOfPrimitiveB")
             )
         }
     }

build-logic/src/test/kotlin/com/example/forgery/CrossFileOneOfPrimitiveAForgeryFactory.kt

@@ -0,0 +1,24 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.example.forgery
+
+import com.example.model.CrossFileOneOfPrimitiveA
+import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.ForgeryFactory
+
+internal class CrossFileOneOfPrimitiveAForgeryFactory : ForgeryFactory<CrossFileOneOfPrimitiveA> {
+    override fun getForgery(forge: Forge): CrossFileOneOfPrimitiveA {
+        return CrossFileOneOfPrimitiveA(
+            path = forge.anElementFrom(
+                listOf(
+                    CrossFileOneOfPrimitiveA.Path.String(forge.aString()),
+                    CrossFileOneOfPrimitiveA.Path.Long(forge.aLong())
+                )
+            )
+        )
+    }
+}

build-logic/src/test/kotlin/com/example/forgery/CrossFileOneOfPrimitiveBForgeryFactory.kt

@@ -0,0 +1,24 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.example.forgery
+
+import com.example.model.CrossFileOneOfPrimitiveB
+import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.ForgeryFactory
+
+internal class CrossFileOneOfPrimitiveBForgeryFactory : ForgeryFactory<CrossFileOneOfPrimitiveB> {
+    override fun getForgery(forge: Forge): CrossFileOneOfPrimitiveB {
+        return CrossFileOneOfPrimitiveB(
+            path = forge.anElementFrom(
+                listOf(
+                    CrossFileOneOfPrimitiveB.Path.String(forge.aString()),
+                    CrossFileOneOfPrimitiveB.Path.Long(forge.aLong())
+                )
+            )
+        )
+    }
+}

build-logic/src/test/kotlin/com/example/forgery/ModelForgeryConfigurator.kt

@@ -40,5 +40,8 @@ internal class ModelForgeryConfigurator : ForgeConfigurator {
         forge.addFactory(WeirdComboForgeryFactory())
         forge.addFactory(PathArrayWithIntegerForgeryFactory())
         forge.addFactory(PathArrayWithNumberForgeryFactory())
+        forge.addFactory(OneOfPrimitiveRefForgeryFactory())
+        forge.addFactory(CrossFileOneOfPrimitiveAForgeryFactory())
+        forge.addFactory(CrossFileOneOfPrimitiveBForgeryFactory())
     }
 }

build-logic/src/test/kotlin/com/example/forgery/OneOfPrimitiveRefForgeryFactory.kt

@@ -0,0 +1,29 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.example.forgery
+
+import com.example.model.OneOfPrimitiveRef
+import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.ForgeryFactory
+
+internal class OneOfPrimitiveRefForgeryFactory : ForgeryFactory<OneOfPrimitiveRef> {
+    override fun getForgery(forge: Forge): OneOfPrimitiveRef {
+        return OneOfPrimitiveRef(
+            from = forge.aPath(),
+            to = forge.aNullable { aPath() }
+        )
+    }
+
+    private fun Forge.aPath(): OneOfPrimitiveRef.Path {
+        return anElementFrom(
+            listOf(
+                OneOfPrimitiveRef.Path.String(aString()),
+                OneOfPrimitiveRef.Path.Long(aLong())
+            )
+        )
+    }
+}