Update Scala version

Author: michaelmior

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix some anomaly checking with `additionalProperties`
 
 ### Changed
+- Update to Scala 2.13.14
 - Update to Java 11
 - Change base image for Docker container
 - Set build timestamp for reproducible builds

build.sbt

@@ -2,7 +2,7 @@ import Dependencies._
 import com.typesafe.sbt.packager.docker._
 import xerial.sbt.Sonatype._
 
-ThisBuild / scalaVersion      := "2.13.10"
+ThisBuild / scalaVersion      := "2.13.14"
 ThisBuild / versionScheme     := Some("early-semver")
 ThisBuild / organization      := "io.github.dataunitylab"
 ThisBuild / organizationName  := "Rochester Institute of Technology"

sbtx

@@ -37,7 +37,7 @@ set -o pipefail
 declare -r sbt_release_version="1.8.2"
 declare -r sbt_unreleased_version="1.8.2"
 
-declare -r latest_213="2.13.10"
+declare -r latest_213="2.13.14"
 declare -r latest_212="2.12.17"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"

src/main/scala/io/github/dataunitylab/jsonoid/discovery/schemas/ArraySchema.scala

@@ -450,7 +450,7 @@ final case class ItemTypeProperty(
         itemType match {
           case Left(singleType) =>
             arr.zipWithIndex.flatMap { case (schema, index) =>
-              singleType.collectAnomalies(schema, f"${path}[$index]")
+              singleType.collectAnomalies(schema, f"${path}[${index.toString}]")
             }
 
           case Right(typeList) =>
@@ -465,7 +465,8 @@ final case class ItemTypeProperty(
             } else {
               typeList.zip(arr).zipWithIndex.flatMap {
                 case ((schema, arrayValue), index) =>
-                  schema.collectAnomalies(arrayValue, f"${path}[$index]")
+                  schema
+                    .collectAnomalies(arrayValue, f"${path}[${index.toString}]")
               }
             }
         }

src/main/scala/io/github/dataunitylab/jsonoid/discovery/schemas/JsonSchema.scala

@@ -7,6 +7,7 @@ import scala.reflect.ClassTag
 
 import org.json4s.JsonDSL._
 import org.json4s._
+import org.json4s.jackson.JsonMethods._
 
 import Helpers._
 import utils.JsonPointer
@@ -515,7 +516,13 @@ trait JsonSchema[T] {
     if (isValidType(value))
       properties.flatMap(_.collectAnomalies(value, path)(p, tag)).toSeq
     else
-      Seq(Anomaly(path, f"${value} has wrong type", AnomalyLevel.Fatal))
+      Seq(
+        Anomaly(
+          path,
+          f"${compact(render(value))} has wrong type",
+          AnomalyLevel.Fatal
+        )
+      )
   }
 
   /** Update a schema to only include a specific set of properties.

src/main/scala/io/github/dataunitylab/jsonoid/discovery/schemas/NullSchema.scala

@@ -4,6 +4,7 @@ package schemas
 import scala.reflect.ClassTag
 
 import org.json4s._
+import org.json4s.jackson.JsonMethods._
 
 import Helpers._
 
@@ -61,6 +62,12 @@ final case class NullSchema(
       //
       // Note that we override this behaviour in [[ProductSchema]] since
       // there we are explicitly expecting some non-null value
-      Seq(Anomaly(path, f"${value} is not null", AnomalyLevel.Info))
+      Seq(
+        Anomaly(
+          path,
+          f"${compact(render(value))} is not null",
+          AnomalyLevel.Info
+        )
+      )
   }
 }

src/main/scala/io/github/dataunitylab/jsonoid/discovery/schemas/ProductSchema.scala

@@ -7,6 +7,7 @@ import scala.reflect.ClassTag
 
 import org.json4s.JsonDSL._
 import org.json4s._
+import org.json4s.jackson.JsonMethods._
 
 import Helpers._
 import utils.JsonPointer
@@ -421,7 +422,13 @@ final case class ProductSchemaTypesProperty(
           Seq.empty
         } else {
           val maxLevel = maxAnomalyLevels.flatten.max
-          Seq(Anomaly(path, f"failed match for ${value} in schema", maxLevel))
+          Seq(
+            Anomaly(
+              path,
+              f"failed match for ${compact(render(value))} in schema",
+              maxLevel
+            )
+          )
         }
 
       // At least one schema must have no anomalies or only info level
@@ -434,7 +441,13 @@ final case class ProductSchemaTypesProperty(
           Seq.empty
         } else {
           val maxLevel = maxAnomalyLevels.flatten.max
-          Seq(Anomaly(path, f"failed match for ${value} in schema", maxLevel))
+          Seq(
+            Anomaly(
+              path,
+              f"failed match for ${compact(render(value))} in schema",
+              maxLevel
+            )
+          )
         }
 
       // Info anomalies are fine in multiple schemas
@@ -447,12 +460,18 @@ final case class ProductSchemaTypesProperty(
           // We take the lowest anomaly level from each schema
           // since this is the schema with the closest match
           val minAnomalyLevel = maxAnomalyLevels.flatten.min
-          Seq(Anomaly(path, f"no matches found for ${value}", minAnomalyLevel))
+          Seq(
+            Anomaly(
+              path,
+              f"no matches found for ${compact(render(value))}",
+              minAnomalyLevel
+            )
+          )
         } else {
           Seq(
             Anomaly(
               path,
-              f"multiple matches found for ${value}",
+              f"multiple matches found for ${compact(render(value))}",
               AnomalyLevel.Fatal
             )
           )

src/test/scala/io/github/dataunitylab/jsonoid/discovery/schemas/ObjectSchemaSpec.scala

@@ -111,7 +111,7 @@ class ObjectSchemaSpec extends UnitSpec with ScalaCheckPropertyChecks {
   it should "pass through anomalies from matches schemas" in {
     PatternTypesProperty(Map("^foo.*".r -> NumberSchema(3)))
       .collectAnomalies(JObject(List(("foobar", JBool(true))))) shouldEqual Seq(
-      Anomaly("$.foobar", "JBool(true) has wrong type", AnomalyLevel.Fatal)
+      Anomaly("$.foobar", "true has wrong type", AnomalyLevel.Fatal)
     )
   }
 

src/test/scala/io/github/dataunitylab/jsonoid/discovery/transformers/DisjointObjectTransformerSpec.scala

@@ -6,7 +6,7 @@ import schemas._
 class DisjointObjectTransformerSpec extends UnitSpec {
   behavior of "DisjointObjectTransformer"
 
-  implicit val propSet = PropertySets.AllProperties
+  implicit val propSet: PropertySet = PropertySets.AllProperties
 
   it should "replace disjoint objects with a product schema" in {
     val obj1 =