This is an automated email from the ASF dual-hosted git repository.
slawrence 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 60087d0d3 Update scalafmt-core to 3.7.2
60087d0d3 is described below
commit 60087d0d31642fd3d94c0411b62816a1eae35c35
Author: Scala Steward <[email protected]>
AuthorDate: Fri Feb 24 13:12:44 2023 -0500
Update scalafmt-core to 3.7.2
Reformat with scalafmt 3.7.2
Executed command: scalafmt --non-interactive
---
.scalafmt.conf | 2 +-
scripts/osgi-refactor/Rat.scala | 179 +++++--
scripts/osgi-refactor/add-imports.scala | 752 +++++++++++++++++++++------
scripts/osgi-refactor/fix-imports.scala | 76 ++-
scripts/osgi-refactor/gen-symbol-table.scala | 13 +-
5 files changed, 800 insertions(+), 222 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 811cfed17..5c0bdc4bf 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -32,4 +32,4 @@ rewrite.rules = [
rewrite.trailingCommas.style = always
runner.dialect = scala212
spaces.inImportCurlyBraces = true
-version = 3.7.1
+version = 3.7.2
diff --git a/scripts/osgi-refactor/Rat.scala b/scripts/osgi-refactor/Rat.scala
index ca17a2ab7..29637879d 100644
--- a/scripts/osgi-refactor/Rat.scala
+++ b/scripts/osgi-refactor/Rat.scala
@@ -20,7 +20,6 @@ import sbt._
object Rat {
lazy val excludes = Seq(
-
// git files
file(".git"),
@@ -31,7 +30,9 @@ object Rat {
file("daffodil-sapi/root-doc.txt"),
// UTF-16BE, Apache Rat thinks it is a binary and cannot tell it includes
the Apache v2 license
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd"),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd",
+ ),
// images used for the windows installer
file("daffodil-cli/src/windows/apache-daffodil.ico"),
@@ -42,11 +43,21 @@ object Rat {
file("daffodil-runtime2/src/test/c/examples"),
// Apache Rat thinks these files are binary since the file name contains
".lib"
-
file("daffodil-schematron/src/main/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory"),
-
file("daffodil-japi/src/test/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory"),
-
file("daffodil-sapi/src/test/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory"),
-
file("daffodil-lib/src/main/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory"),
-
file("daffodil-lib/src/test/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory"),
+ file(
+
"daffodil-schematron/src/main/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory",
+ ),
+ file(
+
"daffodil-japi/src/test/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory",
+ ),
+ file(
+
"daffodil-sapi/src/test/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory",
+ ),
+ file(
+
"daffodil-lib/src/main/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory",
+ ),
+ file(
+
"daffodil-lib/src/test/resources/META-INF/services/org.apache.daffodil.lib.api.ValidatorFactory",
+ ),
// test files that cannot include the Apache license without breaking tests
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt"),
@@ -101,12 +112,24 @@ object Rat {
file("daffodil-tdml-lib/src/test/resources/test/tdml/test.txt"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.bin"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.txt"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.0.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.1.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_orange_to_green_60002.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_green_to_orange_60004.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.0.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.1.dat"),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.0.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.1.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_orange_to_green_60002.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_green_to_orange_60004.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.0.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.1.dat",
+ ),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/collisions.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.11.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.12.dat"),
@@ -118,46 +141,110 @@ object Rat {
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.18.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.19.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.20.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.111.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.112.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.113.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.114.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.115.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.116.dat"),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.111.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.112.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.113.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.114.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.115.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.116.dat",
+ ),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.aptina.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.camera.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.command.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.limits.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.video.dat"),
file("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/ext_file.txt"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/ext_file2.txt"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_01.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_02.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_03.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_04.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_07.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13a.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13b.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13c.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13d.bin"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/02nine_headers.txt"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_01.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_01.dat.xml"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_01.dat.xml.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_02.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_02.xml"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_03.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_04.xml"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_05.xml"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_06.xml"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_07.xml"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_08.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/nonamespace/binMessage_01.dat"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/nonamespace/binMessage_01.dat.xml"),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section00/general/ext_file2.txt",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_01.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_02.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_03.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_04.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_07.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13a.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13b.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13c.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/blobs/blob_13d.bin",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/02nine_headers.txt",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_01.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_01.dat.xml",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_01.dat.xml.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_02.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_02.xml",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_03.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_04.xml",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_05.xml",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_06.xml",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_07.xml",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/binMessage_08.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/nonamespace/binMessage_01.dat",
+ ),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/nonamespace/binMessage_01.dat.xml",
+ ),
file("daffodil-test/src/test/resources/org/apache/daffodil/usertests/Book2.csv"),
-
file("daffodil-test/src/test/resources/org/apache/daffodil/usertests/test_prefix_separator_as_variable"),
+ file(
+
"daffodil-test/src/test/resources/org/apache/daffodil/usertests/test_prefix_separator_as_variable",
+ ),
file("daffodil-test/src/test/resources/test space/A BTinyData.tdml.dat"),
-
file("daffodil-tdml-processor/src/test/resources/test/tdml/fake-precompiled-dfdl-schema.bin"),
+ file(
+
"daffodil-tdml-processor/src/test/resources/test/tdml/fake-precompiled-dfdl-schema.bin",
+ ),
file("test-stdLayout/src/test/resources/org1/test-outer-data1.txt"),
file("test-stdLayout/src/test/resources/org2/test-data1.txt"),
)
@@ -165,7 +252,7 @@ object Rat {
lazy val BSD2_LICENSE_NAME = "BSD 2-Clause License"
lazy val LICENSE_TEXT_PASSERA =
-"""
+ """
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
diff --git a/scripts/osgi-refactor/add-imports.scala
b/scripts/osgi-refactor/add-imports.scala
index e67d3b7b2..dfa0c40f7 100644
--- a/scripts/osgi-refactor/add-imports.scala
+++ b/scripts/osgi-refactor/add-imports.scala
@@ -15,168 +15,626 @@
* limitations under the License.
*/
import java.io.BufferedWriter
-import java.io.FileWriter
import java.io.File
+import java.io.FileWriter
import scala.collection.mutable.ListBuffer
import scala.io.Source
object AddImports extends App {
val imports = Seq(
- ("org.apache.daffodil.lib.api._",
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/api/DFDLParserUnparser.scala"),
- ("org.apache.daffodil.runtime1.dsom.walker._",
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/NodeInfo.scala"),
- ("org.apache.daffodil.lib.externalvars._",
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/externalvars/ExternalVariablesLoader.scala"),
- ("org.apache.daffodil.udf._",
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/udf/UserDefinedFunctionService.scala"),
- ("org.apache.daffodil.runtime1.layers._",
"daffodil-runtime1-layers/src/main/scala/org/apache/daffodil/layers/runtime1/Base64Transformer.scala"),
- ("org.apache.daffodil.runtime1.layers._",
"daffodil-runtime1-layers/src/main/scala/org/apache/daffodil/layers/runtime1/ByteSwapTransformer.scala"),
- ("org.apache.daffodil.runtime1.layers._",
"daffodil-runtime1-layers/src/main/scala/org/apache/daffodil/layers/runtime1/GZipTransformer.scala"),
- ("org.apache.daffodil.runtime1.layers._",
"daffodil-runtime1-layers/src/main/scala/org/apache/daffodil/layers/runtime1/LineFoldedTransformer.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/PackedBinaryUnparserTraits.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/BCDUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SpecifiedLengthUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/BinaryBooleanUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/BinaryNumberUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/BlobLengthUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ChoiceAndOtherVariousUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertBinaryCalendarUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertNonBaseTenTextNumberUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertTextBooleanUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertTextCalendarUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertTextStandardNumberUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertZonedNumberUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/DelimitedUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/DelimiterUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ElementUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ExpressionEvaluatingUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/FramingUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/HexBinaryLengthUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/HiddenGroupCombinatorUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/IBM4690PackedDecimalUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/LayeredSequenceUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/NadaUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/NilEmptyCombinatorUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/NilUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/PackedDecimalUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SeparatedSequenceUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SequenceUnparserBases.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SequenceChildUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/StreamSplitterMixin.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/StringLengthUnparsers.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SpecifiedLength2.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SuppressableSeparatorUnparser.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/UnseparatedSequenceUnparsers.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaComponent.scala"),
- ("org.apache.daffodil.runtime1.dpath._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Conversions.scala"),
- ("org.apache.daffodil.runtime1.dpath._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/DFDLExpressionParser.scala"),
- ("org.apache.daffodil.runtime1.dpath._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Expression.scala"),
- ("org.apache.daffodil.runtime1.dpath.NodeInfo",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/NodeInfoUtils.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala"),
- ("org.apache.daffodil.runtime1.dpath.NodeInfo",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala"),
- ("org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/runtime1/TermRuntime1Mixin.scala"),
- ("org.apache.daffodil.runtime1.dpath.NodeInfo",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesExpressions.scala"),
- ("org.apache.daffodil.runtime1.dpath.NodeInfo",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLEscapeScheme.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLSchemaFile.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLStatementMixin.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/RealTermMixin.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ElementBase.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/RuntimePropertyMixins.scala"),
- ("org.apache.daffodil.runtime1.dsom.walker._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/walker/AbstractDSOMWalker.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/Facets.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/RestrictionUnion.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/TermEncodingMixin.scala"),
- ("org.apache.daffodil.unparsers.runtime1._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceChild.scala"),
- ("org.apache.daffodil.unparsers.runtime1._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/ChoiceCombinator.scala"),
- ("org.apache.daffodil.unparsers.runtime1._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/DelimiterAndEscapeRelated.scala"),
- ("org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesExpressions.scala"),
- ("org.apache.daffodil.unparsers.runtime1._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceCombinator.scala"),
- ("org.apache.daffodil.unparsers.runtime1._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SpecifiedLength.scala"),
- ("org.apache.daffodil.lib.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI1.scala"),
- ("org.apache.daffodil.lib.api._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestForHeapDump.scala"),
- ("org.apache.daffodil.runtime1.api._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestParseIndividualMessages.scala"),
- ("org.apache.daffodil.runtime1.infoset._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala"),
- ("org.apache.daffodil.runtime1.dpath.NodeInfo",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala"),
- ("org.apache.daffodil.runtime1.dpath.NodeInfo",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala"),
- ("org.apache.daffodil.runtime1.dpath._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInputValueCalc.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInteriorAlignmentElimination.scala"),
- ("org.apache.daffodil.runtime1.debugger._",
"daffodil-cli/src/main/scala/org/apache/daffodil/cli/debugger/CLIDebuggerRunner.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestIsScannable.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPropertyScoping.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestSimpleTypeUnions.scala"),
- ("org.apache.daffodil.core.dsom._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestSimpleTypeUnions.scala"),
- ("org.apache.daffodil.runtime1.dsom.walker._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/walker/TestDSOMWalker.scala"),
- ("org.apache.daffodil.core.util._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala"),
- ("org.apache.daffodil.runtime1.infoset._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor.scala"),
- ("org.apache.daffodil.runtime1.infoset._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala"),
- ("org.apache.daffodil.runtime1.infoset._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala"),
- ("org.apache.daffodil.runtime1.infoset._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala"),
- ("org.apache.daffodil.runtime1.infoset._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala"),
- ("org.apache.daffodil.lib.schema.annotation.props._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/schema/annotation/props/TestPropertyRuntime.scala"),
- ("org.apache.daffodil.lib.xml._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/xml/TestXMLLoaderWithLocation.scala"),
- ("org.apache.daffodil.io.processors.charset._",
"daffodil-tdml-lib/src/test/scala/org/apache/daffodil/processors/charset/TestLSBFirstAndUSASCII7BitPacked.scala"),
- ("org.apache.daffodil.tdml.TDMLException",
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/TDMLInfosetInputter.scala"),
- ("org.apache.daffodil.tdml.processor._",
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala"),
- ("org.apache.daffodil.tdml.processor._",
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/Runtime2TDMLDFDLProcessor.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestExtVars1.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerTutorial.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala"),
- ("org.apache.daffodil.tdml.Runner",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLUnparseCases.scala"),
- ("org.apache.daffodil.tdml.Runner;",
"daffodil-tdml-processor/src/test/java/org/apache/daffodil/processor/tdml/TestRunnerFactory.java"),
- ("org.apache.daffodil.tdml.NoRoundTrip$;",
"daffodil-tdml-processor/src/test/java/org/apache/daffodil/processor/tdml/TestRunnerFactory.java"),
- ("org.apache.daffodil.tdml._",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala"),
- ("org.apache.daffodil.tdml._",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala"),
- ("org.apache.daffodil.tdml._",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala"),
- ("org.apache.daffodil.tdml._",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLUnparseCases.scala"),
- ("org.apache.daffodil.tdml.Document",
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala"),
+ (
+ "org.apache.daffodil.lib.api._",
+
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/api/DFDLParserUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom.walker._",
+
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/NodeInfo.scala",
+ ),
+ (
+ "org.apache.daffodil.lib.externalvars._",
+
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/externalvars/ExternalVariablesLoader.scala",
+ ),
+ (
+ "org.apache.daffodil.udf._",
+
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/udf/UserDefinedFunctionService.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.layers._",
+
"daffodil-runtime1-layers/src/main/scala/org/apache/daffodil/layers/runtime1/Base64Transformer.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.layers._",
+
"daffodil-runtime1-layers/src/main/scala/org/apache/daffodil/layers/runtime1/ByteSwapTransformer.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.layers._",
+
"daffodil-runtime1-layers/src/main/scala/org/apache/daffodil/layers/runtime1/GZipTransformer.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.layers._",
+
"daffodil-runtime1-layers/src/main/scala/org/apache/daffodil/layers/runtime1/LineFoldedTransformer.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/PackedBinaryUnparserTraits.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/BCDUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SpecifiedLengthUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/BinaryBooleanUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/BinaryNumberUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/BlobLengthUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ChoiceAndOtherVariousUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertBinaryCalendarUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertNonBaseTenTextNumberUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertTextBooleanUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertTextCalendarUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertTextStandardNumberUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ConvertZonedNumberUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/DelimitedUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/DelimiterUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ElementUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/ExpressionEvaluatingUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/FramingUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/HexBinaryLengthUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/HiddenGroupCombinatorUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/IBM4690PackedDecimalUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/LayeredSequenceUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/NadaUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/NilEmptyCombinatorUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/NilUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/PackedDecimalUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SeparatedSequenceUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SequenceUnparserBases.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SequenceChildUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/StreamSplitterMixin.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/StringLengthUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SpecifiedLength2.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/SuppressableSeparatorUnparser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-runtime1-unparser/src/main/scala/org/apache/daffodil/unparsers/runtime1/UnseparatedSequenceUnparsers.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaComponent.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Conversions.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/DFDLExpressionParser.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/Expression.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath.NodeInfo",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dpath/NodeInfoUtils.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath.NodeInfo",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala",
+ ),
+ (
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/runtime1/TermRuntime1Mixin.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath.NodeInfo",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesExpressions.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath.NodeInfo",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLEscapeScheme.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLSchemaFile.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLStatementMixin.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/RealTermMixin.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/ElementBase.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/RuntimePropertyMixins.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom.walker._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/walker/AbstractDSOMWalker.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/Facets.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/RestrictionUnion.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/TermEncodingMixin.scala",
+ ),
+ (
+ "org.apache.daffodil.unparsers.runtime1._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceChild.scala",
+ ),
+ (
+ "org.apache.daffodil.unparsers.runtime1._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/ChoiceCombinator.scala",
+ ),
+ (
+ "org.apache.daffodil.unparsers.runtime1._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/DelimiterAndEscapeRelated.scala",
+ ),
+ (
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesExpressions.scala",
+ ),
+ (
+ "org.apache.daffodil.unparsers.runtime1._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceCombinator.scala",
+ ),
+ (
+ "org.apache.daffodil.unparsers.runtime1._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SpecifiedLength.scala",
+ ),
+ (
+ "org.apache.daffodil.lib.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI1.scala",
+ ),
+ (
+ "org.apache.daffodil.lib.api._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestForHeapDump.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.api._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestParseIndividualMessages.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.infoset._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath.NodeInfo",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath.NodeInfo",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dpath._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInputValueCalc.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInteriorAlignmentElimination.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.debugger._",
+
"daffodil-cli/src/main/scala/org/apache/daffodil/cli/debugger/CLIDebuggerRunner.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestIsScannable.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPropertyScoping.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestSimpleTypeUnions.scala",
+ ),
+ (
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestSimpleTypeUnions.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom.walker._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/walker/TestDSOMWalker.scala",
+ ),
+ (
+ "org.apache.daffodil.core.util._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.infoset._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.infoset._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.infoset._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.infoset._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.infoset._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala",
+ ),
+ (
+ "org.apache.daffodil.lib.schema.annotation.props._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/schema/annotation/props/TestPropertyRuntime.scala",
+ ),
+ (
+ "org.apache.daffodil.lib.xml._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/xml/TestXMLLoaderWithLocation.scala",
+ ),
+ (
+ "org.apache.daffodil.io.processors.charset._",
+
"daffodil-tdml-lib/src/test/scala/org/apache/daffodil/processors/charset/TestLSBFirstAndUSASCII7BitPacked.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.TDMLException",
+
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/TDMLInfosetInputter.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.processor._",
+
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.processor._",
+
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/Runtime2TDMLDFDLProcessor.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestExtVars1.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerTutorial.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLUnparseCases.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Runner;",
+
"daffodil-tdml-processor/src/test/java/org/apache/daffodil/processor/tdml/TestRunnerFactory.java",
+ ),
+ (
+ "org.apache.daffodil.tdml.NoRoundTrip$;",
+
"daffodil-tdml-processor/src/test/java/org/apache/daffodil/processor/tdml/TestRunnerFactory.java",
+ ),
+ (
+ "org.apache.daffodil.tdml._",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml._",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml._",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml._",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLUnparseCases.scala",
+ ),
+ (
+ "org.apache.daffodil.tdml.Document",
+
"daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala",
+ ),
)
var importsToRemove = Seq(
- ("org.apache.daffodil.core.dsom.walker._",
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/NodeInfo.scala"),
- ("org.apache.daffodil.dpath._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLEscapeScheme.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/DelimiterAndEscapeRelated.scala"),
- ("org.apache.daffodil.runtime1.processors.unparsers._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceChild.scala"),
- ("org.apache.daffodil.dpath._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesExpressions.scala"),
- ("org.apache.daffodil.runtime1.dsom._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala"),
- ("org.apache.daffodil.processor.tdml.tdml.TDMLInfosetInputter",
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala"),
- ("org.apache.daffodil.processor.tdml.tdml.TDMLInfosetOutputter",
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala"),
+ (
+ "org.apache.daffodil.core.dsom.walker._",
+
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/NodeInfo.scala",
+ ),
+ (
+ "org.apache.daffodil.dpath._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/DFDLEscapeScheme.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/DelimiterAndEscapeRelated.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.processors.unparsers._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceChild.scala",
+ ),
+ (
+ "org.apache.daffodil.dpath._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesExpressions.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala",
+ ),
+ (
+ "org.apache.daffodil.processor.tdml.tdml.TDMLInfosetInputter",
+
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala",
+ ),
+ (
+ "org.apache.daffodil.processor.tdml.tdml.TDMLInfosetOutputter",
+
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala",
+ ),
)
var importsToReplace = Seq(
- ("org.apache.daffodil.dpath._", "org.apache.daffodil.core.dpath._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/Grammar.scala"),
- ("org.apache.daffodil.runtime1.dsom.IIUtils.IIMap",
"org.apache.daffodil.core.dsom.IIUtils.IIMap",
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaDocument.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/GrammarMixin.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesDelimiters.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesNil.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/DelimiterAndEscapeRelated.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/SequenceGrammarMixin.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/ByteOrderMixin.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesTextNumber.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesZoned.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/LayeredSequence.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceChild.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceCombinator.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/ChoiceCombinator.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/Primitives.scala"),
- ("org.apache.daffodil.lib.api._", "org.apache.daffodil.runtime1.api._",
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala"),
- ("org.apache.daffodil.runtime1.infoset.TestInfoset",
"org.apache.daffodil.core.infoset.TestInfoset",
"daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala"),
- ("org.apache.daffodil.runtime1.dsom._", "org.apache.daffodil.core.dsom._",
"daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/TestGrammar.scala"),
- ("org.apache.daffodil.validation.Validators;",
"org.apache.daffodil.lib.validation.Validators;",
"daffodil-japi/src/test/java/org/apache/daffodil/example/ValidatorSpiExample.java"),
+ (
+ "org.apache.daffodil.dpath._",
+ "org.apache.daffodil.core.dpath._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/CompiledExpression.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/Grammar.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom.IIUtils.IIMap",
+ "org.apache.daffodil.core.dsom.IIUtils.IIMap",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/SchemaDocument.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/GrammarMixin.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesDelimiters.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesNil.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/DelimiterAndEscapeRelated.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/SequenceGrammarMixin.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/ByteOrderMixin.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesTextNumber.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesZoned.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/LayeredSequence.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceChild.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/SequenceCombinator.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/ChoiceCombinator.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/Primitives.scala",
+ ),
+ (
+ "org.apache.daffodil.lib.api._",
+ "org.apache.daffodil.runtime1.api._",
+
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.infoset.TestInfoset",
+ "org.apache.daffodil.core.infoset.TestInfoset",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala",
+ ),
+ (
+ "org.apache.daffodil.runtime1.dsom._",
+ "org.apache.daffodil.core.dsom._",
+
"daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/TestGrammar.scala",
+ ),
+ (
+ "org.apache.daffodil.validation.Validators;",
+ "org.apache.daffodil.lib.validation.Validators;",
+
"daffodil-japi/src/test/java/org/apache/daffodil/example/ValidatorSpiExample.java",
+ ),
)
var importsToAddLast = Seq(
- ("org.apache.daffodil.lib.api._",
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala"),
+ (
+ "org.apache.daffodil.lib.api._",
+
"daffodil-tdml-processor/src/main/scala/org/apache/daffodil/processor/tdml/DaffodilTDMLDFDLProcessor.scala",
+ ),
)
def addImports(name: String, file: File) = {
diff --git a/scripts/osgi-refactor/fix-imports.scala
b/scripts/osgi-refactor/fix-imports.scala
index e970b8c96..807d5227d 100644
--- a/scripts/osgi-refactor/fix-imports.scala
+++ b/scripts/osgi-refactor/fix-imports.scala
@@ -15,8 +15,8 @@
* limitations under the License.
*/
import java.io.BufferedWriter
-import java.io.FileWriter
import java.io.File
+import java.io.FileWriter
import scala.collection.mutable.ListBuffer
import scala.collection.mutable.Map
import scala.io.Source
@@ -32,7 +32,7 @@ object FixImports extends App {
"daffodil-runtime1" -> "runtime1",
"daffodil-runtime1-layers" -> "layers.runtime1",
"daffodil-runtime1-unparser" -> "unparsers.runtime1",
- "daffodil-tdml-processor" -> "processor.tdml"
+ "daffodil-tdml-processor" -> "processor.tdml",
)
val removeSuffix = Map(
"daffodil-runtime1-layers" -> "layers",
@@ -113,20 +113,29 @@ object FixImports extends App {
val reImports = """^ ?import (.+)$""".r
val rePackage = """^ ?package (.+)$""".r
- def fixLine(libName: String, line: String, symbols: Map[String,String]) = {
- line match {
- case rePackage(name) => s"package ${fixPackage(libName, name)}"
- case reImports(name) => s"import ${fixImport(name, symbols)}"
- case _ => line
- }
+ def fixLine(libName: String, line: String, symbols: Map[String, String]) = {
+ line match {
+ case rePackage(name) => s"package ${fixPackage(libName, name)}"
+ case reImports(name) => s"import ${fixImport(name, symbols)}"
+ case _ => line
+ }
}
val replacements = Seq(
("new org.apache.daffodil.xml", "new org.apache.daffodil.lib.xml"),
- ("org.apache.daffodil.schema.annotation.props.gen.{
BinaryNumberCheckPolicy, TextZonedSignStyle }",
"org.apache.daffodil.lib.schema.annotation.props.gen.{ BinaryNumberCheckPolicy,
TextZonedSignStyle }"),
- ("import org.apache.daffodil.util.MaybeULong", "import
org.apache.daffodil.lib.util.MaybeULong"),
+ (
+ "org.apache.daffodil.schema.annotation.props.gen.{
BinaryNumberCheckPolicy, TextZonedSignStyle }",
+ "org.apache.daffodil.lib.schema.annotation.props.gen.{
BinaryNumberCheckPolicy, TextZonedSignStyle }",
+ ),
+ (
+ "import org.apache.daffodil.util.MaybeULong",
+ "import org.apache.daffodil.lib.util.MaybeULong",
+ ),
("import org.apache.daffodil.Implicits._", "import
org.apache.daffodil.lib.Implicits._"),
- ("import org.apache.daffodil.infoset.DataValue", "import
org.apache.daffodil.runtime1.infoset.DataValue"),
+ (
+ "import org.apache.daffodil.infoset.DataValue",
+ "import org.apache.daffodil.runtime1.infoset.DataValue",
+ ),
("org.apache.daffodil.api", "org.apache.daffodil.lib.api"),
("org.apache.daffodil.calendar", "org.apache.daffodil.lib.calendar"),
("org.apache.daffodil.dpath.NodeInfo",
"org.apache.daffodil.runtime1.dpath.NodeInfo"),
@@ -138,24 +147,45 @@ object FixImports extends App {
("org.apache.daffodil.processors",
"org.apache.daffodil.runtime1.processors"),
("org.apache.daffodil.schema", "org.apache.daffodil.lib.schema"),
("org.apache.daffodil.xml", "org.apache.daffodil.lib.xml"),
- ("org.apache.daffodil.udf.UserDefinedFunctionService",
"org.apache.daffodil.runtime1.udf.UserDefinedFunctionService"),
+ (
+ "org.apache.daffodil.udf.UserDefinedFunctionService",
+ "org.apache.daffodil.runtime1.udf.UserDefinedFunctionService",
+ ),
("org.apache.daffodil.util", "org.apache.daffodil.lib.util"),
("org.apache.daffodil.grammar", "org.apache.daffodil.core.grammar"),
("org.apache.daffodil.lib.api.DFDL",
"org.apache.daffodil.runtime1.api.DFDL"),
- ("import org.apache.daffodil.runtime1.dsom.{ChoiceTermBase, GroupRef,
InitiatedTerminatedMixin, ModelGroup, SequenceTermBase}", "import
org.apache.daffodil.core.dsom.{ChoiceTermBase, GroupRef,
InitiatedTerminatedMixin, ModelGroup, SequenceTermBase}"),
+ (
+ "import org.apache.daffodil.runtime1.dsom.{ChoiceTermBase, GroupRef,
InitiatedTerminatedMixin, ModelGroup, SequenceTermBase}",
+ "import org.apache.daffodil.core.dsom.{ChoiceTermBase, GroupRef,
InitiatedTerminatedMixin, ModelGroup, SequenceTermBase}",
+ ),
("org.apache.daffodil.compiler", "org.apache.daffodil.core.compiler"),
("import org.apache.daffodil.debugger", "import
org.apache.daffodil.runtime1.debugger"),
("org.apache.daffodil.lib.util.TestUtils",
"org.apache.daffodil.core.util.TestUtils"),
("org.apache.daffodil.lib.util.Fakes",
"org.apache.daffodil.core.util.Fakes"),
- ("org.apache.daffodil.runtime1.dsom.{ ElementBase, Root }",
"org.apache.daffodil.core.dsom.{ ElementBase, Root }"),
+ (
+ "org.apache.daffodil.runtime1.dsom.{ ElementBase, Root }",
+ "org.apache.daffodil.core.dsom.{ ElementBase, Root }",
+ ),
("org.apache.daffodil.lib.util.StreamParser",
"org.apache.daffodil.core.util.StreamParser"),
("org.apache.daffodil.cli.CLI.Util._",
"org.apache.daffodil.cli.cliTest.Util._"),
("package org.apache.daffodil.cli.CLI", "package
org.apache.daffodil.cli.cliTest"),
- ("case TDMLImplementation.Daffodil =>
\"org.apache.daffodil.tdml.processor.TDMLDFDLProcessorFactory\"", "case
TDMLImplementation.Daffodil =>
\"org.apache.daffodil.processor.tdml.TDMLDFDLProcessorFactory\""),
- ("case TDMLImplementation.DaffodilC =>
\"org.apache.daffodil.tdml.processor.Runtime2TDMLDFDLProcessorFactory\"", "case
TDMLImplementation.DaffodilC =>
\"org.apache.daffodil.processor.tdml.Runtime2TDMLDFDLProcessorFactory\""),
- ("case TDMLImplementation.Ibm =>
\"org.apache.daffodil.tdml.processor.TDMLDFDLProcessorFactory\"", "case
TDMLImplementation.Ibm =>
\"org.apache.daffodil.processor.tdml.TDMLDFDLProcessorFactory\""),
+ (
+ "case TDMLImplementation.Daffodil =>
\"org.apache.daffodil.tdml.processor.TDMLDFDLProcessorFactory\"",
+ "case TDMLImplementation.Daffodil =>
\"org.apache.daffodil.processor.tdml.TDMLDFDLProcessorFactory\"",
+ ),
+ (
+ "case TDMLImplementation.DaffodilC =>
\"org.apache.daffodil.tdml.processor.Runtime2TDMLDFDLProcessorFactory\"",
+ "case TDMLImplementation.DaffodilC =>
\"org.apache.daffodil.processor.tdml.Runtime2TDMLDFDLProcessorFactory\"",
+ ),
+ (
+ "case TDMLImplementation.Ibm =>
\"org.apache.daffodil.tdml.processor.TDMLDFDLProcessorFactory\"",
+ "case TDMLImplementation.Ibm =>
\"org.apache.daffodil.processor.tdml.TDMLDFDLProcessorFactory\"",
+ ),
("private[tdml] def getTS = this.synchronized {", "def getTS =
this.synchronized {"),
- ("package org.apache.daffodil.processor.tdml.tdml;", "package
org.apache.daffodil.processor.tdml;")
+ (
+ "package org.apache.daffodil.processor.tdml.tdml;",
+ "package org.apache.daffodil.processor.tdml;",
+ ),
)
def applyReplacements(line: String): String = {
@@ -180,20 +210,22 @@ object FixImports extends App {
}
source.close
- val outName = if (inline) file.getPath() else
file.getPath().replace(".scala", ".refactor.scala")
+ val outName =
+ if (inline) file.getPath() else file.getPath().replace(".scala",
".refactor.scala")
val out = new BufferedWriter(new FileWriter(outName))
for (line <- fixed) out.write(line + "\n")
out.close
}
- def processDir(libName: String, path: File, symbols: Map[String,String]):
Unit = {
+ def processDir(libName: String, path: File, symbols: Map[String, String]):
Unit = {
for (file <- path.listFiles) {
if (file.isDirectory) processDir(libName, file, symbols)
- if (file.getName.endsWith(".scala") || file.getName.endsWith(".java"))
fixFile(libName, file, symbols)
+ if (file.getName.endsWith(".scala") || file.getName.endsWith(".java"))
+ fixFile(libName, file, symbols)
}
}
- def processLib(libPath: String, symbols: Map[String,String]) = {
+ def processLib(libPath: String, symbols: Map[String, String]) = {
var path = new File(libPath)
val libName = path.getName
processDir(libName, path, symbols)
diff --git a/scripts/osgi-refactor/gen-symbol-table.scala
b/scripts/osgi-refactor/gen-symbol-table.scala
index 306284e7a..2410489cf 100644
--- a/scripts/osgi-refactor/gen-symbol-table.scala
+++ b/scripts/osgi-refactor/gen-symbol-table.scala
@@ -23,12 +23,12 @@ class Symbols(
val libraryName: String,
val fileName: String,
val packageName: String,
- val exports: List[String]
+ val exports: List[String],
)
object GenSymbolTable extends App {
val ignoreFiles = List(
-
"daffodil-runtime1/src/main/scala/org/apache/daffodil/reflection/FieldFinder.scala"
+
"daffodil-runtime1/src/main/scala/org/apache/daffodil/reflection/FieldFinder.scala",
)
val rePackage: Regex = """package ([\w\.]+)""".r
@@ -46,7 +46,7 @@ object GenSymbolTable extends App {
val reExports = List(
"^(?:abstract |case |final |sealed |implict |lazy )* ?class ([\\w\\.]+)".r,
"^(?:abstract |case |final |sealed |implict |lazy )* ?object
([\\w\\.]+)".r,
- "^(?:abstract |case |final |sealed |implict |lazy )* ?trait ([\\w\\.]+)".r
+ "^(?:abstract |case |final |sealed |implict |lazy )* ?trait ([\\w\\.]+)".r,
)
def parseExports(lines: Iterator[String]): List[String] = {
@@ -107,8 +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) symbols ++= processDir(libraryName, file)
+ 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 {
case Some(s) => symbols += s
@@ -128,7 +128,8 @@ object GenSymbolTable extends App {
val libraryDir = new File(arg)
val symbols = processLibrary(libraryDir)
for (symbol <- symbols) {
- for (export <- symbol.exports)
println(s"${symbol.libraryName}:${symbol.packageName}.${export}")
+ for (export <- symbol.exports)
+ println(s"${symbol.libraryName}:${symbol.packageName}.${export}")
}
}
}
