This is an automated email from the ASF dual-hosted git repository.
olabusayo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new accd89f6c Added parens to functions that override functions with paren
accd89f6c is described below
commit accd89f6cd18bec1fa0166d4bcf62f92b05b4964
Author: olabusayoT <[email protected]>
AuthorDate: Wed Feb 12 15:05:10 2025 -0500
Added parens to functions that override functions with paren
- Map.mapValues -> new RichMap.mapValues
- moved util.{collections} into util.collections.{collections}
- fixed some more deprecated autoapplication errors
- fixed nullary method with side effect requiring ()
- fixed Parser[Any] warning of inferred type by making it Parser[Number].
explicitly setting it Parser[Any] still resulted in the warning, which seems to
generate false positives (based on online searches).
- fixed functions, which override functions with paren, missing the paren
- make InfoDiffable extend DebugCommand so we can use .name on it. Cannot
use .collect due to type erasure of inner traits, so used filter/map instead
- fixed some Symbol literals
- remove unused imports
- fix Seq error by using .toSeq as necessary to convert to version
appropriate Seq (collection v immutable)
- replace deprecated toStream with to(LazyList)
DAFFODIL-2152
---
.../org/apache/daffodil/core/dpath/DFDLExpressionParser.scala | 5 +++--
.../main/scala/org/apache/daffodil/core/dpath/Expression.scala | 1 -
.../org/apache/daffodil/core/dsom/AnnotatedSchemaComponent.scala | 3 ++-
.../scala/org/apache/daffodil/core/dsom/CompiledExpression.scala | 4 ++--
.../org/apache/daffodil/core/dsom/InitiatedTerminatedMixin.scala | 1 -
.../scala/org/apache/daffodil/core/dsom/LocalElementMixin.scala | 1 -
.../daffodil/core/dsom/SchemaDocIncludesAndImportsMixin.scala | 4 ++--
.../main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala | 2 +-
.../main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala | 4 ++--
.../src/main/scala/org/apache/daffodil/core/dsom/Term.scala | 3 ++-
.../scala/org/apache/daffodil/core/grammar/TermGrammarMixin.scala | 1 -
.../daffodil/core/infoset/TestInfosetCursorFromReader.scala | 6 ++++--
.../daffodil/core/infoset/TestInfosetCursorFromReader2.scala | 2 +-
.../src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala | 2 +-
.../scala/org/apache/daffodil/lib/util/collections/MultiMap.scala | 4 ++--
.../apache/daffodil/runtime1/debugger/InteractiveDebugger.scala | 8 ++++----
.../org/apache/daffodil/runtime1/dsom/CompiledExpression1.scala | 2 +-
.../apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala | 2 +-
.../apache/daffodil/runtime1/infoset/JsonInfosetInputter.scala | 2 +-
.../daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala | 2 +-
.../apache/daffodil/runtime1/infoset/W3CDOMInfosetInputter.scala | 2 +-
.../apache/daffodil/runtime1/infoset/XMLTextInfosetInputter.scala | 2 +-
.../org/apache/daffodil/runtime1/processors/Evaluatable.scala | 2 +-
.../org/apache/daffodil/runtime1/processors/RuntimeData.scala | 2 +-
.../apache/daffodil/runtime1/processors/unparsers/UState.scala | 8 ++++----
.../src/main/scala/org/apache/daffodil/sapi/infoset/Infoset.scala | 2 +-
26 files changed, 39 insertions(+), 38 deletions(-)
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/DFDLExpressionParser.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/DFDLExpressionParser.scala
index da6d39c02..a28da6597 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/DFDLExpressionParser.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/DFDLExpressionParser.scala
@@ -17,6 +17,7 @@
package org.apache.daffodil.core.dpath
+import java.lang.{ Double => JDouble }
import java.math.{ BigDecimal => JBigDecimal }
import java.math.{ BigInteger => JBigInt }
import scala.util.parsing.combinator.RegexParsers
@@ -336,7 +337,7 @@ class DFDLPathExpressionParser[T <: AnyRef](
def Literal = log((StringLiteral | NumericLiteral) ^^ { LiteralExpression(_)
})("literal")
- def NumericLiteral = DoubleLiteral | DecimalLiteral | IntegerLiteral
+ def NumericLiteral: Parser[Number] = DoubleLiteral | DecimalLiteral |
IntegerLiteral
def VarRef = "$" ~> RefName ^^ { VariableRef(_) }
@@ -404,7 +405,7 @@ class DFDLPathExpressionParser[T <: AnyRef](
new JBigDecimal(digit + "." + optDig)
}
- val DoubleLiteral: Parser[Double] = ("." ~> Digits ~ Expon ^^ {
+ val DoubleLiteral: Parser[JDouble] = ("." ~> Digits ~ Expon ^^ {
case fraction ~ exp => {
"0." + fraction + exp
}
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Expression.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Expression.scala
index d4a1decf9..01bd3b08d 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Expression.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Expression.scala
@@ -36,7 +36,6 @@ import org.apache.daffodil.runtime1.dpath._
import org.apache.daffodil.runtime1.dsom.RelativePathPastRootError
import org.apache.daffodil.runtime1.dsom._
import org.apache.daffodil.runtime1.infoset.DataValue.DataValuePrimitive
-import org.apache.daffodil.runtime1.processors._
import org.apache.daffodil.runtime1.udf.UserDefinedFunctionService
/**
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/AnnotatedSchemaComponent.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/AnnotatedSchemaComponent.scala
index 797763c04..308ac22e8 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/AnnotatedSchemaComponent.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/AnnotatedSchemaComponent.scala
@@ -17,6 +17,7 @@
package org.apache.daffodil.core.dsom
+import scala.collection.compat.immutable.LazyList
import scala.collection.mutable
import scala.xml.Node
import scala.xml.NodeSeq
@@ -130,7 +131,7 @@ trait ResolvesScopedProperties extends FindPropertyMixin {
self: Term =>
// Important - use of stream here insures we don't lookup
// properties down the chain once we have them here.
//
- val str = sources.toStream.map { _.chainFindProperty(pname) }
+ val str = sources.to(LazyList).map { _.chainFindProperty(pname) }
val optFound = str.collectFirst { case found: Found => found }
val result = optFound match {
case Some(f: Found) => f
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala
index 3dee43b6a..970485972 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala
@@ -68,8 +68,8 @@ class ExpressionCompiler[T <: AnyRef] extends
ExpressionCompilerBase[T] {
compileInfo: DPathCompileInfo
): CompiledExpression[T] = {
- compileInfo.initialize
- compileInfoWhereExpressionWasLocated.initialize
+ compileInfo.initialize()
+ compileInfoWhereExpressionWasLocated.initialize()
val res =
if (DPathUtil.isExpression(exprOrLiteral)) {
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/InitiatedTerminatedMixin.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/InitiatedTerminatedMixin.scala
index a118a4ff9..b6e2c4332 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/InitiatedTerminatedMixin.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/InitiatedTerminatedMixin.scala
@@ -18,7 +18,6 @@
package org.apache.daffodil.core.dsom
import org.apache.daffodil.core.grammar.GrammarMixin
-import org.apache.daffodil.core.grammar._
import org.apache.daffodil.core.grammar.primitives.InitiatedContent
import org.apache.daffodil.core.grammar.primitives.Initiator
import org.apache.daffodil.core.grammar.primitives.Terminator
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/LocalElementMixin.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/LocalElementMixin.scala
index c2ca4079d..23a8cf3c5 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/LocalElementMixin.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/LocalElementMixin.scala
@@ -20,7 +20,6 @@ package org.apache.daffodil.core.dsom
import java.math.{ BigInteger => JBigInt }
import org.apache.daffodil.core.grammar.LocalElementGrammarMixin
-import org.apache.daffodil.core.grammar._
import org.apache.daffodil.lib.equality._
import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.lib.schema.annotation.props.gen._
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaDocIncludesAndImportsMixin.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaDocIncludesAndImportsMixin.scala
index 93c1b445b..92826809c 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaDocIncludesAndImportsMixin.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaDocIncludesAndImportsMixin.scala
@@ -221,14 +221,14 @@ trait SchemaDocIncludesAndImportsMixin { self:
XMLSchemaDocument =>
def importStatementsMap = ismli_._1
def localImports = ismli_._2
- private lazy val ismli_ = LV('importStatementsMap_localImports) {
+ private lazy val ismli_ = LV(Symbol("importStatementsMap_localImports")) {
val res = getImportsOrIncludes(seenBefore, impNodes, new Import(_, _, _))
res
}.value
def seenAfter = sali_._1
def localIncludes = sali_._2
- private lazy val sali_ = LV('seenAfter_localIncludes) {
+ private lazy val sali_ = LV(Symbol("seenAfter_localIncludes")) {
val res = getImportsOrIncludes(importStatementsMap, incNodes, new
Include(_, _, _))
res
}.value
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala
index 4aeba5d27..17b88f5bb 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala
@@ -278,7 +278,7 @@ trait SequenceDefMixin
protected def emptyFormatFactory = new
DFDLSequence(newDFDLAnnotationXML("sequence"), this)
- final lazy val apparentXMLChildren = (xml \\ "sequence").head.child
+ final lazy val apparentXMLChildren = (xml \\ "sequence").head.child.toSeq
def xmlChildren: Seq[Node] = apparentXMLChildren
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala
index 7462251ec..e3a3e5c19 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala
@@ -278,7 +278,7 @@ final class EnumerationDef(xml: Node, parentType:
SimpleTypeDefBase)
lazy val repValuesRaw: Seq[String] = {
val optNodes = xml.attribute(XMLUtils.DFDLX_NAMESPACE, "repValues")
- val res = optNodes.getOrElse(Seq.empty).flatMap { node =>
+ val res = optNodes.map(_.toSeq).getOrElse(Seq.empty).flatMap { node =>
RepValueCooker.convertConstant(node.text, this, false)
}
res
@@ -286,7 +286,7 @@ final class EnumerationDef(xml: Node, parentType:
SimpleTypeDefBase)
lazy val repValueRangesRaw: Seq[String] = {
val optNodes = xml.attribute(XMLUtils.DFDLX_NAMESPACE, "repValueRanges")
- val res = optNodes.getOrElse(Seq.empty).flatMap { node =>
+ val res = optNodes.map(_.toSeq).getOrElse(Seq.empty).flatMap { node =>
val ranges = RepValueCooker.convertConstant(node.text, this, false)
if (ranges.length % 2 != 0) {
SDE("dfdlx:repValueRanges must specify an even number of values")
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/Term.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/Term.scala
index 74e7466ca..9fbb1fb85 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/Term.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/Term.scala
@@ -19,6 +19,7 @@ package org.apache.daffodil.core.dsom
import java.lang.{ Integer => JInt }
import java.util.UUID
+import scala.collection.compat.immutable.LazyList
import org.apache.daffodil.core.dsom.walker.TermView
import org.apache.daffodil.core.grammar.TermGrammarMixin
@@ -484,7 +485,7 @@ trait Term
val psibs = priorSiblings
val representedPriorSiblings = psibs.filter { _.isRepresented }
val (optionalPotentialPriorReversed, requiredPotentialPriorReversed)
=
- representedPriorSiblings.reverse.toStream.span { sib =>
+ representedPriorSiblings.reverse.to(LazyList).span { sib =>
sib match {
case eb: ElementBase if eb.isScalar =>
false
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/TermGrammarMixin.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/TermGrammarMixin.scala
index 5851fabe8..1ba9323c4 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/TermGrammarMixin.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/TermGrammarMixin.scala
@@ -18,7 +18,6 @@
package org.apache.daffodil.core.grammar
import org.apache.daffodil.core.dsom.Term
import org.apache.daffodil.core.grammar.primitives.MandatoryTextAlignment
-import org.apache.daffodil.core.grammar.primitives._
import org.apache.daffodil.core.runtime1.TermRuntime1Mixin
/////////////////////////////////////////////////////////////////
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
index 38770eb96..ed78145a2 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
@@ -17,6 +17,8 @@
package org.apache.daffodil.core.infoset
+import scala.collection.compat.immutable.LazyList
+
import org.apache.daffodil.core.compiler.Compiler
import org.apache.daffodil.core.util.TestUtils
import org.apache.daffodil.lib.Implicits._
@@ -83,7 +85,7 @@ class TestInfosetInputterFromReader {
)
val infosetXML = <foo xmlns={XMLUtils.EXAMPLE_NAMESPACE}>Hello</foo>
val (ii, _, _, _) = infosetInputter(sch, infosetXML)
- val is = ii.toStream.toList
+ val is = ii.to(LazyList).toList
val List(Start(s: DISimple), End(e: DISimple)) = is
assertTrue(s eq e) // exact same object
assertTrue(s.dataValue.getAnyRef.isInstanceOf[String])
@@ -100,7 +102,7 @@ class TestInfosetInputterFromReader {
XMLUtils.XSI_NAMESPACE
}/>
val (ii, _, _, _) = infosetInputter(sch, infosetXML)
- val is = ii.toStream.toList
+ val is = ii.to(LazyList).toList
val List(Start(s: DISimple), End(e: DISimple)) = is
assertTrue(s eq e) // exact same object
assertTrue(s.isNilled)
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
index 68a2ae5d3..6aeaeb34a 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
@@ -75,7 +75,7 @@ class TestInfosetInputterFromReader2 {
class StreamInputStream(private var strings: LazyList[String]) extends
java.io.InputStream {
private var bytes = {
- val ss = strings.flatMap { _.getBytes() } ++ "</bar>".getBytes().toStream
+ val ss = strings.flatMap { _.getBytes() } ++
"</bar>".getBytes().to(LazyList)
strings = Nil.to(LazyList)
ss
}
diff --git
a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala
b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala
index 1a40f43ed..7d50e53f9 100644
---
a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala
+++
b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala
@@ -446,7 +446,7 @@ abstract class InfosetInputterProxy extends InfosetInputter
{
override def next() = infosetInputter.next()
override lazy val supportsNamespaces = infosetInputter.supportsNamespaces
- override def fini = infosetInputter.fini()
+ override def fini() = infosetInputter.fini()
}
/**
diff --git
a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/util/collections/MultiMap.scala
b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/util/collections/MultiMap.scala
index 2796cb754..97c8751ae 100644
---
a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/util/collections/MultiMap.scala
+++
b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/util/collections/MultiMap.scala
@@ -56,11 +56,11 @@ class MultiMap[K, V] {
filtered
}
- def map[T](func: (K, mutable.Set[V]) => T): collection.Seq[T] = {
+ def map[T](func: (K, mutable.Set[V]) => T): Seq[T] = {
val ret = mutable.ListBuffer.empty[T]
for ((key, values) <- underlying) {
ret.append(func(key, values))
}
- ret
+ ret.toSeq
}
}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/debugger/InteractiveDebugger.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/debugger/InteractiveDebugger.scala
index 2246e33b8..a086b7f91 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/debugger/InteractiveDebugger.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/debugger/InteractiveDebugger.scala
@@ -1404,7 +1404,7 @@ class InteractiveDebugger(
DebugState.Pause
}
- trait InfoDiffable {
+ trait InfoDiffable extends DebugCommand {
/**
* Outputs any differences between previousProcessorState and state for
the mixed in debugger command
@@ -1664,9 +1664,9 @@ class InteractiveDebugger(
val desc = "display differences since the previous pause in the
debugger"
val longDesc = desc
- lazy val infoDiffables = Info.subcommands.collect { case diffable:
InfoDiffable =>
- diffable
- }
+ lazy val infoDiffables = Info.subcommands
+ .filter(_.isInstanceOf[InfoDiffable])
+ .map(_.asInstanceOf[InfoDiffable])
def act(
args: Seq[String],
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dsom/CompiledExpression1.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dsom/CompiledExpression1.scala
index 523b5a89f..7d5323210 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dsom/CompiledExpression1.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dsom/CompiledExpression1.scala
@@ -214,7 +214,7 @@ class DPathCompileInfo(
with PreSerialization
with HasSchemaFileLocation {
- def initialize: Unit = {
+ def initialize(): Unit = {
parents
}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala
index b33fd0dee..7cc84527f 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala
@@ -135,7 +135,7 @@ class JDOMInfosetInputter(doc: Document) extends
InfosetInputter {
!atDocumentEnd
}
- override def fini = {
+ override def fini() = {
stack.clear()
}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JsonInfosetInputter.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JsonInfosetInputter.scala
index a8beb1301..39cf15b4f 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JsonInfosetInputter.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JsonInfosetInputter.scala
@@ -99,7 +99,7 @@ class JsonInfosetInputter(input: java.io.InputStream) extends
InfosetInputter {
}
}
- override def getLocalName: String = {
+ override def getLocalName(): String = {
val curName = jsp.getCurrentName()
if (curName == null) {
// this only happens if we are directly inside an array, so get the value
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala
index 3eada9683..3f9e99a88 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala
@@ -151,7 +151,7 @@ class ScalaXMLInfosetInputter(rootNode: Node) extends
InfosetInputter {
!atDocumentEnd
}
- override def fini = {
+ override def fini() = {
stack.clear()
}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/W3CDOMInfosetInputter.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/W3CDOMInfosetInputter.scala
index 46b90a799..caa315138 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/W3CDOMInfosetInputter.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/W3CDOMInfosetInputter.scala
@@ -137,7 +137,7 @@ class W3CDOMInfosetInputter(doc: Document) extends
InfosetInputter {
!atDocumentEnd
}
- override def fini = {
+ override def fini() = {
stack.clear()
}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/XMLTextInfosetInputter.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/XMLTextInfosetInputter.scala
index 02cd7cc5a..be476f0ce 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/XMLTextInfosetInputter.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/XMLTextInfosetInputter.scala
@@ -231,7 +231,7 @@ class XMLTextInfosetInputter(input: java.io.InputStream)
extends InfosetInputter
}
}
- override def getLocalName: String = {
+ override def getLocalName(): String = {
xsr.getLocalName()
}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/Evaluatable.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/Evaluatable.scala
index 2175340a4..354d18949 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/Evaluatable.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/Evaluatable.scala
@@ -190,7 +190,7 @@ abstract class Evaluatable[+T <: AnyRef](
@inline final def isCompiled = isCompiled_
@inline final def ensureCompiled(): Unit = {
- ci.initialize
+ ci.initialize()
if (!isCompiled)
Assert.invariantFailed("not compiled Ev: " + this.qName)
}
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
index 886d3fe1c..290e8a8e2 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
@@ -171,7 +171,7 @@ sealed abstract class TermRuntimeData(
protected def initializeFunction(): Unit = {
partialNextElementResolver
- dpathCompileInfo.initialize
+ dpathCompileInfo.initialize()
}
final def namespaces = dpathCompileInfo.namespaces
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/UState.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/UState.scala
index 1097db5bf..01d6dd321 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/UState.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/UState.scala
@@ -445,7 +445,7 @@ final class UStateForSuspension(
override def advanceAccessor: InfosetAccessor = die
override def inspect: Boolean = die
override def inspectAccessor: InfosetAccessor = die
- override def fini: Unit = die
+ override def fini(): Unit = die
override def inspectOrError = die
override def advanceOrError = die
override def isInspectArrayEnd = die
@@ -484,9 +484,9 @@ final class UStateForSuspension(
override def documentElement = mainUState.documentElement
- override def incrementHiddenDef =
+ override def incrementHiddenDef() =
Assert.usageError("Unparser suspended UStates need not be aware of hidden
contexts")
- override def decrementHiddenDef =
+ override def decrementHiddenDef() =
Assert.usageError("Unparser suspended UStates need not be aware of hidden
contexts")
override def withinHiddenNest =
Assert.usageError("Unparser suspended UStates need not be aware of hidden
contexts")
@@ -608,7 +608,7 @@ final class UStateMain private (
override def inspect: Boolean = inputter.inspect
override def inspectAccessor: InfosetAccessor = inputter.inspectAccessor
// $COVERAGE-OFF$ // unused, but necessary to meet requirements of Cursor[T]
- override def fini = Assert.usageError("Not to be used on UState")
+ override def fini() = Assert.usageError("Not to be used on UState")
// $COVERAGE-ON$
/**
* Use this so if there isn't an event we get a clean diagnostic message
saying
diff --git
a/daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/infoset/Infoset.scala
b/daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/infoset/Infoset.scala
index b4be2a0d7..bc05c40c4 100644
---
a/daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/infoset/Infoset.scala
+++
b/daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/infoset/Infoset.scala
@@ -435,7 +435,7 @@ abstract class InfosetInputterProxy extends InfosetInputter
{
override def next() = infosetInputter.next()
override lazy val supportsNamespaces = infosetInputter.supportsNamespaces
- override def fini = infosetInputter.fini()
+ override def fini() = infosetInputter.fini()
}
/**
