Make ValidationError implement Single

softwaremill · Aug 19, 2020 · 723da5a · 723da5a
1 parent da0e9b7
commit 723da5a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/core/src/main/scala/sttp/tapir/Validator.scala b/core/src/main/scala/sttp/tapir/Validator.scala
@@ -129,7 +129,7 @@ object Validator extends ValidatorMagnoliaDerivation with ValidatorEnumMacro {
       }
     }
   }
-  case class Custom[T](doValidate: T => List[ValidationError[_]]) extends Validator[T] {
+  case class Custom[T](doValidate: T => List[ValidationError[_]]) extends Validator.Single[T] {
     override def validate(t: T): List[ValidationError[_]] = {
       doValidate(t)
     }

diff --git a/docs/openapi-docs/src/main/scala/sttp/tapir/docs/openapi/schema/package.scala b/docs/openapi-docs/src/main/scala/sttp/tapir/docs/openapi/schema/package.scala
@@ -18,7 +18,6 @@ package object schema {
     v match {
       case Validator.All(validators) => validators.flatMap(asSingleValidators)
       case Validator.Any(validators) => validators.flatMap(asSingleValidators)
-      case cv: Validator.Custom[_]   => List.empty
       case sv: Validator.Single[_]   => List(sv)
     }
   }

diff --git a/docs/openapi-docs/src/test/scala/sttp/tapir/docs/openapi/VerifyYamlTest.scala b/docs/openapi-docs/src/test/scala/sttp/tapir/docs/openapi/VerifyYamlTest.scala
@@ -136,8 +136,6 @@ class VerifyYamlTest extends FunSuite with Matchers {
     val actualYaml = List(e1, e2, e3).toOpenAPI(Info("Fruits", "1.0")).toYaml
     val actualYamlNoIndent = noIndentation(actualYaml)
 
-    println(actualYaml)
-
     actualYamlNoIndent shouldBe expectedYaml
   }