Scala Common Enrich: removed event_vendor and ue_name and renamed ue_…

…properties to unstruct_event (#836)

3-enrich/scala-common-enrich/src/main/scala/com.snowplowanalytics.snowplow.enrich/common/enrichments/EnrichmentManager.scala

@@ -136,7 +136,6 @@ object EnrichmentManager {
     // Caution: by definition, a TransformMap loses type safety. Always unit test!
     val transformMap: TransformMap =
       Map(("e"       , (EE.extractEventType, "event")),
-          ("evn"     , (ME.toTsvSafe, "event_vendor")),
           ("ip"      , (ME.toTsvSafe, "user_ipaddress")),
           ("aid"     , (ME.toTsvSafe, "app_id")),
           ("p"       , (ME.extractPlatform, "platform")),
@@ -185,9 +184,8 @@ object EnrichmentManager {
           ("se_pr"   , (ME.toTsvSafe, "se_property")),
           ("se_va"   , (CU.stringToDoublelike, "se_value")),
           // Custom unstructured events
-          ("ue_na"   , (ME.toTsvSafe, "ue_name")),
-          ("ue_pr"   , (extractUrlEncJson, "ue_properties")),
-          ("ue_px"   , (extractBase64EncJson, "ue_properties")),
+          ("ue_pr"   , (extractUrlEncJson, "unstruct_event")),
+          ("ue_px"   , (extractBase64EncJson, "unstruct_event")),
           // Ecommerce transactions
           ("tr_id"   , (ME.toTsvSafe, "tr_orderid")),
           ("tr_af"   , (ME.toTsvSafe, "tr_affiliation")),

3-enrich/scala-common-enrich/src/main/scala/com.snowplowanalytics.snowplow.enrich/common/outputs/CanonicalOutput.scala

@@ -49,7 +49,6 @@ class CanonicalOutput {
 
   // Transaction (i.e. this logging event)
   @BeanProperty var event: String = _
-  @BeanProperty var event_vendor: String = _
   @BeanProperty var event_id: String = _
   @BeanProperty var txn_id: String = _
 
@@ -119,8 +118,7 @@ class CanonicalOutput {
   @BeanProperty var se_value: String = _ // Technically should be a Double but may be rendered incorrectly by Cascading with scientific notification (which Redshift can't process)
 
   // Unstructured Event
-  @BeanProperty var ue_name: String = _
-  @BeanProperty var ue_properties: String = _
+  @BeanProperty var unstruct_event: String = _
 
   // Ecommerce transaction (from querystring)
   @BeanProperty var tr_orderid: String = _

CHANGELOG

@@ -1,6 +1,7 @@
 Version 0.9.X (2014-XX-XX)
 --------------------------
 Scala Common Enrich: stored etl_tstamp in new field in CanonicalOutput (#818)
+Scala Common Enrich: removed event_vendor and ue_name and renamed ue_properties to unstruct_event (#836)
 Redshift: bumped table-def to 0.4.0
 Redshift: added etl_tstamp to atomic.events (#819)
 Redshift: removed event_vendor and ue_name and renamed ue_properties to unstruct_event (#834)