Merge pull request #118 from disneystreaming/new-data-examples-trait

update for new data examples trait
disneystreaming · Apr 18, 2023 · 5fce453 · 5fce453
2 parents f5cef69 + 1e117f9
commit 5fce453
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/build.sc b/build.sc
@@ -401,7 +401,7 @@ object transitive extends BaseScalaModule {
 object Deps {
   object alloy {
     val core =
-      ivy"com.disneystreaming.alloy:alloy-core:0.1.17"
+      ivy"com.disneystreaming.alloy:alloy-core:0.1.18"
   }
   object circe {
     val jawn = ivy"io.circe::circe-jawn:0.14.5"

diff --git a/modules/openapi/src/internals/IModelToSmithy.scala b/modules/openapi/src/internals/IModelToSmithy.scala
@@ -308,7 +308,14 @@ final class IModelToSmithy(useEnumTraitSyntax: Boolean)
     case Hint.JsonName(value)         => List(new JsonNameTrait(value))
     case Hint.Examples(examples) =>
       val trt = DataExamplesTrait.builder
-      examples.foreach(ex => trt.addExample(ex))
+      examples.foreach(ex =>
+        trt.addExample(
+          new DataExamplesTrait.DataExample(
+            DataExamplesTrait.DataExampleType.JSON,
+            ex
+          )
+        )
+      )
       List(trt.build)
     case Hint.Auth(schemes) =>
       val shapeIds = schemes.map {

diff --git a/modules/openapi/tests/src/ExamplesSpec.scala b/modules/openapi/tests/src/ExamplesSpec.scala
@@ -35,7 +35,11 @@ final class ExamplesSpec extends munit.FunSuite {
                             |
                             |use alloy#dataExamples
                             |
-                            |@dataExamples([1])
+                            |@dataExamples([
+                            | {
+                            |   json: 1
+                            | }
+                            |])
                             |integer Id
                             |""".stripMargin
 
@@ -59,7 +63,7 @@ final class ExamplesSpec extends munit.FunSuite {
                             |
                             |use alloy#dataExamples
                             |
-                            |@dataExamples(["something"])
+                            |@dataExamples([{json: "something"}])
                             |string Id
                             |""".stripMargin
 
@@ -108,16 +112,16 @@ final class ExamplesSpec extends munit.FunSuite {
                             |
                             |use alloy#dataExamples
                             |
-                            |@dataExamples([
-                            |  {
+                            |@dataExamples([{
+                            |  json: {
                             |    int: 1,
                             |    str: "Jessica Smith",
                             |    dbl: 1.1,
                             |    lst: [1, 2, 3],
                             |    bool: true,
                             |    struct: { str: "whatever" }
                             |  }
-                            |])
+                            |}])
                             |structure User {
                             |  int: Integer
                             |  str: String
@@ -159,7 +163,7 @@ final class ExamplesSpec extends munit.FunSuite {
                             |
                             |use alloy#dataExamples
                             |
-                            |@dataExamples([[1, 2, 3]])
+                            |@dataExamples([{json: [1, 2, 3]}])
                             |list A {
                             |  member: Integer
                             |}
@@ -190,7 +194,7 @@ final class ExamplesSpec extends munit.FunSuite {
                             |use alloy#dataExamples
                             |
                             |@uniqueItems
-                            |@dataExamples([[1, 2, 3]])
+                            |@dataExamples([{json: [1, 2, 3]}])
                             |list A {
                             |  member: Integer
                             |}
@@ -219,8 +223,10 @@ final class ExamplesSpec extends munit.FunSuite {
                             |
                             |use alloy#dataExamples
                             |
-                            |@dataExamples([{
-                            |  foo: "bar"
+                            |@dataExamples([{json: 
+                            |  {
+                            |    foo: "bar"
+                            |  }
                             |}])
                             |map M {
                             |  key: String
@@ -256,8 +262,10 @@ final class ExamplesSpec extends munit.FunSuite {
                             |use alloy#dataExamples
                             |
                             |@dataExamples([{
-                            |  foo: {
-                            |    test: "bar"
+                            |  json: {
+                            |    foo: {
+                            |      test: "bar"
+                            |    }
                             |  }
                             |}])
                             |map M {