Merge pull request #186 from disneystreaming/union-member-fix

Union member fix
disneystreaming · Apr 15, 2022 · 829cb3a · 829cb3a
2 parents e131bd5 + a515dc3
commit 829cb3a
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 13 deletions.
diff --git a/modules/codegen/src/smithy4s/codegen/Renderer.scala b/modules/codegen/src/smithy4s/codegen/Renderer.scala
@@ -471,7 +471,7 @@ private[codegen] class Renderer(compilationUnit: CompilationUnit) { self =>
           val cn = caseName(altName)
           block(s"object $cn")(
             renderHintsVal(altHints),
-            s"val schema: $Schema_[$cn] = bijection(${tpe.schemaRef}, $cn(_), _.${uncapitalise(altName)})",
+            s"val schema: $Schema_[$cn] = bijection(${tpe.schemaRef}.withHints(hints), $cn(_), _.${uncapitalise(altName)})",
             s"""val alt = schema.oneOf[$name]("$realName")"""
           )
         },

diff --git a/modules/example/src/smithy4s/example/Foo.scala b/modules/example/src/smithy4s/example/Foo.scala
@@ -17,22 +17,22 @@ object Foo extends smithy4s.ShapeTag.Companion[Foo] {
 
   object IntCase {
     val hints : smithy4s.Hints = smithy4s.Hints()
-    val schema: smithy4s.Schema[IntCase] = bijection(int, IntCase(_), _.int)
+    val schema: smithy4s.Schema[IntCase] = bijection(int.withHints(hints), IntCase(_), _.int)
     val alt = schema.oneOf[Foo]("int")
   }
   object StrCase {
     val hints : smithy4s.Hints = smithy4s.Hints()
-    val schema: smithy4s.Schema[StrCase] = bijection(string, StrCase(_), _.str)
+    val schema: smithy4s.Schema[StrCase] = bijection(string.withHints(hints), StrCase(_), _.str)
     val alt = schema.oneOf[Foo]("str")
   }
   object BIntCase {
     val hints : smithy4s.Hints = smithy4s.Hints()
-    val schema: smithy4s.Schema[BIntCase] = bijection(bigint, BIntCase(_), _.bInt)
+    val schema: smithy4s.Schema[BIntCase] = bijection(bigint.withHints(hints), BIntCase(_), _.bInt)
     val alt = schema.oneOf[Foo]("bInt")
   }
   object BDecCase {
     val hints : smithy4s.Hints = smithy4s.Hints()
-    val schema: smithy4s.Schema[BDecCase] = bijection(bigdecimal, BDecCase(_), _.bDec)
+    val schema: smithy4s.Schema[BDecCase] = bijection(bigdecimal.withHints(hints), BDecCase(_), _.bDec)
     val alt = schema.oneOf[Foo]("bDec")
   }
 

diff --git a/modules/example/src/smithy4s/example/ObjectService.scala b/modules/example/src/smithy4s/example/ObjectService.scala
@@ -93,12 +93,12 @@ object ObjectServiceGen extends smithy4s.Service[ObjectServiceGen, ObjectService
 
     object ServerErrorCase {
       val hints : smithy4s.Hints = smithy4s.Hints()
-      val schema: smithy4s.Schema[ServerErrorCase] = bijection(ServerError.schema, ServerErrorCase(_), _.serverError)
+      val schema: smithy4s.Schema[ServerErrorCase] = bijection(ServerError.schema.withHints(hints), ServerErrorCase(_), _.serverError)
       val alt = schema.oneOf[PutObjectError]("ServerError")
     }
     object NoMoreSpaceCase {
       val hints : smithy4s.Hints = smithy4s.Hints()
-      val schema: smithy4s.Schema[NoMoreSpaceCase] = bijection(NoMoreSpace.schema, NoMoreSpaceCase(_), _.noMoreSpace)
+      val schema: smithy4s.Schema[NoMoreSpaceCase] = bijection(NoMoreSpace.schema.withHints(hints), NoMoreSpaceCase(_), _.noMoreSpace)
       val alt = schema.oneOf[PutObjectError]("NoMoreSpace")
     }
 
@@ -146,7 +146,7 @@ object ObjectServiceGen extends smithy4s.Service[ObjectServiceGen, ObjectService
 
     object ServerErrorCase {
       val hints : smithy4s.Hints = smithy4s.Hints()
-      val schema: smithy4s.Schema[ServerErrorCase] = bijection(ServerError.schema, ServerErrorCase(_), _.serverError)
+      val schema: smithy4s.Schema[ServerErrorCase] = bijection(ServerError.schema.withHints(hints), ServerErrorCase(_), _.serverError)
       val alt = schema.oneOf[GetObjectError]("ServerError")
     }
 

diff --git a/modules/example/src/smithy4s/example/imp/ImportService.scala b/modules/example/src/smithy4s/example/imp/ImportService.scala
@@ -84,7 +84,7 @@ object ImportServiceGen extends smithy4s.Service[ImportServiceGen, ImportService
 
     object NotFoundErrorCase {
       val hints : smithy4s.Hints = smithy4s.Hints()
-      val schema: smithy4s.Schema[NotFoundErrorCase] = bijection(NotFoundError.schema, NotFoundErrorCase(_), _.notFoundError)
+      val schema: smithy4s.Schema[NotFoundErrorCase] = bijection(NotFoundError.schema.withHints(hints), NotFoundErrorCase(_), _.notFoundError)
       val alt = schema.oneOf[ImportOperationError]("NotFoundError")
     }
 

diff --git a/modules/json/test/src/smithy4s/http/json/SchematicJCodecTests.scala b/modules/json/test/src/smithy4s/http/json/SchematicJCodecTests.scala
@@ -22,13 +22,20 @@ import schematic.ByteArray
 import smithy.api.JsonName
 import smithy4s.http.PayloadError
 import smithy4s.syntax._
-import weaver._
+import smithy4s.example.{
+  CheckedOrUnchecked,
+  Four,
+  One,
+  PayloadData,
+  TestBiggerUnion,
+  Three,
+  UntaggedUnion
+}
 import smithy4s.api.Discriminated
+import weaver._
 
 import scala.collection.immutable.ListMap
-import smithy4s.example.PayloadData
-import smithy4s.example.{TestBiggerUnion, One}
-import smithy4s.example.{UntaggedUnion, Three, Four}
+import scala.util.Try
 
 object SchematicJCodecTests extends SimpleIOSuite {
 
@@ -162,6 +169,24 @@ object SchematicJCodecTests extends SimpleIOSuite {
     expect(str == jsonStr)
   }
 
+  pureTest("Valid union values are parsed successfuly") {
+    val jsonStr = """{"checked":"foo"}"""
+    val result = readFromString[CheckedOrUnchecked](jsonStr)
+    expect(result == CheckedOrUnchecked.CheckedCase("foo"))
+  }
+
+  pureTest("Invalid union values fails to parse") {
+    val jsonStr = """{"checked":"!@#"}"""
+    val result = Try(readFromString[CheckedOrUnchecked](jsonStr)).failed
+    expect(
+      result.get == PayloadError(
+        PayloadPath.fromString(".checked"),
+        "string",
+        "String '!@#' does not match pattern '^\\w+$'"
+      )
+    )
+  }
+
   pureTest("Discriminated union gets encoded correctly") {
     val jsonBaz = """{"type":"baz","str":"test"}"""
     val jsonBin = """{"type":"binBin","binStr":"foo","int":2022}"""

diff --git a/sampleSpecs/misc.smithy b/sampleSpecs/misc.smithy
@@ -59,3 +59,10 @@ structure BigStruct{
   {value: "_"},
 ])
 string EnumWithSymbols
+
+
+union CheckedOrUnchecked {
+  @pattern("^\\w+$")
+  checked: String,
+  raw: String
+}