#2309 Delete old package and code

Merlin Rabens · merlinrabens · commit 36f209549b6b · 2020-11-03T15:28:18.000+01:00
Signed-off-by: Merlin Rabens &lt;merlin.rabens@intenthq.com&gt;
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/CsvSource.scala b/src/main/scala/com/intenthq/action_processor/integrations/CsvSource.scala
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/DomainStemmer.scala b/src/main/scala/com/intenthq/action_processor/integrations/DomainStemmer.scala
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/HiveSource.scala b/src/main/scala/com/intenthq/action_processor/integrations/HiveSource.scala
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/LocalFileCsvSource.scala b/src/main/scala/com/intenthq/action_processor/integrations/LocalFileCsvSource.scala
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/SQLSource.scala b/src/main/scala/com/intenthq/action_processor/integrations/SQLSource.scala
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/Source.scala b/src/main/scala/com/intenthq/action_processor/integrations/Source.scala
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/aggregations/Aggregate.scala b/src/main/scala/com/intenthq/action_processor/integrations/aggregations/Aggregate.scala
@@ -1,11 +1,11 @@
-package com.intenthq.action_processor.integrationsV2.aggregations
+package com.intenthq.action_processor.integrations.aggregations
 
 import java.util.concurrent.ConcurrentMap
 
 import cats.effect.{IO, Resource}
-import com.intenthq.action_processor.integrationsV2.config.MapDbSettings
-import com.intenthq.action_processor.integrationsV2.feeds.FeedContext
-import com.intenthq.action_processor.integrationsV2.repositories.MapDBRepository
+import com.intenthq.action_processor.integrations.config.MapDbSettings
+import com.intenthq.action_processor.integrations.feeds.FeedContext
+import com.intenthq.action_processor.integrations.repositories.MapDBRepository
 import org.mapdb.elsa.{ElsaMaker, ElsaSerializer}
 import org.mapdb.serializer.GroupSerializerObjectArray
 import org.mapdb.{DataInput2, DataOutput2, HTreeMap, Serializer}
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/aggregations/NoAggregate.scala b/src/main/scala/com/intenthq/action_processor/integrations/aggregations/NoAggregate.scala
@@ -1,7 +1,7 @@
-package com.intenthq.action_processor.integrationsV2.aggregations
+package com.intenthq.action_processor.integrations.aggregations
 
 import cats.effect.IO
-import com.intenthq.action_processor.integrationsV2.feeds.{Feed, FeedContext}
+import com.intenthq.action_processor.integrations.feeds.{Feed, FeedContext}
 
 import scala.annotation.unused
 
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/config/MapDbSettings.scala b/src/main/scala/com/intenthq/action_processor/integrations/config/MapDbSettings.scala
@@ -1,4 +1,4 @@
-package com.intenthq.action_processor.integrationsV2.config
+package com.intenthq.action_processor.integrations.config
 
 import java.nio.file.Path
 
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/feeds/CSVFeed.scala b/src/main/scala/com/intenthq/action_processor/integrations/feeds/CSVFeed.scala
@@ -1,4 +1,4 @@
-package com.intenthq.action_processor.integrationsV2.feeds
+package com.intenthq.action_processor.integrations.feeds
 
 import java.io.StringReader
 
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/feeds/Feed.scala b/src/main/scala/com/intenthq/action_processor/integrations/feeds/Feed.scala
@@ -1,4 +1,4 @@
-package com.intenthq.action_processor.integrationsV2.feeds
+package com.intenthq.action_processor.integrations.feeds
 
 import cats.effect.IO
 
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/feeds/FeedContext.scala b/src/main/scala/com/intenthq/action_processor/integrations/feeds/FeedContext.scala
@@ -1,8 +1,8 @@
-package com.intenthq.action_processor.integrationsV2.feeds
+package com.intenthq.action_processor.integrations.feeds
 
 import java.time.{LocalDate, LocalTime}
 
-import com.intenthq.action_processor.integrationsV2.config.MapDbSettings
+import com.intenthq.action_processor.integrations.config.MapDbSettings
 import com.intenthq.embeddings.Mapping
 
 case class FeedFilter(date: Option[LocalDate], time: Option[LocalTime])
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/feeds/HiveFeed.scala b/src/main/scala/com/intenthq/action_processor/integrations/feeds/HiveFeed.scala
@@ -1,4 +1,4 @@
-package com.intenthq.action_processor.integrationsV2.feeds
+package com.intenthq.action_processor.integrations.feeds
 
 import cats.effect.IO
 import com.intenthq.action_processor.integrations.{JavaLegacyTimeMeta, TimeMeta}
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/feeds/LocalFileCSVFeed.scala b/src/main/scala/com/intenthq/action_processor/integrations/feeds/LocalFileCSVFeed.scala
@@ -1,4 +1,4 @@
-package com.intenthq.action_processor.integrationsV2.feeds
+package com.intenthq.action_processor.integrations.feeds
 
 import java.nio.file.Paths
 
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/feeds/SQLFeed.scala b/src/main/scala/com/intenthq/action_processor/integrations/feeds/SQLFeed.scala
@@ -1,4 +1,4 @@
-package com.intenthq.action_processor.integrationsV2.feeds
+package com.intenthq.action_processor.integrations.feeds
 
 import cats.effect.{ContextShift, IO}
 import com.intenthq.action_processor.integrations.DoobieImplicits
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/repositories/MapDBRepository.scala b/src/main/scala/com/intenthq/action_processor/integrations/repositories/MapDBRepository.scala
@@ -1,11 +1,11 @@
-package com.intenthq.action_processor.integrationsV2.repositories
+package com.intenthq.action_processor.integrations.repositories
 
 import java.io.File
 import java.nio.file.Paths
 import java.time.LocalDateTime
 
 import cats.effect.{IO, Resource}
-import com.intenthq.action_processor.integrationsV2.config.MapDbSettings
+import com.intenthq.action_processor.integrations.config.MapDbSettings
 import org.mapdb.{DB, DBMaker}
 
 object MapDBRepository {
diff --git a/src/main/scala/com/intenthq/action_processor/integrations/serializations/csv/CsvSerialization.scala b/src/main/scala/com/intenthq/action_processor/integrations/serializations/csv/CsvSerialization.scala
@@ -1,6 +1,6 @@
 package com.intenthq.action_processor.integrations.serializations.csv
 
-import java.io._
+import java.io.StringWriter
 import java.nio.charset.StandardCharsets
 
 import de.siegmar.fastcsv.writer.CsvWriter
diff --git a/src/test/scala/com/intenthq/action_processor/integrations/CSVFeedSpec.scala b/src/test/scala/com/intenthq/action_processor/integrations/CSVFeedSpec.scala
@@ -6,9 +6,9 @@ import java.nio.file.Files
 
 import cats.effect.{IO, Resource}
 import cats.implicits._
+import com.intenthq.action_processor.integrations.aggregations.NoAggregate
+import com.intenthq.action_processor.integrations.feeds.LocalFileCSVFeed
 import com.intenthq.action_processor.integrations.serializations.csv.CsvSerialization
-import com.intenthq.action_processor.integrationsV2.aggregations.NoAggregate
-import com.intenthq.action_processor.integrationsV2.feeds.LocalFileCSVFeed
 import weaver.IOSuite
 
 object CSVFeedSpec extends IOSuite with CSVFeedSpecResources {
diff --git a/src/test/scala/com/intenthq/action_processor/integrations/Defaults.scala b/src/test/scala/com/intenthq/action_processor/integrations/Defaults.scala
@@ -2,8 +2,8 @@ package com.intenthq.action_processor.integrations
 
 import java.nio.file.Paths
 
-import com.intenthq.action_processor.integrationsV2.config.MapDbSettings
-import com.intenthq.action_processor.integrationsV2.feeds.{FeedContext, FeedFilter}
+import com.intenthq.action_processor.integrations.config.MapDbSettings
+import com.intenthq.action_processor.integrations.feeds.{FeedContext, FeedFilter}
 
 object Defaults {
 
diff --git a/src/test/scala/com/intenthq/action_processor/integrations/FeedAggregatedSpec.scala b/src/test/scala/com/intenthq/action_processor/integrations/FeedAggregatedSpec.scala
@@ -4,9 +4,9 @@ import java.nio.charset.StandardCharsets
 import java.time.LocalDateTime
 
 import cats.effect.IO
+import com.intenthq.action_processor.integrations.aggregations.Aggregate
+import com.intenthq.action_processor.integrations.feeds.{Feed, FeedContext}
 import com.intenthq.action_processor.integrations.serializations.csv.CsvSerialization
-import com.intenthq.action_processor.integrationsV2.aggregations.Aggregate
-import com.intenthq.action_processor.integrationsV2.feeds.{Feed, FeedContext}
 import fs2.Pipe
 import weaver.SimpleIOSuite
 
diff --git a/src/test/scala/com/intenthq/action_processor/integrations/SQLFeedSpec.scala b/src/test/scala/com/intenthq/action_processor/integrations/SQLFeedSpec.scala
@@ -4,16 +4,16 @@ import java.time.temporal.ChronoUnit
 import java.time.{Instant, LocalDate, LocalTime}
 
 import cats.effect.{Async, Blocker, Bracket, ContextShift, IO, Resource}
-import cats.implicits._
+import cats.implicits.toFunctorOps
+import com.intenthq.action_processor.integrations.aggregations.NoAggregate
+import com.intenthq.action_processor.integrations.feeds.{FeedContext, SQLFeed}
 import com.intenthq.action_processor.integrations.serializations.csv.CsvSerialization
-import com.intenthq.action_processor.integrationsV2.aggregations.NoAggregate
-import com.intenthq.action_processor.integrationsV2.feeds.{FeedContext, SQLFeed}
 import doobie.h2.H2Transactor
-import doobie.implicits._
-import doobie.implicits.javatime._
+import doobie.implicits.{toConnectionIOOps, toSqlInterpolator}
 import doobie.util.query.Query0
 import doobie.util.transactor.Transactor
 import doobie.util.update.Update
+import doobie.implicits.javatime._
 import weaver.IOSuite
 
 import scala.concurrent.ExecutionContextExecutor
diff --git a/src/test/scala/com/intenthq/action_processor/integrations/serializations/csv/CsvSerializationSpec.scala b/src/test/scala/com/intenthq/action_processor/integrations/serializations/csv/CsvSerializationSpec.scala
@@ -4,6 +4,7 @@ import java.nio.charset.StandardCharsets
 import java.time._
 
 import cats.implicits._
+import com.intenthq.action_processor.integrations.serializations.csv.{Csv, CsvSerialization}
 import weaver.{Expectations, SimpleIOSuite}
 
 object CsvSerializationSpec extends SimpleIOSuite {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.intenthq.action_processor.integrationsV2.config`
	`1`	`+package com.intenthq.action_processor.integrations.config`
`2`	`2`
`3`	`3`	`import java.nio.file.Path`
`4`	`4`