Skip to content

Commit 2c068b7

Browse files
committed
#769 Move reader parameters parser to the parser module to support non-Spark readers.
1 parent b703a40 commit 2c068b7

File tree

9 files changed

+12
-15
lines changed

9 files changed

+12
-15
lines changed

spark-cobol/src/main/scala/za/co/absa/cobrix/spark/cobol/parameters/CobolParametersParser.scala renamed to cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/reader/parameters/CobolParametersParser.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package za.co.absa.cobrix.spark.cobol.parameters
17+
package za.co.absa.cobrix.cobol.reader.parameters
1818

1919
import za.co.absa.cobrix.cobol.internal.Logging
2020
import za.co.absa.cobrix.cobol.parser.CopybookParser
@@ -26,7 +26,6 @@ import za.co.absa.cobrix.cobol.parser.policies.StringTrimmingPolicy.StringTrimmi
2626
import za.co.absa.cobrix.cobol.parser.policies._
2727
import za.co.absa.cobrix.cobol.parser.recordformats.RecordFormat
2828
import za.co.absa.cobrix.cobol.parser.recordformats.RecordFormat._
29-
import za.co.absa.cobrix.cobol.reader.parameters._
3029
import za.co.absa.cobrix.cobol.reader.policies.SchemaRetentionPolicy
3130
import za.co.absa.cobrix.cobol.reader.policies.SchemaRetentionPolicy.SchemaRetentionPolicy
3231

spark-cobol/src/main/scala/za/co/absa/cobrix/spark/cobol/parameters/Parameters.scala renamed to cobol-parser/src/main/scala/za/co/absa/cobrix/cobol/reader/parameters/Parameters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package za.co.absa.cobrix.spark.cobol.parameters
17+
package za.co.absa.cobrix.cobol.reader.parameters
1818

1919
import scala.collection.mutable
2020

spark-cobol/src/main/scala/za/co/absa/cobrix/spark/cobol/builder/RddReaderParams.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616

1717
package za.co.absa.cobrix.spark.cobol.builder
1818

19-
import za.co.absa.cobrix.cobol.reader.parameters.{CobolParameters, ReaderParameters}
20-
import za.co.absa.cobrix.spark.cobol.parameters.CobolParametersParser._
21-
import za.co.absa.cobrix.spark.cobol.parameters.{CobolParametersParser, Parameters}
19+
import za.co.absa.cobrix.cobol.reader.parameters.{CobolParameters, CobolParametersParser, Parameters, ReaderParameters}
20+
import za.co.absa.cobrix.cobol.reader.parameters.CobolParametersParser._
2221

2322
object RddReaderParams {
2423
def forBinary(options: Map[String, String]): ReaderParameters = {

spark-cobol/src/main/scala/za/co/absa/cobrix/spark/cobol/schema/CobolSchema.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import za.co.absa.cobrix.cobol.parser.ast.datatype.{AlphaNumeric, COMP1, COMP2,
2424
import za.co.absa.cobrix.cobol.parser.common.Constants
2525
import za.co.absa.cobrix.cobol.parser.encoding.RAW
2626
import za.co.absa.cobrix.cobol.parser.policies.MetadataPolicy
27+
import za.co.absa.cobrix.cobol.reader.parameters.{CobolParametersParser, Parameters}
2728
import za.co.absa.cobrix.cobol.reader.policies.SchemaRetentionPolicy
2829
import za.co.absa.cobrix.cobol.reader.policies.SchemaRetentionPolicy.SchemaRetentionPolicy
2930
import za.co.absa.cobrix.cobol.reader.schema.{CobolSchema => CobolReaderSchema}
30-
import za.co.absa.cobrix.spark.cobol.parameters.CobolParametersParser.getReaderProperties
31+
import za.co.absa.cobrix.cobol.reader.parameters.CobolParametersParser.getReaderProperties
3132
import za.co.absa.cobrix.spark.cobol.parameters.MetadataFields.{MAX_ELEMENTS, MAX_LENGTH, MIN_ELEMENTS}
32-
import za.co.absa.cobrix.spark.cobol.parameters.{CobolParametersParser, Parameters}
3333

3434
import scala.collection.mutable
3535
import scala.collection.mutable.ArrayBuffer

spark-cobol/src/main/scala/za/co/absa/cobrix/spark/cobol/source/DefaultSource.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ import org.apache.spark.sql.sources.{BaseRelation, DataSourceRegister, RelationP
2121
import org.apache.spark.sql.types.StructType
2222
import org.apache.spark.sql.{SQLContext, SparkSession}
2323
import za.co.absa.cobrix.cobol.internal.Logging
24-
import za.co.absa.cobrix.cobol.reader.parameters.CobolParameters
25-
import za.co.absa.cobrix.spark.cobol.parameters.CobolParametersParser._
26-
import za.co.absa.cobrix.spark.cobol.parameters.{CobolParametersParser, Parameters}
24+
import za.co.absa.cobrix.cobol.reader.parameters.{CobolParameters, CobolParametersParser, Parameters}
25+
import za.co.absa.cobrix.cobol.reader.parameters.CobolParametersParser._
2726
import za.co.absa.cobrix.spark.cobol.reader._
2827
import za.co.absa.cobrix.spark.cobol.source.copybook.CopybookContentLoader
2928
import za.co.absa.cobrix.spark.cobol.source.parameters._

spark-cobol/src/main/scala/za/co/absa/cobrix/spark/cobol/source/parameters/CobolParametersValidator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.apache.hadoop.conf.Configuration
2222
import org.apache.hadoop.fs.Path
2323
import org.apache.spark.SparkConf
2424
import za.co.absa.cobrix.cobol.reader.parameters.CobolParameters
25-
import za.co.absa.cobrix.spark.cobol.parameters.CobolParametersParser._
25+
import za.co.absa.cobrix.cobol.reader.parameters.CobolParametersParser._
2626
import za.co.absa.cobrix.spark.cobol.utils.ResourceUtils.getClass
2727
import za.co.absa.cobrix.spark.cobol.utils.{FileNameUtils, FsType}
2828

spark-cobol/src/main/scala/za/co/absa/cobrix/spark/cobol/source/streaming/CobolStreamer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import za.co.absa.cobrix.cobol.parser.encoding.codepage.CodePage
2525
import za.co.absa.cobrix.cobol.parser.policies.{FillerNamingPolicy, StringTrimmingPolicy}
2626
import za.co.absa.cobrix.cobol.reader.parameters.ReaderParameters
2727
import za.co.absa.cobrix.cobol.reader.policies.SchemaRetentionPolicy
28-
import za.co.absa.cobrix.spark.cobol.parameters.CobolParametersParser._
28+
import za.co.absa.cobrix.cobol.reader.parameters.CobolParametersParser._
2929
import za.co.absa.cobrix.spark.cobol.reader.{FixedLenNestedReader, FixedLenReader}
3030
import za.co.absa.cobrix.spark.cobol.source.parameters.CobolParametersValidator
3131
import za.co.absa.cobrix.spark.cobol.utils.HDFSUtils

spark-cobol/src/test/scala/za/co/absa/cobrix/spark/cobol/source/DefaultSourceSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import za.co.absa.cobrix.spark.cobol.source.utils.SourceTestUtils
2626
class DefaultSourceSpec extends SparkCobolTestBase {
2727

2828
import SourceTestUtils._
29-
import za.co.absa.cobrix.spark.cobol.parameters.CobolParametersParser._
29+
import za.co.absa.cobrix.cobol.reader.parameters.CobolParametersParser._
3030

3131
private var defaultSource: DefaultSource = _
3232

spark-cobol/src/test/scala/za/co/absa/cobrix/spark/cobol/source/ParametersParsingSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package za.co.absa.cobrix.spark.cobol.source
1818

1919
import org.scalatest.funsuite.AnyFunSuite
20-
import za.co.absa.cobrix.spark.cobol.parameters.{CobolParametersParser, Parameters}
20+
import za.co.absa.cobrix.cobol.reader.parameters.{CobolParametersParser, Parameters}
2121

2222
import scala.collection.immutable.HashMap
2323

0 commit comments

Comments
 (0)