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 b89652c14 Update scalafmt-core to 3.8.3
b89652c14 is described below
commit b89652c14270171f04b9b96dea590cd9c8c68e1c
Author: Scala Steward <[email protected]>
AuthorDate: Mon Sep 16 10:34:59 2024 -0400
Update scalafmt-core to 3.8.3
---
.scalafmt.conf | 2 +-
.../daffodil/japi/packageprivate/Utils.scala | 1 -
.../dpath/DFDLCheckConstraintsFunction.scala | 1 -
.../runtime1/parser/TestCharsetBehavior.scala | 6 +-
.../daffodil/sapi/packageprivate/Utils.scala | 1 -
.../daffodil/runtime1/layers/AllTypesLayer.scala | 1 -
.../runtime1/layers/SimpleBombOutLayer.scala | 1 -
.../daffodil/runtime1/layers/SimpleTestLayer.scala | 1 -
scripts/osgi-refactor/Rat.scala | 90 +++----
scripts/osgi-refactor/add-imports.scala | 300 ++++++++++-----------
scripts/osgi-refactor/fix-imports.scala | 28 +-
scripts/osgi-refactor/gen-symbol-table.scala | 6 +-
12 files changed, 217 insertions(+), 221 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index b10719a71..a6ac4e0f0 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.1
+version = 3.8.3
diff --git
a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/packageprivate/Utils.scala
b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/packageprivate/Utils.scala
index f1334b14d..6367962a9 100644
---
a/daffodil-japi/src/main/scala/org/apache/daffodil/japi/packageprivate/Utils.scala
+++
b/daffodil-japi/src/main/scala/org/apache/daffodil/japi/packageprivate/Utils.scala
@@ -23,7 +23,6 @@ package org.apache.daffodil.japi.packageprivate
// them from Javadocs. So, when we generate Javadocs, we manually exclude
// anything in the japiexclude package. So anything that should be package
// private should go in this package.
-
import org.apache.daffodil.japi._
import org.apache.daffodil.japi.debugger._
import org.apache.daffodil.japi.infoset._
diff --git
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DFDLCheckConstraintsFunction.scala
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DFDLCheckConstraintsFunction.scala
index a79c1352c..701393818 100644
---
a/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DFDLCheckConstraintsFunction.scala
+++
b/daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/dpath/DFDLCheckConstraintsFunction.scala
@@ -18,7 +18,6 @@
package org.apache.daffodil.runtime1.dpath
// TODO: replace these with our own Infoset implementation objects
-
import org.apache.daffodil.lib.util.OKOrError
import org.apache.daffodil.runtime1.infoset.DISimple
import org.apache.daffodil.runtime1.processors.parsers.PState
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 4a056cedc..f87a8e18b 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
@@ -226,7 +226,8 @@ class TestUnicodeErrorTolerance {
val decoder = cs.newDecoder()
val inBuf: Array[Byte] = Array[Int](
// 6 byte encoding of \x7FFFFFFF
- 0xfd, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf)
+ 0xfd, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf
+ )
val input = new ByteArrayInputStream(inBuf);
val e = intercept[MalformedInputException] {
Converter.parse(input, decoder)
@@ -268,7 +269,8 @@ class TestUnicodeErrorTolerance {
// Compatibility with pre-surrogate world.
// Character U+1d4d0, but represented as a surrogate pair, each
surrogate then
// represented as a 3-byte UTF-8 sequence. (This is an older technique).
- 0xed, 0xa0, 0xb5, 0xed, 0xb3, 0x90)
+ 0xed, 0xa0, 0xb5, 0xed, 0xb3, 0x90
+ )
val input = new ByteArrayInputStream(inBuf);
val exc = intercept[MalformedInputException] {
diff --git
a/daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/packageprivate/Utils.scala
b/daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/packageprivate/Utils.scala
index 58915a118..d6b487ecc 100644
---
a/daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/packageprivate/Utils.scala
+++
b/daffodil-sapi/src/main/scala/org/apache/daffodil/sapi/packageprivate/Utils.scala
@@ -23,7 +23,6 @@ package org.apache.daffodil.sapi.packageprivate
// them from Javadocs. So, when we generate Javadocs, we manually exclude
// anything in the sapi.packageprivate package. So anything that should be
package
// private should go in this package.
-
import org.apache.daffodil.lib.api.{ ValidationMode => SValidationMode }
import org.apache.daffodil.runtime1.debugger.{ InteractiveDebugger =>
SInteractiveDebugger }
import org.apache.daffodil.runtime1.debugger.{
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/AllTypesLayer.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/AllTypesLayer.scala
index da9e46ba0..9ddb979eb 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/AllTypesLayer.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/AllTypesLayer.scala
@@ -18,7 +18,6 @@
package org.apache.daffodil.runtime1.layers
// different subpackage on purpose to test package private methods
-
import java.io.InputStream
import java.io.OutputStream
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/SimpleBombOutLayer.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/SimpleBombOutLayer.scala
index 318dce2b1..aa08409f2 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/SimpleBombOutLayer.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/SimpleBombOutLayer.scala
@@ -18,7 +18,6 @@
package org.apache.daffodil.runtime1.layers
// different subpackage on purpose to test package private methods
-
import java.io.InputStream
import java.io.OutputStream
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/SimpleTestLayer.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/SimpleTestLayer.scala
index e33ac8608..491b4074c 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/SimpleTestLayer.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/SimpleTestLayer.scala
@@ -18,7 +18,6 @@
package org.apache.daffodil.runtime1.layers
// different subpackage on purpose to test package private methods
-
import java.io.InputStream
import java.io.OutputStream
diff --git a/scripts/osgi-refactor/Rat.scala b/scripts/osgi-refactor/Rat.scala
index 29637879d..380f12522 100644
--- a/scripts/osgi-refactor/Rat.scala
+++ b/scripts/osgi-refactor/Rat.scala
@@ -31,7 +31,7 @@ object Rat {
// 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",
+
"daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd"
),
// images used for the windows installer
@@ -44,19 +44,19 @@ object Rat {
// 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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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
@@ -113,22 +113,22 @@ object Rat {
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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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"),
@@ -142,22 +142,22 @@ object Rat {
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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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"),
@@ -166,87 +166,87 @@ object Rat {
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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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"),
+ file("test-stdLayout/src/test/resources/org2/test-data1.txt")
)
lazy val BSD2_LICENSE_NAME = "BSD 2-Clause License"
diff --git a/scripts/osgi-refactor/add-imports.scala
b/scripts/osgi-refactor/add-imports.scala
index dfa0c40f7..0355591a9 100644
--- a/scripts/osgi-refactor/add-imports.scala
+++ b/scripts/osgi-refactor/add-imports.scala
@@ -24,617 +24,617 @@ object AddImports extends App {
val imports = Seq(
(
"org.apache.daffodil.lib.api._",
-
"daffodil-runtime1/src/main/scala/org/apache/daffodil/runtime1/api/DFDLParserUnparser.scala",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+ "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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
- ),
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
- ),
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
+
"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",
- ),
+
"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",
- ),
+
"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 807d5227d..8e1bfd5bf 100644
--- a/scripts/osgi-refactor/fix-imports.scala
+++ b/scripts/osgi-refactor/fix-imports.scala
@@ -32,12 +32,12 @@ 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",
"daffodil-runtime1-unparser" -> "processors.unparsers",
- "daffodil-tdml-processor" -> "tdml.processor",
+ "daffodil-tdml-processor" -> "tdml.processor"
)
def loadSymbolTable(file: File): Map[String, String] = {
@@ -78,7 +78,7 @@ object FixImports extends App {
"org.apache.daffodil.validation.XercesValidator.XercesValidatorImpl" ->
"daffodil-lib",
"org.apache.daffodil.xml._" -> "daffodil-lib",
"org.apache.daffodil.xml.NS.implicitNStoString" -> "daffodil-lib",
- "org.apache.daffodil.xml.QNameRegex" -> "daffodil-lib",
+ "org.apache.daffodil.xml.QNameRegex" -> "daffodil-lib"
)
symbols
}
@@ -125,16 +125,16 @@ object FixImports extends App {
("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 }",
+ "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.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.runtime1.infoset.DataValue"
),
("org.apache.daffodil.api", "org.apache.daffodil.lib.api"),
("org.apache.daffodil.calendar", "org.apache.daffodil.lib.calendar"),
@@ -149,14 +149,14 @@ object FixImports extends App {
("org.apache.daffodil.xml", "org.apache.daffodil.lib.xml"),
(
"org.apache.daffodil.udf.UserDefinedFunctionService",
- "org.apache.daffodil.runtime1.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.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"),
@@ -164,28 +164,28 @@ object FixImports extends App {
("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.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.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.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.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;"
+ )
)
def applyReplacements(line: String): String = {
diff --git a/scripts/osgi-refactor/gen-symbol-table.scala
b/scripts/osgi-refactor/gen-symbol-table.scala
index 2410489cf..6940d00e7 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] = {
