Merge branch 'master' into update/scala3-library-3.3.1

fd4s · Jan 7, 2024 · e4912d2 · e4912d2
2 parents 430454d + 5b16c8d
commit e4912d2
Show file tree

Hide file tree

Showing 101 changed files with 191 additions and 104 deletions.
diff --git a/build.sbt b/build.sbt
@@ -10,9 +10,9 @@ val refinedVersion = "0.10.3"
 val scalaCollectionCompatVersion = "2.9.0"
 val shapeless3Version = "3.3.0"
 val shapelessVersion = "2.3.10"
-val slf4jNopVersion = "2.0.7"
+val slf4jNopVersion = "2.0.9"
 
-val scala212 = "2.12.17"
+val scala212 = "2.12.18"
 val scala213 = "2.13.10"
 val scala3 = "3.3.1"
 

diff --git a/modules/core/src/main/scala-2.12/vulcan/internal/converters.scala b/modules/core/src/main/scala-2.12/vulcan/internal/converters.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala-2.13+/vulcan/internal/converters.scala b/modules/core/src/main/scala-2.13+/vulcan/internal/converters.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala-2/AvroDoc.scala b/modules/core/src/main/scala-2/AvroDoc.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala-2/AvroNamespace.scala b/modules/core/src/main/scala-2/AvroNamespace.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala-2/vulcan/CodecCompat.scala b/modules/core/src/main/scala-2/vulcan/CodecCompat.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala-2/vulcan/internal/tags.scala b/modules/core/src/main/scala-2/vulcan/internal/tags.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala-3/vulcan/CodecCompat.scala b/modules/core/src/main/scala-3/vulcan/CodecCompat.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/Avro.scala b/modules/core/src/main/scala/vulcan/Avro.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/AvroError.scala b/modules/core/src/main/scala/vulcan/AvroError.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/AvroException.scala b/modules/core/src/main/scala/vulcan/AvroException.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/Codec.scala b/modules/core/src/main/scala/vulcan/Codec.scala
@@ -1,13 +1,13 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package vulcan
 
 import cats.{Invariant, Show, ~>}
-import cats.data.{Chain, NonEmptyChain, NonEmptyList, NonEmptySet, NonEmptyVector}
+import cats.data.{Chain, NonEmptyChain, NonEmptyList, NonEmptyMap, NonEmptySet, NonEmptyVector}
 import cats.free.FreeApplicative
 import cats.implicits._
 
@@ -23,7 +23,7 @@ import vulcan.Avro.Bytes
 import vulcan.internal.{Deserializer, Serializer}
 
 import scala.annotation.implicitNotFound
-import scala.collection.immutable.SortedSet
+import scala.collection.immutable.{SortedMap, SortedSet}
 import vulcan.internal.converters.collection._
 import vulcan.internal.syntax._
 import vulcan.internal.schema.adaptForSchema
@@ -972,6 +972,22 @@ object Codec extends CodecCompanionCompat {
       )(_.toVector)
       .withTypeName("NonEmptyVector")
 
+  /**
+    * @group Cats
+    */
+  implicit final def nonEmptyMap[A](
+    implicit codec: Codec[A]
+  ): Codec.Aux[Avro.Map[codec.AvroType], NonEmptyMap[String, A]] =
+    Codec
+      .map[A]
+      .imapError(
+        map =>
+          NonEmptyMap
+            .fromMap(SortedMap.apply(map.toList: _*))
+            .toRight(AvroError.decodeEmptyCollection)
+      )(_.toSortedMap)
+      .withTypeName("NonEmptyMap")
+
   /**
     * @group General
     */

diff --git a/modules/core/src/main/scala/vulcan/Prism.scala b/modules/core/src/main/scala/vulcan/Prism.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/Props.scala b/modules/core/src/main/scala/vulcan/Props.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/internal/Deserializer.scala b/modules/core/src/main/scala/vulcan/internal/Deserializer.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/internal/Serializer.scala b/modules/core/src/main/scala/vulcan/internal/Serializer.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/internal/schema.scala b/modules/core/src/main/scala/vulcan/internal/schema.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/main/scala/vulcan/internal/syntax.scala b/modules/core/src/main/scala/vulcan/internal/syntax.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala-2/vulcan/AvroDocSpec.scala b/modules/core/src/test/scala-2/vulcan/AvroDocSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala-2/vulcan/AvroNamespaceSpec.scala b/modules/core/src/test/scala-2/vulcan/AvroNamespaceSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala-2/vulcan/DerivationSpec.scala b/modules/core/src/test/scala-2/vulcan/DerivationSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala-2/vulcan/examples/CaseClassAvroDoc.scala b/modules/core/src/test/scala-2/vulcan/examples/CaseClassAvroDoc.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala-2/vulcan/examples/FixedAvroDoc.scala b/modules/core/src/test/scala-2/vulcan/examples/FixedAvroDoc.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala-2/vulcan/examples/FixedNamespace.scala b/modules/core/src/test/scala-2/vulcan/examples/FixedNamespace.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala-2/vulcan/examples/SealedTraitEnumDerived.scala b/modules/core/src/test/scala-2/vulcan/examples/SealedTraitEnumDerived.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/cats/tests/CatsEquality.scala b/modules/core/src/test/scala/cats/tests/CatsEquality.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/cats/tests/CatsSuite.scala b/modules/core/src/test/scala/cats/tests/CatsSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/AvroErrorEqSpec.scala b/modules/core/src/test/scala/vulcan/AvroErrorEqSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/AvroErrorSpec.scala b/modules/core/src/test/scala/vulcan/AvroErrorSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/AvroExceptionSpec.scala b/modules/core/src/test/scala/vulcan/AvroExceptionSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/BaseSpec.scala b/modules/core/src/test/scala/vulcan/BaseSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/CodecInvariantSpec.scala b/modules/core/src/test/scala/vulcan/CodecInvariantSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/CodecSpec.scala b/modules/core/src/test/scala/vulcan/CodecSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -1556,6 +1556,77 @@ final class CodecSpec extends BaseSpec with CodecSpecHelpers {
       }
     }
 
+    describe("nonEmptyMap") {
+      describe("schema") {
+        it("should be encoded as map") {
+          assertSchemaIs[NonEmptyMap[String, Int]] {
+            """{"type":"map","values":"int"}"""
+          }
+        }
+      }
+
+      describe("encode") {
+        it("should encode as java map using encoder for value") {
+          assertEncodeIs[NonEmptyMap[String, Int]](
+            NonEmptyMap.of("key1" -> 1, "key2" -> 2, "key3" -> 3),
+            Right(
+              Map(Avro.String("key1") -> 1, Avro.String("key2") -> 2, Avro.String("key3") -> 3).asJava
+            )
+          )
+        }
+      }
+
+      describe("decode") {
+        it("should error if schema is not map") {
+          assertDecodeError[NonEmptyMap[String, Int]](
+            unsafeEncode[NonEmptyMap[String, Int]](NonEmptyMap.one("key", 1)),
+            SchemaBuilder.builder().intType(),
+            "Error decoding NonEmptyMap: Error decoding Map: Got unexpected schema type INT, expected schema type MAP"
+          )
+        }
+
+        it("should error if value is not java.util.Map") {
+          assertDecodeError[NonEmptyMap[String, Int]](
+            123,
+            unsafeSchema[NonEmptyMap[String, Int]],
+            "Error decoding NonEmptyMap: Error decoding Map: Got unexpected type java.lang.Integer, expected type java.util.Map"
+          )
+        }
+
+        it("should error if keys are not strings") {
+          assertDecodeError[NonEmptyMap[String, Int]](
+            NonEmptyMap.one(1, 2).toSortedMap.asJava,
+            unsafeSchema[NonEmptyMap[String, Int]],
+            "Error decoding NonEmptyMap: Error decoding Map: Got unexpected map key with type java.lang.Integer, expected Utf8"
+          )
+        }
+
+        it("should error if any keys are null") {
+          assertDecodeError[NonEmptyMap[String, Int]](
+            Map((null, 2)).asJava,
+            unsafeSchema[NonEmptyMap[String, Int]],
+            "Error decoding NonEmptyMap: Error decoding Map: Got unexpected map key with type null, expected Utf8"
+          )
+        }
+
+        it("should error on empty collection") {
+          assertDecodeError[NonEmptyMap[String, Int]](
+            unsafeEncode(Map.empty[String, Int]),
+            unsafeSchema[NonEmptyMap[String, Int]],
+            "Error decoding NonEmptyMap: Got unexpected empty collection"
+          )
+        }
+
+        it("should decode to map using decoder for value") {
+          val value = NonEmptyMap.of("key1" -> 1, "key2" -> 2, "key3" -> 3)
+          assertDecodeIs[NonEmptyMap[String, Int]](
+            unsafeEncode[NonEmptyMap[String, Int]](value),
+            Right(value)
+          )
+        }
+      }
+    }
+
     describe("option") {
       describe("schema") {
         it("should be encoded as union") {

diff --git a/modules/core/src/test/scala/vulcan/EitherValues.scala b/modules/core/src/test/scala/vulcan/EitherValues.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/PrismSpec.scala b/modules/core/src/test/scala/vulcan/PrismSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/PropsSpec.scala b/modules/core/src/test/scala/vulcan/PropsSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/RoundtripSpec.scala b/modules/core/src/test/scala/vulcan/RoundtripSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/examples/CaseClassField.scala b/modules/core/src/test/scala/vulcan/examples/CaseClassField.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */

diff --git a/modules/core/src/test/scala/vulcan/examples/CaseClassTwoFields.scala b/modules/core/src/test/scala/vulcan/examples/CaseClassTwoFields.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 OVO Energy Limited
+ * Copyright 2019-2024 OVO Energy Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */