better naming for path_array

aleksandr-gringauz · aleksandr-gringauz · commit bf22e3ca767c · 2025-10-31T10:47:56.000+01:00
diff --git a/buildSrc/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/JsonSchemaReaderTest.kt b/buildSrc/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/JsonSchemaReaderTest.kt
@@ -88,8 +88,8 @@ class JsonSchemaReaderTest(
                 arrayOf("sets", Video),
                 arrayOf("one_of_nested", WeirdCombo),
                 arrayOf("required_for_other_all_of", RequiredForOtherAllOf),
-                arrayOf("path_array", PathArray),
-                arrayOf("path_array_2", PathArray2)
+                arrayOf("path_array_with_integer", PathArrayWithInteger),
+                arrayOf("path_array_with_number", PathArrayWithNumber)
             )
         }
     }
diff --git a/buildSrc/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/ModelValidationTest.kt b/buildSrc/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/ModelValidationTest.kt
@@ -208,8 +208,8 @@ class ModelValidationTest(
                 arrayOf("constant_number", OutputInfo("Version")),
                 arrayOf("sets", OutputInfo("Video")),
                 arrayOf("one_of_nested", OutputInfo("WeirdCombo")),
-                arrayOf("path_array", OutputInfo("PathArray")),
-                arrayOf("path_array_2", OutputInfo("PathArray2"))
+                arrayOf("path_array_with_integer", OutputInfo("PathArrayWithInteger")),
+                arrayOf("path_array_with_number", OutputInfo("PathArrayWithNumber"))
             )
         }
     }
diff --git a/buildSrc/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/TestDefinitions.kt b/buildSrc/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/TestDefinitions.kt
@@ -992,8 +992,8 @@ val RequiredForOtherAllOf = TypeDefinition.Class(
     )
 )
 
-val PathArray = TypeDefinition.Class(
-    name = "PathArray",
+val PathArrayWithInteger = TypeDefinition.Class(
+    name = "PathArrayWithInteger",
     properties = listOf(
         TypeProperty(
             name = "path",
@@ -1049,8 +1049,8 @@ val PathArray = TypeDefinition.Class(
     required = setOf("path")
 )
 
-val PathArray2 = TypeDefinition.Class(
-    name = "PathArray2",
+val PathArrayWithNumber = TypeDefinition.Class(
+    name = "PathArrayWithNumber",
     properties = listOf(
         TypeProperty(
             name = "path",
diff --git a/buildSrc/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/generator/FileGeneratorTest.kt b/buildSrc/src/test/kotlin/com/datadog/gradle/plugin/jsonschema/generator/FileGeneratorTest.kt
@@ -26,8 +26,8 @@ import com.datadog.gradle.plugin.jsonschema.NoOpLogger
 import com.datadog.gradle.plugin.jsonschema.Opus
 import com.datadog.gradle.plugin.jsonschema.Order
 import com.datadog.gradle.plugin.jsonschema.Paper
-import com.datadog.gradle.plugin.jsonschema.PathArray
-import com.datadog.gradle.plugin.jsonschema.PathArray2
+import com.datadog.gradle.plugin.jsonschema.PathArrayWithInteger
+import com.datadog.gradle.plugin.jsonschema.PathArrayWithNumber
 import com.datadog.gradle.plugin.jsonschema.Person
 import com.datadog.gradle.plugin.jsonschema.Product
 import com.datadog.gradle.plugin.jsonschema.Shipping
@@ -131,8 +131,8 @@ class FileGeneratorTest(
                 arrayOf(Version, "Version"),
                 arrayOf(Video, "Video"),
                 arrayOf(WeirdCombo, "WeirdCombo"),
-                arrayOf(PathArray, "PathArray"),
-                arrayOf(PathArray2, "PathArray2")
+                arrayOf(PathArrayWithInteger, "PathArrayWithInteger"),
+                arrayOf(PathArrayWithNumber, "PathArrayWithNumber")
             )
         }
     }
diff --git a/buildSrc/src/test/kotlin/com/example/forgery/ForgeryConfiguration.kt b/buildSrc/src/test/kotlin/com/example/forgery/ForgeryConfiguration.kt
@@ -38,7 +38,7 @@ internal class ForgeryConfiguration : ForgeConfigurator {
         forge.addFactory(VersionForgeryFactory())
         forge.addFactory(VideoForgeryFactory())
         forge.addFactory(WeirdComboForgeryFactory())
-        forge.addFactory(PathArrayForgeryFactory())
-        forge.addFactory(PathArray2ForgeryFactory())
+        forge.addFactory(PathArrayWithIntegerForgeryFactory())
+        forge.addFactory(PathArrayWithNumberForgeryFactory())
     }
 }
diff --git a/buildSrc/src/test/kotlin/com/example/forgery/PathArray2ForgeryFactory.kt b/buildSrc/src/test/kotlin/com/example/forgery/PathArray2ForgeryFactory.kt
diff --git a/buildSrc/src/test/kotlin/com/example/forgery/PathArrayForgeryFactory.kt b/buildSrc/src/test/kotlin/com/example/forgery/PathArrayForgeryFactory.kt
diff --git a/buildSrc/src/test/kotlin/com/example/forgery/PathArrayWithIntegerForgeryFactory.kt b/buildSrc/src/test/kotlin/com/example/forgery/PathArrayWithIntegerForgeryFactory.kt
@@ -0,0 +1,32 @@
+/*
+ * 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.PathArrayWithInteger
+import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.ForgeryFactory
+
+internal class PathArrayWithIntegerForgeryFactory : ForgeryFactory<PathArrayWithInteger> {
+    override fun getForgery(forge: Forge): PathArrayWithInteger {
+        return PathArrayWithInteger(
+            path = forge.aList {
+                forge.anElementFrom(
+                    listOf(
+                        PathArrayWithInteger.Path.String(forge.aString()),
+                        PathArrayWithInteger.Path.Boolean(forge.aBool()),
+                        PathArrayWithInteger.Path.Point(x = forge.aLong(), y = forge.aLong()),
+                        PathArrayWithInteger.Path.String("true"),
+                        PathArrayWithInteger.Path.String("false"),
+                        PathArrayWithInteger.Path.String("123"),
+                        PathArrayWithInteger.Path.String("123.123"),
+                        PathArrayWithInteger.Path.Long(forge.aLong())
+                    )
+                )
+            }
+        )
+    }
+}
diff --git a/buildSrc/src/test/kotlin/com/example/forgery/PathArrayWithNumberForgeryFactory.kt b/buildSrc/src/test/kotlin/com/example/forgery/PathArrayWithNumberForgeryFactory.kt
@@ -0,0 +1,32 @@
+/*
+ * 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.PathArrayWithNumber
+import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.ForgeryFactory
+
+internal class PathArrayWithNumberForgeryFactory : ForgeryFactory<PathArrayWithNumber> {
+    override fun getForgery(forge: Forge): PathArrayWithNumber {
+        return PathArrayWithNumber(
+            path = forge.aList {
+                forge.anElementFrom(
+                    listOf(
+                        PathArrayWithNumber.Path.String(forge.aString()),
+                        PathArrayWithNumber.Path.Boolean(forge.aBool()),
+                        PathArrayWithNumber.Path.Point(x = forge.aLong(), y = forge.aLong()),
+                        PathArrayWithNumber.Path.String("true"),
+                        PathArrayWithNumber.Path.String("false"),
+                        PathArrayWithNumber.Path.String("123"),
+                        PathArrayWithNumber.Path.String("123.123"),
+                        PathArrayWithNumber.Path.Number(forge.aNumber())
+                    )
+                )
+            }
+        )
+    }
+}
diff --git a/buildSrc/src/test/kotlin/com/example/model/PathArrayWithInteger.kt b/buildSrc/src/test/kotlin/com/example/model/PathArrayWithInteger.kt
@@ -16,7 +16,7 @@ import kotlin.collections.List
 import kotlin.jvm.JvmStatic
 import kotlin.jvm.Throws
 
-public data class PathArray(
+public data class PathArrayWithInteger(
     public val path: List<Path>,
 ) {
     public fun toJson(): JsonElement {
@@ -30,21 +30,21 @@ public data class PathArray(
     public companion object {
         @JvmStatic
         @Throws(JsonParseException::class)
-        public fun fromJson(jsonString: String): PathArray {
+        public fun fromJson(jsonString: String): PathArrayWithInteger {
             try {
                 val jsonObject = JsonParser.parseString(jsonString).asJsonObject
                 return fromJsonObject(jsonObject)
             } catch (e: IllegalStateException) {
                 throw JsonParseException(
-                    "Unable to parse json into type PathArray",
+                    "Unable to parse json into type PathArrayWithInteger",
                     e
                 )
             }
         }
 
         @JvmStatic
         @Throws(JsonParseException::class)
-        public fun fromJsonObject(jsonObject: JsonObject): PathArray {
+        public fun fromJsonObject(jsonObject: JsonObject): PathArrayWithInteger {
             try {
                 val path = jsonObject.get("path").asJsonArray.let { jsonArray ->
                     val collection = ArrayList<Path>(jsonArray.size())
@@ -53,20 +53,20 @@ public data class PathArray(
                     }
                     collection
                 }
-                return PathArray(path)
+                return PathArrayWithInteger(path)
             } catch (e: IllegalStateException) {
                 throw JsonParseException(
-                    "Unable to parse json into type PathArray",
+                    "Unable to parse json into type PathArrayWithInteger",
                     e
                 )
             } catch (e: NumberFormatException) {
                 throw JsonParseException(
-                    "Unable to parse json into type PathArray",
+                    "Unable to parse json into type PathArrayWithInteger",
                     e
                 )
             } catch (e: NullPointerException) {
                 throw JsonParseException(
-                    "Unable to parse json into type PathArray",
+                    "Unable to parse json into type PathArrayWithInteger",
                     e
                 )
             }
diff --git a/buildSrc/src/test/kotlin/com/example/model/PathArrayWithNumber.kt b/buildSrc/src/test/kotlin/com/example/model/PathArrayWithNumber.kt
@@ -17,7 +17,7 @@ import kotlin.collections.List
 import kotlin.jvm.JvmStatic
 import kotlin.jvm.Throws
 
-public data class PathArray2(
+public data class PathArrayWithNumber(
     public val path: List<Path>,
 ) {
     public fun toJson(): JsonElement {
@@ -31,21 +31,21 @@ public data class PathArray2(
     public companion object {
         @JvmStatic
         @Throws(JsonParseException::class)
-        public fun fromJson(jsonString: String): PathArray2 {
+        public fun fromJson(jsonString: String): PathArrayWithNumber {
             try {
                 val jsonObject = JsonParser.parseString(jsonString).asJsonObject
                 return fromJsonObject(jsonObject)
             } catch (e: IllegalStateException) {
                 throw JsonParseException(
-                    "Unable to parse json into type PathArray2",
+                    "Unable to parse json into type PathArrayWithNumber",
                     e
                 )
             }
         }
 
         @JvmStatic
         @Throws(JsonParseException::class)
-        public fun fromJsonObject(jsonObject: JsonObject): PathArray2 {
+        public fun fromJsonObject(jsonObject: JsonObject): PathArrayWithNumber {
             try {
                 val path = jsonObject.get("path").asJsonArray.let { jsonArray ->
                     val collection = ArrayList<Path>(jsonArray.size())
@@ -54,20 +54,20 @@ public data class PathArray2(
                     }
                     collection
                 }
-                return PathArray2(path)
+                return PathArrayWithNumber(path)
             } catch (e: IllegalStateException) {
                 throw JsonParseException(
-                    "Unable to parse json into type PathArray2",
+                    "Unable to parse json into type PathArrayWithNumber",
                     e
                 )
             } catch (e: NumberFormatException) {
                 throw JsonParseException(
-                    "Unable to parse json into type PathArray2",
+                    "Unable to parse json into type PathArrayWithNumber",
                     e
                 )
             } catch (e: NullPointerException) {
                 throw JsonParseException(
-                    "Unable to parse json into type PathArray2",
+                    "Unable to parse json into type PathArrayWithNumber",
                     e
                 )
             }
diff --git a/buildSrc/src/test/resources/input/path_array_with_integer.json b/buildSrc/src/test/resources/input/path_array_with_integer.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "PathArray",
+  "title": "PathArrayWithInteger",
   "type": "object",
   "required": ["path"],
   "properties": {
diff --git a/buildSrc/src/test/resources/input/path_array_with_number.json b/buildSrc/src/test/resources/input/path_array_with_number.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "PathArray2",
+  "title": "PathArrayWithNumber",
   "type": "object",
   "required": ["path"],
   "properties": {

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ class JsonSchemaReaderTest(`
`88`	`88`	`arrayOf("sets", Video),`
`89`	`89`	`arrayOf("one_of_nested", WeirdCombo),`
`90`	`90`	`arrayOf("required_for_other_all_of", RequiredForOtherAllOf),`
`91`		`- arrayOf("path_array", PathArray),`
`92`		`- arrayOf("path_array_2", PathArray2)`
	`91`	`+ arrayOf("path_array_with_integer", PathArrayWithInteger),`
	`92`	`+ arrayOf("path_array_with_number", PathArrayWithNumber)`
`93`	`93`	`)`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,8 @@ class ModelValidationTest(`
`208`	`208`	`arrayOf("constant_number", OutputInfo("Version")),`
`209`	`209`	`arrayOf("sets", OutputInfo("Video")),`
`210`	`210`	`arrayOf("one_of_nested", OutputInfo("WeirdCombo")),`
`211`		`- arrayOf("path_array", OutputInfo("PathArray")),`
`212`		`- arrayOf("path_array_2", OutputInfo("PathArray2"))`
	`211`	`+ arrayOf("path_array_with_integer", OutputInfo("PathArrayWithInteger")),`
	`212`	`+ arrayOf("path_array_with_number", OutputInfo("PathArrayWithNumber"))`
`213`	`213`	`)`
`214`	`214`	`}`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -992,8 +992,8 @@ val RequiredForOtherAllOf = TypeDefinition.Class(`
`992`	`992`	`)`
`993`	`993`	`)`
`994`	`994`
`995`		`-val PathArray = TypeDefinition.Class(`
`996`		`- name = "PathArray",`
	`995`	`+val PathArrayWithInteger = TypeDefinition.Class(`
	`996`	`+ name = "PathArrayWithInteger",`
`997`	`997`	`properties = listOf(`
`998`	`998`	`TypeProperty(`
`999`	`999`	`name = "path",`
`@@ -1049,8 +1049,8 @@ val PathArray = TypeDefinition.Class(`
`1049`	`1049`	`required = setOf("path")`
`1050`	`1050`	`)`
`1051`	`1051`
`1052`		`-val PathArray2 = TypeDefinition.Class(`
`1053`		`- name = "PathArray2",`
	`1052`	`+val PathArrayWithNumber = TypeDefinition.Class(`
	`1053`	`+ name = "PathArrayWithNumber",`
`1054`	`1054`	`properties = listOf(`
`1055`	`1055`	`TypeProperty(`
`1056`	`1056`	`name = "path",`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ internal class ForgeryConfiguration : ForgeConfigurator {`
`38`	`38`	`forge.addFactory(VersionForgeryFactory())`
`39`	`39`	`forge.addFactory(VideoForgeryFactory())`
`40`	`40`	`forge.addFactory(WeirdComboForgeryFactory())`
`41`		`- forge.addFactory(PathArrayForgeryFactory())`
`42`		`- forge.addFactory(PathArray2ForgeryFactory())`
	`41`	`+ forge.addFactory(PathArrayWithIntegerForgeryFactory())`
	`42`	`+ forge.addFactory(PathArrayWithNumberForgeryFactory())`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import kotlin.collections.List`
`16`	`16`	`import kotlin.jvm.JvmStatic`
`17`	`17`	`import kotlin.jvm.Throws`
`18`	`18`
`19`		`-public data class PathArray(`
	`19`	`+public data class PathArrayWithInteger(`
`20`	`20`	`public val path: List<Path>,`
`21`	`21`	`) {`
`22`	`22`	`public fun toJson(): JsonElement {`
`@@ -30,21 +30,21 @@ public data class PathArray(`
`30`	`30`	`public companion object {`
`31`	`31`	`@JvmStatic`
`32`	`32`	`@Throws(JsonParseException::class)`
`33`		`- public fun fromJson(jsonString: String): PathArray {`
	`33`	`+ public fun fromJson(jsonString: String): PathArrayWithInteger {`
`34`	`34`	`try {`
`35`	`35`	`val jsonObject = JsonParser.parseString(jsonString).asJsonObject`
`36`	`36`	`return fromJsonObject(jsonObject)`
`37`	`37`	`} catch (e: IllegalStateException) {`
`38`	`38`	`throw JsonParseException(`
`39`		`- "Unable to parse json into type PathArray",`
	`39`	`+ "Unable to parse json into type PathArrayWithInteger",`
`40`	`40`	`e`
`41`	`41`	`)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@JvmStatic`
`46`	`46`	`@Throws(JsonParseException::class)`
`47`		`- public fun fromJsonObject(jsonObject: JsonObject): PathArray {`
	`47`	`+ public fun fromJsonObject(jsonObject: JsonObject): PathArrayWithInteger {`
`48`	`48`	`try {`
`49`	`49`	`val path = jsonObject.get("path").asJsonArray.let { jsonArray ->`
`50`	`50`	`val collection = ArrayList<Path>(jsonArray.size())`
`@@ -53,20 +53,20 @@ public data class PathArray(`
`53`	`53`	`}`
`54`	`54`	`collection`
`55`	`55`	`}`
`56`		`- return PathArray(path)`
	`56`	`+ return PathArrayWithInteger(path)`
`57`	`57`	`} catch (e: IllegalStateException) {`
`58`	`58`	`throw JsonParseException(`
`59`		`- "Unable to parse json into type PathArray",`
	`59`	`+ "Unable to parse json into type PathArrayWithInteger",`
`60`	`60`	`e`
`61`	`61`	`)`
`62`	`62`	`} catch (e: NumberFormatException) {`
`63`	`63`	`throw JsonParseException(`
`64`		`- "Unable to parse json into type PathArray",`
	`64`	`+ "Unable to parse json into type PathArrayWithInteger",`
`65`	`65`	`e`
`66`	`66`	`)`
`67`	`67`	`} catch (e: NullPointerException) {`
`68`	`68`	`throw JsonParseException(`
`69`		`- "Unable to parse json into type PathArray",`
	`69`	`+ "Unable to parse json into type PathArrayWithInteger",`
`70`	`70`	`e`
`71`	`71`	`)`
`72`	`72`	`}`