Port JSON Schema validation to Common Enrich from Shred (snowplow/sno…

…wplow#1637)
snowplow · Sep 5, 2017 · 68129bd · 68129bd
1 parent 52ed287
commit 68129bd
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 488 deletions.
diff --git a/shredder/src/main/scala/com.snowplowanalytics.snowplow.enrich/hadoop/ShredJob.scala b/shredder/src/main/scala/com.snowplowanalytics.snowplow.enrich/hadoop/ShredJob.scala
@@ -33,6 +33,7 @@ import com.twitter.scalding._
 import common._
 import common.FatalEtlError
 import common.outputs.BadRow
+import common.utils.Shredder
 
 // Iglu Scala Client
 import iglu.client.{
@@ -44,7 +45,6 @@ import iglu.client.validation.ProcessingMessageMethods._
 
 // This project
 import inputs.EnrichedEventLoader
-import shredder.Shredder
 import outputs.{
   ShreddedPartition => UrShreddedPartition
 }

diff --git a/shredder/src/main/scala/com.snowplowanalytics.snowplow.enrich/hadoop/shredder/Shredder.scala b/shredder/src/main/scala/com.snowplowanalytics.snowplow.enrich/hadoop/shredder/Shredder.scala
diff --git a/.../src/main/scala/com.snowplowanalytics.snowplow.enrich/hadoop/shredder/TypeHierarchy.scala b/.../src/main/scala/com.snowplowanalytics.snowplow.enrich/hadoop/shredder/TypeHierarchy.scala
diff --git a/shredder/src/main/scala/com.snowplowanalytics.snowplow.enrich/package.scala b/shredder/src/main/scala/com.snowplowanalytics.snowplow.enrich/package.scala
@@ -42,14 +42,4 @@ package object hadoop {
   type Validated[A] = Validation[ProcessingMessage, A]
   type ValidatedNel[A] = ValidationNel[ProcessingMessage, A]
 
-  /**
-   * A (possibly empty) list of JsonNodes
-   */
-  type JsonNodes = List[JsonNode]
-
-  /**
-   * A (possibly empty) list of JsonSchemaPairs
-   */
-  type JsonSchemaPairs = List[JsonSchemaPair]
-
 }