Scala Common Enrich: extend PII Enrichment to include identification …

…events in EnrichedEvent (closes #3580)
snowplow · May 23, 2018 · 31f331b · 31f331b
1 parent 9b67ff4
commit 31f331b
Show file tree

Hide file tree

Showing 12 changed files with 806 additions and 478 deletions.
diff --git a/3-enrich/scala-common-enrich/.scalafmt.conf b/3-enrich/scala-common-enrich/.scalafmt.conf
@@ -12,4 +12,4 @@ rewrite.rules = [
   RedundantParens,
   PreferCurlyFors
 ]
-align.tokens = ["|", "!", "!!", "||", "=>", "=", "->", "<-", "|@|", "//", "~", "/", "+"]
+align.tokens = ["|", "!", "!!", "||", "=>", "=", "->", "<-", "|@|", "//", "/", "+"]
diff --git a/...n/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/EnrichmentRegistry.scala b/...n/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/EnrichmentRegistry.scala
@@ -47,7 +47,6 @@ import registry.{
   IpLookupsEnrichment,
   JavascriptScriptEnrichment,
   JavascriptScriptEnrichmentConfig,
-  PiiPseudonymizerEnrichment,
   RefererParserEnrichment,
   UaParserEnrichment,
   UaParserEnrichmentConfig,
@@ -57,6 +56,7 @@ import registry.{
   WeatherEnrichmentConfig
 }
 import registry.apirequest.{ApiRequestEnrichment, ApiRequestEnrichmentConfig}
+import registry.pii.PiiPseudonymizerEnrichment
 import registry.sqlquery.{SqlQueryEnrichment, SqlQueryEnrichmentConfig}
 
 import utils.ScalazJson4sUtils

diff --git a/...m.snowplowanalytics.snowplow.enrich/common/enrichments/registry/IpLookupsEnrichment.scala b/...m.snowplowanalytics.snowplow.enrich/common/enrichments/registry/IpLookupsEnrichment.scala
@@ -51,7 +51,7 @@ import utils.ScalazJson4sUtils
  */
 object IpLookupsEnrichment extends ParseableEnrichment {
 
-  val supportedSchema = SchemaCriterion("com.snowplowanalytics.snowplow", "ip_lookups", "jsonschema", 2, 0)
+  val supportedSchema  = SchemaCriterion("com.snowplowanalytics.snowplow", "ip_lookups", "jsonschema", 2, 0)
 
   /**
    * Creates an IpLookupsEnrichment instance from a JValue.