Fix some more collection errors

build.sbt

@@ -293,7 +293,10 @@ def buildScalacOptions(scalaVersion: String) = {
       Seq(
         "-Xlint:inaccessible",
         "-Xlint:infer-any",
-        "-Xlint:nullary-unit"
+        "-Xlint:nullary-unit",
+        // the import is needed for Scala 2.12 but issues an unused import warning under 2.13, so we add this to
+        // suppresss the warning
+        "-Wconf:origin=scala.collection.compat.*:s"
       )
     case _ => Seq.empty
   }

daffodil-lib/src/main/scala/org/apache/daffodil/lib/util/MultiMapWrapper.scala

@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.daffodil.lib.util
+
+import scala.collection.mutable
+
+/**
+ * Compatibility class for 2.12 and 2.13 since MultiMap and inheritance
+ * from class mutable.HashMap have been deprecated in 2.13.
+ */
+class MultiMapWrapper[K, V] {
+  private val underlying = mutable.Map.empty[K, mutable.Set[V]]
+
+  def addBinding(key: K, value: V): Unit =
+    underlying.getOrElseUpdate(key, mutable.Set.empty) += value
+
+  def addBinding(key: K, values: mutable.Set[V]): Unit = {
+    values.foreach(addBinding(key, _))
+  }
+
+  def removeBinding(key: K, value: V): Unit =
+    underlying.get(key).foreach { values =>
+      values -= value
+      if (values.isEmpty) underlying -= key
+    }
+
+  def get(key: K): Option[mutable.Set[V]] = underlying.get(key)
+
+  def keys: Iterable[K] = underlying.keys
+
+  def iterator: Iterator[(K, mutable.Set[V])] = underlying.iterator
+
+  def filter(func: (K, mutable.Set[V]) => Boolean): MultiMapWrapper[K, V] = {
+    val filtered = new MultiMapWrapper[K, V]
+    for ((key, values) <- underlying) {
+      if (func(key, values)) {
+        filtered.addBinding(key, values)
+      }
+    }
+    filtered
+  }
+
+  def map[T](func: (K, mutable.Set[V]) => T): collection.Seq[T] = {
+    val ret = mutable.ListBuffer.empty[T]
+    for ((key, values) <- underlying) {
+      ret.append(func(key, values))
+    }
+    ret
+  }
+}

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/debugger/InteractiveDebugger.scala

@@ -18,6 +18,7 @@
 package org.apache.daffodil.runtime1.debugger
 
 import java.io.File
+import scala.collection.compat.immutable.ArraySeq
 
 import org.apache.daffodil.lib.api.DaffodilTunables
 import org.apache.daffodil.lib.api.WarnID
@@ -279,7 +280,7 @@ class InteractiveDebugger(
         input
       }
     }
-    cmd.split(" ").filter(_ != "")
+    ArraySeq.unsafeWrapArray(cmd.split(" ").filter(_ != ""))
   }
 
   private val debuggerQName = GlobalQName(Some("daf"), "debugger", XMLUtils.dafintURI)
@@ -1862,7 +1863,7 @@ class InteractiveDebugger(
       }
 
       abstract class InfoProcessorBase extends DebugCommand with DebugCommandValidateZeroArgs {
-        val desc = "display the current Daffodil " + name
+        val desc = "display the current Daffodil " + this.name
         val longDesc = desc
         def act(
           args: Seq[String],
@@ -1871,15 +1872,15 @@ class InteractiveDebugger(
         ): DebugState.Type = {
           state match {
             case pstate: PState => {
-              if (name == "parser") {
-                debugPrintln("%s: %s".format(name, processor.toBriefXML(2)))
+              if (this.name == "parser") {
+                debugPrintln("%s: %s".format(this.name, processor.toBriefXML(2)))
               } else {
                 debugPrintln("unparser: not available")
               }
             }
             case ustate: UState => {
-              if (name == "unparser") {
-                debugPrintln("%s: %s".format(name, processor.toBriefXML(2)))
+              if (this.name == "unparser") {
+                debugPrintln("%s: %s".format(this.name, processor.toBriefXML(2)))
               } else {
                 debugPrintln("parser: not available")
               }

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DFDLXFunctions.scala

@@ -235,7 +235,7 @@
 
   // This is toXML for the case class object, not the infoset node it is
   // dealing with.
-  override def toXML = toXML(recipe.toXML)
+  override def toXML = toXMLVarargs(recipe.toXML)
 
 }
 

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DPathRuntime.scala

@@ -18,6 +18,7 @@
 package org.apache.daffodil.runtime1.dpath
 
 import java.lang.{ Number => JNumber }
+import scala.collection.compat.immutable.ArraySeq
 import scala.xml.NodeSeq.seqToNodeSeq
 
 import org.apache.daffodil.lib.api.DaffodilTunables
@@ -43,7 +44,7 @@
 
 class CompiledDPath(val ops: RecipeOp*) extends Serializable {
 
-  def this(ops: List[RecipeOp]) = this(ops.toArray: _*)
+  def this(ops: List[RecipeOp]) = this(ArraySeq.unsafeWrapArray(ops.toArray): _*)
 
   override def toString =
     toXML.toString
@@ -157,9 +158,9 @@
 
   protected def subRecipes: Seq[CompiledDPath] = Nil
 
-  protected def toXML(s: String): scala.xml.Node = toXML(new scala.xml.Text(s))
+  protected def toXML(s: String): scala.xml.Node = toXMLVarargs(new scala.xml.Text(s))
 
-  protected def toXML(children: scala.xml.Node*): scala.xml.Node = toXML(children.toSeq)
+  protected def toXMLVarargs(children: scala.xml.Node*): scala.xml.Node = toXML(children.toSeq)
 
   protected def toXML(children: scala.xml.NodeSeq): scala.xml.Node = {
     val name = Misc.getNameFromClass(this)
@@ -246,7 +247,8 @@
   def right: CompiledDPath
   override def subRecipes: Seq[CompiledDPath] = Seq(left, right)
 
-  override def toXML: scala.xml.Node = toXML(new scala.xml.Text(op), left.toXML, right.toXML)
+  override def toXML: scala.xml.Node =
+    toXMLVarargs(new scala.xml.Text(op), left.toXML, right.toXML)
 }
 
 case class CompareOperator(cop: CompareOpBase, left: CompiledDPath, right: CompiledDPath)

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/FNBases.scala

@@ -124,7 +124,7 @@
     dstate.setCurrentValue(computeValue(arg, dstate))
   }
 
-  override def toXML = toXML(recipe.toXML)
+  override def toXML = toXMLVarargs(recipe.toXML)
 
   def computeValue(str: DataValuePrimitive, dstate: DState): DataValuePrimitive
 }

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/FNFunctions.scala

@@ -714,7 +714,7 @@
     dstate.setCurrentValue(res)
   }
 
-  override def toXML = toXML(recipe.toXML)
+  override def toXML = toXMLVarargs(recipe.toXML)
 
 }
 
@@ -726,7 +726,7 @@
     dstate.setCurrentValue(!res)
   }
 
-  override def toXML = toXML(recipe.toXML)
+  override def toXML = toXMLVarargs(recipe.toXML)
 
 }
 
@@ -919,13 +919,13 @@
         val f = asFloat(value.getAnyRef).floatValue()
         if (f.isPosInfinity || f.isNegInfinity) f
         else if (f.isNaN()) throw new NumberFormatException("fn:round received NaN")
-        else f.round: Float
+        else f.round.toFloat
       }
       case NodeInfo.Double => {
         val d = asDouble(value.getAnyRef).doubleValue()
         if (d.isPosInfinity || d.isNegInfinity) d
         else if (d.isNaN()) throw new NumberFormatException("fn:round received NaN")
-        else d.round: Double
+        else d.round.toDouble
       }
       case _: NodeInfo.Numeric.Kind => value
       case _ =>

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/externalvars/ExternalVariablesLoader.scala

@@ -19,6 +19,7 @@ package org.apache.daffodil.runtime1.externalvars
 
 import java.io.File
 import java.net.URI
+import scala.collection.compat._
 import scala.collection.immutable.Queue
 import scala.io.Codec.string2codec
 import scala.xml.Node
@@ -65,7 +66,7 @@ object ExternalVariablesLoader {
         Binding(name, value)
       }
     }
-    Queue.empty.enqueue(varsKVP)
+    Queue.empty.enqueueAll(varsKVP)
   }
 
   def uriToBindings(uri: URI): Queue[Binding] = {

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/PartialNextElementResolver.scala

@@ -17,6 +17,8 @@
 
 package org.apache.daffodil.runtime1.infoset
 
+import scala.collection.compat.immutable.LazyList
+
 import org.apache.daffodil.lib.exceptions.Assert
 import org.apache.daffodil.lib.util.Logger
 import org.apache.daffodil.lib.util.MStackOf
@@ -126,7 +128,7 @@
   ): Maybe[ElementRuntimeData] = {
     val allTRDs = {
       iter.reset()
-      iter.toStream.takeWhile { stackTRD =>
+      iter.to(LazyList).takeWhile { stackTRD =>
         optTRD.map { _ ne stackTRD }.getOrElse(true)
       }
     }
@@ -334,7 +336,7 @@
           // with a matching local name, and error if we found more than one.
           // If we only found one we found it. If we didn't find any, there was
           // no match.
-          val localMatches = nextERDMap.filterKeys(_.local == local)
+          val localMatches = nextERDMap.filter { case (k, v) => k.local == local }
           if (localMatches.size > 1) {
             val sqn = StepQName(None, local, NS(namespace))
             val keys = localMatches.keys.toSeq

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/EvTextNumber.scala

@@ -18,7 +18,6 @@
 package org.apache.daffodil.runtime1.processors
 
 import java.math.RoundingMode
-import scala.collection.mutable
 
 import org.apache.daffodil.lib.cookers.TextBooleanFalseRepCooker
 import org.apache.daffodil.lib.cookers.TextBooleanTrueRepCooker
@@ -33,6 +32,7 @@ import org.apache.daffodil.lib.util.Maybe._
 import org.apache.daffodil.lib.util.MaybeChar
 import org.apache.daffodil.lib.util.MaybeDouble
 import org.apache.daffodil.lib.util.MaybeInt
+import org.apache.daffodil.lib.util.MultiMapWrapper
 import org.apache.daffodil.runtime1.dpath.NodeInfo.PrimType
 import org.apache.daffodil.runtime1.dsom._
 
@@ -96,8 +96,7 @@ class TextNumberFormatEv(
     exponentRep: Maybe[String]
   ): Unit = {
 
-    val mm = new mutable.HashMap[String, mutable.Set[String]]
-      with mutable.MultiMap[String, String]
+    val mm = new MultiMapWrapper[String, String]
     if (decimalSep.isDefined)
       mm.addBinding(decimalSep.get.toString, "textStandardDecimalSeparator")
     if (groupingSep.isDefined)

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/SuspensionTracker.scala

@@ -125,9 +125,9 @@ class SuspensionDeadlockException(suspExprs: Seq[Suspension])
       .groupBy {
         _.rd
       }
-      .mapValues {
+      .values
+      .map {
         _(0)
       }
-      .values
       .mkString(" - ", "\n - ", "")
   )

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/dfa/CreateDelimiterDFA.scala

@@ -17,6 +17,7 @@
 
 package org.apache.daffodil.runtime1.processors.dfa
 
+import scala.collection.compat.immutable.ArraySeq
 import scala.collection.mutable.ArrayBuffer
 
 import org.apache.daffodil.runtime1.dsom.DPathCompileInfo
@@ -95,7 +96,7 @@ object CreateDelimiterDFA {
     val d = new Delimiter()
     d.compileDelimiter(delimiterStr, ignoreCase)
     val db = d.delimBuf
-    apply(delimType, ci, db, delimiterStr, ignoreCase)
+    apply(delimType, ci, ArraySeq.unsafeWrapArray(db), delimiterStr, ignoreCase)
   }
 
   /**
@@ -111,7 +112,7 @@ object CreateDelimiterDFA {
     val d = new Delimiter()
     d.compileDelimiter(delimiterStr, false)
     val db = d.delimBuf
-    apply(delimType, ci, db, delimiterStr, outputNewLine)
+    apply(delimType, ci, ArraySeq.unsafeWrapArray(db), delimiterStr, outputNewLine)
   }
 
   /**

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/dfa/TextDelimitedUnparser.scala

@@ -17,6 +17,7 @@
 
 package org.apache.daffodil.runtime1.processors.dfa
 
+import scala.collection.compat.immutable.ArraySeq
 import scala.collection.mutable.ArrayBuffer
 
 import org.apache.daffodil.io.DataInputStream
@@ -97,10 +98,10 @@ class TextDelimitedUnparser(override val context: TermRuntimeData) extends Delim
     val fieldReg: Registers = state.dfaRegistersPool.getFromPool("escapeBlock1")
 
     val fieldEscapesIter = {
-      val ab = ArrayBuffer((blockEnd +: delims): _*)
+      val ab = ArrayBuffer(ArraySeq.unsafeWrapArray(blockEnd +: delims): _*)
       new AllDelimiterIterator(ab)
     }
-    val delimIter = new AllDelimiterIterator(ArrayBuffer(delims: _*))
+    val delimIter = new AllDelimiterIterator(ArrayBuffer(ArraySeq.unsafeWrapArray(delims): _*))
 
     fieldReg.reset(state, input, fieldEscapesIter)
 
@@ -274,7 +275,7 @@ class TextDelimitedUnparser(override val context: TermRuntimeData) extends Delim
     val successes: ArrayBuffer[(DFADelimiter, Registers)] = ArrayBuffer.empty
     val fieldReg: Registers = state.dfaRegistersPool.getFromPool("escapeCharacter1")
 
-    val delimIter = new AllDelimiterIterator(ArrayBuffer(delims: _*))
+    val delimIter = new AllDelimiterIterator(ArrayBuffer(ArraySeq.unsafeWrapArray(delims): _*))
 
     fieldReg.reset(state, input, delimIter)
 

daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/udf/UserDefinedFunctionService.scala

@@ -26,6 +26,7 @@ import java.lang.reflect.Method
 import java.util.ServiceConfigurationError
 import java.util.ServiceLoader
 import scala.collection.mutable._
+import scala.collection.compat.immutable.ArraySeq
 
 import org.apache.daffodil.lib.util.Logger
 import org.apache.daffodil.lib.util.Misc
@@ -56,7 +57,7 @@ object UserDefinedFunctionService {
     }
 
     def lookupMethod() = {
-      val m = decClass.getMethod(methodName, paramTypes: _*)
+      val m = decClass.getMethod(methodName, ArraySeq.unsafeWrapArray(paramTypes): _*)
       m
     }
 

daffodil-sapi/src/test/scala/org/apache/daffodil/example/TestScalaAPI.scala

@@ -29,6 +29,7 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Paths
 import javax.xml.XMLConstants
+import scala.collection.compat.immutable.ArraySeq
 
 import org.apache.daffodil.lib.Implicits.using
 import org.apache.daffodil.lib.exceptions.UsageException
@@ -1213,7 +1214,7 @@ class TestScalaAPI {
 
       val bos = new java.io.ByteArrayOutputStream()
       val wbc = java.nio.channels.Channels.newChannel(bos)
-      val inputter = new TestInfosetInputter(expectedEvents: _*)
+      val inputter = new TestInfosetInputter(ArraySeq.unsafeWrapArray(expectedEvents): _*)
 
       val ur = dp.unparse(inputter, wbc)
       assertFalse(ur.isError())