Fix non-exhaustive matches

- update non-exhaustive matches to be a bit more self documenting as opposed to just using the default case.
- use NoSuccess.I so we don't have to specify Error and Failure cases
- remove explicit Collection.Seq in main and use ArraySeq for Array to Seq conversion
- replaceAllLiterally -> replace
- adding default cases to non-exhaustive matches
- Right(Unit) deprecated in favor of Right(())
- deprecated Seq.union in favor of ++:
- remove unused import
- update TestListSerialization to work for 2.12 and 2.13 errors

DAFFODIL-2152

Author: olabusayoT

daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala

@@ -35,6 +35,7 @@ import javax.xml.parsers.SAXParserFactory
 import javax.xml.transform.TransformerException
 import javax.xml.transform.TransformerFactory
 import javax.xml.transform.stream.StreamResult
+import scala.collection.compat.immutable.ArraySeq
 import scala.concurrent.Await
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
@@ -440,13 +441,13 @@ class CLIConf(arguments: Array[String], stdout: PrintStream, stderr: PrintStream
     validateOpt(debug, infile) {
       case (Some(_), Some("-")) | (Some(_), None) =>
         Left("Input must not be stdin during interactive debugging")
-      case _ => Right(Unit)
+      case _ => Right(())
     }
 
     validateOpt(parser, validate) {
       case (Some(_), Some(ValidationMode.Full)) =>
         Left("The validation mode must be 'limited' or 'off' when using a saved parser.")
-      case _ => Right(Unit)
+      case _ => Right(())
     }
 
     validateOpt(infosetType, stream, schema) {
@@ -456,7 +457,7 @@ class CLIConf(arguments: Array[String], stdout: PrintStream, stderr: PrintStream
         Left("Streaming mode is not currently supported with EXI infosets.")
       case (Some(InfosetType.EXISA), _, None) =>
         Left("A schema must be specified to use schema-aware compression with EXI")
-      case _ => Right(Unit)
+      case _ => Right(())
     }
   }
 
@@ -566,7 +567,7 @@ class CLIConf(arguments: Array[String], stdout: PrintStream, stderr: PrintStream
     validateOpt(debug, infile) {
       case (Some(_), Some("-")) | (Some(_), None) =>
         Left("Input must not be stdin during interactive debugging")
-      case _ => Right(Unit)
+      case _ => Right(())
     }
 
     validateOpt(infosetType, stream, schema) {
@@ -576,7 +577,7 @@ class CLIConf(arguments: Array[String], stdout: PrintStream, stderr: PrintStream
         Left("Streaming mode is not currently supported with EXI infosets.")
       case (Some(InfosetType.EXISA), _, None) =>
         Left("A schema must be specified to use schema-aware compression with EXI")
-      case _ => Right(Unit)
+      case _ => Right(())
     }
   }
 
@@ -787,7 +788,7 @@ class CLIConf(arguments: Array[String], stdout: PrintStream, stderr: PrintStream
     validateOpt(infosetType, schema) {
       case (Some(InfosetType.EXISA), None) =>
         Left("A schema must be specified to use schema-aware compression with EXI")
-      case _ => Right(Unit)
+      case _ => Right(())
     }
   }
 
@@ -991,8 +992,8 @@ class Main(
     val bindingsWithCorrectValues =
       bindings.filter(b => inBoth.exists(p => b.hashCode == p.hashCode))
 
-    val bindingsMinusUpdates = bindingsMinusBoth.union(bindingsToOverrideMinusBoth)
-    val bindingsWithUpdates = bindingsMinusUpdates.union(bindingsWithCorrectValues)
+    val bindingsMinusUpdates = bindingsMinusBoth ++: bindingsToOverrideMinusBoth
+    val bindingsWithUpdates = bindingsMinusUpdates ++: bindingsWithCorrectValues
 
     bindingsWithUpdates
   }
@@ -1428,23 +1429,26 @@ class Main(
               forPerformance = true
             )
 
-            val dataSeq: Seq[Either[AnyRef, Array[Byte]]] = files.map { filePath =>
-              // For performance testing, we want everything in memory so as to
-              // remove I/O from consideration. Additionally, for both parse
-              // and unparse we need immutable inputs since we could parse the
-              // same input data multiple times in different performance runs.
-              // So read the file data into an Array[Byte], and use that for
-              // everything.
-              val input = (new FileInputStream(filePath))
-              val dataSize = filePath.length()
-              val bytes = new Array[Byte](dataSize.toInt)
-              input.read(bytes)
-              val data = performanceOpts.unparse() match {
-                case true => Left(infosetHandler.dataToInfoset(bytes))
-                case false => Right(bytes)
-              }
-              data
-            }
+            val dataSeq: Seq[Either[AnyRef, Array[Byte]]] =
+              ArraySeq
+                .unsafeWrapArray(files)
+                .map { filePath =>
+                  // For performance testing, we want everything in memory so as to
+                  // remove I/O from consideration. Additionally, for both parse
+                  // and unparse we need immutable inputs since we could parse the
+                  // same input data multiple times in different performance runs.
+                  // So read the file data into an Array[Byte], and use that for
+                  // everything.
+                  val input = (new FileInputStream(filePath))
+                  val dataSize = filePath.length()
+                  val bytes = new Array[Byte](dataSize.toInt)
+                  input.read(bytes)
+                  val data = performanceOpts.unparse() match {
+                    case true => Left(infosetHandler.dataToInfoset(bytes))
+                    case false => Right(bytes)
+                  }
+                  data
+                }
 
             val inputs = (0 until performanceOpts.number()).map { n =>
               val index = n % dataSeq.length

daffodil-codegen-c/src/main/scala/org/apache/daffodil/codegen/c/generators/CodeGeneratorState.scala

@@ -1045,7 +1045,7 @@ class CodeGeneratorState(private val root: ElementBase) {
       // Go up the stack that many times to get that struct's C type
       val C = structs(nUpDirs).C
       // Convert the up dirs to parents
-      val parents = upDirs.replaceAllLiterally("../", "parent->").stripSuffix("->")
+      val parents = upDirs.replace("../", "parent->").stripSuffix("->")
       // Convert exprPath to a parents-> indirection
       s"""(($C *)instance->_base.$parents)->$afterUpDirs"""
     } else {

daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/DFDLExpressionParser.scala

@@ -181,25 +181,30 @@ class DFDLPathExpressionParser[T <: AnyRef](
         expressionAST.init()
         expressionAST
       }
-      case NoSuccess(msg, next) => {
-        // blech - no easy way to just grab up to 30 chars from a Reader[Char]
-        var nextRdr = next
-        val nextString = new StringBuilder()
-        var i = 0
-        while (!nextRdr.atEnd && i < 30) {
-          nextString.append(nextRdr.first)
-          nextRdr = nextRdr.rest
-          i += 1
-        }
+      case NoSuccess.I(msg, next) => {
+        val nextString = convertNextToString(next)
         context.SDE(
           "Unable to parse expression. Message: %s\nNext: %s.",
           msg,
-          nextString.toString()
+          nextString
         )
       }
     }
   }
 
+  // blech - no easy way to just grab up to 30 chars from a Reader[Char]
+  def convertNextToString(next: Input): String = {
+    var nextRdr = next
+    var i = 0
+    val nextString = new StringBuilder()
+    while (!nextRdr.atEnd && i < 30) {
+      nextString.append(nextRdr.first)
+      nextRdr = nextRdr.rest
+      i += 1
+    }
+    nextString.toString()
+  }
+
   def wrapAsSuccess[T](p: => Parser[T]): Parser[ParseResult[T]] = Parser { in =>
     p(in) match {
       case ns: NoSuccess => Success(ns, in)

daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLDefineVariable.scala

@@ -158,9 +158,9 @@ final class DFDLNewVariableInstance(node: Node, decl: AnnotatedSchemaComponent)
   final lazy val value = (attrValue, eltValue) match {
     case (None, v) if (v != "") => v
     case (Some(v), "") => v
-    case (Some(v), ev) if (ev != "") =>
+    case (Some(v), _) =>
       decl.SDE("Cannot have both a value attribute and an element value: %s", node)
-    case (None, "") =>
+    case (None, _) =>
       decl.SDE("Must have either a value attribute or an element value: %s", node)
   }
 
@@ -182,9 +182,9 @@ final class DFDLSetVariable(node: Node, decl: AnnotatedSchemaComponent)
   final lazy val value = (attrValue, eltValue) match {
     case (None, v) if (v != "") => v
     case (Some(v), "") => v
-    case (Some(v), ev) if (ev != "") =>
+    case (Some(v), _) =>
       decl.SDE("Cannot have both a value attribute and an element value: %s", node)
-    case (None, "") =>
+    case (None, _) =>
       decl.SDE("Must have either a value attribute or an element value: %s", node)
   }
 

daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/RestrictionUnion.scala

@@ -168,7 +168,7 @@ final class Restriction private (xmlArg: Node, val simpleTypeDef: SimpleTypeDefB
     if (hasPattern) {
       val lPattern = localBaseFacets.filter { case (f, v) => f == Facet.pattern }
       val rPattern = remoteBaseFacets.filter { case (f, v) => f == Facet.pattern }
-      val cPattern = lPattern.union(rPattern)
+      val cPattern = lPattern ++: rPattern
       cPattern.foreach(x => combined.enqueue(x))
     }
     if (hasLength) {

daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaSet.scala

@@ -550,8 +550,7 @@ final class SchemaSet private (
   }
 
   lazy val allDefinedVariables = schemas
-    .flatMap(_.defineVariables)
-    .union(predefinedVars)
+    .flatMap(_.defineVariables) ++: predefinedVars
 
   private lazy val checkUnusedProperties = LV(Symbol("hasUnusedProperties")) {
     root.checkUnusedProperties

daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/ElementBaseGrammarMixin.scala

@@ -1269,7 +1269,7 @@ trait ElementBaseGrammarMixin
             )
             LiteralValueNilOfSpecifiedLength(this)
           }
-          case LengthKind.Implicit if isComplexType =>
+          case LengthKind.Implicit =>
             LiteralValueNilOfSpecifiedLength(this)
           case LengthKind.Prefixed => LiteralValueNilOfSpecifiedLength(this)
           case LengthKind.EndOfParent if isComplexType =>
@@ -1286,7 +1286,7 @@ trait ElementBaseGrammarMixin
         lengthKind match {
           case LengthKind.Explicit => LiteralCharacterNilOfSpecifiedLength(this)
           case LengthKind.Implicit if isSimpleType => LiteralCharacterNilOfSpecifiedLength(this)
-          case LengthKind.Implicit if isComplexType =>
+          case LengthKind.Implicit =>
             Assert.invariantFailed("literal nil complex types aren't handled here.")
           case LengthKind.Prefixed =>
             SDE("nilKind='literalCharacter' is not valid for lengthKind='prefixed'")
@@ -1392,6 +1392,10 @@ trait ElementBaseGrammarMixin
           notYetImplemented("lengthKind='endOfParent' for complex type")
         case LengthKind.EndOfParent =>
           notYetImplemented("lengthKind='endOfParent' for simple type")
+        case LengthKind.Delimited | LengthKind.Implicit =>
+          Assert.impossibleCase(
+            "Delimited and ComplexType Implicit cases should not be reached"
+          )
       }
     }
   }

daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/Padded.scala

@@ -49,6 +49,8 @@ trait PaddingInfoMixin {
     eBase.textTrimKind match {
       case TextTrimKind.None => (MaybeChar.Nope, TextJustificationType.None)
       case TextTrimKind.PadChar if eBase.isSimpleType => padCharAndJustificationForType
+      case TextTrimKind.PadChar =>
+        eBase.SDE("padChar textTrimKind not supported for complexType")
     }
 
   lazy val (unparsingPadChar: MaybeChar, justificationPad) = {

daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesTextNumber.scala

@@ -454,7 +454,7 @@ case class ConvertTextStandardNumberPrim(e: ElementBase)
           checkPosNegNumPartSyntax(beforeV + "V" + afterV, negNum)
           afterV.length
         }
-        case None =>
+        case Some(_) | None =>
           e.SDE(
             s"""The dfdl:textNumberPattern '%s' contains 'V' (virtual decimal point).
                | Other than the sign indicators, it can contain only

daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceChild.scala

@@ -392,12 +392,10 @@ class ScalarOrderedSequenceChild(sq: SequenceTermBase, term: Term, groupIndex: I
   import SeparatedSequenceChildBehavior._
 
   lazy val sequenceChildParser: SequenceChildParser = {
-    val HasSep = true
-    val UnSep = false
-    val res = (term, sq.hasSeparator) match {
-      case (_, _) if !term.isRepresented =>
+    val res = term match {
+      case _ if !term.isRepresented =>
         new NonRepresentedSequenceChildParser(childParser, srd, trd)
-      case (_: ElementBase, HasSep) =>
+      case (_: ElementBase) if sq.hasSeparator =>
         new ScalarOrderedElementSeparatedSequenceChildParser(
           childParser,
           srd,
@@ -406,7 +404,7 @@ class ScalarOrderedSequenceChild(sq: SequenceTermBase, term: Term, groupIndex: I
           sq.separatorPosition,
           separatedHelper
         )
-      case (_: ModelGroup, HasSep) => {
+      case (_: ModelGroup) if sq.hasSeparator => {
         Assert.invariant(term.isInstanceOf[ModelGroup])
         new GroupSeparatedSequenceChildParser(
           childParser,
@@ -417,7 +415,7 @@ class ScalarOrderedSequenceChild(sq: SequenceTermBase, term: Term, groupIndex: I
           separatedHelper
         )
       }
-      case (_, UnSep) =>
+      case _ if !sq.hasSeparator =>
         new ScalarOrderedUnseparatedSequenceChildParser(
           childParser,
           srd,

daffodil-core/src/main/scala/org/apache/daffodil/core/util/FuzzData.scala

@@ -64,7 +64,7 @@ abstract class FuzzData(
    */
   def runLength: Int
 
-  override def hasNext() = true // we can keep fuzzing forever
+  override def hasNext = true // we can keep fuzzing forever
 
   override def next(): Array[Byte] = {
     val data = originalData.clone()

daffodil-core/src/test/scala/org/apache/daffodil/core/externalvars/TestExternalVariables.scala

@@ -17,14 +17,11 @@
 
 package org.apache.daffodil.core.externalvars
 
-import org.apache.daffodil.lib.Implicits._
-
-import org.junit.Assert._
-import org.junit.Test; object INoWarn2 { ImplicitsSuppressUnusedImportWarning() }
 import scala.util.Success
 
 import org.apache.daffodil.lib.xml._
 
+import org.junit.Assert._
 import org.junit.Test
 
 class TestExternalVariables {