From 9c3d33e083106d7c941d2e1376172d71fb694e9f Mon Sep 17 00:00:00 2001 From: Martin Mauch Date: Wed, 4 Dec 2024 15:00:58 +0100 Subject: [PATCH] refactor: Rename from com.crealytics to dev.mauch --- .github/ISSUE_TEMPLATE/generic.yml | 4 ++-- ISSUE_TEMPLATE.md | 4 ++-- README.md | 24 +++++++++---------- build.sc | 2 +- .../mauch}/spark/ExcelSparkInternal.scala | 0 .../spark/excel/v2/ExcelDataSource.scala | 2 +- .../excel/v2/ExcelDateTimeStringUtils.scala | 2 +- .../mauch}/spark/excel/v2/ExcelFilters.scala | 2 +- .../mauch}/spark/excel/v2/ExcelOptions.scala | 2 +- .../spark/excel/v2/ExcelParserBase.scala | 2 +- .../spark/excel/v2/FailureSafeParser.scala | 2 +- .../mauch}/spark/excel/v2/SchemaUtils.scala | 2 +- .../excel/v2/ExcelDateTimeStringUtils.scala | 2 +- .../mauch}/spark/excel/v2/ExcelFilters.scala | 2 +- .../spark/excel/v2/ExcelDataSource.scala | 2 +- .../spark/excel/v2/ExcelFileFormat.scala | 2 +- .../spark/excel/v2/ExcelOutputWriter.scala | 2 +- .../mauch}/spark/excel/v2/ExcelTable.scala | 2 +- .../spark/excel/v2/ExcelWriteBuilder.scala | 2 +- .../mauch}/spark/excel/v2/ExcelScan.scala | 2 +- .../spark/excel/v2/ExcelScanBuilder.scala | 2 +- .../mauch}/spark/excel/v2/ExcelOptions.scala | 2 +- .../spark/excel/v2/ExcelParserBase.scala | 2 +- .../v2/ExcelPartitionReaderFactory.scala | 2 +- .../excel/v2/ExcelDateTimeStringUtils.scala | 2 +- .../mauch}/spark/excel/v2/ExcelFilters.scala | 2 +- .../excel/v2/ExcelDateTimeStringUtils.scala | 2 +- .../spark/excel/v2/ExcelOutputWriter.scala | 2 +- .../mauch}/spark/excel/v2/ExcelTable.scala | 2 +- .../spark/excel/v2/ExcelWriteBuilder.scala | 2 +- .../mauch}/spark/excel/v2/ExcelScan.scala | 2 +- .../spark/excel/v2/ExcelScanBuilder.scala | 2 +- .../spark/excel/v2/ExcelParserBase.scala | 2 +- .../v2/ExcelPartitionReaderFactory.scala | 2 +- .../mauch}/spark/excel/v2/ExcelOptions.scala | 2 +- ...pache.spark.sql.sources.DataSourceRegister | 2 +- .../mauch}/spark/excel/DataColumn.scala | 2 +- .../mauch}/spark/excel/DataLocator.scala | 4 ++-- .../mauch}/spark/excel/DefaultSource.scala | 2 +- .../mauch}/spark/excel/DefaultSource15.scala | 2 +- .../mauch}/spark/excel/ExcelFileSaver.scala | 2 +- .../mauch}/spark/excel/ExcelRelation.scala | 2 +- .../mauch}/spark/excel/InferSchema.scala | 2 +- .../spark/excel/PlainNumberFormat.scala | 2 +- .../mauch}/spark/excel/Utils.scala | 2 +- .../mauch}/spark/excel/WorkbookReader.scala | 4 ++-- .../mauch}/spark/excel/package.scala | 6 ++--- .../mauch}/spark/excel/v2/DataLocator.scala | 2 +- .../spark/excel/v2/ExcelGenerator.scala | 2 +- .../spark/excel/v2/ExcelHeaderChecker.scala | 2 +- .../mauch}/spark/excel/v2/ExcelHelper.scala | 2 +- .../spark/excel/v2/ExcelInferSchema.scala | 2 +- .../spark/excel/v2/ExcelOptionsTrait.scala | 2 +- .../mauch}/spark/excel/v2/ExcelParser.scala | 2 +- .../mauch}/spark/excel/v2/SheetData.scala | 2 +- .../mauch}/spark/DataFrameSuiteBase.scala | 2 +- .../mauch}/spark/excel/DataLocatorSuite.scala | 2 +- .../spark/excel/EncryptedReadSuite.scala | 4 ++-- .../excel/ErrorsAsStringsReadSuite.scala | 4 ++-- .../mauch}/spark/excel/Generators.scala | 2 +- .../mauch}/spark/excel/IntegrationSuite.scala | 4 ++-- .../spark/excel/PlainNumberReadSuite.scala | 4 ++-- .../mauch}/spark/excel/RichRowSuite.scala | 2 +- .../excel/v2/AreaReferenceReadSuite.scala | 4 ++-- .../DataFrameWriterApiComplianceSuite.scala | 4 ++-- .../spark/excel/v2/EncryptedReadSuite.scala | 4 ++-- .../excel/v2/ErrorsAsStringsReadSuite.scala | 4 ++-- .../excel/v2/ExcelTestingUtilities.scala | 2 +- .../v2/GlobPartitionAndFileNameSuite.scala | 4 ++-- .../v2/InferStricterNumericalTypesSuite.scala | 4 ++-- .../excel/v2/KeepUndefinedRowsSuite.scala | 4 ++-- .../excel/v2/LocalFileTestingUtilities.scala | 2 +- .../excel/v2/ManyPartitionReadSuite.scala | 4 ++-- .../spark/excel/v2/NumericTypesSuite.scala | 4 ++-- .../spark/excel/v2/PlainNumberReadSuite.scala | 4 ++-- .../v2/ProjectionAndFilterPushdownSuite.scala | 4 ++-- .../spark/excel/v2/RowNumberColumnSuite.scala | 4 ++-- .../spark/excel/v2/TableReadSuite.scala | 4 ++-- .../excel/v2/UserReportedIssuesSuite.scala | 4 ++-- .../spark/excel/v2/WriteAndReadSuite.scala | 4 ++-- .../mauch}/tags/package.scala | 4 ++-- 81 files changed, 117 insertions(+), 117 deletions(-) rename src/main/2.4/scala/{com/crealytics => dev/mauch}/spark/ExcelSparkInternal.scala (100%) rename src/main/2.4/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelDataSource.scala (99%) rename src/main/2.4/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelDateTimeStringUtils.scala (97%) rename src/main/2.4/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelFilters.scala (96%) rename src/main/{3.0_to_3.3/scala/com/crealytics => 2.4/scala/dev/mauch}/spark/excel/v2/ExcelOptions.scala (97%) rename src/main/2.4/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelParserBase.scala (96%) rename src/main/2.4/scala/{com/crealytics => dev/mauch}/spark/excel/v2/FailureSafeParser.scala (98%) rename src/main/2.4/scala/{com/crealytics => dev/mauch}/spark/excel/v2/SchemaUtils.scala (98%) rename src/main/3.0/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelDateTimeStringUtils.scala (97%) rename src/main/3.0/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelFilters.scala (96%) rename src/main/3.0_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelDataSource.scala (97%) rename src/main/3.0_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelFileFormat.scala (98%) rename src/main/3.0_to_3.1/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelOutputWriter.scala (97%) rename src/main/3.0_to_3.1/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelTable.scala (98%) rename src/main/3.0_to_3.1/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelWriteBuilder.scala (98%) rename src/main/3.0_to_3.2/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelScan.scala (99%) rename src/main/3.0_to_3.2/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelScanBuilder.scala (97%) rename src/main/{2.4/scala/com/crealytics => 3.0_to_3.3/scala/dev/mauch}/spark/excel/v2/ExcelOptions.scala (97%) rename src/main/3.0_to_3.4.1/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelParserBase.scala (96%) rename src/main/3.0_to_3.4.1/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelPartitionReaderFactory.scala (98%) rename src/main/3.1/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelDateTimeStringUtils.scala (97%) rename src/main/3.1_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelFilters.scala (96%) rename src/main/3.2_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelDateTimeStringUtils.scala (97%) rename src/main/3.2_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelOutputWriter.scala (97%) rename src/main/3.2_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelTable.scala (98%) rename src/main/3.2_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelWriteBuilder.scala (97%) rename src/main/3.3_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelScan.scala (99%) rename src/main/3.3_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelScanBuilder.scala (97%) rename src/main/3.4.2_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelParserBase.scala (96%) rename src/main/3.4.2_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelPartitionReaderFactory.scala (99%) rename src/main/3.4_and_up/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelOptions.scala (97%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/DataColumn.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/DataLocator.scala (98%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/DefaultSource.scala (98%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/DefaultSource15.scala (95%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/ExcelFileSaver.scala (98%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/ExcelRelation.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/InferSchema.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/PlainNumberFormat.scala (97%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/Utils.scala (98%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/WorkbookReader.scala (98%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/package.scala (95%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/v2/DataLocator.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelGenerator.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelHeaderChecker.scala (98%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelHelper.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelInferSchema.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelOptionsTrait.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelParser.scala (99%) rename src/main/scala/{com/crealytics => dev/mauch}/spark/excel/v2/SheetData.scala (96%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/DataFrameSuiteBase.scala (99%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/DataLocatorSuite.scala (99%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/EncryptedReadSuite.scala (96%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/ErrorsAsStringsReadSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/Generators.scala (99%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/IntegrationSuite.scala (99%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/PlainNumberReadSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/RichRowSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/AreaReferenceReadSuite.scala (96%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/DataFrameWriterApiComplianceSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/EncryptedReadSuite.scala (96%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ErrorsAsStringsReadSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ExcelTestingUtilities.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/GlobPartitionAndFileNameSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/InferStricterNumericalTypesSuite.scala (97%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/KeepUndefinedRowsSuite.scala (97%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/LocalFileTestingUtilities.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ManyPartitionReadSuite.scala (97%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/NumericTypesSuite.scala (97%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/PlainNumberReadSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/ProjectionAndFilterPushdownSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/RowNumberColumnSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/TableReadSuite.scala (97%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/UserReportedIssuesSuite.scala (95%) rename src/test/scala/{com/crealytics => dev/mauch}/spark/excel/v2/WriteAndReadSuite.scala (98%) rename src/test/scala/{com/crealytics => dev/mauch}/tags/package.scala (89%) diff --git a/.github/ISSUE_TEMPLATE/generic.yml b/.github/ISSUE_TEMPLATE/generic.yml index a8a5d687..bdec2d0a 100644 --- a/.github/ISSUE_TEMPLATE/generic.yml +++ b/.github/ISSUE_TEMPLATE/generic.yml @@ -37,10 +37,10 @@ body: Steps to Reproduce (for bugs) Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant. Example: Download the example file uploaded here - Start Spark from command line as spark-shell --packages com.crealytics:spark-excel_2.12:x.y.z --foo=bar + Start Spark from command line as spark-shell --packages dev.mauch:spark-excel_2.12:x.y.z --foo=bar Read the downloaded example file val df = spark.read - .format("com.crealytics.spark.excel") + .format("dev.mauch.spark.excel") .option("dataAddress", "'My Sheet'!B3:C35") .load("example_file_exhibiting_bug.xlsx") validations: diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 931f6c32..69f33652 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -21,11 +21,11 @@ Moreover, please read the [`CHANGELOG.md`](../../blob/master/CHANGELOG.md) file > reproduce this bug. Include code to reproduce, if relevant. > Example: 1. Download the example file uploaded [here](http://example.com/) -2. Start Spark from command line as `spark-shell --packages com.crealytics:spark-excel_2.12:x.y.z --foo=bar` +2. Start Spark from command line as `spark-shell --packages dev.mauch:spark-excel_2.12:x.y.z --foo=bar` 3. Read the downloaded example file ``` val df = spark.read - .format("com.crealytics.spark.excel") + .format("dev.mauch.spark.excel") .option("dataAddress", "'My Sheet'!B3:C35") .load("example_file_exhibiting_bug.xlsx") ``` diff --git a/README.md b/README.md index 7972dea4..23588122 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A library for querying Excel files with Apache Spark, for Spark SQL and DataFrames. [![Build Status](https://github.com/crealytics/spark-excel/workflows/CI/badge.svg)](https://github.com/crealytics/spark-excel/actions) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.crealytics/spark-excel_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.crealytics/spark-excel_2.12) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.mauch/spark-excel_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.mauch/spark-excel_2.12) ## Co-maintainers wanted @@ -32,14 +32,14 @@ You can link against this library in your program at the following coordinates: ### Scala 2.12 ``` -groupId: com.crealytics +groupId: dev.mauch artifactId: spark-excel_2.12 version: _0.18.0 ``` ### Scala 2.11 ``` -groupId: com.crealytics +groupId: dev.mauch artifactId: spark-excel_2.11 version: _0.13.7 ``` @@ -49,12 +49,12 @@ This package can be added to Spark using the `--packages` command line option. ### Spark compiled with Scala 2.12 ``` -$SPARK_HOME/bin/spark-shell --packages com.crealytics:spark-excel_2.12:_0.18.0 +$SPARK_HOME/bin/spark-shell --packages dev.mauch:spark-excel_2.12:_0.18.0 ``` ### Spark compiled with Scala 2.11 ``` -$SPARK_HOME/bin/spark-shell --packages com.crealytics:spark-excel_2.11:_0.13.7 +$SPARK_HOME/bin/spark-shell --packages dev.mauch:spark-excel_2.11:_0.13.7 ``` ## Features @@ -64,7 +64,7 @@ $SPARK_HOME/bin/spark-shell --packages com.crealytics:spark-excel_2.11: "Worktime.xlsx") , spark.sparkContext.hadoopConfiguration ).sheetNames @@ -160,7 +160,7 @@ val peopleSchema = StructType(Array( val spark: SparkSession = ??? val df = spark.read - .format("com.crealytics.spark.excel") // Or .format("excel") for V2 implementation + .format("dev.mauch.spark.excel") // Or .format("excel") for V2 implementation .option("dataAddress", "'Info'!A1") .option("header", "true") .schema(peopleSchema) @@ -173,7 +173,7 @@ import org.apache.spark.sql._ val df: DataFrame = ??? df.write - .format("com.crealytics.spark.excel") // Or .format("excel") for V2 implementation + .format("dev.mauch.spark.excel") // Or .format("excel") for V2 implementation .option("dataAddress", "'My Sheet'!B3:C35") .option("header", "true") .option("dateFormat", "yy-mmm-d") // Optional, default: yy-m-d h:mm @@ -205,7 +205,7 @@ Currently the following address styles are supported: The V2 API offers you several improvements when it comes to file and folder handling. and works in a very similar way than data sources like csv and parquet. -To use V2 implementation, just change your .format from `.format("com.crealytics.spark.excel")` to `.format("excel")` +To use V2 implementation, just change your .format from `.format("dev.mauch.spark.excel")` to `.format("excel")` The big difference is the fact that you provide a path to read / write data from/to and not an individual single file only: diff --git a/build.sc b/build.sc index 0d077160..a016c3e6 100644 --- a/build.sc +++ b/build.sc @@ -54,7 +54,7 @@ trait SparkModule extends Cross.Module2[String, String] with SbtModule with CiRe def pomSettings = PomSettings( description = "A Spark plugin for reading and writing Excel files", - organization = "com.crealytics", + organization = "dev.mauch", url = "https://github.com/crealytics/spark-excel", licenses = Seq(License.`Apache-2.0`), versionControl = VersionControl.github("crealytics", "spark-excel"), diff --git a/src/main/2.4/scala/com/crealytics/spark/ExcelSparkInternal.scala b/src/main/2.4/scala/dev/mauch/spark/ExcelSparkInternal.scala similarity index 100% rename from src/main/2.4/scala/com/crealytics/spark/ExcelSparkInternal.scala rename to src/main/2.4/scala/dev/mauch/spark/ExcelSparkInternal.scala diff --git a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelDataSource.scala b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelDataSource.scala similarity index 99% rename from src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelDataSource.scala rename to src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelDataSource.scala index 9342b58d..daa6eb45 100644 --- a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelDataSource.scala +++ b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelDataSource.scala @@ -9,7 +9,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.FileStatus diff --git a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala similarity index 97% rename from src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala rename to src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala index 20a6ad30..014aad2c 100644 --- a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala +++ b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala @@ -9,7 +9,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.unsafe.types.UTF8String import org.apache.spark.sql.catalyst.util._ diff --git a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala similarity index 96% rename from src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala rename to src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala index ea063af9..7c58f9b6 100644 --- a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala +++ b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala @@ -9,7 +9,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.sources import org.apache.spark.sql.types.StructType diff --git a/src/main/3.0_to_3.3/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala similarity index 97% rename from src/main/3.0_to_3.3/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala rename to src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala index 3d1e63e6..54e989e0 100644 --- a/src/main/3.0_to_3.3/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala +++ b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap import org.apache.spark.sql.internal.SQLConf diff --git a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala similarity index 96% rename from src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala rename to src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala index ef72d4ec..31e04416 100644 --- a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala +++ b/src/main/2.4/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import _root_.org.apache.spark.sql.catalyst.util.BadRecordException import org.apache.spark.unsafe.types.UTF8String diff --git a/src/main/2.4/scala/com/crealytics/spark/excel/v2/FailureSafeParser.scala b/src/main/2.4/scala/dev/mauch/spark/excel/v2/FailureSafeParser.scala similarity index 98% rename from src/main/2.4/scala/com/crealytics/spark/excel/v2/FailureSafeParser.scala rename to src/main/2.4/scala/dev/mauch/spark/excel/v2/FailureSafeParser.scala index 3320fc20..2b15f6b3 100644 --- a/src/main/2.4/scala/com/crealytics/spark/excel/v2/FailureSafeParser.scala +++ b/src/main/2.4/scala/dev/mauch/spark/excel/v2/FailureSafeParser.scala @@ -9,7 +9,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.SparkException import org.apache.spark.sql.catalyst.InternalRow diff --git a/src/main/2.4/scala/com/crealytics/spark/excel/v2/SchemaUtils.scala b/src/main/2.4/scala/dev/mauch/spark/excel/v2/SchemaUtils.scala similarity index 98% rename from src/main/2.4/scala/com/crealytics/spark/excel/v2/SchemaUtils.scala rename to src/main/2.4/scala/dev/mauch/spark/excel/v2/SchemaUtils.scala index cacdc76d..7a79cb55 100644 --- a/src/main/2.4/scala/com/crealytics/spark/excel/v2/SchemaUtils.scala +++ b/src/main/2.4/scala/dev/mauch/spark/excel/v2/SchemaUtils.scala @@ -9,7 +9,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.catalyst.analysis._ import org.apache.spark.sql.types.StructType diff --git a/src/main/3.0/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala b/src/main/3.0/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala similarity index 97% rename from src/main/3.0/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala rename to src/main/3.0/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala index 34888e39..490989ca 100644 --- a/src/main/3.0/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala +++ b/src/main/3.0/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.unsafe.types.UTF8String import org.apache.spark.sql.catalyst.util._ diff --git a/src/main/3.0/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala b/src/main/3.0/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala similarity index 96% rename from src/main/3.0/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala rename to src/main/3.0/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala index 142b6dc0..b023be27 100644 --- a/src/main/3.0/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala +++ b/src/main/3.0/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.catalyst.csv.CSVFilters import org.apache.spark.sql.sources diff --git a/src/main/3.0_and_up/scala/com/crealytics/spark/excel/v2/ExcelDataSource.scala b/src/main/3.0_and_up/scala/dev/mauch/spark/excel/v2/ExcelDataSource.scala similarity index 97% rename from src/main/3.0_and_up/scala/com/crealytics/spark/excel/v2/ExcelDataSource.scala rename to src/main/3.0_and_up/scala/dev/mauch/spark/excel/v2/ExcelDataSource.scala index 94660da4..00ac19c7 100644 --- a/src/main/3.0_and_up/scala/com/crealytics/spark/excel/v2/ExcelDataSource.scala +++ b/src/main/3.0_and_up/scala/dev/mauch/spark/excel/v2/ExcelDataSource.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.connector.catalog.Table import org.apache.spark.sql.execution.datasources.FileFormat diff --git a/src/main/3.0_and_up/scala/com/crealytics/spark/excel/v2/ExcelFileFormat.scala b/src/main/3.0_and_up/scala/dev/mauch/spark/excel/v2/ExcelFileFormat.scala similarity index 98% rename from src/main/3.0_and_up/scala/com/crealytics/spark/excel/v2/ExcelFileFormat.scala rename to src/main/3.0_and_up/scala/dev/mauch/spark/excel/v2/ExcelFileFormat.scala index 604201d0..d3ab63e7 100644 --- a/src/main/3.0_and_up/scala/com/crealytics/spark/excel/v2/ExcelFileFormat.scala +++ b/src/main/3.0_and_up/scala/dev/mauch/spark/excel/v2/ExcelFileFormat.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileStatus, Path} diff --git a/src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelOutputWriter.scala b/src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelOutputWriter.scala similarity index 97% rename from src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelOutputWriter.scala rename to src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelOutputWriter.scala index 66ef16eb..f79b6159 100644 --- a/src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelOutputWriter.scala +++ b/src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelOutputWriter.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.mapreduce.TaskAttemptContext import org.apache.spark.internal.Logging diff --git a/src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelTable.scala b/src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelTable.scala similarity index 98% rename from src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelTable.scala rename to src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelTable.scala index 0fc8629d..7485d6e9 100644 --- a/src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelTable.scala +++ b/src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelTable.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.fs.FileStatus import org.apache.spark.sql.SparkSession diff --git a/src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelWriteBuilder.scala b/src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelWriteBuilder.scala similarity index 98% rename from src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelWriteBuilder.scala rename to src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelWriteBuilder.scala index 4d70fc99..2fb45422 100644 --- a/src/main/3.0_to_3.1/scala/com/crealytics/spark/excel/v2/ExcelWriteBuilder.scala +++ b/src/main/3.0_to_3.1/scala/dev/mauch/spark/excel/v2/ExcelWriteBuilder.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.mapreduce.TaskAttemptContext diff --git a/src/main/3.0_to_3.2/scala/com/crealytics/spark/excel/v2/ExcelScan.scala b/src/main/3.0_to_3.2/scala/dev/mauch/spark/excel/v2/ExcelScan.scala similarity index 99% rename from src/main/3.0_to_3.2/scala/com/crealytics/spark/excel/v2/ExcelScan.scala rename to src/main/3.0_to_3.2/scala/dev/mauch/spark/excel/v2/ExcelScan.scala index 003beca3..b4f30766 100644 --- a/src/main/3.0_to_3.2/scala/com/crealytics/spark/excel/v2/ExcelScan.scala +++ b/src/main/3.0_to_3.2/scala/dev/mauch/spark/excel/v2/ExcelScan.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.fs.Path import org.apache.spark.sql.SparkSession diff --git a/src/main/3.0_to_3.2/scala/com/crealytics/spark/excel/v2/ExcelScanBuilder.scala b/src/main/3.0_to_3.2/scala/dev/mauch/spark/excel/v2/ExcelScanBuilder.scala similarity index 97% rename from src/main/3.0_to_3.2/scala/com/crealytics/spark/excel/v2/ExcelScanBuilder.scala rename to src/main/3.0_to_3.2/scala/dev/mauch/spark/excel/v2/ExcelScanBuilder.scala index cef9b036..19cbf9a9 100644 --- a/src/main/3.0_to_3.2/scala/com/crealytics/spark/excel/v2/ExcelScanBuilder.scala +++ b/src/main/3.0_to_3.2/scala/dev/mauch/spark/excel/v2/ExcelScanBuilder.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.SparkSession import org.apache.spark.sql.connector.read.{Scan, SupportsPushDownFilters} diff --git a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala b/src/main/3.0_to_3.3/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala similarity index 97% rename from src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala rename to src/main/3.0_to_3.3/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala index 3d1e63e6..54e989e0 100644 --- a/src/main/2.4/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala +++ b/src/main/3.0_to_3.3/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap import org.apache.spark.sql.internal.SQLConf diff --git a/src/main/3.0_to_3.4.1/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala b/src/main/3.0_to_3.4.1/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala similarity index 96% rename from src/main/3.0_to_3.4.1/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala rename to src/main/3.0_to_3.4.1/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala index ef72d4ec..31e04416 100644 --- a/src/main/3.0_to_3.4.1/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala +++ b/src/main/3.0_to_3.4.1/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import _root_.org.apache.spark.sql.catalyst.util.BadRecordException import org.apache.spark.unsafe.types.UTF8String diff --git a/src/main/3.0_to_3.4.1/scala/com/crealytics/spark/excel/v2/ExcelPartitionReaderFactory.scala b/src/main/3.0_to_3.4.1/scala/dev/mauch/spark/excel/v2/ExcelPartitionReaderFactory.scala similarity index 98% rename from src/main/3.0_to_3.4.1/scala/com/crealytics/spark/excel/v2/ExcelPartitionReaderFactory.scala rename to src/main/3.0_to_3.4.1/scala/dev/mauch/spark/excel/v2/ExcelPartitionReaderFactory.scala index 9de1fdba..5122b0a0 100644 --- a/src/main/3.0_to_3.4.1/scala/com/crealytics/spark/excel/v2/ExcelPartitionReaderFactory.scala +++ b/src/main/3.0_to_3.4.1/scala/dev/mauch/spark/excel/v2/ExcelPartitionReaderFactory.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.conf.Configuration import org.apache.spark.broadcast.Broadcast diff --git a/src/main/3.1/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala b/src/main/3.1/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala similarity index 97% rename from src/main/3.1/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala rename to src/main/3.1/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala index 926e3010..2355cd4e 100644 --- a/src/main/3.1/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala +++ b/src/main/3.1/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala @@ -9,7 +9,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.unsafe.types.UTF8String import org.apache.spark.sql.catalyst.util._ diff --git a/src/main/3.1_and_up/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala b/src/main/3.1_and_up/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala similarity index 96% rename from src/main/3.1_and_up/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala rename to src/main/3.1_and_up/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala index 87087657..bf66401a 100644 --- a/src/main/3.1_and_up/scala/com/crealytics/spark/excel/v2/ExcelFilters.scala +++ b/src/main/3.1_and_up/scala/dev/mauch/spark/excel/v2/ExcelFilters.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.catalyst.OrderedFilters import org.apache.spark.sql.catalyst.StructFilters diff --git a/src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala b/src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala similarity index 97% rename from src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala rename to src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala index 7ab5802a..9fc2e783 100644 --- a/src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelDateTimeStringUtils.scala +++ b/src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelDateTimeStringUtils.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.unsafe.types.UTF8String import org.apache.spark.sql.catalyst.util._ diff --git a/src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelOutputWriter.scala b/src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelOutputWriter.scala similarity index 97% rename from src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelOutputWriter.scala rename to src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelOutputWriter.scala index 67ed032d..4b179c99 100644 --- a/src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelOutputWriter.scala +++ b/src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelOutputWriter.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.mapreduce.TaskAttemptContext import org.apache.spark.internal.Logging diff --git a/src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelTable.scala b/src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelTable.scala similarity index 98% rename from src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelTable.scala rename to src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelTable.scala index de774150..0bbfeb5c 100644 --- a/src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelTable.scala +++ b/src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelTable.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.fs.FileStatus import org.apache.spark.sql.SparkSession diff --git a/src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelWriteBuilder.scala b/src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelWriteBuilder.scala similarity index 97% rename from src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelWriteBuilder.scala rename to src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelWriteBuilder.scala index ae7ad286..1db13690 100644 --- a/src/main/3.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelWriteBuilder.scala +++ b/src/main/3.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelWriteBuilder.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.mapreduce.TaskAttemptContext diff --git a/src/main/3.3_and_up/scala/com/crealytics/spark/excel/v2/ExcelScan.scala b/src/main/3.3_and_up/scala/dev/mauch/spark/excel/v2/ExcelScan.scala similarity index 99% rename from src/main/3.3_and_up/scala/com/crealytics/spark/excel/v2/ExcelScan.scala rename to src/main/3.3_and_up/scala/dev/mauch/spark/excel/v2/ExcelScan.scala index 83aa3915..3ed1298e 100644 --- a/src/main/3.3_and_up/scala/com/crealytics/spark/excel/v2/ExcelScan.scala +++ b/src/main/3.3_and_up/scala/dev/mauch/spark/excel/v2/ExcelScan.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.fs.Path import org.apache.spark.sql.SparkSession diff --git a/src/main/3.3_and_up/scala/com/crealytics/spark/excel/v2/ExcelScanBuilder.scala b/src/main/3.3_and_up/scala/dev/mauch/spark/excel/v2/ExcelScanBuilder.scala similarity index 97% rename from src/main/3.3_and_up/scala/com/crealytics/spark/excel/v2/ExcelScanBuilder.scala rename to src/main/3.3_and_up/scala/dev/mauch/spark/excel/v2/ExcelScanBuilder.scala index f516953d..df6c75ed 100644 --- a/src/main/3.3_and_up/scala/com/crealytics/spark/excel/v2/ExcelScanBuilder.scala +++ b/src/main/3.3_and_up/scala/dev/mauch/spark/excel/v2/ExcelScanBuilder.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.SparkSession import org.apache.spark.sql.connector.read.Scan diff --git a/src/main/3.4.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala b/src/main/3.4.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala similarity index 96% rename from src/main/3.4.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala rename to src/main/3.4.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala index d4f9d99f..970cb754 100644 --- a/src/main/3.4.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelParserBase.scala +++ b/src/main/3.4.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelParserBase.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import _root_.org.apache.spark.sql.catalyst.util.BadRecordException import org.apache.spark.unsafe.types.UTF8String diff --git a/src/main/3.4.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelPartitionReaderFactory.scala b/src/main/3.4.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelPartitionReaderFactory.scala similarity index 99% rename from src/main/3.4.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelPartitionReaderFactory.scala rename to src/main/3.4.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelPartitionReaderFactory.scala index b04f2dd3..cc2e8e5d 100644 --- a/src/main/3.4.2_and_up/scala/com/crealytics/spark/excel/v2/ExcelPartitionReaderFactory.scala +++ b/src/main/3.4.2_and_up/scala/dev/mauch/spark/excel/v2/ExcelPartitionReaderFactory.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.conf.Configuration import org.apache.spark.broadcast.Broadcast diff --git a/src/main/3.4_and_up/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala b/src/main/3.4_and_up/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala similarity index 97% rename from src/main/3.4_and_up/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala rename to src/main/3.4_and_up/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala index 69dc0232..910ef1d3 100644 --- a/src/main/3.4_and_up/scala/com/crealytics/spark/excel/v2/ExcelOptions.scala +++ b/src/main/3.4_and_up/scala/dev/mauch/spark/excel/v2/ExcelOptions.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.catalyst.FileSourceOptions import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap diff --git a/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister index 0d1ca028..de191718 100644 --- a/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister +++ b/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister @@ -1 +1 @@ -com.crealytics.spark.excel.v2.ExcelDataSource +dev.mauch.spark.excel.v2.ExcelDataSource diff --git a/src/main/scala/com/crealytics/spark/excel/DataColumn.scala b/src/main/scala/dev/mauch/spark/excel/DataColumn.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/DataColumn.scala rename to src/main/scala/dev/mauch/spark/excel/DataColumn.scala index 8594a742..aea4dd70 100644 --- a/src/main/scala/com/crealytics/spark/excel/DataColumn.scala +++ b/src/main/scala/dev/mauch/spark/excel/DataColumn.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.apache.poi.ss.usermodel.{Cell, CellType, DataFormatter, DateUtil} import org.apache.spark.sql.types._ diff --git a/src/main/scala/com/crealytics/spark/excel/DataLocator.scala b/src/main/scala/dev/mauch/spark/excel/DataLocator.scala similarity index 98% rename from src/main/scala/com/crealytics/spark/excel/DataLocator.scala rename to src/main/scala/dev/mauch/spark/excel/DataLocator.scala index 1342ee15..85501c9c 100644 --- a/src/main/scala/com/crealytics/spark/excel/DataLocator.scala +++ b/src/main/scala/dev/mauch/spark/excel/DataLocator.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel -import com.crealytics.spark.excel.Utils.MapIncluding +import dev.mauch.spark.excel.Utils.MapIncluding import org.apache.poi.ss.SpreadsheetVersion import org.apache.poi.ss.usermodel.{Cell, Sheet, Workbook} import org.apache.poi.ss.util.{AreaReference, CellReference} diff --git a/src/main/scala/com/crealytics/spark/excel/DefaultSource.scala b/src/main/scala/dev/mauch/spark/excel/DefaultSource.scala similarity index 98% rename from src/main/scala/com/crealytics/spark/excel/DefaultSource.scala rename to src/main/scala/dev/mauch/spark/excel/DefaultSource.scala index b733e9a7..facbb542 100644 --- a/src/main/scala/com/crealytics/spark/excel/DefaultSource.scala +++ b/src/main/scala/dev/mauch/spark/excel/DefaultSource.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.apache.hadoop.fs.Path import org.apache.spark.sql.sources._ diff --git a/src/main/scala/com/crealytics/spark/excel/DefaultSource15.scala b/src/main/scala/dev/mauch/spark/excel/DefaultSource15.scala similarity index 95% rename from src/main/scala/com/crealytics/spark/excel/DefaultSource15.scala rename to src/main/scala/dev/mauch/spark/excel/DefaultSource15.scala index 5f521c7c..d8a5715f 100644 --- a/src/main/scala/com/crealytics/spark/excel/DefaultSource15.scala +++ b/src/main/scala/dev/mauch/spark/excel/DefaultSource15.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.apache.spark.sql.sources.DataSourceRegister diff --git a/src/main/scala/com/crealytics/spark/excel/ExcelFileSaver.scala b/src/main/scala/dev/mauch/spark/excel/ExcelFileSaver.scala similarity index 98% rename from src/main/scala/com/crealytics/spark/excel/ExcelFileSaver.scala rename to src/main/scala/dev/mauch/spark/excel/ExcelFileSaver.scala index 2d315dba..53611fbc 100644 --- a/src/main/scala/com/crealytics/spark/excel/ExcelFileSaver.scala +++ b/src/main/scala/dev/mauch/spark/excel/ExcelFileSaver.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.apache.hadoop.fs.{FSDataInputStream, FileSystem, Path} import org.apache.poi.xssf.usermodel.XSSFWorkbook diff --git a/src/main/scala/com/crealytics/spark/excel/ExcelRelation.scala b/src/main/scala/dev/mauch/spark/excel/ExcelRelation.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/ExcelRelation.scala rename to src/main/scala/dev/mauch/spark/excel/ExcelRelation.scala index 44706268..42673565 100644 --- a/src/main/scala/com/crealytics/spark/excel/ExcelRelation.scala +++ b/src/main/scala/dev/mauch/spark/excel/ExcelRelation.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import java.sql.{Date, Timestamp} import java.text.SimpleDateFormat diff --git a/src/main/scala/com/crealytics/spark/excel/InferSchema.scala b/src/main/scala/dev/mauch/spark/excel/InferSchema.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/InferSchema.scala rename to src/main/scala/dev/mauch/spark/excel/InferSchema.scala index 3d94f526..27bb7dfb 100644 --- a/src/main/scala/com/crealytics/spark/excel/InferSchema.scala +++ b/src/main/scala/dev/mauch/spark/excel/InferSchema.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.apache.spark.rdd.RDD import org.apache.spark.sql.types._ diff --git a/src/main/scala/com/crealytics/spark/excel/PlainNumberFormat.scala b/src/main/scala/dev/mauch/spark/excel/PlainNumberFormat.scala similarity index 97% rename from src/main/scala/com/crealytics/spark/excel/PlainNumberFormat.scala rename to src/main/scala/dev/mauch/spark/excel/PlainNumberFormat.scala index 4d0f9afc..0883c111 100644 --- a/src/main/scala/com/crealytics/spark/excel/PlainNumberFormat.scala +++ b/src/main/scala/dev/mauch/spark/excel/PlainNumberFormat.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import java.math.BigDecimal import java.text.FieldPosition diff --git a/src/main/scala/com/crealytics/spark/excel/Utils.scala b/src/main/scala/dev/mauch/spark/excel/Utils.scala similarity index 98% rename from src/main/scala/com/crealytics/spark/excel/Utils.scala rename to src/main/scala/dev/mauch/spark/excel/Utils.scala index 572fc2a6..eb5f686b 100644 --- a/src/main/scala/com/crealytics/spark/excel/Utils.scala +++ b/src/main/scala/dev/mauch/spark/excel/Utils.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import scala.util.{Success, Try} object Utils { diff --git a/src/main/scala/com/crealytics/spark/excel/WorkbookReader.scala b/src/main/scala/dev/mauch/spark/excel/WorkbookReader.scala similarity index 98% rename from src/main/scala/com/crealytics/spark/excel/WorkbookReader.scala rename to src/main/scala/dev/mauch/spark/excel/WorkbookReader.scala index 24b6b917..9b2df224 100644 --- a/src/main/scala/com/crealytics/spark/excel/WorkbookReader.scala +++ b/src/main/scala/dev/mauch/spark/excel/WorkbookReader.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import java.io.InputStream -import com.crealytics.spark.excel.Utils.MapIncluding +import dev.mauch.spark.excel.Utils.MapIncluding import com.github.pjfanning.xlsx.StreamingReader import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileSystem, Path} diff --git a/src/main/scala/com/crealytics/spark/excel/package.scala b/src/main/scala/dev/mauch/spark/excel/package.scala similarity index 95% rename from src/main/scala/com/crealytics/spark/excel/package.scala rename to src/main/scala/dev/mauch/spark/excel/package.scala index 1913c417..ce9709a2 100644 --- a/src/main/scala/com/crealytics/spark/excel/package.scala +++ b/src/main/scala/dev/mauch/spark/excel/package.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark +package dev.mauch.spark import org.apache.poi.ss.usermodel.Row.MissingCellPolicy import org.apache.poi.ss.usermodel.{Cell, CellType, Row} @@ -101,7 +101,7 @@ package object excel { "tempFileThreshold" -> tempFileThreshold, "excerptSize" -> excerptSize, "workbookPassword" -> workbookPassword - ).foldLeft(dataFrameReader.format("com.crealytics.spark.excel")) { case (dfReader, (key, value)) => + ).foldLeft(dataFrameReader.format("dev.mauch.spark.excel")) { case (dfReader, (key, value)) => value match { case null => dfReader case v => dfReader.option(key, v.toString) @@ -126,7 +126,7 @@ package object excel { "timestampFormat" -> timestampFormat, "workbookPassword" -> workbookPassword, "preHeader" -> preHeader - ).foldLeft(dataFrameWriter.format("com.crealytics.spark.excel")) { case (dfWriter, (key, value)) => + ).foldLeft(dataFrameWriter.format("dev.mauch.spark.excel")) { case (dfWriter, (key, value)) => value match { case null => dfWriter case v => dfWriter.option(key, v.toString) diff --git a/src/main/scala/com/crealytics/spark/excel/v2/DataLocator.scala b/src/main/scala/dev/mauch/spark/excel/v2/DataLocator.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/v2/DataLocator.scala rename to src/main/scala/dev/mauch/spark/excel/v2/DataLocator.scala index d152cc32..48a1d166 100644 --- a/src/main/scala/com/crealytics/spark/excel/v2/DataLocator.scala +++ b/src/main/scala/dev/mauch/spark/excel/v2/DataLocator.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.poi.ss.usermodel.{Cell, Sheet, Workbook} import org.apache.poi.ss.usermodel.Row.MissingCellPolicy diff --git a/src/main/scala/com/crealytics/spark/excel/v2/ExcelGenerator.scala b/src/main/scala/dev/mauch/spark/excel/v2/ExcelGenerator.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/v2/ExcelGenerator.scala rename to src/main/scala/dev/mauch/spark/excel/v2/ExcelGenerator.scala index 9aa7aff6..592f01f4 100644 --- a/src/main/scala/com/crealytics/spark/excel/v2/ExcelGenerator.scala +++ b/src/main/scala/dev/mauch/spark/excel/v2/ExcelGenerator.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path diff --git a/src/main/scala/com/crealytics/spark/excel/v2/ExcelHeaderChecker.scala b/src/main/scala/dev/mauch/spark/excel/v2/ExcelHeaderChecker.scala similarity index 98% rename from src/main/scala/com/crealytics/spark/excel/v2/ExcelHeaderChecker.scala rename to src/main/scala/dev/mauch/spark/excel/v2/ExcelHeaderChecker.scala index 2e5e7d62..25a426d5 100644 --- a/src/main/scala/com/crealytics/spark/excel/v2/ExcelHeaderChecker.scala +++ b/src/main/scala/dev/mauch/spark/excel/v2/ExcelHeaderChecker.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.internal.Logging import org.apache.spark.sql.internal.SQLConf diff --git a/src/main/scala/com/crealytics/spark/excel/v2/ExcelHelper.scala b/src/main/scala/dev/mauch/spark/excel/v2/ExcelHelper.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/v2/ExcelHelper.scala rename to src/main/scala/dev/mauch/spark/excel/v2/ExcelHelper.scala index 80b489e4..b55793e4 100644 --- a/src/main/scala/com/crealytics/spark/excel/v2/ExcelHelper.scala +++ b/src/main/scala/dev/mauch/spark/excel/v2/ExcelHelper.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import com.github.pjfanning.xlsx.StreamingReader import org.apache.hadoop.conf.Configuration diff --git a/src/main/scala/com/crealytics/spark/excel/v2/ExcelInferSchema.scala b/src/main/scala/dev/mauch/spark/excel/v2/ExcelInferSchema.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/v2/ExcelInferSchema.scala rename to src/main/scala/dev/mauch/spark/excel/v2/ExcelInferSchema.scala index c99adb3e..02d6b8bb 100644 --- a/src/main/scala/com/crealytics/spark/excel/v2/ExcelInferSchema.scala +++ b/src/main/scala/dev/mauch/spark/excel/v2/ExcelInferSchema.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.poi.ss.usermodel.Cell import org.apache.poi.ss.usermodel.CellType diff --git a/src/main/scala/com/crealytics/spark/excel/v2/ExcelOptionsTrait.scala b/src/main/scala/dev/mauch/spark/excel/v2/ExcelOptionsTrait.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/v2/ExcelOptionsTrait.scala rename to src/main/scala/dev/mauch/spark/excel/v2/ExcelOptionsTrait.scala index a25d7129..f7cadf53 100644 --- a/src/main/scala/com/crealytics/spark/excel/v2/ExcelOptionsTrait.scala +++ b/src/main/scala/dev/mauch/spark/excel/v2/ExcelOptionsTrait.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap import org.apache.spark.sql.catalyst.util.DateFormatter diff --git a/src/main/scala/com/crealytics/spark/excel/v2/ExcelParser.scala b/src/main/scala/dev/mauch/spark/excel/v2/ExcelParser.scala similarity index 99% rename from src/main/scala/com/crealytics/spark/excel/v2/ExcelParser.scala rename to src/main/scala/dev/mauch/spark/excel/v2/ExcelParser.scala index ed8239c4..01aedf91 100644 --- a/src/main/scala/com/crealytics/spark/excel/v2/ExcelParser.scala +++ b/src/main/scala/dev/mauch/spark/excel/v2/ExcelParser.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.poi.ss.usermodel.Cell import org.apache.poi.ss.usermodel.CellType diff --git a/src/main/scala/com/crealytics/spark/excel/v2/SheetData.scala b/src/main/scala/dev/mauch/spark/excel/v2/SheetData.scala similarity index 96% rename from src/main/scala/com/crealytics/spark/excel/v2/SheetData.scala rename to src/main/scala/dev/mauch/spark/excel/v2/SheetData.scala index 82fb8fb9..6d657d71 100644 --- a/src/main/scala/com/crealytics/spark/excel/v2/SheetData.scala +++ b/src/main/scala/dev/mauch/spark/excel/v2/SheetData.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import java.io.Closeable diff --git a/src/test/scala/com/crealytics/spark/DataFrameSuiteBase.scala b/src/test/scala/dev/mauch/spark/DataFrameSuiteBase.scala similarity index 99% rename from src/test/scala/com/crealytics/spark/DataFrameSuiteBase.scala rename to src/test/scala/dev/mauch/spark/DataFrameSuiteBase.scala index e56882af..da12151e 100644 --- a/src/test/scala/com/crealytics/spark/DataFrameSuiteBase.scala +++ b/src/test/scala/dev/mauch/spark/DataFrameSuiteBase.scala @@ -1,4 +1,4 @@ -package com.crealytics.spark +package dev.mauch.spark import com.github.mrpowers.spark.fast.tests.DataFrameComparer import org.apache.spark.sql.{DataFrame, Row, SparkSession} diff --git a/src/test/scala/com/crealytics/spark/excel/DataLocatorSuite.scala b/src/test/scala/dev/mauch/spark/excel/DataLocatorSuite.scala similarity index 99% rename from src/test/scala/com/crealytics/spark/excel/DataLocatorSuite.scala rename to src/test/scala/dev/mauch/spark/excel/DataLocatorSuite.scala index 769c859d..630e7e07 100644 --- a/src/test/scala/com/crealytics/spark/excel/DataLocatorSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/DataLocatorSuite.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.apache.poi.xssf.usermodel.XSSFWorkbook import org.scalacheck.Gen diff --git a/src/test/scala/com/crealytics/spark/excel/EncryptedReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/EncryptedReadSuite.scala similarity index 96% rename from src/test/scala/com/crealytics/spark/excel/EncryptedReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/EncryptedReadSuite.scala index 2a49eb8d..e9163989 100644 --- a/src/test/scala/com/crealytics/spark/excel/EncryptedReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/EncryptedReadSuite.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.apache.spark.sql._ import org.apache.spark.sql.types._ -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.scalatest.funspec.AnyFunSpec import org.scalatest.matchers.should.Matchers import scala.jdk.CollectionConverters._ diff --git a/src/test/scala/com/crealytics/spark/excel/ErrorsAsStringsReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/ErrorsAsStringsReadSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/ErrorsAsStringsReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/ErrorsAsStringsReadSuite.scala index 937a2f89..56d9a63c 100644 --- a/src/test/scala/com/crealytics/spark/excel/ErrorsAsStringsReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/ErrorsAsStringsReadSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.types._ import org.apache.spark.sql.{Row, _} import org.scalatest.funspec.AnyFunSpec diff --git a/src/test/scala/com/crealytics/spark/excel/Generators.scala b/src/test/scala/dev/mauch/spark/excel/Generators.scala similarity index 99% rename from src/test/scala/com/crealytics/spark/excel/Generators.scala rename to src/test/scala/dev/mauch/spark/excel/Generators.scala index 2560d7f9..5dd02207 100644 --- a/src/test/scala/com/crealytics/spark/excel/Generators.scala +++ b/src/test/scala/dev/mauch/spark/excel/Generators.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.scalacheck.Arbitrary.{arbBigDecimal => _, arbLong => _, arbString => _, _} import org.scalacheck.ScalacheckShapeless._ diff --git a/src/test/scala/com/crealytics/spark/excel/IntegrationSuite.scala b/src/test/scala/dev/mauch/spark/excel/IntegrationSuite.scala similarity index 99% rename from src/test/scala/com/crealytics/spark/excel/IntegrationSuite.scala rename to src/test/scala/dev/mauch/spark/excel/IntegrationSuite.scala index b3f83787..78cf8343 100644 --- a/src/test/scala/com/crealytics/spark/excel/IntegrationSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/IntegrationSuite.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import cats.Monoid -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.poi.ss.util.CellReference import org.apache.spark.sql.functions.{col, lit} import org.apache.spark.sql.types._ diff --git a/src/test/scala/com/crealytics/spark/excel/PlainNumberReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/PlainNumberReadSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/PlainNumberReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/PlainNumberReadSuite.scala index b820581a..51a116b5 100644 --- a/src/test/scala/com/crealytics/spark/excel/PlainNumberReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/PlainNumberReadSuite.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import java.util -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.{DataFrame, Row} import org.apache.spark.sql.types._ import org.scalatest.funspec.AnyFunSpec diff --git a/src/test/scala/com/crealytics/spark/excel/RichRowSuite.scala b/src/test/scala/dev/mauch/spark/excel/RichRowSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/RichRowSuite.scala rename to src/test/scala/dev/mauch/spark/excel/RichRowSuite.scala index f7c1e22d..5dec1cd9 100644 --- a/src/test/scala/com/crealytics/spark/excel/RichRowSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/RichRowSuite.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel +package dev.mauch.spark.excel import org.apache.poi.ss.usermodel.{Cell, Row} import org.scalacheck.Gen diff --git a/src/test/scala/com/crealytics/spark/excel/v2/AreaReferenceReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/AreaReferenceReadSuite.scala similarity index 96% rename from src/test/scala/com/crealytics/spark/excel/v2/AreaReferenceReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/AreaReferenceReadSuite.scala index 53d46b19..10fdff0d 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/AreaReferenceReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/AreaReferenceReadSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/DataFrameWriterApiComplianceSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/DataFrameWriterApiComplianceSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/DataFrameWriterApiComplianceSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/DataFrameWriterApiComplianceSuite.scala index 24fcfd33..77d38c2b 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/DataFrameWriterApiComplianceSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/DataFrameWriterApiComplianceSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql._ import org.scalatest.wordspec.AnyWordSpec diff --git a/src/test/scala/com/crealytics/spark/excel/v2/EncryptedReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/EncryptedReadSuite.scala similarity index 96% rename from src/test/scala/com/crealytics/spark/excel/v2/EncryptedReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/EncryptedReadSuite.scala index 81524f6c..34a4e894 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/EncryptedReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/EncryptedReadSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql._ import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/ErrorsAsStringsReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/ErrorsAsStringsReadSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/ErrorsAsStringsReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/ErrorsAsStringsReadSuite.scala index dc3d9db4..22b130df 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/ErrorsAsStringsReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/ErrorsAsStringsReadSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/ExcelTestingUtilities.scala b/src/test/scala/dev/mauch/spark/excel/v2/ExcelTestingUtilities.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/ExcelTestingUtilities.scala rename to src/test/scala/dev/mauch/spark/excel/v2/ExcelTestingUtilities.scala index 0e9052e0..0637aaf2 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/ExcelTestingUtilities.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/ExcelTestingUtilities.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import org.apache.spark.sql._ import org.apache.spark.sql.types.StructType diff --git a/src/test/scala/com/crealytics/spark/excel/v2/GlobPartitionAndFileNameSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/GlobPartitionAndFileNameSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/GlobPartitionAndFileNameSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/GlobPartitionAndFileNameSuite.scala index 56f71163..173c20d5 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/GlobPartitionAndFileNameSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/GlobPartitionAndFileNameSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.functions.input_file_name import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/InferStricterNumericalTypesSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/InferStricterNumericalTypesSuite.scala similarity index 97% rename from src/test/scala/com/crealytics/spark/excel/v2/InferStricterNumericalTypesSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/InferStricterNumericalTypesSuite.scala index c2bba2c0..acd2d2ab 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/InferStricterNumericalTypesSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/InferStricterNumericalTypesSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/KeepUndefinedRowsSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/KeepUndefinedRowsSuite.scala similarity index 97% rename from src/test/scala/com/crealytics/spark/excel/v2/KeepUndefinedRowsSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/KeepUndefinedRowsSuite.scala index ea9692c2..097f360a 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/KeepUndefinedRowsSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/KeepUndefinedRowsSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/LocalFileTestingUtilities.scala b/src/test/scala/dev/mauch/spark/excel/v2/LocalFileTestingUtilities.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/LocalFileTestingUtilities.scala rename to src/test/scala/dev/mauch/spark/excel/v2/LocalFileTestingUtilities.scala index 7393c039..f374ef2f 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/LocalFileTestingUtilities.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/LocalFileTestingUtilities.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 import java.io.File import java.nio.file.Files diff --git a/src/test/scala/com/crealytics/spark/excel/v2/ManyPartitionReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/ManyPartitionReadSuite.scala similarity index 97% rename from src/test/scala/com/crealytics/spark/excel/v2/ManyPartitionReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/ManyPartitionReadSuite.scala index da84ba45..d1407801 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/ManyPartitionReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/ManyPartitionReadSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql._ import org.apache.spark.sql.functions.col import org.apache.spark.sql.types.IntegerType diff --git a/src/test/scala/com/crealytics/spark/excel/v2/NumericTypesSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/NumericTypesSuite.scala similarity index 97% rename from src/test/scala/com/crealytics/spark/excel/v2/NumericTypesSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/NumericTypesSuite.scala index c9bc04f3..357eecc9 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/NumericTypesSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/NumericTypesSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/PlainNumberReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/PlainNumberReadSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/PlainNumberReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/PlainNumberReadSuite.scala index 469ec3c3..893423ff 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/PlainNumberReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/PlainNumberReadSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/ProjectionAndFilterPushdownSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/ProjectionAndFilterPushdownSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/ProjectionAndFilterPushdownSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/ProjectionAndFilterPushdownSuite.scala index 810a7c7c..86017326 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/ProjectionAndFilterPushdownSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/ProjectionAndFilterPushdownSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/RowNumberColumnSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/RowNumberColumnSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/RowNumberColumnSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/RowNumberColumnSuite.scala index 262104b0..f7a26d23 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/RowNumberColumnSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/RowNumberColumnSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/TableReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/TableReadSuite.scala similarity index 97% rename from src/test/scala/com/crealytics/spark/excel/v2/TableReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/TableReadSuite.scala index c8a8b2e3..5410d232 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/TableReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/TableReadSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/UserReportedIssuesSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/UserReportedIssuesSuite.scala similarity index 95% rename from src/test/scala/com/crealytics/spark/excel/v2/UserReportedIssuesSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/UserReportedIssuesSuite.scala index a739d047..80ececd4 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/UserReportedIssuesSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/UserReportedIssuesSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.sql.Row import org.apache.spark.sql.types._ import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/com/crealytics/spark/excel/v2/WriteAndReadSuite.scala b/src/test/scala/dev/mauch/spark/excel/v2/WriteAndReadSuite.scala similarity index 98% rename from src/test/scala/com/crealytics/spark/excel/v2/WriteAndReadSuite.scala rename to src/test/scala/dev/mauch/spark/excel/v2/WriteAndReadSuite.scala index f0913820..bcda9690 100644 --- a/src/test/scala/com/crealytics/spark/excel/v2/WriteAndReadSuite.scala +++ b/src/test/scala/dev/mauch/spark/excel/v2/WriteAndReadSuite.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.crealytics.spark.excel.v2 +package dev.mauch.spark.excel.v2 -import com.crealytics.spark.DataFrameSuiteBase +import dev.mauch.spark.DataFrameSuiteBase import org.apache.spark.SparkException import org.apache.spark.sql._ import org.apache.spark.sql.types._ diff --git a/src/test/scala/com/crealytics/tags/package.scala b/src/test/scala/dev/mauch/tags/package.scala similarity index 89% rename from src/test/scala/com/crealytics/tags/package.scala rename to src/test/scala/dev/mauch/tags/package.scala index 897b518d..e4beb4b4 100644 --- a/src/test/scala/com/crealytics/tags/package.scala +++ b/src/test/scala/dev/mauch/tags/package.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.crealytics +package dev.mauch import org.scalatest.Tag package object tags { - object WIP extends Tag("com.crealytics.tags.WIP") + object WIP extends Tag("dev.mauch.tags.WIP") }