From 88b97cfb73121b85ec4f95984c03c3d3316f1348 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 24 Jan 2025 15:03:17 +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 a6ac4e0f0b..408d4479db 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -32,4 +32,4 @@ rewrite.rules = [ rewrite.trailingCommas.style = never runner.dialect = scala212 spaces.inImportCurlyBraces = true -version = 3.8.3 +version = 3.8.6 From 6df0c89aaca72dac11b2fb150a7459a77d88f047 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 24 Jan 2025 15:04:52 +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 ++++- .../core/dpath/TestDFDLExpressionTree.scala | 15 ++++++++++----- .../org/apache/daffodil/lib/xml/Namespaces.scala | 3 ++- .../apache/daffodil/runtime1/dpath/DPath.scala | 1 + .../runtime1/processors/VariableMap1.scala | 1 + .../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/gen-symbol-table.scala | 3 ++- 14 files changed, 49 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 846b43a283..d617c767d8 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 @@ -139,7 +139,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 { @@ -1348,8 +1351,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 0130affc91..213c037de8 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 fb55d36d5b..c318872e8a 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 @@ -120,6 +120,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 @@ -131,6 +132,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 963e0b8ed4..d6a2465825 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 @@ -200,14 +200,16 @@ trait SchemaComponent case st: SimpleTypeDefBase => "st=" + st.namedQName.toQNameString case st: SimpleTypeBase => "st=" + st.primType.globalQName.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 12b53c352a..325fdab9a8 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/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala index 0ce25bc4be..6d4c3d0e4f 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 @@ -340,19 +340,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-lib/src/main/scala/org/apache/daffodil/lib/xml/Namespaces.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/Namespaces.scala index f7d73348b6..b2cb88d694 100644 --- a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/Namespaces.scala +++ b/daffodil-lib/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-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DPath.scala b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DPath.scala index 3e5a8f6e63..b60c554ca9 100644 --- a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DPath.scala +++ b/daffodil-runtime1/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-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/VariableMap1.scala b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/VariableMap1.scala index ee3805e0f2..5561815928 100644 --- a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/VariableMap1.scala +++ b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/processors/VariableMap1.scala @@ -468,6 +468,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-runtime1/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala b/daffodil-runtime1/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala index f87a8e18bb..4e138a4013 100644 --- a/daffodil-runtime1/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala +++ b/daffodil-runtime1/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 4db42b4b4c..b235d11f8c 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 @@ -2406,7 +2406,7 @@ case class Document(d: NodeSeq, parent: TestCase) { final lazy val nBits: Long = documentParts.map { _.nBits - } sum + }.sum final lazy val documentBytes = bits2Bytes(documentBits) @@ -2643,7 +2643,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 1d4ccf74d1..b885dc4569 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 @@ -343,7 +343,9 @@ class TestTDMLRunner { fileWriter.write(testSchema.toString()) } - val testSuite = + val testSuite = diff --git a/project/OsgiCheck.scala b/project/OsgiCheck.scala index cee84a88dd..1c738451fc 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/gen-symbol-table.scala b/scripts/osgi-refactor/gen-symbol-table.scala index 6940d00e7a..57623a53a8 100644 --- a/scripts/osgi-refactor/gen-symbol-table.scala +++ b/scripts/osgi-refactor/gen-symbol-table.scala @@ -107,7 +107,8 @@ object GenSymbolTable extends App { val files = dir.listFiles() for (file <- files) { val name = file.getName - if (name.startsWith("Test") || name == "test") {} else if (file.isDirectory) + if (name.startsWith("Test") || name == "test") {} + else if (file.isDirectory) symbols ++= processDir(libraryName, file) else if (name.endsWith(".scala") || name.endsWith(".java")) { processFile(libraryName, file) match { From cf53b1070871113ecca20fd0a5c8d759131d84d8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 24 Jan 2025 15:04:52 +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..18d18d2ac4 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.6 +6df0c89aaca72dac11b2fb150a7459a77d88f047