Repository: incubator-griffin Updated Branches: refs/heads/master ddff93bf0 -> 6c969e801
utilize some trivial scala code using native libraries Hi, I found that some of Scala codes here are not not standardized enough. Please have a review Author: zornlemma <[email protected]> Closes #259 from zornlemma/master. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/6c969e80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/6c969e80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/6c969e80 Branch: refs/heads/master Commit: 6c969e8019d20f47f1f5b674efa7f418376dabd2 Parents: ddff93b Author: zornlemma <[email protected]> Authored: Tue Apr 24 14:42:17 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Tue Apr 24 14:42:17 2018 +0800 ---------------------------------------------------------------------- .../apache/griffin/measure/config/params/user/UserParam.scala | 4 ++-- .../apache/griffin/measure/data/connector/DataConnector.scala | 2 +- .../measure/data/connector/batch/HiveBatchDataConnector.scala | 2 +- .../measure/data/connector/batch/TextDirBatchDataConnector.scala | 2 +- .../apache/griffin/measure/data/source/DataSourceFactory.scala | 4 ++-- .../scala/org/apache/griffin/measure/process/ProcessType.scala | 4 ++-- .../org/apache/griffin/measure/process/engine/DqEngines.scala | 2 +- .../scala/org/apache/griffin/measure/rule/dsl/CollectType.scala | 4 ++-- .../main/scala/org/apache/griffin/measure/rule/dsl/DqType.scala | 4 ++-- .../main/scala/org/apache/griffin/measure/rule/dsl/DslType.scala | 4 ++-- .../scala/org/apache/griffin/measure/rule/dsl/PersistType.scala | 4 ++-- .../src/main/scala/org/apache/griffin/measure/util/MailUtil.java | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/config/params/user/UserParam.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/config/params/user/UserParam.scala b/measure/src/main/scala/org/apache/griffin/measure/config/params/user/UserParam.scala index 7d8b0af..b0f7b29 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/config/params/user/UserParam.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/config/params/user/UserParam.scala @@ -41,7 +41,7 @@ case class UserParam( @JsonProperty("name") name: String, } private val baselineDsOpt = { val baselines = validDs.filter(_.isBaseLine) - if (baselines.size > 0) baselines.headOption + if (baselines.nonEmpty) baselines.headOption else validDs.headOption } @@ -58,7 +58,7 @@ case class UserParam( @JsonProperty("name") name: String, } override def validate(): Boolean = { - dataSources.size > 0 + dataSources.nonEmpty } } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/data/connector/DataConnector.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/data/connector/DataConnector.scala b/measure/src/main/scala/org/apache/griffin/measure/data/connector/DataConnector.scala index ea35204..79d4250 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/data/connector/DataConnector.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/data/connector/DataConnector.scala @@ -115,7 +115,7 @@ trait DataConnector extends Loggable with Serializable { } } catch { case e: Throwable => { - error(s"preporcess of data connector [${id}] error: ${e.getMessage}") + error(s"pre-process of data connector [${id}] error: ${e.getMessage}") None } } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/HiveBatchDataConnector.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/HiveBatchDataConnector.scala b/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/HiveBatchDataConnector.scala index 2c9747e..5632bfc 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/HiveBatchDataConnector.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/HiveBatchDataConnector.scala @@ -147,7 +147,7 @@ case class HiveBatchDataConnector(sqlContext: SQLContext, dqEngines: DqEngines, private def dataSql(): String = { val tableClause = s"SELECT * FROM ${concreteTableName}" - if (wheres.size > 0) { + if (wheres.length > 0) { val clauses = wheres.map { w => s"${tableClause} WHERE ${w}" } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala b/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala index fe8d386..769a20f 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/data/connector/batch/TextDirBatchDataConnector.scala @@ -55,7 +55,7 @@ case class TextDirBatchDataConnector(sqlContext: SQLContext, dqEngines: DqEngine val validDataDirs = dataDirs.filter(dir => !emptyDir(dir)) - if (validDataDirs.size > 0) { + if (validDataDirs.nonEmpty) { val df = sqlContext.read.text(validDataDirs: _*) val dfOpt = Some(df) val preDfOpt = preProcess(dfOpt, ms) http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSourceFactory.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSourceFactory.scala b/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSourceFactory.scala index e18c852..831e990 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSourceFactory.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/data/source/DataSourceFactory.scala @@ -67,8 +67,8 @@ object DataSourceFactory extends Loggable { (seq :+ dsParam, names + dsParam.name) } else ret } - if (validDsParams.size > 0) { - val baselineDsParam = validDsParams.filter(_.isBaseLine).headOption.getOrElse(validDsParams.head) + if (validDsParams.nonEmpty) { + val baselineDsParam = validDsParams.find(_.isBaseLine).getOrElse(validDsParams.head) validDsParams.map { dsParam => if (dsParam.name != baselineDsParam.name && dsParam.isBaseLine) { dsParam.falseBaselineClone http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/process/ProcessType.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/process/ProcessType.scala b/measure/src/main/scala/org/apache/griffin/measure/process/ProcessType.scala index 36f88e1..9f9e424 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/process/ProcessType.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/process/ProcessType.scala @@ -28,10 +28,10 @@ sealed trait ProcessType { object ProcessType { private val procTypes: List[ProcessType] = List(BatchProcessType, StreamingProcessType) def apply(ptn: String): ProcessType = { - procTypes.filter(tp => ptn match { + procTypes.find(tp => ptn match { case tp.regex() => true case _ => false - }).headOption.getOrElse(BatchProcessType) + }).getOrElse(BatchProcessType) } def unapply(pt: ProcessType): Option[String] = Some(pt.desc) } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/process/engine/DqEngines.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/process/engine/DqEngines.scala b/measure/src/main/scala/org/apache/griffin/measure/process/engine/DqEngines.scala index 6b9a215..0be33af 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/process/engine/DqEngines.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/process/engine/DqEngines.scala @@ -215,7 +215,7 @@ case class DqEngines(engines: Seq[DqEngine]) extends DqEngine { val dsName = dsUpdate.dsName collectUpdateDf(dsUpdate) match { case Some(df) => { - dataSources.filter(_.name == dsName).headOption.foreach(_.updateData(df)) + dataSources.find(_.name == dsName).foreach(_.updateData(df)) } case _ => { // do nothing http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/CollectType.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/CollectType.scala b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/CollectType.scala index 03a43d6..313c486 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/CollectType.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/CollectType.scala @@ -28,10 +28,10 @@ sealed trait CollectType { object CollectType { private val collectTypes: List[CollectType] = List(DefaultCollectType, EntriesCollectType, ArrayCollectType, MapCollectType) def apply(ptn: String): CollectType = { - collectTypes.filter(tp => ptn match { + collectTypes.find(tp => ptn match { case tp.regex() => true case _ => false - }).headOption.getOrElse(DefaultCollectType) + }).getOrElse(DefaultCollectType) } def unapply(pt: CollectType): Option[String] = Some(pt.desc) } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DqType.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DqType.scala b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DqType.scala index f6a7f85..830e319 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DqType.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DqType.scala @@ -31,10 +31,10 @@ object DqType { AccuracyType, ProfilingType, UniquenessType, DistinctnessType, TimelinessType, CompletenessType, UnknownType ) def apply(ptn: String): DqType = { - dqTypes.filter(tp => ptn match { + dqTypes.find(tp => ptn match { case tp.regex() => true case _ => false - }).headOption.getOrElse(UnknownType) + }).getOrElse(UnknownType) } def unapply(pt: DqType): Option[String] = Some(pt.desc) } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DslType.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DslType.scala b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DslType.scala index 27ab2ac..dd2b1c7 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DslType.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/DslType.scala @@ -29,10 +29,10 @@ sealed trait DslType { object DslType { private val dslTypes: List[DslType] = List(SparkSqlType, GriffinDslType, DfOprType) def apply(ptn: String): DslType = { - dslTypes.filter(tp => ptn match { + dslTypes.find(tp => ptn match { case tp.regex() => true case _ => false - }).headOption.getOrElse(GriffinDslType) + }).getOrElse(GriffinDslType) } def unapply(pt: DslType): Option[String] = Some(pt.desc) } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/PersistType.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/PersistType.scala b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/PersistType.scala index f2857e3..a16c571 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/PersistType.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/rule/dsl/PersistType.scala @@ -32,10 +32,10 @@ sealed trait PersistType { object PersistType { private val persistTypes: List[PersistType] = List(RecordPersistType, MetricPersistType, NonePersistType) def apply(ptn: String): PersistType = { - persistTypes.filter(tp => ptn match { + persistTypes.find(tp => ptn match { case tp.regex() => true case _ => false - }).headOption.getOrElse(NonePersistType) + }).getOrElse(NonePersistType) } def unapply(pt: PersistType): Option[String] = Some(pt.desc) } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/6c969e80/measure/src/main/scala/org/apache/griffin/measure/util/MailUtil.java ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/util/MailUtil.java b/measure/src/main/scala/org/apache/griffin/measure/util/MailUtil.java index 1d27838..6ab951b 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/util/MailUtil.java +++ b/measure/src/main/scala/org/apache/griffin/measure/util/MailUtil.java @@ -45,7 +45,7 @@ public class MailUtil { msg.setFrom(new InternetAddress(emailParam.mail())); //msg.setRecipient(Message.RecipientType.TO, new InternetAddress(UserArr)); String[] arr = null; - if (UserArr.indexOf(",") == -1) { + if (!UserArr.contains(",")) { arr = new String[]{UserArr}; } else { arr = UserArr.split(",");
