diff --git a/README.md b/README.md index b34ff13..e52e2b1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/be.timvw/adobe-analytics-datafeed-datasource_2.12/badge.svg)](https://central.sonatype.com/artifact/be.timvw/adobe-analytics-datafeed-datasource_2.12) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/be.icteam/adobe-analytics-datafeed-datasource_2.12/badge.svg)](https://central.sonatype.com/artifact/be.icteam/adobe-analytics-datafeed-datasource_2.12) # Datasource for Adobe Analytics Data Feed @@ -12,14 +12,14 @@ Concretly, escaped values are not handled correctly by a CSV parser due to inher Make sure the package is in the classpath, eg: by using the --packages option: ```bash -spark-shell --packages "be.timvw:adobe-analytics-datafeed-datasource_2.12:0.0.1" +spark-shell --packages "be.icteam:adobe-analytics-datafeed-datasource_2.12:0.0.1" ``` And you can read the feed as following: ```scala val df = spark.read - .format("be.timvw.adobe.analytics.datafeed") + .format("be.icteam.adobe.analytics.datafeed") .load("./src/test/resources/randyzwitch") ``` @@ -40,7 +40,7 @@ We also support the Generic file source options: ```scala val df = spark.read - .format("be.timvw.adobe.analytics.datafeed") + .format("be.icteam.adobe.analytics.datafeed") .option(ClickstreamOptions.MODIFIED_AFTER, "2023-11-01T00:00:00") .load("./src/test/resources/randyzwitch") ``` \ No newline at end of file diff --git a/build.sbt b/build.sbt index a289c9f..7f22c79 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val scala212 = "2.12.18" lazy val supportedScalaVersions = List(scala212) -organization := "be.timvw" +organization := "be.icteam" name := "adobe-analytics-datafeed-datasource" ThisBuild / homepage := Some(url("https://github.com/timvw/adobe-analytics-datafeed-datasource")) 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 a20d444..dcd8a5a 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 @@ -be.timvw.adobe.analytics.datafeed.DefaultSource \ No newline at end of file +be.icteam.adobe.analytics.datafeed.DefaultSource \ No newline at end of file diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DataFile.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DataFile.scala similarity index 89% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DataFile.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DataFile.scala index b4ba070..ee49cd4 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DataFile.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DataFile.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.hadoop.fs.Path diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedOptions.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedOptions.scala similarity index 97% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedOptions.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedOptions.scala index 69cb9b1..0d40bf0 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedOptions.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedOptions.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.internal.Logging import org.apache.spark.sql.catalyst.util.{CaseInsensitiveMap, DateTimeUtils} diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartition.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartition.scala similarity index 81% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartition.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartition.scala index 0e034f7..d703480 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartition.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartition.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.connector.read.InputPartition diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartitionReader.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartitionReader.scala similarity index 97% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartitionReader.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartitionReader.scala index 61dba65..1dee154 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartitionReader.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartitionReader.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import com.univocity.parsers.tsv.{TsvParser, TsvParserSettings} import org.apache.hadoop.conf.Configuration diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartitionReaderFactory.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartitionReaderFactory.scala similarity index 94% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartitionReaderFactory.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartitionReaderFactory.scala index 7041570..9a3e720 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedPartitionReaderFactory.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedPartitionReaderFactory.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.broadcast.Broadcast import org.apache.spark.sql.catalyst.InternalRow diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedScan.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedScan.scala similarity index 96% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedScan.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedScan.scala index 196fd7f..b218fa2 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedScan.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedScan.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.SparkSession import org.apache.spark.sql.connector.read._ diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedScanBuilder.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedScanBuilder.scala similarity index 95% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedScanBuilder.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedScanBuilder.scala index 04869cd..01a8aaf 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedScanBuilder.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedScanBuilder.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.SparkSession import org.apache.spark.sql.connector.read.{Scan, ScanBuilder, SupportsPushDownRequiredColumns} diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedTable.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedTable.scala similarity index 97% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedTable.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedTable.scala index b14dc0c..5552a18 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DatafeedTable.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DatafeedTable.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.hadoop.fs.Path import org.apache.spark.sql.SparkSession diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/DefaultSource.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/DefaultSource.scala similarity index 96% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/DefaultSource.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/DefaultSource.scala index e722828..02659de 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/DefaultSource.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/DefaultSource.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap import org.apache.spark.sql.connector.catalog.Table diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/LookupFile.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/LookupFile.scala similarity index 98% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/LookupFile.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/LookupFile.scala index 909a1e0..36cc3a4 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/LookupFile.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/LookupFile.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import com.univocity.parsers.tsv.{TsvParser, TsvParserSettings} import org.apache.commons.compress.archivers.tar.TarArchiveInputStream diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/ManifestFile.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/ManifestFile.scala similarity index 99% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/ManifestFile.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/ManifestFile.scala index 25bb158..5baa635 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/ManifestFile.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/ManifestFile.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileSystem, Path} diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/SimpleLookupValuesContributor.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/SimpleLookupValuesContributor.scala similarity index 99% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/SimpleLookupValuesContributor.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/SimpleLookupValuesContributor.scala index 954b689..ea31165 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/SimpleLookupValuesContributor.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/SimpleLookupValuesContributor.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import com.univocity.parsers.tsv.{TsvParser, TsvParserSettings} import org.apache.spark.sql.catalyst.expressions.GenericInternalRow diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/SimpleSourceValuesContributor.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/SimpleSourceValuesContributor.scala similarity index 97% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/SimpleSourceValuesContributor.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/SimpleSourceValuesContributor.scala index 2863df2..3e941b6 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/SimpleSourceValuesContributor.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/SimpleSourceValuesContributor.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.catalyst.expressions.GenericInternalRow import org.apache.spark.sql.types.{StructField, StructType} diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/Util.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/Util.scala similarity index 93% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/Util.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/Util.scala index 8069994..6409ce5 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/Util.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/Util.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.hadoop.fs.{FileSystem, Path} diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/ValuesContributor.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/ValuesContributor.scala similarity index 98% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/ValuesContributor.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/ValuesContributor.scala index 4fdd36f..585a1ca 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/ValuesContributor.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/ValuesContributor.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.catalyst.expressions.GenericInternalRow import org.apache.spark.sql.types.{StructField, StructType} diff --git a/src/main/scala/be/timvw/adobe/analytics/datafeed/implicits.scala b/src/main/scala/be/icteam/adobe/analytics/datafeed/implicits.scala similarity index 98% rename from src/main/scala/be/timvw/adobe/analytics/datafeed/implicits.scala rename to src/main/scala/be/icteam/adobe/analytics/datafeed/implicits.scala index 1f25703..c3bc51b 100644 --- a/src/main/scala/be/timvw/adobe/analytics/datafeed/implicits.scala +++ b/src/main/scala/be/icteam/adobe/analytics/datafeed/implicits.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.catalyst.util.CaseInsensitiveMap import org.apache.spark.sql.streaming.DataStreamReader diff --git a/src/test/scala/be/timvw/adobe/analytics/datafeed/DataFileTests.scala b/src/test/scala/be/icteam/adobe/analytics/datafeed/DataFileTests.scala similarity index 88% rename from src/test/scala/be/timvw/adobe/analytics/datafeed/DataFileTests.scala rename to src/test/scala/be/icteam/adobe/analytics/datafeed/DataFileTests.scala index a0a6032..8b69486 100644 --- a/src/test/scala/be/timvw/adobe/analytics/datafeed/DataFileTests.scala +++ b/src/test/scala/be/icteam/adobe/analytics/datafeed/DataFileTests.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.hadoop.fs.Path import org.scalatest.funsuite.AnyFunSuite diff --git a/src/test/scala/be/timvw/adobe/analytics/datafeed/DefaultSourceTest.scala b/src/test/scala/be/icteam/adobe/analytics/datafeed/DefaultSourceTest.scala similarity index 95% rename from src/test/scala/be/timvw/adobe/analytics/datafeed/DefaultSourceTest.scala rename to src/test/scala/be/icteam/adobe/analytics/datafeed/DefaultSourceTest.scala index 2f85784..061e02b 100644 --- a/src/test/scala/be/timvw/adobe/analytics/datafeed/DefaultSourceTest.scala +++ b/src/test/scala/be/icteam/adobe/analytics/datafeed/DefaultSourceTest.scala @@ -1,10 +1,10 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.functions.col import org.apache.spark.sql.types.{StringType, StructField, StructType} import org.apache.spark.sql.{AnalysisException, SparkSession} // needed for 'the read clickstream extension method works' test -import be.timvw.adobe.analytics.datafeed.implicits._ +import be.icteam.adobe.analytics.datafeed.implicits._ import org.scalatest.funsuite.AnyFunSuite class DefaultSourceTest extends AnyFunSuite { diff --git a/src/test/scala/be/timvw/adobe/analytics/datafeed/LookupFileTests.scala b/src/test/scala/be/icteam/adobe/analytics/datafeed/LookupFileTests.scala similarity index 93% rename from src/test/scala/be/timvw/adobe/analytics/datafeed/LookupFileTests.scala rename to src/test/scala/be/icteam/adobe/analytics/datafeed/LookupFileTests.scala index 344f956..b0af7cb 100644 --- a/src/test/scala/be/timvw/adobe/analytics/datafeed/LookupFileTests.scala +++ b/src/test/scala/be/icteam/adobe/analytics/datafeed/LookupFileTests.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path diff --git a/src/test/scala/be/timvw/adobe/analytics/datafeed/ManifestFileTests.scala b/src/test/scala/be/icteam/adobe/analytics/datafeed/ManifestFileTests.scala similarity index 97% rename from src/test/scala/be/timvw/adobe/analytics/datafeed/ManifestFileTests.scala rename to src/test/scala/be/icteam/adobe/analytics/datafeed/ManifestFileTests.scala index d9a4eb7..c1c9e5b 100644 --- a/src/test/scala/be/timvw/adobe/analytics/datafeed/ManifestFileTests.scala +++ b/src/test/scala/be/icteam/adobe/analytics/datafeed/ManifestFileTests.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path diff --git a/src/test/scala/be/timvw/adobe/analytics/datafeed/TestUtil.scala b/src/test/scala/be/icteam/adobe/analytics/datafeed/TestUtil.scala similarity index 80% rename from src/test/scala/be/timvw/adobe/analytics/datafeed/TestUtil.scala rename to src/test/scala/be/icteam/adobe/analytics/datafeed/TestUtil.scala index 25e1610..034fcce 100644 --- a/src/test/scala/be/timvw/adobe/analytics/datafeed/TestUtil.scala +++ b/src/test/scala/be/icteam/adobe/analytics/datafeed/TestUtil.scala @@ -1,4 +1,4 @@ -package be.timvw.adobe.analytics.datafeed +package be.icteam.adobe.analytics.datafeed import org.apache.spark.sql.SparkSession