Skip to content

Commit accd89f

Browse files
olabusayoTolabusayoT
committed
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
1 parent 2a83ac9 commit accd89f

File tree

26 files changed

+39
-38
lines changed

26 files changed

+39
-38
lines changed

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.daffodil.core.dpath
1919

20+
import java.lang.{ Double => JDouble }
2021
import java.math.{ BigDecimal => JBigDecimal }
2122
import java.math.{ BigInteger => JBigInt }
2223
import scala.util.parsing.combinator.RegexParsers
@@ -336,7 +337,7 @@ class DFDLPathExpressionParser[T <: AnyRef](
336337

337338
def Literal = log((StringLiteral | NumericLiteral) ^^ { LiteralExpression(_) })("literal")
338339

339-
def NumericLiteral = DoubleLiteral | DecimalLiteral | IntegerLiteral
340+
def NumericLiteral: Parser[Number] = DoubleLiteral | DecimalLiteral | IntegerLiteral
340341

341342
def VarRef = "$" ~> RefName ^^ { VariableRef(_) }
342343

@@ -404,7 +405,7 @@ class DFDLPathExpressionParser[T <: AnyRef](
404405
new JBigDecimal(digit + "." + optDig)
405406
}
406407

407-
val DoubleLiteral: Parser[Double] = ("." ~> Digits ~ Expon ^^ {
408+
val DoubleLiteral: Parser[JDouble] = ("." ~> Digits ~ Expon ^^ {
408409
case fraction ~ exp => {
409410
"0." + fraction + exp
410411
}

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Expression.scala

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import org.apache.daffodil.runtime1.dpath._
3636
import org.apache.daffodil.runtime1.dsom.RelativePathPastRootError
3737
import org.apache.daffodil.runtime1.dsom._
3838
import org.apache.daffodil.runtime1.infoset.DataValue.DataValuePrimitive
39-
import org.apache.daffodil.runtime1.processors._
4039
import org.apache.daffodil.runtime1.udf.UserDefinedFunctionService
4140

4241
/**

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/AnnotatedSchemaComponent.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.daffodil.core.dsom
1919

20+
import scala.collection.compat.immutable.LazyList
2021
import scala.collection.mutable
2122
import scala.xml.Node
2223
import scala.xml.NodeSeq
@@ -130,7 +131,7 @@ trait ResolvesScopedProperties extends FindPropertyMixin { self: Term =>
130131
// Important - use of stream here insures we don't lookup
131132
// properties down the chain once we have them here.
132133
//
133-
val str = sources.toStream.map { _.chainFindProperty(pname) }
134+
val str = sources.to(LazyList).map { _.chainFindProperty(pname) }
134135
val optFound = str.collectFirst { case found: Found => found }
135136
val result = optFound match {
136137
case Some(f: Found) => f

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ class ExpressionCompiler[T <: AnyRef] extends ExpressionCompilerBase[T] {
6868
compileInfo: DPathCompileInfo
6969
): CompiledExpression[T] = {
7070

71-
compileInfo.initialize
72-
compileInfoWhereExpressionWasLocated.initialize
71+
compileInfo.initialize()
72+
compileInfoWhereExpressionWasLocated.initialize()
7373

7474
val res =
7575
if (DPathUtil.isExpression(exprOrLiteral)) {

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/InitiatedTerminatedMixin.scala

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.apache.daffodil.core.dsom
1919

2020
import org.apache.daffodil.core.grammar.GrammarMixin
21-
import org.apache.daffodil.core.grammar._
2221
import org.apache.daffodil.core.grammar.primitives.InitiatedContent
2322
import org.apache.daffodil.core.grammar.primitives.Initiator
2423
import org.apache.daffodil.core.grammar.primitives.Terminator

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/LocalElementMixin.scala

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package org.apache.daffodil.core.dsom
2020
import java.math.{ BigInteger => JBigInt }
2121

2222
import org.apache.daffodil.core.grammar.LocalElementGrammarMixin
23-
import org.apache.daffodil.core.grammar._
2423
import org.apache.daffodil.lib.equality._
2524
import org.apache.daffodil.lib.exceptions.Assert
2625
import org.apache.daffodil.lib.schema.annotation.props.gen._

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaDocIncludesAndImportsMixin.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,14 @@ trait SchemaDocIncludesAndImportsMixin { self: XMLSchemaDocument =>
221221

222222
def importStatementsMap = ismli_._1
223223
def localImports = ismli_._2
224-
private lazy val ismli_ = LV('importStatementsMap_localImports) {
224+
private lazy val ismli_ = LV(Symbol("importStatementsMap_localImports")) {
225225
val res = getImportsOrIncludes(seenBefore, impNodes, new Import(_, _, _))
226226
res
227227
}.value
228228

229229
def seenAfter = sali_._1
230230
def localIncludes = sali_._2
231-
private lazy val sali_ = LV('seenAfter_localIncludes) {
231+
private lazy val sali_ = LV(Symbol("seenAfter_localIncludes")) {
232232
val res = getImportsOrIncludes(importStatementsMap, incNodes, new Include(_, _, _))
233233
res
234234
}.value

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SequenceGroup.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ trait SequenceDefMixin
278278

279279
protected def emptyFormatFactory = new DFDLSequence(newDFDLAnnotationXML("sequence"), this)
280280

281-
final lazy val apparentXMLChildren = (xml \\ "sequence").head.child
281+
final lazy val apparentXMLChildren = (xml \\ "sequence").head.child.toSeq
282282

283283
def xmlChildren: Seq[Node] = apparentXMLChildren
284284

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SimpleTypes.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,15 @@ final class EnumerationDef(xml: Node, parentType: SimpleTypeDefBase)
278278

279279
lazy val repValuesRaw: Seq[String] = {
280280
val optNodes = xml.attribute(XMLUtils.DFDLX_NAMESPACE, "repValues")
281-
val res = optNodes.getOrElse(Seq.empty).flatMap { node =>
281+
val res = optNodes.map(_.toSeq).getOrElse(Seq.empty).flatMap { node =>
282282
RepValueCooker.convertConstant(node.text, this, false)
283283
}
284284
res
285285
}
286286

287287
lazy val repValueRangesRaw: Seq[String] = {
288288
val optNodes = xml.attribute(XMLUtils.DFDLX_NAMESPACE, "repValueRanges")
289-
val res = optNodes.getOrElse(Seq.empty).flatMap { node =>
289+
val res = optNodes.map(_.toSeq).getOrElse(Seq.empty).flatMap { node =>
290290
val ranges = RepValueCooker.convertConstant(node.text, this, false)
291291
if (ranges.length % 2 != 0) {
292292
SDE("dfdlx:repValueRanges must specify an even number of values")

‎daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/Term.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package org.apache.daffodil.core.dsom
1919

2020
import java.lang.{ Integer => JInt }
2121
import java.util.UUID
22+
import scala.collection.compat.immutable.LazyList
2223

2324
import org.apache.daffodil.core.dsom.walker.TermView
2425
import org.apache.daffodil.core.grammar.TermGrammarMixin
@@ -484,7 +485,7 @@ trait Term
484485
val psibs = priorSiblings
485486
val representedPriorSiblings = psibs.filter { _.isRepresented }
486487
val (optionalPotentialPriorReversed, requiredPotentialPriorReversed) =
487-
representedPriorSiblings.reverse.toStream.span { sib =>
488+
representedPriorSiblings.reverse.to(LazyList).span { sib =>
488489
sib match {
489490
case eb: ElementBase if eb.isScalar =>
490491
false

‎daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/TermGrammarMixin.scala

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.apache.daffodil.core.grammar
1919
import org.apache.daffodil.core.dsom.Term
2020
import org.apache.daffodil.core.grammar.primitives.MandatoryTextAlignment
21-
import org.apache.daffodil.core.grammar.primitives._
2221
import org.apache.daffodil.core.runtime1.TermRuntime1Mixin
2322

2423
/////////////////////////////////////////////////////////////////

‎daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package org.apache.daffodil.core.infoset
1919

20+
import scala.collection.compat.immutable.LazyList
21+
2022
import org.apache.daffodil.core.compiler.Compiler
2123
import org.apache.daffodil.core.util.TestUtils
2224
import org.apache.daffodil.lib.Implicits._
@@ -83,7 +85,7 @@ class TestInfosetInputterFromReader {
8385
)
8486
val infosetXML = <foo xmlns={XMLUtils.EXAMPLE_NAMESPACE}>Hello</foo>
8587
val (ii, _, _, _) = infosetInputter(sch, infosetXML)
86-
val is = ii.toStream.toList
88+
val is = ii.to(LazyList).toList
8789
val List(Start(s: DISimple), End(e: DISimple)) = is
8890
assertTrue(s eq e) // exact same object
8991
assertTrue(s.dataValue.getAnyRef.isInstanceOf[String])
@@ -100,7 +102,7 @@ class TestInfosetInputterFromReader {
100102
XMLUtils.XSI_NAMESPACE
101103
}/>
102104
val (ii, _, _, _) = infosetInputter(sch, infosetXML)
103-
val is = ii.toStream.toList
105+
val is = ii.to(LazyList).toList
104106
val List(Start(s: DISimple), End(e: DISimple)) = is
105107
assertTrue(s eq e) // exact same object
106108
assertTrue(s.isNilled)

‎daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class TestInfosetInputterFromReader2 {
7575
class StreamInputStream(private var strings: LazyList[String]) extends java.io.InputStream {
7676

7777
private var bytes = {
78-
val ss = strings.flatMap { _.getBytes() } ++ "</bar>".getBytes().toStream
78+
val ss = strings.flatMap { _.getBytes() } ++ "</bar>".getBytes().to(LazyList)
7979
strings = Nil.to(LazyList)
8080
ss
8181
}

‎daffodil-japi/src/main/scala/org/apache/daffodil/japi/infoset/Infoset.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ abstract class InfosetInputterProxy extends InfosetInputter {
446446
override def next() = infosetInputter.next()
447447
override lazy val supportsNamespaces = infosetInputter.supportsNamespaces
448448

449-
override def fini = infosetInputter.fini()
449+
override def fini() = infosetInputter.fini()
450450
}
451451

452452
/**

‎daffodil-lib/src/main/scala/org/apache/daffodil/lib/util/collections/MultiMap.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ class MultiMap[K, V] {
5656
filtered
5757
}
5858

59-
def map[T](func: (K, mutable.Set[V]) => T): collection.Seq[T] = {
59+
def map[T](func: (K, mutable.Set[V]) => T): Seq[T] = {
6060
val ret = mutable.ListBuffer.empty[T]
6161
for ((key, values) <- underlying) {
6262
ret.append(func(key, values))
6363
}
64-
ret
64+
ret.toSeq
6565
}
6666
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ class InteractiveDebugger(
14041404
DebugState.Pause
14051405
}
14061406

1407-
trait InfoDiffable {
1407+
trait InfoDiffable extends DebugCommand {
14081408

14091409
/**
14101410
* Outputs any differences between previousProcessorState and state for the mixed in debugger command
@@ -1664,9 +1664,9 @@ class InteractiveDebugger(
16641664
val desc = "display differences since the previous pause in the debugger"
16651665
val longDesc = desc
16661666

1667-
lazy val infoDiffables = Info.subcommands.collect { case diffable: InfoDiffable =>
1668-
diffable
1669-
}
1667+
lazy val infoDiffables = Info.subcommands
1668+
.filter(_.isInstanceOf[InfoDiffable])
1669+
.map(_.asInstanceOf[InfoDiffable])
16701670

16711671
def act(
16721672
args: Seq[String],

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dsom/CompiledExpression1.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class DPathCompileInfo(
214214
with PreSerialization
215215
with HasSchemaFileLocation {
216216

217-
def initialize: Unit = {
217+
def initialize(): Unit = {
218218
parents
219219
}
220220

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class JDOMInfosetInputter(doc: Document) extends InfosetInputter {
135135
!atDocumentEnd
136136
}
137137

138-
override def fini = {
138+
override def fini() = {
139139
stack.clear()
140140
}
141141

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/JsonInfosetInputter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class JsonInfosetInputter(input: java.io.InputStream) extends InfosetInputter {
9999
}
100100
}
101101

102-
override def getLocalName: String = {
102+
override def getLocalName(): String = {
103103
val curName = jsp.getCurrentName()
104104
if (curName == null) {
105105
// this only happens if we are directly inside an array, so get the value

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class ScalaXMLInfosetInputter(rootNode: Node) extends InfosetInputter {
151151
!atDocumentEnd
152152
}
153153

154-
override def fini = {
154+
override def fini() = {
155155
stack.clear()
156156
}
157157

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/W3CDOMInfosetInputter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class W3CDOMInfosetInputter(doc: Document) extends InfosetInputter {
137137
!atDocumentEnd
138138
}
139139

140-
override def fini = {
140+
override def fini() = {
141141
stack.clear()
142142
}
143143

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/infoset/XMLTextInfosetInputter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ class XMLTextInfosetInputter(input: java.io.InputStream) extends InfosetInputter
231231
}
232232
}
233233

234-
override def getLocalName: String = {
234+
override def getLocalName(): String = {
235235
xsr.getLocalName()
236236
}
237237

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/Evaluatable.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ abstract class Evaluatable[+T <: AnyRef](
190190
@inline final def isCompiled = isCompiled_
191191

192192
@inline final def ensureCompiled(): Unit = {
193-
ci.initialize
193+
ci.initialize()
194194
if (!isCompiled)
195195
Assert.invariantFailed("not compiled Ev: " + this.qName)
196196
}

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ sealed abstract class TermRuntimeData(
171171

172172
protected def initializeFunction(): Unit = {
173173
partialNextElementResolver
174-
dpathCompileInfo.initialize
174+
dpathCompileInfo.initialize()
175175
}
176176

177177
final def namespaces = dpathCompileInfo.namespaces

‎daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/UState.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ final class UStateForSuspension(
445445
override def advanceAccessor: InfosetAccessor = die
446446
override def inspect: Boolean = die
447447
override def inspectAccessor: InfosetAccessor = die
448-
override def fini: Unit = die
448+
override def fini(): Unit = die
449449
override def inspectOrError = die
450450
override def advanceOrError = die
451451
override def isInspectArrayEnd = die
@@ -484,9 +484,9 @@ final class UStateForSuspension(
484484

485485
override def documentElement = mainUState.documentElement
486486

487-
override def incrementHiddenDef =
487+
override def incrementHiddenDef() =
488488
Assert.usageError("Unparser suspended UStates need not be aware of hidden contexts")
489-
override def decrementHiddenDef =
489+
override def decrementHiddenDef() =
490490
Assert.usageError("Unparser suspended UStates need not be aware of hidden contexts")
491491
override def withinHiddenNest =
492492
Assert.usageError("Unparser suspended UStates need not be aware of hidden contexts")
@@ -608,7 +608,7 @@ final class UStateMain private (
608608
override def inspect: Boolean = inputter.inspect
609609
override def inspectAccessor: InfosetAccessor = inputter.inspectAccessor
610610
// $COVERAGE-OFF$ // unused, but necessary to meet requirements of Cursor[T]
611-
override def fini = Assert.usageError("Not to be used on UState")
611+
override def fini() = Assert.usageError("Not to be used on UState")
612612
// $COVERAGE-ON$
613613
/**
614614
* Use this so if there isn't an event we get a clean diagnostic message saying

‎daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/infoset/Infoset.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ abstract class InfosetInputterProxy extends InfosetInputter {
435435
override def next() = infosetInputter.next()
436436
override lazy val supportsNamespaces = infosetInputter.supportsNamespaces
437437

438-
override def fini = infosetInputter.fini()
438+
override def fini() = infosetInputter.fini()
439439
}
440440

441441
/**

0 commit comments

Comments
 (0)