Handle uuid decoding failure

zio · Jul 20, 2021 · 01da641 · 01da641
1 parent f6774c8
commit 01da641
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/zio-schema/shared/src/main/scala/zio/schema/codec/ProtobufCodec.scala b/zio-schema/shared/src/main/scala/zio/schema/codec/ProtobufCodec.scala
@@ -11,6 +11,7 @@ import zio.stream.ZTransducer
 import zio.{ Chunk, ZIO }
 
 import java.util.UUID
+import scala.util.control.NonFatal
 
 object ProtobufCodec extends Codec {
   override def encoder[A](schema: Schema[A]): ZTransducer[Any, Nothing, A, Byte] =
@@ -590,7 +591,13 @@ object ProtobufCodec extends Codec {
         case StandardType.DoubleType => doubleDecoder
         case StandardType.BinaryType => binaryDecoder
         case StandardType.CharType   => stringDecoder.map(_.charAt(0))
-        case StandardType.UUIDType   => stringDecoder.map(UUID.fromString)
+        case StandardType.UUIDType =>
+          stringDecoder.flatMap { uuid =>
+            try succeed(UUID.fromString(uuid))
+            catch {
+              case NonFatal(_) => fail("Invalid UUID string")
+            }
+          }
         case StandardType.DayOfWeekType =>
           varIntDecoder.map(_.intValue).map(DayOfWeek.of)
         case StandardType.Month =>