Merging http4s-stir implementation and tests.

Author: luksow

http4s-stir/src/main/scala-2/pl/iterators/kebs/http4sstir/unmarshallers/enums/package.scala

@@ -1,9 +1,9 @@
 package pl.iterators.kebs.http4sstir.matchers
 
-import pl.iterators.stir.server.PathMatcher1
+import pl.iterators.kebs.core.enums._
 import pl.iterators.kebs.core.instances.InstanceConverter
 import pl.iterators.kebs.core.macros.ValueClassLike
-import pl.iterators.kebs.core.enums._
+import pl.iterators.stir.server.PathMatcher1
 
 trait KebsMatchers extends pl.iterators.stir.server.PathMatchers {
 

http4s-stir/src/main/scala-3/pl/iterators/kebs/http4sstir/matchers/KebsMatchers.scala

@@ -1,4 +1,4 @@
-package pl.iterators.kebs.http4sstir.enums
+package pl.iterators.kebs.http4sstir.unmarshallers.enums
 
 import pl.iterators.stir.unmarshalling.PredefinedFromStringUnmarshallers._
 import pl.iterators.stir.unmarshalling.{FromStringUnmarshaller, Unmarshaller}
@@ -19,18 +19,21 @@ trait EnumUnmarshallers {
     enumUnmarshaller(ev)
 }
 
-trait ValueEnumUnmarshallers {
+trait LowerPriorityValueEnumUnmarshallers {
   final def valueEnumUnmarshaller[V, E <: ValueEnumLikeEntry[V]](`enum`: ValueEnumLike[V, E]): Unmarshaller[V, E] = Unmarshaller { v =>
-    `enum`.withValueOption(v) match {
+    `enum`.values.find(e => e.value == v) match {
       case Some(enumEntry) => IO.pure(enumEntry)
       case None =>
-        IO.raiseError(new IllegalArgumentException(s"""Invalid value '$v'. Expected one of: ${`enum`.getValuesToEntriesMap.keysIterator
-            .mkString(", ")}"""))
+        IO.raiseError(
+          new IllegalArgumentException(s"""Invalid value '$v'. Expected one of: ${`enum`.getValuesToEntriesMap.keysIterator
+              .mkString(", ")}""")
+        )
     }
   }
 
-  implicit def kebsValueEnumUnmarshaller[V, E <: ValueEnumLikeEntry[V]](implicit ev: ValueEnumLike[V, E]): Unmarshaller[V, E] =
-    valueEnumUnmarshaller(ev)
+  implicit def kebsValueEnumFromStringUnmarshaller[E <: ValueEnumLikeEntry[String]](implicit
+      ev: ValueEnumLike[String, E]
+  ): FromStringUnmarshaller[E] = valueEnumUnmarshaller(ev)
 
   implicit def kebsIntValueEnumFromStringUnmarshaller[E <: ValueEnumLikeEntry[Int]](implicit
       ev: ValueEnumLike[Int, E]
@@ -50,4 +53,13 @@ trait ValueEnumUnmarshallers {
     byteFromStringUnmarshaller andThen valueEnumUnmarshaller(ev)
 }
 
-trait KebsEnumUnmarshallers extends EnumUnmarshallers with ValueEnumUnmarshallers {}
+trait ValueEnumUnmarshallers extends LowerPriorityValueEnumUnmarshallers {
+  implicit def kebsValueEnumUnmarshaller[V, E <: ValueEnumLikeEntry[V]](implicit ev: ValueEnumLike[V, E]): Unmarshaller[V, E] =
+    valueEnumUnmarshaller(ev)
+}
+
+trait KebsEnumUnmarshallers extends ValueEnumUnmarshallers with EnumUnmarshallers {
+  // this is to make both 2.13.x and 3.x compilers happy
+  override implicit def kebsValueEnumUnmarshaller[V, E <: ValueEnumLikeEntry[V]](implicit ev: ValueEnumLike[V, E]): Unmarshaller[V, E] =
+    valueEnumUnmarshaller(ev)
+}

http4s-stir/src/main/scala-3/pl/iterators/kebs/http4sstir/unmarshallers/enums/KebsEnumUnmarshallers.scala

@@ -0,0 +1,5 @@
+package pl.iterators.kebs.http4sstir
+
+import pl.iterators.kebs.enumeratum.KebsEnumeratum
+
+trait KebsEnumForTests extends KebsEnumeratum

http4s-stir/src/main/scala-2/pl/iterators/kebs/http4sstir/matchers/KebsMatchers.scala http4s-stir/src/main/scala/pl/iterators/kebs/http4sstir/matchers/KebsMatchers.scala

@@ -0,0 +1,5 @@
+package pl.iterators.kebs.http4sstir
+
+import pl.iterators.kebs.enumeratum.KebsEnumeratum
+
+trait KebsValueEnumForTests extends KebsEnumeratum

http4s-stir/src/main/scala-2/pl/iterators/kebs/http4sstir/unmarshallers/enums/KebsEnumUnmarshallers.scala http4s-stir/src/main/scala/pl/iterators/kebs/http4sstir/unmarshallers/enums/KebsEnumUnmarshallers.scala

@@ -0,0 +1,5 @@
+package pl.iterators.kebs.http4sstir
+
+import pl.iterators.kebs.enums.KebsEnum
+
+trait KebsEnumForTests extends KebsEnum

http4s-stir/src/main/scala-3/pl/iterators/kebs/http4sstir/unmarshallers/enums/package.scala http4s-stir/src/main/scala/pl/iterators/kebs/http4sstir/unmarshallers/enums/package.scala

@@ -0,0 +1,5 @@
+package pl.iterators.kebs.http4sstir
+
+import pl.iterators.kebs.enums.KebsValueEnum
+
+trait KebsValueEnumForTests extends KebsValueEnum

http4s-stir/src/test/scala-2/pl/iterators/kebs/http4sstir/KebsEnumForTests.scala

@@ -10,10 +10,23 @@ import pl.iterators.kebs.core.enums.ValueEnumLikeEntry
 object Domain {
   opaque type TestTaggedUri = URI
   object TestTaggedUri extends Opaque[TestTaggedUri, URI]
+
   opaque type TestId = UUID
   object TestId extends Opaque[TestId, UUID]
+
   opaque type Id = Long
   object Id extends Opaque[Id, Long]
+
+  opaque type TestDouble = Double
+  object TestDouble extends Opaque[TestDouble, Double]
+
+  opaque type UUIDId = UUID
+  object UUIDId extends Opaque[UUIDId, UUID] {
+    def generate[T]: UUIDId = UUID.randomUUID()
+    def fromString[T](str: String): UUIDId =
+      UUID.fromString(str)
+  }
+
   case class I(i: Int)
   case class S(s: String)
   case class P[A](a: A)