Update scalafmt

Author: michaelmior

.scalafmt.conf

@@ -1 +1,2 @@
-version = 2.7.5
+version = 3.8.2
+runner.dialect = scala213

src/main/scala/io/github/dataunitylab/jsonoid/discovery/Anomaly.scala

@@ -15,23 +15,28 @@ object AnomalyLevel {
   }
 
   /** This is an anomaly for a value which is structurally valid, but falls
-    *  outside of the expected range.
+    * outside of the expected range.
     */
   case object Warning extends AnomalyLevel {
     override val order: Int = 1
   }
 
-  /** This is an anomaly which would cause the value to fail structural validation. */
+  /** This is an anomaly which would cause the value to fail structural
+    * validation.
+    */
   case object Fatal extends AnomalyLevel {
     override val order: Int = 2
   }
 }
 
 /** Anomalies are potential violations of a schema according to a given value.
   *
-  * @param path the path where this anomaly occurred
-  * @param message a message describing this anomaly
-  * @param anomalyLevel the level of this anomaly
+  * @param path
+  *   the path where this anomaly occurred
+  * @param message
+  *   a message describing this anomaly
+  * @param anomalyLevel
+  *   the level of this anomaly
   */
 final case class Anomaly(
     path: String,

src/main/scala/io/github/dataunitylab/jsonoid/discovery/DiscoverSchema.scala

@@ -48,11 +48,15 @@ object DiscoverSchema {
   /** Perform split schema discovery by randomly splitting the input and
     * generating two different schemas.
     *
-    * @param jsons an iterator of JSON objects to perform schema discovery on
-    * @param propSet the property set to use for schema discovery
-    * @param splitPercentage the percentage of the input to use for training
+    * @param jsons
+    *   an iterator of JSON objects to perform schema discovery on
+    * @param propSet
+    *   the property set to use for schema discovery
+    * @param splitPercentage
+    *   the percentage of the input to use for training
     *
-    * @return a tuple of the discovered schemas
+    * @return
+    *   a tuple of the discovered schemas
     */
   def splitDiscover(
       jsons: Iterator[JValue],
@@ -77,9 +81,12 @@ object DiscoverSchema {
 
   /** Perform schema discovery on a set of JSON objects.
     *
-    * @param jsons an iterator of JSON objects to perform schema discovery on
-    * @param propSet the property set to use for schema discovery
-    * @return the discovered schema
+    * @param jsons
+    *   an iterator of JSON objects to perform schema discovery on
+    * @param propSet
+    *   the property set to use for schema discovery
+    * @return
+    *   the discovered schema
     */
   def discover(
       jsons: Iterator[JValue]
@@ -94,8 +101,10 @@ object DiscoverSchema {
 
   /** Discover a schema from a single JSON object.
     *
-    * @param value the JSON object to discover the schema for
-    * @param propSet the property set to use for schema discovery
+    * @param value
+    *   the JSON object to discover the schema for
+    * @param propSet
+    *   the property set to use for schema discovery
     */
   @SuppressWarnings(Array("org.wartremover.warts.Recursion"))
   def discoverFromValue(
@@ -126,8 +135,10 @@ object DiscoverSchema {
 
   /** Discover a schema from a set of fields in a JSON object.
     *
-    * @param fields the fields to discover the schema for
-    * @param propSet the property set to use for schema discovery
+    * @param fields
+    *   the fields to discover the schema for
+    * @param propSet
+    *   the property set to use for schema discovery
     */
   private def discoverObjectFields(
       fields: Seq[JField]

src/main/scala/io/github/dataunitylab/jsonoid/discovery/EquivalenceRelation.scala

@@ -7,8 +7,8 @@ import schemas._
   */
 object EquivalenceRelations {
 
-  /** An equivalence relation which considers objects equal if they have the same
-    * set of keys.
+  /** An equivalence relation which considers objects equal if they have the
+    * same set of keys.
     */
   implicit object LabelEquivalenceRelation extends EquivalenceRelation {
     def fuse(kind1: JsonSchema[_], kind2: JsonSchema[_]): Boolean = {
@@ -42,8 +42,8 @@ object EquivalenceRelations {
     }
   }
 
-  /** An equivalence relation which considers objects equal if all keys which are
-    * in common between the objects have the same type.
+  /** An equivalence relation which considers objects equal if all keys which
+    * are in common between the objects have the same type.
     */
   implicit object TypeMatchEquivalenceRelation extends EquivalenceRelation {
     def fuse(kind1: JsonSchema[_], kind2: JsonSchema[_]): Boolean = {
@@ -62,8 +62,8 @@ object EquivalenceRelations {
     }
   }
 
-  /** An equivalence relation which considers schemas equal if they have the same
-    * type.
+  /** An equivalence relation which considers schemas equal if they have the
+    * same type.
     */
   implicit object KindEquivalenceRelation extends EquivalenceRelation {
     def fuse(kind1: JsonSchema[_], kind2: JsonSchema[_]): Boolean = {
@@ -97,8 +97,10 @@ abstract class EquivalenceRelation extends Serializable {
 
   /** Returns true if the two schemas should be considered equivalent.
     *
-    * @param kind1 the first schema to compare
-    * @param kind2 the second schem to compare
+    * @param kind1
+    *   the first schema to compare
+    * @param kind2
+    *   the second schem to compare
     */
   def fuse(kind1: JsonSchema[_], kind2: JsonSchema[_]): Boolean
 }

src/main/scala/io/github/dataunitylab/jsonoid/discovery/ForeignKeyFinder.scala

@@ -5,9 +5,12 @@ import utils.BloomFilter
 
 /** Represents a discovered foreign key.
   *
-  * @constructor Create a new foreign key with two paths.
-  * @param localPath the path of the referencing property
-  * @param foreignPath the path of the referenced property
+  * @constructor
+  *   Create a new foreign key with two paths.
+  * @param localPath
+  *   the path of the referencing property
+  * @param foreignPath
+  *   the path of the referenced property
   */
 final case class ForeignKey(localPath: String, foreignPath: String)
 
@@ -17,8 +20,10 @@ object ForeignKeyFinder extends SchemaWalker[BloomFilter[_]] {
 
   /** Collect Bloom filters of all types in the schemas.
     *
-    * @param schemas the schemas to search for filters
-    * @return a map from paths to Bloom filters
+    * @param schemas
+    *   the schemas to search for filters
+    * @return
+    *   a map from paths to Bloom filters
     */
   private def collectFiltersByPath(
       schema: JsonSchema[_]
@@ -37,7 +42,8 @@ object ForeignKeyFinder extends SchemaWalker[BloomFilter[_]] {
 
   /** Returns a list of possible foreign keys.
     *
-    * @param schema the schema to search for foreign keys
+    * @param schema
+    *   the schema to search for foreign keys
     */
   def findForeignKeys(schema: JsonSchema[_]): List[ForeignKey] = {
     val filters = collectFiltersByPath(schema)

src/main/scala/io/github/dataunitylab/jsonoid/discovery/Helpers.scala

@@ -60,12 +60,17 @@ object Helpers {
 
   /** Expands an integer used for a minimum value to meet a given limit.
     *
-    * @param current the current minimum value
-    * @param limit the limit from the other schema
-    * @param exclusive whether the current limit is exclusive or not
-    * @param round the current round of expansion
+    * @param current
+    *   the current minimum value
+    * @param limit
+    *   the limit from the other schema
+    * @param exclusive
+    *   whether the current limit is exclusive or not
+    * @param round
+    *   the current round of expansion
     *
-    * @return the new minimum value and whether it is exclusive
+    * @return
+    *   the new minimum value and whether it is exclusive
     */
   def expandInt(
       current: BigInt,
@@ -156,12 +161,17 @@ object Helpers {
 
   /** Contracts an integer used for a maxium value to meet a given limit.
     *
-    * @param current the current maximum value
-    * @param limit the limit from the other schema
-    * @param exclusive whether the current limit is exclusive or not
-    * @param round the current round of expansion
+    * @param current
+    *   the current maximum value
+    * @param limit
+    *   the limit from the other schema
+    * @param exclusive
+    *   whether the current limit is exclusive or not
+    * @param round
+    *   the current round of expansion
     *
-    * @return the new maximum value and whether it is exclusive
+    * @return
+    *   the new maximum value and whether it is exclusive
     */
   @SuppressWarnings(Array("org.wartremover.warts.Equals"))
   def contractInt(
@@ -237,15 +247,20 @@ object Helpers {
     foo(x, 2).sorted
   }
 
-  /** Determine if one minimum values the values of another,
-    * considering whether each minimum is exclusive or not.
+  /** Determine if one minimum values the values of another, considering whether
+    * each minimum is exclusive or not.
     *
-    * @param value1 the first minimum value
-    * @param exclusive1 whether the first minimum value is exclusive
-    * @param value2 the second minimum value
-    * @param exclusive2 whether the second minimum value is exclusive
+    * @param value1
+    *   the first minimum value
+    * @param exclusive1
+    *   whether the first minimum value is exclusive
+    * @param value2
+    *   the second minimum value
+    * @param exclusive2
+    *   whether the second minimum value is exclusive
     *
-    * @return true if the second value covers the first, false otherwise
+    * @return
+    *   true if the second value covers the first, false otherwise
     */
   @SuppressWarnings(Array("org.wartremover.warts.OptionPartial"))
   def isMinCoveredBy[A: Order](
@@ -269,14 +284,19 @@ object Helpers {
       value2.get <= value1.get
   }
 
-  /** Determine if one maximum value covers the values of another,
-    *  considering whether each maximum is exclusive or not.
+  /** Determine if one maximum value covers the values of another, considering
+    * whether each maximum is exclusive or not.
     *
-    * @param value1 the first maximum value
-    * @param exclusive1 whether the first maximum value is exclusive
-    * @param value2 the second maximum value
-    * @param exclusive2 whether the second maximum value is exclusive
-    * @return true if the second value covers the first, false otherwise
+    * @param value1
+    *   the first maximum value
+    * @param exclusive1
+    *   whether the first maximum value is exclusive
+    * @param value2
+    *   the second maximum value
+    * @param exclusive2
+    *   whether the second maximum value is exclusive
+    * @return
+    *   true if the second value covers the first, false otherwise
     */
   @SuppressWarnings(Array("org.wartremover.warts.OptionPartial"))
   def isMaxCoveredBy[A: Order](
@@ -321,7 +341,7 @@ object Helpers {
     }
 
   /** Find the intersection of two optional sets or None if neither set is
-    *  specified.
+    * specified.
     */
   def intersectOrNone[A](
       first: Option[Set[A]],
@@ -333,7 +353,8 @@ object Helpers {
     case (None, None)       => None
   }
 
-  /** Find the union of two optional sets or None if neither set is specified. */
+  /** Find the union of two optional sets or None if neither set is specified.
+    */
   def unionOrNone[A](
       first: Option[Set[A]],
       second: Option[Set[A]]

src/main/scala/io/github/dataunitylab/jsonoid/discovery/IncompatiblityCollector.scala

@@ -9,15 +9,20 @@ final case class Incompatibility[T](path: String, property: ClassTag[T])
 
 object IncompatibilityCollector {
 
-  /** Give a more detailed incompatibility by
-    * manually checking the type of these two schemas.
+  /** Give a more detailed incompatibility by manually checking the type of
+    * these two schemas.
     *
-    * @param path the path of the potential incompatibility
-    * @param s1 the first schema
-    * @param s2 the second schema
-    * @param tag the type of incompatibility to report
+    * @param path
+    *   the path of the potential incompatibility
+    * @param s1
+    *   the first schema
+    * @param s2
+    *   the second schema
+    * @param tag
+    *   the type of incompatibility to report
     *
-    * @return an sequence of a single incompatibility if one exists
+    * @return
+    *   an sequence of a single incompatibility if one exists
     */
   def typeIncompat(
       path: String,
@@ -36,11 +41,15 @@ object IncompatibilityCollector {
 
   /** Check for incompatibilities at a given path.
     *
-    * @param base the base schema
-    * @param other the other schema to check for incompatibilities
-    * @param path the path of the potential incompatibility
+    * @param base
+    *   the base schema
+    * @param other
+    *   the other schema to check for incompatibilities
+    * @param path
+    *   the path of the potential incompatibility
     *
-    * @return a sequence of incompatibilities at the given path
+    * @return
+    *   a sequence of incompatibilities at the given path
     */
   @SuppressWarnings(
     Array(
@@ -186,10 +195,13 @@ object IncompatibilityCollector {
 
   /** Check for incompatibilities across an entire schema..
     *
-    * @param base the base schema
-    * @param other the other schema to check for incompatibilities
+    * @param base
+    *   the base schema
+    * @param other
+    *   the other schema to check for incompatibilities
     *
-    * @return a sequence of incompatibilities at the given path
+    * @return
+    *   a sequence of incompatibilities at the given path
     */
   def findIncompatibilities(
       base: JsonSchema[_],

src/main/scala/io/github/dataunitylab/jsonoid/discovery/JsonoidParams.scala

@@ -4,12 +4,19 @@ import schemas.{PropertySet, PropertySets}
 
 /** Parameters used during the discovery process.
   *
-  * @param additionalProperties whether `additionalProperties` is set to true in generated schemas
-  * @param er the equivalence relation to use during the discovery process
-  * @param extendedFormats whether to include extended formats
-  * @param formatThreshold the fraction of values that must match a given format for [[schemas.FormatProperty]] to consider the format valid
-  * @param maxExamples the maximum number of examples to be kept for any examples property
-  * @param resetFormatLength whether to reset max/min length of strings with [[schemas.FormatProperty]]
+  * @param additionalProperties
+  *   whether `additionalProperties` is set to true in generated schemas
+  * @param er
+  *   the equivalence relation to use during the discovery process
+  * @param extendedFormats
+  *   whether to include extended formats
+  * @param formatThreshold
+  *   the fraction of values that must match a given format for
+  *   [[schemas.FormatProperty]] to consider the format valid
+  * @param maxExamples
+  *   the maximum number of examples to be kept for any examples property
+  * @param resetFormatLength
+  *   whether to reset max/min length of strings with [[schemas.FormatProperty]]
   */
 final case class JsonoidParams(
     val additionalProperties: Boolean = false,