Updated Branches: refs/heads/master c512da98c -> 8028d8deb
SAMZA-68; make regex class and regex filename match Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/8028d8de Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/8028d8de Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/8028d8de Branch: refs/heads/master Commit: 8028d8deb60f94eda383c5f33eba2cd23e8553c4 Parents: c512da9 Author: Chris Riccomini <[email protected]> Authored: Fri Nov 22 09:49:54 2013 -0800 Committer: Chris Riccomini <[email protected]> Committed: Fri Nov 22 09:49:54 2013 -0800 ---------------------------------------------------------------------- .../main/scala/org/apache/samza/config/RegExTopicGenerator.scala | 2 +- .../scala/org/apache/samza/config/TestRegExTopicGenerator.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8028d8de/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala b/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala index c7c50c4..18b49a1 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala @@ -47,7 +47,7 @@ import org.apache.samza.util.Util * @see samza.config.KafkaConfig.getRegexResolvedStreams * */ -class RegexTopicGenerator extends ConfigRewriter with Logging { +class RegExTopicGenerator extends ConfigRewriter with Logging { def rewrite(rewriterName: String, config: Config): Config = { val regex = config http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8028d8de/samza-kafka/src/test/scala/org/apache/samza/config/TestRegExTopicGenerator.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/test/scala/org/apache/samza/config/TestRegExTopicGenerator.scala b/samza-kafka/src/test/scala/org/apache/samza/config/TestRegExTopicGenerator.scala index 9122848..d52a7e4 100644 --- a/samza-kafka/src/test/scala/org/apache/samza/config/TestRegExTopicGenerator.scala +++ b/samza-kafka/src/test/scala/org/apache/samza/config/TestRegExTopicGenerator.scala @@ -46,7 +46,7 @@ class TestRegExTopicGenerator { val config = new MapConfig(map) // Don't actually talk to ZooKeeper - val rewriter = new RegexTopicGenerator() { + val rewriter = new RegExTopicGenerator() { override def getTopicsFromZK(rewriterName: String, config: Config): Seq[String] = List("catdog", "dogtired", "cow", "scaredycat", "Homer", "crazycat") } @@ -77,7 +77,7 @@ class TestRegExTopicGenerator { getRegexConfigSystem -> "test", getRegexConfigInherited + ".config.zorp" -> "morp") - val rewriter = new RegexTopicGenerator() { + val rewriter = new RegExTopicGenerator() { override def getTopicsFromZK(rewriterName: String, config: Config): Seq[String] = List("yoyoyo") }
