Repository: incubator-griffin Updated Branches: refs/heads/master e8a0580ae -> ff3098ffd
2018 06 11 remove reduntant finals Author: William Guo <[email protected]> Closes #293 from guoyuepeng/2018_06_11_remove_reduntant_finals. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/ff3098ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/ff3098ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/ff3098ff Branch: refs/heads/master Commit: ff3098ffd7b5fc1332f58d781f335b6fc28fe0e4 Parents: e8a0580 Author: William Guo <[email protected]> Authored: Mon Jun 11 15:57:18 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Mon Jun 11 15:57:18 2018 +0800 ---------------------------------------------------------------------- .../griffin/measure/configuration/enums/DslType.scala | 8 ++++---- .../measure/configuration/enums/NormalizeType.scala | 10 +++++----- .../griffin/measure/configuration/enums/ProcessType.scala | 6 +++--- .../griffin/measure/configuration/enums/WriteMode.scala | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ff3098ff/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/DslType.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/DslType.scala b/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/DslType.scala index c6b68d3..d65c316 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/DslType.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/DslType.scala @@ -42,7 +42,7 @@ object DslType { /** * spark-sql: rule defined in "SPARK-SQL" directly */ -final case object SparkSqlType extends DslType { + case object SparkSqlType extends DslType { val regex = "^(?i)spark-?sql$".r val desc = "spark-sql" } @@ -50,7 +50,7 @@ final case object SparkSqlType extends DslType { /** * df-ops: data frame operations rule, support some pre-defined data frame ops */ -final case object DataFrameOpsType extends DslType { + case object DataFrameOpsType extends DslType { val regex = "^(?i)df-?(?:op|opr|ops)$".r val desc = "df-opr" } @@ -58,7 +58,7 @@ final case object DataFrameOpsType extends DslType { /** * griffin-dsl: griffin dsl rule, to define dq measurements easier */ -final case object GriffinDslType extends DslType { + case object GriffinDslType extends DslType { val regex = "^(?i)griffin-?dsl$".r val desc = "griffin-dsl" -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ff3098ff/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/NormalizeType.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/NormalizeType.scala b/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/NormalizeType.scala index d8cfcf8..df86fac 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/NormalizeType.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/NormalizeType.scala @@ -47,7 +47,7 @@ object NormalizeType { * n > 1: { "arr-name": [ { "col1": "value1", "col2": "value2", ... }, ... ] } * all rows */ -final case object DefaultNormalizeType extends NormalizeType { + case object DefaultNormalizeType extends NormalizeType { val regex: Regex = "".r val desc: String = "default" } @@ -58,7 +58,7 @@ final case object DefaultNormalizeType extends NormalizeType { * n >= 1: { "col1": "value1", "col2": "value2", ... } * the first row only */ -final case object EntriesNormalizeType extends NormalizeType { + case object EntriesNormalizeType extends NormalizeType { val regex: Regex = "^(?i)entries$".r val desc: String = "entries" } @@ -69,7 +69,7 @@ final case object EntriesNormalizeType extends NormalizeType { * n >= 1: { "arr-name": [ { "col1": "value1", "col2": "value2", ... }, ... ] } * all rows */ -final case object ArrayNormalizeType extends NormalizeType { + case object ArrayNormalizeType extends NormalizeType { val regex: Regex = "^(?i)array|list$".r val desc: String = "array" } @@ -80,7 +80,7 @@ final case object ArrayNormalizeType extends NormalizeType { * n >= 1: { "map-name": { "col1": "value1", "col2": "value2", ... } } * the first row only */ -final case object MapNormalizeType extends NormalizeType { + case object MapNormalizeType extends NormalizeType { val regex: Regex = "^(?i)map$".r val desc: String = "map" -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ff3098ff/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/ProcessType.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/ProcessType.scala b/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/ProcessType.scala index 18a82bf..4bec659 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/ProcessType.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/ProcessType.scala @@ -42,7 +42,7 @@ object ProcessType { /** * process in batch mode */ -final case object BatchProcessType extends ProcessType { + case object BatchProcessType extends ProcessType { val regex = """^(?i)batch$""".r val desc = "batch" } @@ -50,7 +50,7 @@ final case object BatchProcessType extends ProcessType { /** * process in streaming mode */ -final case object StreamingProcessType extends ProcessType { + case object StreamingProcessType extends ProcessType { val regex = """^(?i)streaming$""".r val desc = "streaming" -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ff3098ff/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/WriteMode.scala ---------------------------------------------------------------------- diff --git a/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/WriteMode.scala b/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/WriteMode.scala index fd73da3..d3935a1 100644 --- a/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/WriteMode.scala +++ b/measure/src/main/scala/org/apache/griffin/measure/configuration/enums/WriteMode.scala @@ -35,9 +35,9 @@ object WriteMode { /** * simple mode: write metrics and records directly */ -final case object SimpleMode extends WriteMode {} + case object SimpleMode extends WriteMode {} /** * timestamp mode: write metrics and records with timestamp information */ -final case object TimestampMode extends WriteMode {} \ No newline at end of file + case object TimestampMode extends WriteMode {}
