From b8116340e20d268369acdface38e35d3e459353e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Aug 2025 10:44:45 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.6 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 34158f229b..c289552911 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -41,4 +41,4 @@ rewrite.scala3.newSyntax { deprecated = true } spaces.inImportCurlyBraces = true -version = 3.8.3 \ No newline at end of file +version = 3.8.6 \ No newline at end of file From d869e2e6a460f447003c5f6a09445a128795306f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Aug 2025 10:45:33 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.6 Executed command: scalafmt --non-interactive --- .../main/scala/org/apache/daffodil/cli/Main.scala | 10 +++++++--- .../apache/daffodil/core/dsom/ElementBase.scala | 3 +-- .../apache/daffodil/core/dsom/ParticleMixin.scala | 2 ++ .../daffodil/core/dsom/SchemaComponent.scala | 14 ++++++++------ .../core/grammar/ElementBaseGrammarMixin.scala | 5 ++++- .../org/apache/daffodil/lib/xml/Namespaces.scala | 3 ++- .../apache/daffodil/runtime1/dpath/DPath.scala | 1 + .../runtime1/processors/VariableMap1.scala | 1 + .../core/dpath/TestDFDLExpressionTree.scala | 15 ++++++++++----- .../runtime1/parser/TestCharsetBehavior.scala | 4 +++- .../org/apache/daffodil/tdml/TDMLRunner.scala | 4 ++-- .../daffodil/processor/tdml/TestTDMLRunner.scala | 4 +++- project/OsgiCheck.scala | 6 +++--- scripts/osgi-refactor/Rat.scala | 2 +- 14 files changed, 48 insertions(+), 26 deletions(-) diff --git a/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala b/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala index 5fe7668a00..07d9d08896 100644 --- a/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala +++ b/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala @@ -138,7 +138,10 @@ class CLIConf(arguments: Array[String], stdout: PrintStream, stderr: PrintStream s match { case Nil => Right(None) // flag was not present case (_, Nil) :: Nil => Right(Some(None)) // flag was present but had no parameter - case (_, v :: Nil) :: Nil => { // flag was present with a parameter, convert the parameter + case ( + _, + v :: Nil + ) :: Nil => { // flag was present with a parameter, convert the parameter try { Right(Some(Some(conv(v)))) } catch { @@ -1378,8 +1381,9 @@ class Main( else "" val dataHex = if (destArrayFilled) - s"\nLeft over data (Hex) starting at byte ${curBytePosition1b} is: (0x${destArray.map { a => - f"$a%02x" + s"\nLeft over data (Hex) starting at byte ${curBytePosition1b} is: (0x${destArray.map { + a => + f"$a%02x" }.mkString}...)" else "" val remainingBits = diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ElementBase.scala b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ElementBase.scala index 09e0331148..ecd52db423 100644 --- a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ElementBase.scala +++ b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ElementBase.scala @@ -631,8 +631,7 @@ trait ElementBase // if they have binary representation we must worry about packed digits, which require 4-bit alignment. // primType match { - case PrimType.Float | PrimType.Double | PrimType.Boolean | - PrimType.HexBinary => /* Non textual data, no need to compare alignment to encoding's expected alignment */ + case PrimType.Float | PrimType.Double | PrimType.Boolean | PrimType.HexBinary => /* Non textual data, no need to compare alignment to encoding's expected alignment */ case _ => binaryNumberRep match { case BinaryNumberRep.Packed | BinaryNumberRep.Bcd | diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ParticleMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ParticleMixin.scala index 96a34210a1..5c2457a29c 100644 --- a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ParticleMixin.scala +++ b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ParticleMixin.scala @@ -116,6 +116,7 @@ trait RequiredOptionalMixin { self: ElementBase => case (1, 1) => false case (_, n) if n > 1 => true case (_, UNBOUNDED) => true + /** * This next case is for occursCountKinds parsed and stopValue. * These only use min/maxOccurs for validation, so anything @@ -127,6 +128,7 @@ trait RequiredOptionalMixin { self: ElementBase => occursCountKind == OccursCountKind.StopValue || occursCountKind == OccursCountKind.Expression) => true + /** * Special case for minoccurs 0 and maxOccurs 0 when OCK is 'implicit' in that * case we treat as an array that cannot have any occurrences. diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaComponent.scala b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaComponent.scala index 4174e99760..94fd9078cf 100644 --- a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaComponent.scala +++ b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaComponent.scala @@ -199,14 +199,16 @@ trait SchemaComponent case ct: ComplexTypeBase => "ct" case st: SimpleTypeDefBase => "st=" + st.namedQName.toQNameString case cgr: ChoiceGroupRef => - "cgr" + (if (cgr.isHidden) "h" else "") + (if (cgr.position > 1) cgr.position - else - "") + "=" + cgr.groupDef.namedQName.toQNameString + "cgr" + (if (cgr.isHidden) "h" + else "") + (if (cgr.position > 1) cgr.position + else + "") + "=" + cgr.groupDef.namedQName.toQNameString case cgd: GlobalChoiceGroupDef => "cgd=" + cgd.namedQName.toQNameString case sgr: SequenceGroupRef => - "sgr" + (if (sgr.isHidden) "h" else "") + (if (sgr.position > 1) sgr.position - else - "") + "=" + sgr.groupDef.namedQName.toQNameString + "sgr" + (if (sgr.isHidden) "h" + else "") + (if (sgr.position > 1) sgr.position + else + "") + "=" + sgr.groupDef.namedQName.toQNameString case sgd: GlobalSequenceGroupDef => "sgd=" + sgd.namedQName.toQNameString case cg: Choice => "c" + (if (cg.position > 1) cg.position else "") case sg: LocalSequence => "s" + (if (sg.position > 1) sg.position else "") diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/ElementBaseGrammarMixin.scala b/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/ElementBaseGrammarMixin.scala index 48ee0a08b6..e8b4586446 100644 --- a/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/ElementBaseGrammarMixin.scala +++ b/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/ElementBaseGrammarMixin.scala @@ -1304,7 +1304,10 @@ trait ElementBaseGrammarMixin } private lazy val nilOrValue = - prod("nilOrValue", isNillable) { // TODO: make it exclude emptyness once emptyness is implemented + prod( + "nilOrValue", + isNillable + ) { // TODO: make it exclude emptyness once emptyness is implemented SimpleNilOrValue(this, nilLit || parsedNil, parsedValue) } diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/lib/xml/Namespaces.scala b/daffodil-core/src/main/scala/org/apache/daffodil/lib/xml/Namespaces.scala index 47498b282c..bb566301dc 100644 --- a/daffodil-core/src/main/scala/org/apache/daffodil/lib/xml/Namespaces.scala +++ b/daffodil-core/src/main/scala/org/apache/daffodil/lib/xml/Namespaces.scala @@ -100,7 +100,8 @@ object UnspecifiedNamespace extends NS(null) { override def explainForMsg = "with unspecified namespace" } -sealed class NS protected (uriArg: URI) extends Serializable { // protected constructor. Must use factory. +sealed class NS protected (uriArg: URI) + extends Serializable { // protected constructor. Must use factory. override def toString = uri.toString def uri = uriArg def optURI = One(uriArg) diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/dpath/DPath.scala b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/dpath/DPath.scala index b35db0c09a..91a667fa6c 100644 --- a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/dpath/DPath.scala +++ b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/dpath/DPath.scala @@ -142,6 +142,7 @@ final class RuntimeExpressionDPath[T <: AnyRef]( state.setFailed(e) null } + /** * Almost anything that can go wrong in an expression maps to a SDE. * Except when we're evaluating a discriminator. diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/VariableMap1.scala b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/VariableMap1.scala index f33174c7eb..69b76e3895 100644 --- a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/VariableMap1.scala +++ b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/VariableMap1.scala @@ -469,6 +469,7 @@ class VariableMap private ( case _ => { vrd.direction match { + /** * Due to potential race conditions regarding the setting of * variables via setVariable and default values in combination with diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala index d372eba32a..11a3308043 100644 --- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala +++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala @@ -445,19 +445,24 @@ class TestDFDLExpressionTree extends Parsers { @Test def test_numbers() = { testExpr(dummySchema, "{ 5.0E2 }") { - case WholeExpression(_, LiteralExpression(500.0), _, _, _, _) => /* ok */ ; + case WholeExpression(_, LiteralExpression(500.0), _, _, _, _) => /* ok */ + ; } testExpr(dummySchema, "{ 5E2 }") { - case WholeExpression(_, LiteralExpression(500.0), _, _, _, _) => /* ok */ ; + case WholeExpression(_, LiteralExpression(500.0), _, _, _, _) => /* ok */ + ; } testExpr(dummySchema, "{ .2E2 }") { - case WholeExpression(_, LiteralExpression(20.0), _, _, _, _) => /* ok */ ; + case WholeExpression(_, LiteralExpression(20.0), _, _, _, _) => /* ok */ + ; } testExpr(dummySchema, "{ .2E-3 }") { - case WholeExpression(_, LiteralExpression(0.0002), _, _, _, _) => /* ok */ ; + case WholeExpression(_, LiteralExpression(0.0002), _, _, _, _) => /* ok */ + ; } testExpr(dummySchema, "{ .2E+3 }") { - case WholeExpression(_, LiteralExpression(200.0), _, _, _, _) => /* ok */ ; + case WholeExpression(_, LiteralExpression(200.0), _, _, _, _) => /* ok */ + ; } // testExpr(dummySchema, "0.") { actual => diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala b/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala index 1795dadb6d..ddf7f28108 100644 --- a/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala +++ b/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala @@ -249,7 +249,9 @@ class TestUnicodeErrorTolerance { ) val input = new ByteArrayInputStream(inBuf); val e = - intercept[MalformedInputException] { // fails to convert because there is no possible surrogate-pair rep for this. + intercept[ + MalformedInputException + ] { // fails to convert because there is no possible surrogate-pair rep for this. Converter.parse(input, decoder) } assertEquals(1, e.getInputLength()) diff --git a/daffodil-tdml-lib/src/main/scala/org/apache/daffodil/tdml/TDMLRunner.scala b/daffodil-tdml-lib/src/main/scala/org/apache/daffodil/tdml/TDMLRunner.scala index 77a4e9c6af..817785cc63 100644 --- a/daffodil-tdml-lib/src/main/scala/org/apache/daffodil/tdml/TDMLRunner.scala +++ b/daffodil-tdml-lib/src/main/scala/org/apache/daffodil/tdml/TDMLRunner.scala @@ -2399,7 +2399,7 @@ case class Document(d: NodeSeq, parent: TestCase) { final lazy val nBits: Long = documentParts.map { _.nBits - } sum + }.sum final lazy val documentBytes = bits2Bytes(documentBits) @@ -2636,7 +2636,7 @@ sealed abstract class DataDocumentPart(part: Node, parent: Document) lazy val lengthInBits = dataBits.map { _.length - } sum + }.sum override lazy val nBits: Long = lengthInBits lazy val contentAsBits = dataBits diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala index 8cbfb0ebf3..a44ca46ffd 100644 --- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala +++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala @@ -342,7 +342,9 @@ class TestTDMLRunner { fileWriter.write(testSchema.toString()) } - val testSuite = + val testSuite = diff --git a/project/OsgiCheck.scala b/project/OsgiCheck.scala index 6bb4e10e3e..4cc11327e3 100644 --- a/project/OsgiCheck.scala +++ b/project/OsgiCheck.scala @@ -73,10 +73,10 @@ object OsgiCheckPlugin extends AutoPlugin { // flatten all of our tuples so we have a single list of package name -> // project owner tuples. At this point, there might be multiple owners // for the same package name in this list - val packageOwnerTuples = subprojectPackagesAndOwner.flatMap { - case (ownedPackages, packageOwner) => + val packageOwnerTuples = + subprojectPackagesAndOwner.flatMap { case (ownedPackages, packageOwner) => ownedPackages.map { _ -> packageOwner } - } + } // create a map, grouping with a key of package name and value of all of the // owners that claim to own it. If only one project owns a package, the value diff --git a/scripts/osgi-refactor/Rat.scala b/scripts/osgi-refactor/Rat.scala index 380f12522a..2997659d24 100644 --- a/scripts/osgi-refactor/Rat.scala +++ b/scripts/osgi-refactor/Rat.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -import sbt._ +import sbt.* object Rat { From 2a6032aec7224d6e1f8871d9b887311adecd85b0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Aug 2025 10:45:33 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.6' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..aad041158f --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.6 +d869e2e6a460f447003c5f6a09445a128795306f