change private scope to predictionio
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/d7c14178 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/d7c14178 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/d7c14178 Branch: refs/heads/develop Commit: d7c14178d14610d69cb3453a49c7dc830db98d07 Parents: 6d160b6 Author: Xusen Yin <[email protected]> Authored: Thu Jul 7 17:05:48 2016 -0700 Committer: Xusen Yin <[email protected]> Committed: Thu Jul 7 17:05:48 2016 -0700 ---------------------------------------------------------------------- .../apache/predictionio/controller/Engine.scala | 6 ++-- .../predictionio/workflow/FakeWorkflow.scala | 6 ++-- .../predictionio/workflow/WorkflowUtils.scala | 2 +- .../org/apache/predictionio/data/Utils.scala | 2 +- .../apache/predictionio/data/api/Webhooks.scala | 2 +- .../data/api/WebhooksConnectors.scala | 2 +- .../predictionio/data/storage/BiMap.scala | 2 +- .../predictionio/data/storage/LEvents.scala | 18 +++++----- .../data/storage/PEventAggregator.scala | 14 ++++---- .../predictionio/data/storage/Storage.scala | 24 ++++++------- .../predictionio/data/storage/Utils.scala | 2 +- .../data/storage/jdbc/JDBCLEvents.scala | 2 +- .../apache/predictionio/data/store/Common.scala | 2 +- .../predictionio/data/view/PBatchView.scala | 12 +++---- .../data/webhooks/ConnectorException.scala | 2 +- .../data/webhooks/ConnectorUtil.scala | 2 +- .../data/webhooks/FormConnector.scala | 2 +- .../data/webhooks/JsonConnector.scala | 2 +- .../exampleform/ExampleFormConnector.scala | 2 +- .../examplejson/ExampleJsonConnector.scala | 2 +- .../webhooks/mailchimp/MailChimpConnector.scala | 2 +- .../webhooks/segmentio/SegmentIOConnector.scala | 38 ++++++++++---------- 22 files changed, 74 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/core/src/main/scala/org/apache/predictionio/controller/Engine.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/predictionio/controller/Engine.scala b/core/src/main/scala/org/apache/predictionio/controller/Engine.scala index c875a9f..1bc177a 100644 --- a/core/src/main/scala/org/apache/predictionio/controller/Engine.scala +++ b/core/src/main/scala/org/apache/predictionio/controller/Engine.scala @@ -85,7 +85,7 @@ class Engine[TD, EI, PD, Q, P, A]( val servingClassMap: Map[String, Class[_ <: BaseServing[Q, P]]]) extends BaseEngine[EI, Q, P, A] { - private[prediction] + private[predictionio] implicit lazy val formats = Utils.json4sDefaultFormats + new NameParamsSerializer @@ -192,7 +192,7 @@ class Engine[TD, EI, PD, Q, P, A]( * possible that models are not persisted. This method retrains non-persisted * models and return a list of models that can be used directly in deploy. */ - private[prediction] + private[predictionio] def prepareDeploy( sc: SparkContext, engineParams: EngineParams, @@ -416,7 +416,7 @@ class Engine[TD, EI, PD, Q, P, A]( servingParams = servingParams) } - private[prediction] def engineInstanceToEngineParams( + private[predictionio] def engineInstanceToEngineParams( engineInstance: EngineInstance, jsonExtractor: JsonExtractorOption): EngineParams = { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala b/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala index f11ea2e..c980b97 100644 --- a/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala +++ b/core/src/main/scala/org/apache/predictionio/workflow/FakeWorkflow.scala @@ -27,7 +27,7 @@ import org.apache.spark.rdd.RDD @Experimental -private[prediction] class FakeEngine +private[predictionio] class FakeEngine extends BaseEngine[EmptyParams, EmptyParams, EmptyParams, EmptyParams] { @transient lazy val logger = Logger[this.type] @@ -49,7 +49,7 @@ extends BaseEngine[EmptyParams, EmptyParams, EmptyParams, EmptyParams] { } @Experimental -private[prediction] class FakeRunner(f: (SparkContext => Unit)) +private[predictionio] class FakeRunner(f: (SparkContext => Unit)) extends BaseEvaluator[EmptyParams, EmptyParams, EmptyParams, EmptyParams, FakeEvalResult] { @transient private lazy val logger = Logger[this.type] @@ -65,7 +65,7 @@ private[prediction] class FakeRunner(f: (SparkContext => Unit)) } @Experimental -private[prediction] case class FakeEvalResult() extends BaseEvaluatorResult { +private[predictionio] case class FakeEvalResult() extends BaseEvaluatorResult { override val noSave: Boolean = true } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/core/src/main/scala/org/apache/predictionio/workflow/WorkflowUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/predictionio/workflow/WorkflowUtils.scala b/core/src/main/scala/org/apache/predictionio/workflow/WorkflowUtils.scala index e26b754..cd80fd9 100644 --- a/core/src/main/scala/org/apache/predictionio/workflow/WorkflowUtils.scala +++ b/core/src/main/scala/org/apache/predictionio/workflow/WorkflowUtils.scala @@ -211,7 +211,7 @@ object WorkflowUtils extends Logging { */ def javaObjectToJValue(params: AnyRef): JValue = parse(gson.toJson(params)) - private[prediction] def checkUpgrade( + private[predictionio] def checkUpgrade( component: String = "core", engine: String = ""): Unit = { val runner = new Thread(new UpgradeCheckRunner(component, engine)) http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/Utils.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/Utils.scala b/data/src/main/scala/org/apache/predictionio/data/Utils.scala index db8c7a2..11816b4 100644 --- a/data/src/main/scala/org/apache/predictionio/data/Utils.scala +++ b/data/src/main/scala/org/apache/predictionio/data/Utils.scala @@ -20,7 +20,7 @@ import org.joda.time.format.ISODateTimeFormat import java.lang.IllegalArgumentException -private[prediction] object Utils { +private[predictionio] object Utils { // use dateTime() for strict ISO8601 format val dateTimeFormatter = ISODateTimeFormat.dateTime().withOffsetParsed() http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/api/Webhooks.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/api/Webhooks.scala b/data/src/main/scala/org/apache/predictionio/data/api/Webhooks.scala index 04ff78f..7347dcb 100644 --- a/data/src/main/scala/org/apache/predictionio/data/api/Webhooks.scala +++ b/data/src/main/scala/org/apache/predictionio/data/api/Webhooks.scala @@ -39,7 +39,7 @@ import akka.actor.ActorSelection import scala.concurrent.{ExecutionContext, Future} -private[prediction] object Webhooks { +private[predictionio] object Webhooks { def postJson( appId: Int, http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/api/WebhooksConnectors.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/api/WebhooksConnectors.scala b/data/src/main/scala/org/apache/predictionio/data/api/WebhooksConnectors.scala index c2578ee..9fc6a7f 100644 --- a/data/src/main/scala/org/apache/predictionio/data/api/WebhooksConnectors.scala +++ b/data/src/main/scala/org/apache/predictionio/data/api/WebhooksConnectors.scala @@ -21,7 +21,7 @@ import org.apache.predictionio.data.webhooks.FormConnector import org.apache.predictionio.data.webhooks.segmentio.SegmentIOConnector import org.apache.predictionio.data.webhooks.mailchimp.MailChimpConnector -private[prediction] object WebhooksConnectors { +private[predictionio] object WebhooksConnectors { val json: Map[String, JsonConnector] = Map( "segmentio" -> SegmentIOConnector http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/storage/BiMap.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/storage/BiMap.scala b/data/src/main/scala/org/apache/predictionio/data/storage/BiMap.scala index ad845b3..3236b99 100644 --- a/data/src/main/scala/org/apache/predictionio/data/storage/BiMap.scala +++ b/data/src/main/scala/org/apache/predictionio/data/storage/BiMap.scala @@ -22,7 +22,7 @@ import org.apache.spark.rdd.RDD /** Immutable Bi-directional Map * */ -class BiMap[K, V] private[prediction] ( +class BiMap[K, V] private[predictionio] ( private val m: Map[K, V], private val i: Option[BiMap[V, K]] = None ) extends Serializable { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/storage/LEvents.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/storage/LEvents.scala b/data/src/main/scala/org/apache/predictionio/data/storage/LEvents.scala index d6e753c..519af2c 100644 --- a/data/src/main/scala/org/apache/predictionio/data/storage/LEvents.scala +++ b/data/src/main/scala/org/apache/predictionio/data/storage/LEvents.scala @@ -188,7 +188,7 @@ trait LEvents { * @param ec ExecutionContext * @return Future[Map[String, PropertyMap]] */ - private[prediction] def futureAggregateProperties( + private[predictionio] def futureAggregateProperties( appId: Int, channelId: Option[Int] = None, entityType: String, @@ -231,7 +231,7 @@ trait LEvents { * @return Future[Option[PropertyMap]] */ @Experimental - private[prediction] def futureAggregatePropertiesOfEntity( + private[predictionio] def futureAggregatePropertiesOfEntity( appId: Int, channelId: Option[Int] = None, entityType: String, @@ -253,21 +253,21 @@ trait LEvents { } // following is blocking - private[prediction] def insert(event: Event, appId: Int, + private[predictionio] def insert(event: Event, appId: Int, channelId: Option[Int] = None, timeout: Duration = defaultTimeout)(implicit ec: ExecutionContext): String = { Await.result(futureInsert(event, appId, channelId), timeout) } - private[prediction] def get(eventId: String, appId: Int, + private[predictionio] def get(eventId: String, appId: Int, channelId: Option[Int] = None, timeout: Duration = defaultTimeout)(implicit ec: ExecutionContext): Option[Event] = { Await.result(futureGet(eventId, appId, channelId), timeout) } - private[prediction] def delete(eventId: String, appId: Int, + private[predictionio] def delete(eventId: String, appId: Int, channelId: Option[Int] = None, timeout: Duration = defaultTimeout)(implicit ec: ExecutionContext): Boolean = { @@ -299,7 +299,7 @@ trait LEvents { * @param ec ExecutionContext * @return Iterator[Event] */ - private[prediction] def find( + private[predictionio] def find( appId: Int, channelId: Option[Int] = None, startTime: Option[DateTime] = None, @@ -329,7 +329,7 @@ trait LEvents { // NOTE: remove in next release @deprecated("Use find() instead.", "0.9.2") - private[prediction] def findLegacy( + private[predictionio] def findLegacy( appId: Int, channelId: Option[Int] = None, startTime: Option[DateTime] = None, @@ -431,7 +431,7 @@ trait LEvents { * @param ec ExecutionContext * @return Map[String, PropertyMap] */ - private[prediction] def aggregateProperties( + private[predictionio] def aggregateProperties( appId: Int, channelId: Option[Int] = None, entityType: String, @@ -467,7 +467,7 @@ trait LEvents { * @return Future[Option[PropertyMap]] */ @Experimental - private[prediction] def aggregatePropertiesOfEntity( + private[predictionio] def aggregatePropertiesOfEntity( appId: Int, channelId: Option[Int] = None, entityType: String, http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/storage/PEventAggregator.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/storage/PEventAggregator.scala b/data/src/main/scala/org/apache/predictionio/data/storage/PEventAggregator.scala index 72287dd..7b946ab 100644 --- a/data/src/main/scala/org/apache/predictionio/data/storage/PEventAggregator.scala +++ b/data/src/main/scala/org/apache/predictionio/data/storage/PEventAggregator.scala @@ -24,10 +24,10 @@ import org.apache.spark.SparkContext._ import org.apache.spark.rdd.RDD // each JValue data associated with the time it is set -private[prediction] case class PropTime(val d: JValue, val t: Long) +private[predictionio] case class PropTime(val d: JValue, val t: Long) extends Serializable -private[prediction] case class SetProp ( +private[predictionio] case class SetProp ( val fields: Map[String, PropTime], // last set time. Note: fields could be empty with valid set time val t: Long) extends Serializable { @@ -56,7 +56,7 @@ private[prediction] case class SetProp ( } } -private[prediction] case class UnsetProp (fields: Map[String, Long]) +private[predictionio] case class UnsetProp (fields: Map[String, Long]) extends Serializable { def ++ (that: UnsetProp): UnsetProp = { val commonKeys = fields.keySet.intersect(that.fields.keySet) @@ -78,13 +78,13 @@ private[prediction] case class UnsetProp (fields: Map[String, Long]) } } -private[prediction] case class DeleteEntity (t: Long) extends Serializable { +private[predictionio] case class DeleteEntity (t: Long) extends Serializable { def ++ (that: DeleteEntity): DeleteEntity = { if (this.t > that.t) this else that } } -private[prediction] case class EventOp ( +private[predictionio] case class EventOp ( val setProp: Option[SetProp] = None, val unsetProp: Option[UnsetProp] = None, val deleteEntity: Option[DeleteEntity] = None, @@ -149,7 +149,7 @@ private[prediction] case class EventOp ( } -private[prediction] object EventOp { +private[predictionio] object EventOp { // create EventOp from Event object def apply(e: Event): EventOp = { val t = e.eventTime.getMillis @@ -188,7 +188,7 @@ private[prediction] object EventOp { } -private[prediction] object PEventAggregator { +private[predictionio] object PEventAggregator { val eventNames = List("$set", "$unset", "$delete") http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/storage/Storage.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/storage/Storage.scala b/data/src/main/scala/org/apache/predictionio/data/storage/Storage.scala index 1f170be..6c150e7 100644 --- a/data/src/main/scala/org/apache/predictionio/data/storage/Storage.scala +++ b/data/src/main/scala/org/apache/predictionio/data/storage/Storage.scala @@ -89,7 +89,7 @@ class StorageClientException(message: String, cause: Throwable) extends RuntimeException(message, cause) @deprecated("Use StorageException", "0.9.2") -private[prediction] case class StorageError(message: String) +private[predictionio] case class StorageError(message: String) /** :: DeveloperApi :: * Thrown by data access objects when they run into exceptional conditions @@ -255,7 +255,7 @@ object Storage extends Logging { } } - private[prediction] + private[predictionio] def getDataObjectFromRepo[T](repo: String, test: Boolean = false) (implicit tag: TypeTag[T]): T = { val repoDOMeta = repositoriesToDataObjectMeta(repo) @@ -263,14 +263,14 @@ object Storage extends Logging { getDataObject[T](repoDOSourceName, repoDOMeta.namespace, test = test) } - private[prediction] + private[predictionio] def getPDataObject[T](repo: String)(implicit tag: TypeTag[T]): T = { val repoDOMeta = repositoriesToDataObjectMeta(repo) val repoDOSourceName = repoDOMeta.sourceName getPDataObject[T](repoDOSourceName, repoDOMeta.namespace) } - private[prediction] def getDataObject[T]( + private[predictionio] def getDataObject[T]( sourceName: String, namespace: String, parallel: Boolean = false, @@ -332,7 +332,7 @@ object Storage extends Logging { Seq(client.client, client.config, namespace) } - private[prediction] def verifyAllDataObjects(): Unit = { + private[predictionio] def verifyAllDataObjects(): Unit = { info("Verifying Meta Data Backend (Source: " + s"${repositoriesToDataObjectMeta(MetaDataRepository).sourceName})...") getMetaDataEngineManifests() @@ -357,25 +357,25 @@ object Storage extends Logging { eventsDb.close() } - private[prediction] def getMetaDataEngineManifests(): EngineManifests = + private[predictionio] def getMetaDataEngineManifests(): EngineManifests = getDataObjectFromRepo[EngineManifests](MetaDataRepository) - private[prediction] def getMetaDataEngineInstances(): EngineInstances = + private[predictionio] def getMetaDataEngineInstances(): EngineInstances = getDataObjectFromRepo[EngineInstances](MetaDataRepository) - private[prediction] def getMetaDataEvaluationInstances(): EvaluationInstances = + private[predictionio] def getMetaDataEvaluationInstances(): EvaluationInstances = getDataObjectFromRepo[EvaluationInstances](MetaDataRepository) - private[prediction] def getMetaDataApps(): Apps = + private[predictionio] def getMetaDataApps(): Apps = getDataObjectFromRepo[Apps](MetaDataRepository) - private[prediction] def getMetaDataAccessKeys(): AccessKeys = + private[predictionio] def getMetaDataAccessKeys(): AccessKeys = getDataObjectFromRepo[AccessKeys](MetaDataRepository) - private[prediction] def getMetaDataChannels(): Channels = + private[predictionio] def getMetaDataChannels(): Channels = getDataObjectFromRepo[Channels](MetaDataRepository) - private[prediction] def getModelDataModels(): Models = + private[predictionio] def getModelDataModels(): Models = getDataObjectFromRepo[Models](ModelDataRepository) /** Obtains a data access object that returns [[Event]] related local data http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/storage/Utils.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/storage/Utils.scala b/data/src/main/scala/org/apache/predictionio/data/storage/Utils.scala index 321b245..c11d08c 100644 --- a/data/src/main/scala/org/apache/predictionio/data/storage/Utils.scala +++ b/data/src/main/scala/org/apache/predictionio/data/storage/Utils.scala @@ -19,7 +19,7 @@ import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat /** Backend-agnostic storage utilities. */ -private[prediction] object Utils { +private[predictionio] object Utils { /** * Add prefix to custom attribute keys. */ http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCLEvents.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCLEvents.scala b/data/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCLEvents.scala index 945879c..e048dc4 100644 --- a/data/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCLEvents.scala +++ b/data/src/main/scala/org/apache/predictionio/data/storage/jdbc/JDBCLEvents.scala @@ -220,7 +220,7 @@ class JDBCLEvents( } } - private[prediction] def resultToEvent(rs: WrappedResultSet): Event = { + private[predictionio] def resultToEvent(rs: WrappedResultSet): Event = { Event( eventId = rs.stringOpt("id"), event = rs.string("event"), http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/store/Common.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/store/Common.scala b/data/src/main/scala/org/apache/predictionio/data/store/Common.scala index 81b4b28..b86ebce 100644 --- a/data/src/main/scala/org/apache/predictionio/data/store/Common.scala +++ b/data/src/main/scala/org/apache/predictionio/data/store/Common.scala @@ -18,7 +18,7 @@ package org.apache.predictionio.data.store import org.apache.predictionio.data.storage.Storage import grizzled.slf4j.Logger -private[prediction] object Common { +private[predictionio] object Common { @transient lazy val logger = Logger[this.type] @transient lazy private val appsDb = Storage.getMetaDataApps() http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/view/PBatchView.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/view/PBatchView.scala b/data/src/main/scala/org/apache/predictionio/data/view/PBatchView.scala index 6c75402..4cf32cd 100644 --- a/data/src/main/scala/org/apache/predictionio/data/view/PBatchView.scala +++ b/data/src/main/scala/org/apache/predictionio/data/view/PBatchView.scala @@ -31,9 +31,9 @@ import org.apache.spark.rdd.RDD // each JValue data associated with the time it is set -private[prediction] case class PropTime(val d: JValue, val t: Long) extends Serializable +private[predictionio] case class PropTime(val d: JValue, val t: Long) extends Serializable -private[prediction] case class SetProp ( +private[predictionio] case class SetProp ( val fields: Map[String, PropTime], // last set time. Note: fields could be empty with valid set time val t: Long) extends Serializable { @@ -62,7 +62,7 @@ private[prediction] case class SetProp ( } } -private[prediction] case class UnsetProp (fields: Map[String, Long]) extends Serializable { +private[predictionio] case class UnsetProp (fields: Map[String, Long]) extends Serializable { def ++ (that: UnsetProp): UnsetProp = { val commonKeys = fields.keySet.intersect(that.fields.keySet) @@ -83,13 +83,13 @@ private[prediction] case class UnsetProp (fields: Map[String, Long]) extends Ser } } -private[prediction] case class DeleteEntity (t: Long) extends Serializable { +private[predictionio] case class DeleteEntity (t: Long) extends Serializable { def ++ (that: DeleteEntity): DeleteEntity = { if (this.t > that.t) this else that } } -private[prediction] case class EventOp ( +private[predictionio] case class EventOp ( val setProp: Option[SetProp] = None, val unsetProp: Option[UnsetProp] = None, val deleteEntity: Option[DeleteEntity] = None @@ -133,7 +133,7 @@ private[prediction] case class EventOp ( } -private[prediction] object EventOp { +private[predictionio] object EventOp { def apply(e: Event): EventOp = { val t = e.eventTime.getMillis e.event match { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorException.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorException.scala b/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorException.scala index ee47a9c..a895e7d 100644 --- a/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorException.scala +++ b/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorException.scala @@ -20,7 +20,7 @@ package org.apache.predictionio.data.webhooks * @param message the detail message * @param cause the cause */ -private[prediction] class ConnectorException(message: String, cause: Throwable) +private[predictionio] class ConnectorException(message: String, cause: Throwable) extends Exception(message, cause) { /** Webhooks Connnector Exception with cause being set to null http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorUtil.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorUtil.scala b/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorUtil.scala index 40feb98..c77c138 100644 --- a/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorUtil.scala +++ b/data/src/main/scala/org/apache/predictionio/data/webhooks/ConnectorUtil.scala @@ -25,7 +25,7 @@ import org.json4s.native.Serialization.read import org.json4s.native.Serialization.write -private[prediction] object ConnectorUtil { +private[predictionio] object ConnectorUtil { implicit val eventJson4sFormats: Formats = DefaultFormats + new EventJson4sSupport.APISerializer http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/webhooks/FormConnector.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/webhooks/FormConnector.scala b/data/src/main/scala/org/apache/predictionio/data/webhooks/FormConnector.scala index dd04a21..74a79e3 100644 --- a/data/src/main/scala/org/apache/predictionio/data/webhooks/FormConnector.scala +++ b/data/src/main/scala/org/apache/predictionio/data/webhooks/FormConnector.scala @@ -19,7 +19,7 @@ import org.json4s.JObject /** Connector for Webhooks connection with Form submission data format */ -private[prediction] trait FormConnector { +private[predictionio] trait FormConnector { // TODO: support conversion to multiple events? http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/webhooks/JsonConnector.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/webhooks/JsonConnector.scala b/data/src/main/scala/org/apache/predictionio/data/webhooks/JsonConnector.scala index eda8059..04cebbf 100644 --- a/data/src/main/scala/org/apache/predictionio/data/webhooks/JsonConnector.scala +++ b/data/src/main/scala/org/apache/predictionio/data/webhooks/JsonConnector.scala @@ -18,7 +18,7 @@ package org.apache.predictionio.data.webhooks import org.json4s.JObject /** Connector for Webhooks connection */ -private[prediction] trait JsonConnector { +private[predictionio] trait JsonConnector { // TODO: support conversion to multiple events? http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/webhooks/exampleform/ExampleFormConnector.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/webhooks/exampleform/ExampleFormConnector.scala b/data/src/main/scala/org/apache/predictionio/data/webhooks/exampleform/ExampleFormConnector.scala index adf8791..14667b0 100644 --- a/data/src/main/scala/org/apache/predictionio/data/webhooks/exampleform/ExampleFormConnector.scala +++ b/data/src/main/scala/org/apache/predictionio/data/webhooks/exampleform/ExampleFormConnector.scala @@ -49,7 +49,7 @@ import org.json4s.JObject * "timestamp"="2015-01-15T04:20:23.567Z" * */ -private[prediction] object ExampleFormConnector extends FormConnector { +private[predictionio] object ExampleFormConnector extends FormConnector { override def toEventJson(data: Map[String, String]): JObject = { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/webhooks/examplejson/ExampleJsonConnector.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/webhooks/examplejson/ExampleJsonConnector.scala b/data/src/main/scala/org/apache/predictionio/data/webhooks/examplejson/ExampleJsonConnector.scala index 2129134..204a3c4 100644 --- a/data/src/main/scala/org/apache/predictionio/data/webhooks/examplejson/ExampleJsonConnector.scala +++ b/data/src/main/scala/org/apache/predictionio/data/webhooks/examplejson/ExampleJsonConnector.scala @@ -57,7 +57,7 @@ import org.json4s.JObject * "timestamp": "2015-01-15T04:20:23.567Z" * } */ -private[prediction] object ExampleJsonConnector extends JsonConnector { +private[predictionio] object ExampleJsonConnector extends JsonConnector { implicit val json4sFormats: Formats = DefaultFormats http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnector.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnector.scala b/data/src/main/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnector.scala index abf8a7f..3c4d32f 100644 --- a/data/src/main/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnector.scala +++ b/data/src/main/scala/org/apache/predictionio/data/webhooks/mailchimp/MailChimpConnector.scala @@ -26,7 +26,7 @@ import org.json4s.JObject import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat -private[prediction] object MailChimpConnector extends FormConnector { +private[predictionio] object MailChimpConnector extends FormConnector { override def toEventJson(data: Map[String, String]): JObject = { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d7c14178/data/src/main/scala/org/apache/predictionio/data/webhooks/segmentio/SegmentIOConnector.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/webhooks/segmentio/SegmentIOConnector.scala b/data/src/main/scala/org/apache/predictionio/data/webhooks/segmentio/SegmentIOConnector.scala index b7548b0..99ecb90 100644 --- a/data/src/main/scala/org/apache/predictionio/data/webhooks/segmentio/SegmentIOConnector.scala +++ b/data/src/main/scala/org/apache/predictionio/data/webhooks/segmentio/SegmentIOConnector.scala @@ -18,7 +18,7 @@ package org.apache.predictionio.data.webhooks.segmentio import org.apache.predictionio.data.webhooks.{ConnectorException, JsonConnector} import org.json4s._ -private[prediction] object SegmentIOConnector extends JsonConnector { +private[predictionio] object SegmentIOConnector extends JsonConnector { // private lazy val supportedAPI = Vector("2", "2.0", "2.0.0") @@ -183,29 +183,29 @@ private[prediction] object SegmentIOConnector extends JsonConnector { object Events { - private[prediction] case class Track( + private[predictionio] case class Track( event: String, properties: Option[JObject] = None ) - private[prediction] case class Alias(previous_id: String, user_id: String) + private[predictionio] case class Alias(previous_id: String, user_id: String) - private[prediction] case class Group( + private[predictionio] case class Group( group_id: String, traits: Option[JObject] = None ) - private[prediction] case class Screen( + private[predictionio] case class Screen( name: Option[String] = None, properties: Option[JObject] = None ) - private[prediction] case class Page( + private[predictionio] case class Page( name: Option[String] = None, properties: Option[JObject] = None ) - private[prediction] case class Identify( + private[predictionio] case class Identify( user_id: String, traits: Option[JObject] ) @@ -214,14 +214,14 @@ object Events { object Common { - private[prediction] case class Integrations( + private[predictionio] case class Integrations( All: Boolean = false, Mixpanel: Boolean = false, Marketo: Boolean = false, Salesforse: Boolean = false ) - private[prediction] case class Context( + private[predictionio] case class Context( ip: String, library: Library, user_agent: String, @@ -236,13 +236,13 @@ object Common { timezone: Option[String] = None ) - private[prediction] case class Screen(width: Int, height: Int, density: Int) + private[predictionio] case class Screen(width: Int, height: Int, density: Int) - private[prediction] case class Referrer(id: String, `type`: String) + private[predictionio] case class Referrer(id: String, `type`: String) - private[prediction] case class OS(name: String, version: String) + private[predictionio] case class OS(name: String, version: String) - private[prediction] case class Location( + private[predictionio] case class Location( city: Option[String] = None, country: Option[String] = None, latitude: Option[Double] = None, @@ -258,16 +258,16 @@ object Common { url: String ) - private[prediction] case class Network( + private[predictionio] case class Network( bluetooth: Option[Boolean] = None, carrier: Option[String] = None, cellular: Option[Boolean] = None, wifi: Option[Boolean] = None ) - private[prediction] case class Library(name: String, version: String) + private[predictionio] case class Library(name: String, version: String) - private[prediction] case class Device( + private[predictionio] case class Device( id: Option[String] = None, advertising_id: Option[String] = None, ad_tracking_enabled: Option[Boolean] = None, @@ -278,7 +278,7 @@ object Common { token: Option[String] = None ) - private[prediction] case class Campaign( + private[predictionio] case class Campaign( name: Option[String] = None, source: Option[String] = None, medium: Option[String] = None, @@ -286,7 +286,7 @@ object Common { content: Option[String] = None ) - private[prediction] case class App( + private[predictionio] case class App( name: Option[String] = None, version: Option[String] = None, build: Option[String] = None @@ -294,7 +294,7 @@ object Common { } -private[prediction] case class Common( +private[predictionio] case class Common( `type`: String, sent_at: String, timestamp: String,
